Package: ffmpeg
Severity: important
Version: 0.cvs20060329-4
Tags: patch
Hi,
the current version fails to build on GNU/kFreeBSD.
Please find attached patch to fix that.
It would also be nice if you can ask upstream
to include change in 025_kfreebsd.diff.
Thanks in advance
Petr
--- ffmpeg-0.cvs20060329/debian/control 2006-06-09 11:12:38.000000000 +0200
+++ ffmpeg-0.cvs20060329/debian/control 2006-06-09 11:12:38.000000000 +0200
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev,
liba52-dev, libdts-dev, zlib1g-dev, libsdl1.2-dev, libfreetype6-dev,
libimlib2-dev, texi2html, libraw1394-dev, libdc1394-13-dev, libtheora-dev (>>
0.0.0.alpha4), libgsm1-dev
+Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev,
liba52-dev, libdts-dev, zlib1g-dev, libsdl1.2-dev, libfreetype6-dev,
libimlib2-dev, texi2html, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64
!hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev
Standards-Version: 3.6.2
Package: ffmpeg
diff -u ffmpeg-0.cvs20060329/debian/patches/series
ffmpeg-0.cvs20060329/debian/patches/series
--- ffmpeg-0.cvs20060329/debian/patches/series
+++ ffmpeg-0.cvs20060329/debian/patches/series
@@ -8,0 +9 @@
+025_kfreebsd.diff
diff -u ffmpeg-0.cvs20060329/debian/rules ffmpeg-0.cvs20060329/debian/rules
--- ffmpeg-0.cvs20060329/debian/rules
+++ ffmpeg-0.cvs20060329/debian/rules
@@ -12,7 +12,12 @@
#endif
confflags += --enable-gpl --enable-pp --enable-pthreads
-confflags += --enable-vorbis --enable-libogg --enable-theora --enable-a52
--enable-dts --enable-dc1394 --enable-libgsm
+confflags += --enable-vorbis --enable-libogg --enable-theora --enable-a52
--enable-dts --enable-libgsm
+
+ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
+ confflags += --enable-dc1394
+endif
+
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
confflags += --enable-debug
else
only in patch2:
unchanged:
--- ffmpeg-0.cvs20060329.orig/debian/patches/025_kfreebsd.diff
+++ ffmpeg-0.cvs20060329/debian/patches/025_kfreebsd.diff
@@ -0,0 +1,34 @@
+Index: ffmpeg-0.cvs20060329/configure
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/configure 2006-06-09 11:04:38.000000000
+0200
++++ ffmpeg-0.cvs20060329/configure 2006-06-09 11:05:52.000000000 +0200
+@@ -339,6 +339,15 @@
+ CFLAGS="-pthread"
+ LDFLAGS="$LDFLAGS -export-dynamic -pthread"
+ ;;
++GNU/kFreeBSD)
++v4l="no"
++v4l2="no"
++bktr="yes"
++audio_oss="yes"
++dv1394="no"
++CFLAGS="-pthread"
++LDFLAGS="$LDFLAGS -rdynamic"
++;;
+ BSD/OS)
+ v4l="no"
+ v4l2="no"
+Index: ffmpeg-0.cvs20060329/libavformat/grab_bktr.c
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/libavformat/grab_bktr.c 2006-03-29
19:53:55.000000000 +0200
++++ ffmpeg-0.cvs20060329/libavformat/grab_bktr.c 2006-06-09
11:05:52.000000000 +0200
+@@ -30,6 +30,9 @@
+ # include <machine/ioctl_meteor.h>
+ # include <machine/ioctl_bt848.h>
+ # endif
++#elif defined(__FreeBSD_kernel__)
++# include <dev/bktr/ioctl_meteor.h>
++# include <dev/bktr/ioctl_bt848.h>
+ #elif defined(__DragonFly__)
+ # include <dev/video/meteor/ioctl_meteor.h>
+ # include <dev/video/bktr/ioctl_bt848.h>
