[xawtv] Re-apply xawtv-3.95-vbi-compile-fix.patch

mchehab mchehab at fedoraproject.org
Sat Jan 29 11:41:27 UTC 2011


commit 674a33e0574c5312893ed40bc6cd6765d2fa2886
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date:   Sat Jan 29 09:39:08 2011 -0200

    Re-apply xawtv-3.95-vbi-compile-fix.patch
    
    While this patch doesn't seem to be needed with Fedora 14, Fedora 15
    build now requires it:
    
    gcc -ldl -Wl,-E -o x11/xawtv x11/xawtv.o x11/wmhooks.o x11/atoms.o x11/x11.o x11/blit.o x11/xt.o x11/xv.o x11/toolbox.o x11/conf.o x11/complete-xaw.o x11/vbi-x11.o jwz/remote.o common/channel.o common/vbi-data.o common/lirc.o common/joystick.o common/midictrl.o common/sound.o common/webcam.o common/frequencies.o common/commands.o common/parseconfig.o common/capture.o common/event.o libng/libng.a -lpthread -lncursesw -lasound -lXft -lXv -lXrandr -lXrender -lXinerama -lXxf86vm -lXxf86dga -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lzvbi -lpthread -lm -lpng -lz -lGL -lm -ljpeg -lm
    /usr/bin/ld: x11/vbi-x11.o: undefined reference to symbol 'FcNameParse'
    /usr/bin/ld: note: 'FcNameParse' is defined in DSO /usr/lib64/libfontconfig.so.1 so try adding it to the linker command line
    /usr/lib64/libfontconfig.so.1: could not read symbols: Invalid operation
    collect2: ld returned 1 exit status
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

 xawtv.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/xawtv.spec b/xawtv.spec
index 8c4918e..754351c 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -50,7 +50,7 @@ Xawtv also includes a grabber driver for vic.
 %setup -q
 %patch0 -p1 -b .strip
 %patch3 -p1 -b .font
-#%patch15 -p1
+%patch15 -p1
 %{!?_without_libv4l:%patch100 -p1 -b .libv4l}
 
 autoconf


More information about the scm-commits mailing list