r85 - in unstable/ffmpeg/debian: . patches

Samuel Hocevar sho at alioth.debian.org
Wed Mar 14 14:20:16 CET 2007


Author: sho
Date: 2006-09-11 00:13:00 +0000 (Mon, 11 Sep 2006)
New Revision: 85

Added:
   unstable/ffmpeg/debian/patches/006_mips_pthreads.diff
   unstable/ffmpeg/debian/patches/007_disable_ffmpeg_option.diff
   unstable/ffmpeg/debian/patches/020_really_use_liba52.diff
Modified:
   unstable/ffmpeg/debian/changelog
   unstable/ffmpeg/debian/patches/series
   unstable/ffmpeg/debian/rules
Log:
ffmpeg (0.cvs20060823-3) unstable; urgency=low

  * debian/rules:
    + Take local packages into account when computing shlibs dependencies, so
      that ffplay/ffserver depend on the proper libraries (Closes: #386029).

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue,  5 Sep 2006 17:44:00 +0200

ffmpeg (0.cvs20060823-2) unstable; urgency=low

  * debian/patches/020_really_use_liba52.diff:
    + New patch: link with the shared liba52 instead of the built-in one.

  * debian/patches/006_mips_pthreads.diff:
    + New patch: link libraries with -lpthreads on Linux MIPS because of a
      known ld bug.

  * debian/patches/007_disable_ffmpeg_option.diff:
    + New patch: add a --disable-ffmpeg option.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed, 30 Aug 2006 18:36:52 +0200


Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog	2006-09-10 20:58:20 UTC (rev 84)
+++ unstable/ffmpeg/debian/changelog	2006-09-11 00:13:00 UTC (rev 85)
@@ -1,3 +1,25 @@
+ffmpeg (0.cvs20060823-3) unstable; urgency=low
+
+  * debian/rules:
+    + Take local packages into account when computing shlibs dependencies, so
+      that ffplay/ffserver depend on the proper libraries (Closes: #386029).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue,  5 Sep 2006 17:44:00 +0200
+
+ffmpeg (0.cvs20060823-2) unstable; urgency=low
+
+  * debian/patches/020_really_use_liba52.diff:
+    + New patch: link with the shared liba52 instead of the built-in one.
+
+  * debian/patches/006_mips_pthreads.diff:
+    + New patch: link libraries with -lpthreads on Linux MIPS because of a
+      known ld bug.
+
+  * debian/patches/007_disable_ffmpeg_option.diff:
+    + New patch: add a --disable-ffmpeg option.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed, 30 Aug 2006 18:36:52 +0200
+
 ffmpeg (0.cvs20060823-1) unstable; urgency=low
 
   * New SVN snapshot (Closes: #368904).

Added: unstable/ffmpeg/debian/patches/006_mips_pthreads.diff
===================================================================
--- unstable/ffmpeg/debian/patches/006_mips_pthreads.diff	2006-09-10 20:58:20 UTC (rev 84)
+++ unstable/ffmpeg/debian/patches/006_mips_pthreads.diff	2006-09-11 00:13:00 UTC (rev 85)
@@ -0,0 +1,17 @@
+Index: ffmpeg-0.cvs20060823/configure
+===================================================================
+--- ffmpeg-0.cvs20060823.orig/configure	2006-08-30 18:02:50.000000000 +0200
++++ ffmpeg-0.cvs20060823/configure	2006-08-30 18:08:23.000000000 +0200
+@@ -1252,7 +1252,11 @@
+ # check for some common methods of building with pthread support
+ # do this before the optional library checks as some of them require pthreads
+ if enabled pthreads; then
+-    { check_cflags -pthread && check_ldflags -pthread; } ||
++    if test "$targetos" = "Linux" -a \
++            "$cpu" = "mips" ; then
++        pthreads_ldadd="-lpthread"
++    fi
++    { check_cflags -pthread && check_ldflags "-pthread $pthreads_ldadd"; } ||
+     { check_cflags -pthreads && check_ldflags -pthreads; } ||
+     check_lib pthread.h pthread_create -lpthread ||
+     check_func pthread_create ||

Added: unstable/ffmpeg/debian/patches/007_disable_ffmpeg_option.diff
===================================================================
--- unstable/ffmpeg/debian/patches/007_disable_ffmpeg_option.diff	2006-09-10 20:58:20 UTC (rev 84)
+++ unstable/ffmpeg/debian/patches/007_disable_ffmpeg_option.diff	2006-09-11 00:13:00 UTC (rev 85)
@@ -0,0 +1,59 @@
+Index: ffmpeg-0.cvs20060823/Makefile
+===================================================================
+--- ffmpeg-0.cvs20060823.orig/Makefile	2006-08-30 18:34:19.000000000 +0200
++++ ffmpeg-0.cvs20060823/Makefile	2006-08-30 18:34:49.000000000 +0200
+@@ -15,11 +15,13 @@
+ CFLAGS := -I$(SRC_PATH)/libswscale $(CFLAGS)
+ endif
+ 
++ifeq ($(CONFIG_FFMPEG),yes)
+ MANPAGES=doc/ffmpeg.1
+ PROGS_G+=ffmpeg_g$(EXESUF)
+ PROGS+=ffmpeg$(EXESUF)
+ PROGTEST=output_example$(EXESUF)
+ QTFASTSTART=qt-faststart$(EXESUF)
++endif
+ 
+ ifeq ($(CONFIG_FFSERVER),yes)
+ MANPAGES+=doc/ffserver.1
+Index: ffmpeg-0.cvs20060823/configure
+===================================================================
+--- ffmpeg-0.cvs20060823.orig/configure	2006-08-30 18:34:19.000000000 +0200
++++ ffmpeg-0.cvs20060823/configure	2006-08-30 18:36:31.000000000 +0200
+@@ -96,6 +96,7 @@
+   echo "  --disable-mpegaudio-hp   faster (but less accurate)"
+   echo "                           MPEG audio decoding [default=no]"
+   echo "  --disable-protocols      disable I/O protocols support [default=no]"
++  echo "  --disable-ffmpeg         disable ffmpeg build"
+   echo "  --disable-ffserver       disable ffserver build"
+   echo "  --disable-ffplay         disable ffplay build"
+   echo "  --enable-small           optimize for size instead of speed"
+@@ -445,6 +446,7 @@
+ netserver="no"
+ need_inet_aton="no"
+ protocols="yes"
++ffmpeg="yes"
+ ffserver="yes"
+ ffplay="yes"
+ LIBOBJFLAGS=""
+@@ -793,6 +795,8 @@
+   ;;
+   --disable-protocols) protocols="no"; network="no"; ffserver="no"
+   ;;
++  --disable-ffmpeg) ffmpeg="no"
++  ;;
+   --disable-ffserver) ffserver="no"
+   ;;
+   --disable-ffplay) ffplay="no"
+@@ -2016,6 +2020,11 @@
+   echo "CONFIG_PROTOCOLS=yes" >> config.mak
+ fi
+ 
++if test "$ffmpeg" = "yes" ; then
++  echo "#define CONFIG_FFMPEG 1" >> $TMPH
++  echo "CONFIG_FFMPEG=yes" >> config.mak
++fi
++
+ if test "$ffserver" = "yes" ; then
+   echo "#define CONFIG_FFSERVER 1" >> $TMPH
+   echo "CONFIG_FFSERVER=yes" >> config.mak

