r1081 - in /experimental/ffmpeg.20080206/debian: changelog control libswscale0.install libswscale1d.install patches/011_link_plugins.diff rules

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Thu Mar 20 09:29:10 UTC 2008 

Author: fabian-guest
Date: Thu Mar 20 09:29:09 2008
New Revision: 1081

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1081
Log:
* debian/control:
  + libswscale1d -> libswscale0
* debian/rules:
  + Simplified dh_makeshlibs and dh_shlibdeps calls.
* debian/patches/011_link_plugins.diff:
  + Updated to link all plugins against libavutil since they all use symbols
    from this library. Resolves "symbols found in none of the libraries"
    warnings from dpkg-shlibdeps.
 

Added:
    experimental/ffmpeg.20080206/debian/libswscale0.install
      - copied unchanged from r1080, experimental/ffmpeg.20080206/debian/libswscale1d.install
Removed:
    experimental/ffmpeg.20080206/debian/libswscale1d.install
Modified:
    experimental/ffmpeg.20080206/debian/changelog
    experimental/ffmpeg.20080206/debian/control
    experimental/ffmpeg.20080206/debian/patches/011_link_plugins.diff
    experimental/ffmpeg.20080206/debian/rules

Modified: experimental/ffmpeg.20080206/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/changelog?rev=1081&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/changelog (original)
+++ experimental/ffmpeg.20080206/debian/changelog Thu Mar 20 09:29:09 2008
@@ -26,6 +26,7 @@
     + Updated, since AAC decoding (through FAAD) is now enabled.
     + Updated URL for unofficial ffmpeg packages.
   * debian/rules:
+    + Reordered confflags to optionally build LGPL versions of the libraries.
     + Removed trailing whitespace.
     + Removed unused strip rule.
     + Added libxvidcore4-dev to weak-build-deps and fixed confflags
@@ -33,6 +34,10 @@
     + Added a get-orig-source rule to reproduce the source tarball. Produce an
       unstripped tarball if DEB_BUILD_OPTIONS=risky.
     + Do not run debian/fixup-config.sh if DEB_BUILD_OPTIONS=risky.
+  * debian/patches/011_link_plugins.diff:
+    + Updated to link all plugins against libavutil since they all use symbols
+      from this library. Resolves "symbols found in none of the libraries"
+      warnings from dpkg-shlibdeps.
 
  -- Reinhard Tartler <siretart at tauware.de>  Wed, 19 Mar 2008 23:53:26 +0100
 

Modified: experimental/ffmpeg.20080206/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/control?rev=1081&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/control (original)
+++ experimental/ffmpeg.20080206/debian/control Thu Mar 20 09:29:09 2008
@@ -44,7 +44,7 @@
  This is the common utility library from the ffmpeg project. It is required
  by all other ffmpeg libraries.
  .
- This package contains a Debian-specific version of the libswscale shared
+ This package contains a Debian-specific version of the libavutil shared
  object that should only be used by Debian packages.
 
 Package: libavcodec51
@@ -93,7 +93,7 @@
  This package contains a Debian-specific version of the libavformat shared
  object that should only be used by Debian packages.
 
-Package: libswscale1d
+Package: libswscale0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -191,7 +191,7 @@
 Package: libswscale-dev
 Section: libdevel
 Architecture: any
-Depends: libswscale1d (= ${binary:Version}),
+Depends: libswscale0 (= ${binary:Version}),
          libavutil-dev (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
@@ -200,4 +200,3 @@
  .
  This package contains the header files and static libraries needed to
  compile applications or shared objects that use libswscale.
-

Modified: experimental/ffmpeg.20080206/debian/patches/011_link_plugins.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/011_link_plugins.diff?rev=1081&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/011_link_plugins.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/011_link_plugins.diff Thu Mar 20 09:29:09 2008
@@ -1,19 +1,19 @@
 Index: ffmpeg.20080206/Makefile
 ===================================================================
---- ffmpeg.20080206.orig/Makefile	2008-02-03 20:26:29.000000000 +0100
-+++ ffmpeg.20080206/Makefile	2008-03-15 23:03:24.000000000 +0100
+--- ffmpeg.20080206.orig/Makefile	2008-03-19 16:20:22.000000000 +0100
++++ ffmpeg.20080206/Makefile	2008-03-19 16:21:42.000000000 +0100
 @@ -52,11 +52,16 @@
  
  HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes)))
  
