r141 - in unstable/ffmpeg/debian: . patches

[lool at alioth.debian.org]

Author: lool
Date: 2007-01-23 21:36:11 +0000 (Tue, 23 Jan 2007)
New Revision: 141

Modified:
   unstable/ffmpeg/debian/changelog
   unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff
   unstable/ffmpeg/debian/rules
Log:
* Exclude firewire libs from ffmpeg-config under kFreeBSD; based on a patch
  by Petr Salinger; closes: #399701.

Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog	2007-01-23 20:55:03 UTC (rev 140)
+++ unstable/ffmpeg/debian/changelog	2007-01-23 21:36:11 UTC (rev 141)
@@ -1,8 +1,10 @@
 ffmpeg (0.cvs20060823-5) UNRELEASED; urgency=low
 
   * Add myself to Uploaders.
+  * Exclude firewire libs from ffmpeg-config under kFreeBSD; based on a patch
+    by Petr Salinger; closes: #399701.
 
- -- Loic Minier <lool at dooz.org>  Tue, 23 Jan 2007 21:54:34 +0100
+ -- Loic Minier <lool at dooz.org>  Tue, 23 Jan 2007 22:35:19 +0100
 
 ffmpeg (0.cvs20060823-4) unstable; urgency=high
 

Modified: unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff
===================================================================
--- unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff	2007-01-23 20:55:03 UTC (rev 140)
+++ unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff	2007-01-23 21:36:11 UTC (rev 141)
@@ -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"

Modified: unstable/ffmpeg/debian/rules
===================================================================
--- unstable/ffmpeg/debian/rules	2007-01-23 20:55:03 UTC (rev 140)
+++ unstable/ffmpeg/debian/rules	2007-01-23 21:36:11 UTC (rev 141)
@@ -7,11 +7,15 @@
 confflags += --enable-gpl --enable-pp --enable-pthreads
 confflags += --enable-vorbis --enable-libogg --enable-a52 --enable-dts --enable-libgsm
 
+DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
+
 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 +149,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@/$(DEB_VERSION)/ 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