Added: unstable/ffmpeg/debian/patches/020_really_use_liba52.diff
===================================================================
--- unstable/ffmpeg/debian/patches/020_really_use_liba52.diff	2006-09-10 20:58:20 UTC (rev 84)
+++ unstable/ffmpeg/debian/patches/020_really_use_liba52.diff	2006-09-11 00:13:00 UTC (rev 85)
@@ -0,0 +1,37 @@
+Index: ffmpeg-0.cvs20060823/libavcodec/Makefile
+===================================================================
+--- ffmpeg-0.cvs20060823.orig/libavcodec/Makefile	2006-08-30 18:47:27.000000000 +0200
++++ ffmpeg-0.cvs20060823/libavcodec/Makefile	2006-08-30 18:48:02.000000000 +0200
+@@ -220,13 +220,13 @@
+ OBJS-$(CONFIG_AC3)                     += a52dec.o
+ 
+ # using builtin liba52 or runtime linked liba52.so.0
+-OBJS-$(CONFIG_AC3)$(CONFIG_A52BIN)     += liba52/bit_allocate.o \
+-                                          liba52/bitstream.o    \
+-                                          liba52/downmix.o      \
+-                                          liba52/imdct.o        \
+-                                          liba52/parse.o        \
+-                                          liba52/crc.o          \
+-                                          liba52/resample.o
++#OBJS-$(CONFIG_AC3)$(CONFIG_A52BIN)     += liba52/bit_allocate.o \
++#                                          liba52/bitstream.o    \
++#                                          liba52/downmix.o      \
++#                                          liba52/imdct.o        \
++#                                          liba52/parse.o        \
++#                                          liba52/crc.o          \
++#                                          liba52/resample.o
+ 
+ # currently using libdts for dts decoding
+ OBJS-$(CONFIG_DTS)                     += dtsdec.o
+Index: ffmpeg-0.cvs20060823/configure
+===================================================================
+--- ffmpeg-0.cvs20060823.orig/configure	2006-08-30 18:48:08.000000000 +0200
++++ ffmpeg-0.cvs20060823/configure	2006-08-30 18:49:36.000000000 +0200
+@@ -1268,6 +1268,7 @@
+ fi
+ 
+ # these are off by default, so fail if requested and not available
++enabled a52     && require liba52 a52dec/a52.h a52_init -la52
+ enabled dts     && require libdts dts.h dts_init -ldts
+ enabled libgsm  && require libgsm gsm.h gsm_create -lgsm
+ enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame

