Source: xawtv
Version: 3.107-4
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
xawtv fails to cross build from source, because configure.ac hard codes
the build architecture pkg-config in a number of occasions. Generally,
PKG_CHECK_MODULES should be used as it automatically detects the correct
pkg-config. I'm attaching an upstreamable patch for your convenience.
Helmut
--- xawtv-3.107.orig/Makefile.in
+++ xawtv-3.107/Makefile.in
@@ -30,7 +30,7 @@
# for CFLAGS
WARN_FLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wno-pointer-sign
LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/include/X11/fonts
+X11_FLAGS := @X_CFLAGS@ @XFT_CFLAGS@ -I/usr/include/X11/fonts
LIB_FLAGS := -I. -I./vbistuff -I./x11 \
-I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
-I$(srcdir)/x11 -I$(srcdir)/structs \
@@ -47,8 +47,8 @@
OSS_LIBS := @LIBOSS@
ALSA_LIBS := @LIBALSA@
AA_LIBS := @AALIBS@
-QT_LIBS := @QTLIBS@
-QT_FLAGS := @QTFLAGS@
+QT_LIBS := @QT_LIBS@
+QT_FLAGS := @QT_CFLAGS@
VBI_LIBS := @LIBZVBI@
GL_LIBS := @LIBGL@
DV_LIBS := @LIBDV@
--- xawtv-3.107.orig/configure.ac
+++ xawtv-3.107/configure.ac
@@ -145,25 +145,19 @@
dnl X11 checks
AC_PATH_XTRA
-if test "$no_x" != "yes"; then
+AS_IF([test "$no_x" != "yes"],[
FOUND_X11="yes"
ATHENA="-lXaw -lXmu -lXt $X_PRE_LIBS -lXpm -lXext -lX11 $X_EXTRA_LIBS"
- XFT_FLAGS=""
+ XFT_CFLAGS=""
XFT_LIBS=""
- if test "$enable_xft" != "no"; then
- AC_MSG_CHECKING(for Xft)
- if test -x "`which pkg-config 2>/dev/null`" && pkg-config xft && pkg-config fontconfig; then
- XFT_FLAGS="`pkg-config --cflags xft fontconfig`"
- XFT_LIBS="`pkg-config --libs xft fontconfig`"
+ AS_IF([test "$enable_xft" != "no"],[
+ PKG_CHECK_MODULES([XFT],[xft fontconfig],[
AC_DEFINE(HAVE_XFT,1,"have xft")
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
- fi
-else
+ ],[])
+ ])
+],[
ATHENA=""
-fi
+])
AC_SUBST(X_CFLAGS)
AC_SUBST(X_PRE_LIBS)
AC_SUBST(X_EXTRA_LIBS)
@@ -173,7 +167,7 @@
AC_SUBST(SUBS)
AC_SUBST(TOOLS)
AC_SUBST(LDLIBS)
-AC_SUBST(XFT_FLAGS)
+AC_SUBST(XFT_CFLAGS)
AC_SUBST(XFT_LIBS)
AC_CHECK_LIB(v4l2, v4l2_fd_open, LIBV4L="yes",,)
@@ -246,10 +240,11 @@
echo "*** DV disabled"
fi
-dashlglib=$(pkg-config glib-2.0 --libs 2>/dev/null)
-if test "$dashlglib" = ""; then
+PKG_CHECK_MODULES([GLIB],[glib-2.0],[
+ dashlglib="$GLIB_LIBS"
+],[
dashlglib=$(glib-config --libs 2>/dev/null)
-fi
+])
if test "$enable_quicktime" != "no"; then
AC_CHECK_LIB(quicktime, lqt_query_registry,
FOUND_LQT="yes"; AC_DEFINE(HAVE_LIBQUICKTIME,1,"have libquicktime"),,
@@ -257,16 +252,16 @@
else
echo "*** quicktime disabled"
fi
-QTLIBS=""
-if test "$FOUND_LQT" = "yes"; then
- QTFLAGS="`pkg-config libquicktime --cflags-only-I`"
- if test "$QTFLAGS" = ""; then
- QTFLAGS= "-I/usr/include/quicktime"
- fi
- QTLIBS="-lquicktime $DLFLAGS $dashlglib -lm"
-fi
-AC_SUBST(QTLIBS)
-AC_SUBST(QTFLAGS)
+QT_LIBS=""
+AS_IF([test "$FOUND_LQT" = "yes"],[
+ PKG_CHECK_MODULES([QT],[libquicktime],[
+ if test "$QT_CFLAGS" = ""; then
+ QT_CFLAGS= "-I/usr/include/quicktime"
+ fi
+ ])
+])
+AC_SUBST(QT_LIBS)
+AC_SUBST(QT_CFLAGS)
if test "$enable_xfree_ext" != "no"; then
AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension,,,
