Bug#448736: avifile: FTBFS on GNU/kFreeBSD

[Petr Salinger]

Package: avifile
Severity: important
Version: 1:0.7.47.20070718-1.2
Tags: patch
User: [EMAIL PROTECTED]
Usertags: kfreebsd


Hi,

the current version fails to build on GNU/kFreeBSD.

Please find attached patch with small tweaks to fix that.

It would be nice if it could be included in the next upload.

Thanks in advance,

        Petr
diff -ur avifile-0.7.47.20070718/debian/rules 
avifile-0.7.47.20070718/debian/rules
--- avifile-0.7.47.20070718/debian/rules        2007-09-29 17:23:10.000000000 
+0200
+++ avifile-0.7.47.20070718/debian/rules        2007-10-31 13:26:17.000000000 
+0100
@@ -229,7 +229,7 @@
 # trick to allow build empty packages
 # avoid problem with  trailing ','
        @for i in $(allplugins) ; do if test ! -e debian/$$i.substvars ; then \
-               echo "shlibs:Depends=libavifile-0.7c2 (>= 1:0.7.43.20050224-1), 
libc6" > debian/$$i.substvars ; \
+               echo "shlibs:Depends=libavifile-0.7c2 (>= 1:0.7.43.20050224-1)" 
> debian/$$i.substvars ; \
        fi ; done
 
        dh_shlibdeps -Xxvid4 -Xdivx4 
-ldebian/$(libraries)/usr/lib:debian/$(player)/usr/lib
diff -ur avifile-0.7.47.20070718/admin/gendefs.sh 
avifile-0.7.47.20070718/admin/gendefs.sh
--- avifile-0.7.47.20070718/admin/gendefs.sh    2007-07-18 15:44:44.000000000 
+0200
+++ avifile-0.7.47.20070718/admin/gendefs.sh    2007-10-31 13:18:30.000000000 
+0100
@@ -50,7 +50,7 @@
 DETECT_MUXER="audio"
 PRUNE_MUXER="$DETECT_MUXER libnut ogg"
 DETECT_DEMUXER="audio dc1394 dv1394"
-PRUNE_DEMUXER="$DETECT_DEMUXER libnut ogg video_grab_bktr"
+PRUNE_DEMUXER="$DETECT_DEMUXER libnut ogg video_grab_bktr v4l2 video_grab_v4l"
 DETECT_PROTOCOL=""
 PRUNE_PROTOCOL="$DETECT_PROTOCOL"
 
diff -ur avifile-0.7.47.20070718/include/configff.h 
avifile-0.7.47.20070718/include/configff.h
--- avifile-0.7.47.20070718/include/configff.h  2007-07-18 15:44:54.000000000 
+0200
+++ avifile-0.7.47.20070718/include/configff.h  2007-10-31 13:18:41.000000000 
+0100
@@ -491,12 +491,8 @@
 #define ENABLE_TTA_DEMUXER 1
 #define CONFIG_TXD_DEMUXER 1
 #define ENABLE_TXD_DEMUXER 1
-#define CONFIG_V4L2_DEMUXER 1
-#define ENABLE_V4L2_DEMUXER 1
 #define CONFIG_VC1_DEMUXER 1
 #define ENABLE_VC1_DEMUXER 1
-#define CONFIG_VIDEO_GRAB_V4L_DEMUXER 1
-#define ENABLE_VIDEO_GRAB_V4L_DEMUXER 1
 #define CONFIG_VMD_DEMUXER 1
 #define ENABLE_VMD_DEMUXER 1
 #define CONFIG_VOC_DEMUXER 1
@@ -518,6 +514,8 @@
 #define ENABLE_LIBNUT_DEMUXER 0
 #define ENABLE_OGG_DEMUXER 0
 #define ENABLE_VIDEO_GRAB_BKTR_DEMUXER 0
+#define ENABLE_V4L2_DEMUXER 0
+#define ENABLE_VIDEO_GRAB_V4L_DEMUXER 0
 #define CONFIG_AAC_PARSER 1
 #define ENABLE_AAC_PARSER 1
 #define CONFIG_AC3_PARSER 1