Modified: unstable/ffmpeg/debian/patches/series
===================================================================
--- unstable/ffmpeg/debian/patches/series	2006-09-10 20:58:20 UTC (rev 84)
+++ unstable/ffmpeg/debian/patches/series	2006-09-11 00:13:00 UTC (rev 85)
@@ -1,8 +1,11 @@
 005_m68k_workaround.diff 
 005_altivec_flags.diff 
 005_runtime_cpudetect.diff 
+006_mips_pthreads.diff
+007_disable_ffmpeg_option.diff
 010_ffmpeg-config.diff 
 010_shared_library_versioning.diff 
 #020_mmx_intrinsics.diff 
 020_mmx_pic_code.diff 
 020_disable_snow_mmx_in_pic.diff 
+020_really_use_liba52.diff

Modified: unstable/ffmpeg/debian/rules
===================================================================
--- unstable/ffmpeg/debian/rules	2006-09-10 20:58:20 UTC (rev 84)
+++ unstable/ffmpeg/debian/rules	2006-09-11 00:13:00 UTC (rev 85)
@@ -44,8 +44,8 @@
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	
-	# Build ffmpeg and static libraries
-	./configure $(confflags) --prefix=/usr
+	# Build static libraries
+	./configure $(confflags) --disable-ffmpeg --disable-ffserver --disable-ffplay --prefix=/usr
 	cd doc && $(MAKE)
 	$(MAKE)
 	
@@ -55,7 +55,7 @@
 	mv libavcodec/libavcodec.a libavcodec/libavcodec.a.bak
 	mv libavformat/libavformat.a libavformat/libavformat.a.bak
 	
-	# Build shared libraries
+	# Build ffmpeg and shared libraries
 	./configure $(confflags) --enable-shared --prefix=/usr
 	
 	sed 's/ldts/ldts_pic/' <config.mak >config.mak.pic
@@ -175,9 +175,8 @@
 	dh_makeshlibs -p libavcodec0d -V 'libavcodec0d (>= 0.cvs20060823)'
 	dh_makeshlibs -p libavformat0d -V 'libavformat0d (>= 0.cvs20060823)'
 	dh_makeshlibs -p libpostproc0d -V 'libpostproc0d (>= 0.cvs20060823)'
-	dh_makeshlibs
 	dh_installdeb
-	dh_shlibdeps
+	dh_shlibdeps -L libavcodec0d -L libpostproc0d -L libavformat0d -l debian/libavcodec0d/usr/lib:debian/libavformat0d/usr/lib:debian/libpostproc0d/usr/lib
 	dh_gencontrol -Vlib1394-dev=$(lib1394-dev)
 	dh_md5sums
 	dh_builddeb




More information about the Pkg-multimedia-commits mailing list