diff --git a/xawtv-3.95-vbi-compile-fix.patch b/xawtv-3.95-vbi-compile-fix.patch new file mode 100644 index 0000000..0253cc3 --- /dev/null +++ b/xawtv-3.95-vbi-compile-fix.patch @@ -0,0 +1,12 @@ +diff -up xawtv-3.95/configure.ac~ xawtv-3.95/configure.ac +--- xawtv-3.95/configure.ac~ 2010-11-17 11:42:27.000000000 +0100 ++++ xawtv-3.95/configure.ac 2010-11-17 11:44:51.891724004 +0100 +@@ -200,7 +200,7 @@ AC_SUBST(LIBZVBI) + LIBZVBI="" + if test "$enable_zvbi" != "no"; then + AC_CHECK_LIB(zvbi, vbi_capture_fd, +- AC_DEFINE(HAVE_ZVBI,1,"have zvbi") FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -lpthread -lm -lpng -lz",,$LIBPTHREAD) ++ AC_DEFINE(HAVE_ZVBI,1,"have zvbi") FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -lpthread -lm -lpng -lz -lfontconfig",,$LIBPTHREAD) + else + echo "*** zvbi disabled" + fi diff --git a/xawtv.spec b/xawtv.spec index 79188e8..8ad3e06 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -26,6 +26,7 @@ Patch11: xawtv-3.95-no-dga.patch Patch12: xawtv-3.95-bpl.patch Patch13: xawtv-3.95-v4l2-old-drop.patch Patch14: xawtv-3.95-no-double-exit.patch +Patch15: xawtv-3.95-vbi-compile-fix.patch # add libv4l2 layer... Patch100: xawtv-3.95-libv4l2.patch @@ -75,6 +76,7 @@ Xawtv also includes a grabber driver for vic. %patch12 -p1 -b .bpl %patch13 -p1 -b .v4l2-old-drop %patch14 -p1 +%patch15 -p1 %{!?_without_libv4l:%patch100 -p1 -b .libv4l} sed -i -e 's,/usr/X11R6/lib/X11,%{_datadir}/X11,g' configure.ac @@ -89,7 +91,7 @@ autoheader export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" %configure --x-libraries=%{_libdir} --disable-motif --disable-quicktime -make +make verbose=yes for man in `find man -name "*.[1-9]" -print` do