Package: ffmpeg
Severity: important
Version: 0.cvs20060823-4
Tags: patch
Hi,
the current version have same ffmpeg-config on GNU/kFreeBSD as on Linux.
The GNU/kFreeBSD variant needs to exclude firewire libs.
Please find attached patch with that.
Thanks in advance
Petr
diff -u ffmpeg-0.cvs20060823/debian/patches/010_ffmpeg-config.diff
ffmpeg-0.cvs20060823/debian/patches/010_ffmpeg-config.diff
--- ffmpeg-0.cvs20060823/debian/patches/010_ffmpeg-config.diff
+++ ffmpeg-0.cvs20060823/debian/patches/010_ffmpeg-config.diff
@@ -76,7 +76,7 @@
+fi
+
+cflags="-I$include_dir"
-+link_libs="$link_libs -lvorbis -lvorbisenc -ltheora -logg -ldts -la52
-lraw1394 -ldc1394_control -lgsm -lz -lm"
++link_libs="$link_libs -lvorbis -lvorbisenc -ltheora -logg -ldts -la52
@FIREWIRELIBS@ -lgsm -lz -lm"
+
+if test "$lib_dir" != "/usr/lib"; then
+ libs="-L$lib_dir"
diff -u ffmpeg-0.cvs20060823/debian/rules ffmpeg-0.cvs20060823/debian/rules
--- ffmpeg-0.cvs20060823/debian/rules
+++ ffmpeg-0.cvs20060823/debian/rules
@@ -10,8 +10,10 @@
ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
confflags += --enable-dc1394
lib1394-dev = libraw1394-dev, libdc1394-13-dev
+ FIREWIRELIBS="-lraw1394 -ldc1394_control"
else
lib1394-dev =
+ FIREWIRELIBS=""
endif
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -145,7 +147,7 @@
cp doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
cp doc/ffserver.conf debian/tmp/etc/
- sed s/@VERSION@/`dpkg-parsechangelog | sed -ne 's/^Version: //p'`/
ffmpeg-config.in > debian/tmp/usr/bin/ffmpeg-config
+ sed -e s/@FIREWIRELIBS@/$(FIREWIRELIBS)/ -e
s/@VERSION@/`dpkg-parsechangelog | sed -ne 's/^Version: //p'`/ ffmpeg-config.in
> debian/tmp/usr/bin/ffmpeg-config
chmod 644 debian/tmp/usr/bin/ffmpeg-config
cp ffmpeg-config.1 debian/tmp/usr/share/man/man1/ffmpeg-config.1