-+LIBS_fish$(SLIBSUF) += -lavcodec -lswscale -lavformat
-+LIBS_null$(SLIBSUF) += -lavcodec -lswscale
-+LIBS_ppm$(SLIBSUF) += -lavcodec -lswscale -lavformat
-+LIBS_watermark$(SLIBSUF) += -lavcodec -lswscale -lavformat
++LIBS_fish$(SLIBSUF) += -lavcodec -lswscale -lavformat -lavutil
++LIBS_null$(SLIBSUF) += -lavcodec -lswscale -lavutil
++LIBS_ppm$(SLIBSUF) += -lavcodec -lswscale -lavformat -lavutil
++LIBS_watermark$(SLIBSUF) += -lavcodec -lswscale -lavformat -lavutil
 +
  VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags`
 -LIBS_imlib2$(SLIBSUF)       = `imlib2-config --libs`
-+LIBS_imlib2$(SLIBSUF)       = `imlib2-config --libs` -lswscale -lavcodec
++LIBS_imlib2$(SLIBSUF)       = `imlib2-config --libs` -lswscale -lavcodec -lavutil
  
  VHOOKCFLAGS-$(HAVE_FREETYPE2) += `freetype-config --cflags`
 -LIBS_drawtext$(SLIBSUF)        = `freetype-config --libs`

Modified: experimental/ffmpeg.20080206/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/rules?rev=1081&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/rules (original)
+++ experimental/ffmpeg.20080206/debian/rules Thu Mar 20 09:29:09 2008
@@ -5,14 +5,15 @@
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 LIBS = libavutil libavcodec libpostproc libavformat libavdevice libswscale
-confflags += --enable-gpl --enable-pp --enable-swscaler --enable-pthreads
+# Comment out the following single line for LGPL versions of the libraries
+confflags += --enable-gpl --enable-liba52 --enable-libfaad --enable-pp --enable-swscaler
+confflags += --enable-pthreads
 confflags += --enable-libvorbis --enable-libtheora
-confflags += --enable-liba52 --enable-libgsm
-confflags += --enable-libfaad
+confflags += --enable-libgsm
 confflags += --disable-armv6 --disable-armv5te
 
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
-SRC_VERSION := $(shell echo $(DEB_VERSION) | sed -ne 's/\-.*$//p')
+SRC_VERSION := $(shell echo $(DEB_VERSION) | cut -d '-' -f 1)
 SVN_VERSION := $(shell echo $(SRC_VERSION) | sed -ne 's/^[0-9]\.[a-z]*//p')
 
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
@@ -48,9 +49,9 @@
 weak-build-deps += libfaac-dev
 confflags += --enable-libfaac
 weak-build-deps += libxvidcore-dev | libxvidcore4-dev
-confflags += --enable-libxvid
+confflags += --enable-gpl --enable-libxvid
 weak-build-deps += libx264-dev
-confflags += --enable-libx264
+confflags += --enable-gpl --enable-libx264
 $(warning Make sure these packages are installed: $(weak-build-deps))
 endif
 
@@ -162,11 +163,13 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	for d in libavutil49 libavcodec51 libpostproc51 libavformat52 libavdevice52 libswscale1d ; do \
-	  dh_makeshlibs -p $${d} -V "$${d} (>= 0.svn20080206)" ; \
-	done
+#	for d in libavutil49 libavcodec51 libpostproc51 libavformat52 libavdevice52 libswscale0 ; do \
+#	  dh_makeshlibs -p $${d} -V "$${d} (>= 0.svn20080206)" ; \
+#	done
+	dh_makeshlibs -V
 	dh_installdeb
-	dh_shlibdeps -L libavutil49 -L libavcodec51 -L libavdevice52 -L libpostproc51 -L libavformat52 -L libswscale1d -l debian/libavutil49/usr/lib:debian/libavcodec51/usr/lib:debian/libavdevice52/usr/lib:debian/libavformat52/usr/lib:debian/libpostproc51/usr/lib:debian/libswscale1d/usr/lib
+#	dh_shlibdeps -L libavutil49 -L libavcodec51 -L libavdevice52 -L libpostproc51 -L libavformat52 -L libswscale0 -l debian/libavutil49/usr/lib:debian/libavcodec51/usr/lib:debian/libavdevice52/usr/lib:debian/libavformat52/usr/lib:debian/libpostproc51/usr/lib:debian/libswscale0/usr/lib
+	dh_shlibdeps
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
 	dh_md5sums
 	dh_builddeb

More information about the pkg-multimedia-commits mailing list