[SCM] FFmpeg packaging branch, master.extra, updated. debian/0.5+svn20090609-2debimedia1

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Aug 1 20:54:01 UTC 2009


The following commit has been merged in the master.extra branch:
commit fa114b707a11090595ac6d365412095cbf5af4f1
Merge: 41a6f60f8a6dedd574ba947d62864ac0b8d92076 0281d775ac9eb6c2b025e8759b9deb5ba11ee88d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 1 21:46:20 2009 +0200

    Merge branch 'master' into master.extra

diff --combined debian/changelog
index 9a7fa9f,93659bb..7650424
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,41 +1,57 @@@
- ffmpeg-extra (4:0.5+svn20090609-1debimedia1) unstable; urgency=low
++ffmpeg-extra (4:0.5+svn20090609-2debimedia1) unstable; urgency=low
 +
 +  * Prepare new release.
 +  * This package is the replacment package that is built against the
 +    following extra packages:
 +     - x264
 +     - mp3lame
 +     - xvidcore  
 +  * We've used the suffix -unstripped- formerly for this set of
 +    package. In order to keep existing packages installable with this set
 +    of packages, we are also building transitional -unstripped- dummy
 +    packages that depend on the right ones. They will be dropped after
 +    squeeze release.
 +  
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 10 Jul 2009 22:41:20 +0200
 +
+ ffmpeg-debian (4:0.5+svn20090609-2) unstable; urgency=low
+ 
+   [ Fabian Greffrath ]
+   * Remove .install files for unstripped packages that we do not build
+     from this branch anyway.
+   * Remove debian/fixup-config.sh which was only a hack needed to repair
+     the crippled config.h
+   * Finally remove strip.sh.
+ 
+   [ Andres Mejia ]
+   * Add vdpau support by including vdpau headers in deb packaging.
+     (Closes: #511544)
+   * Don't disable encoders if internalencoders is set in
+     DEB_BUILD_OPTIONS.
+   * Enable yasm for i386 and amd64.
+ 
+   [ Reinhard Tartler ]
+   * clarifications suggested by upstream in README.Source
+   * refresh patches
+ 
+   [ Fabian Greffrath ]
+   * Document the copyright notice and license for the VDPAU headers in
+     debian/copyright.
+   * Remove parallel make support from debian/confflags, it's overridden
+     in debian/rules anyway.
+   * Quote opts in debian/watch.
+   * Bump debhelper compat to 7.
+   * Clean up clean target in debian/rules in favour of debian/clean.
+   * Replace "dh_clean -k" by dh_prep.
+ 
+   [ Reinhard Tartler ]
+   * remove duplicated libxvmc-dev build dependency
+   * sort build dependencies alphabetically
+   * remove section numbering from README.Debian
+   * add note about the lintian override
+ 
+  -- Andres Mejia <mcitadel at gmail.com>  Mon, 06 Jul 2009 13:04:17 -0400
+ 
  ffmpeg-debian (4:0.5+svn20090609-1) unstable; urgency=low
  
    [ Andres Mejia ]
diff --combined debian/confflags
index 7cd0e09,37711c2..6ad1800
--- a/debian/confflags
+++ b/debian/confflags
@@@ -41,11 -41,6 +41,11 @@@ define cond_enabl
  	$(shell test -r $(1) && echo --enable-$(2) )
  endef
  
 +# variant that also require --enable-nonfree
 +define cond_enable_nf
 +	$(shell test -r $(1) && echo --enable-$(2) --enable-nonfree )
 +endef
 +
  # Configuration flags causing the libs to be GPL tainted
  gpl_confflags += --enable-gpl
  gpl_confflags += --enable-postproc
@@@ -95,9 -90,6 +95,9 @@@ confflags += $(call cond_enable,/usr/in
  confflags += $(call cond_enable,/usr/include/faac.h,libfaac)
  gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
  
 +confflags += $(call cond_enable_nf,/usr/include/amrnb/sp_dec.h,libamr-nb)
 +confflags += $(call cond_enable_nf,/usr/include/amrwb/dec.h,libamr-wb)
 +
  # comment out following line for LGPL versions of the libraries
  confflags += $(gpl_confflags)
  
@@@ -190,13 -182,6 +190,6 @@@ vis_build_confflags += --disable-ffmpe
  vis_build_confflags += --disable-ffserver
  vis_build_confflags += --disable-ffplay
  
- # Support multiple makes at once (taken from the qemu package)
- ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-   NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- else
-   NJOBS := 1
- endif
- 
  # Additional documentation for PowerPC
  ifneq (,$(findstring powerpc,$(DEB_BUILD_GNU_TYPE)))
    extradoc := doc/ffmpeg_powerpc_performance_evaluation_howto.txt
diff --combined debian/control
index 4e7503d,5c7dec8..c870db3
--- a/debian/control
+++ b/debian/control
@@@ -1,4 -1,4 +1,4 @@@
 -Source: ffmpeg-debian
 +Source: ffmpeg-extra
  Section: libs
  Priority: optional
  Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
@@@ -13,164 -13,231 +13,163 @@@ Vcs-Git: git://git.debian.org/git/pkg-m
  Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg-debian.git;a=summary
  Homepage: http://ffmpeg.org/
  Build-Depends-Indep: doxygen
- Build-Depends: debhelper (>= 6.0.7~),
+ Build-Depends: debhelper (>= 7),
                 libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
++               libavcodec-dev,
++               libavfilter-dev,
++               libavformat-dev,
++               libavutil-dev,
+                libbz2-dev,
                 libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                 libfaad-dev | libfaad2-dev,
                 libfreetype6-dev,
                 libgsm1-dev,
                 libimlib2-dev,
++               libmp3lame-dev,
+                libopenjpeg-dev,
++               libpostproc-dev,
                 libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-                libsdl1.2-dev,
                 libschroedinger-dev,
+                libsdl1.2-dev,
                 libspeex-dev,
                 libtheora-dev (>> 0.0.0.alpha4),
                 libvorbis-dev,
-                libopenjpeg-dev,
                 libx11-dev,
++               libx264-dev,
                 libxext-dev,
++               libxvidcore-dev,
                 libxvmc-dev,
                 quilt,
                 texi2html,
-                zlib1g-dev,
-                libxvmc-dev,
-                libbz2-dev,
-                libx264-dev,
-                libmp3lame-dev,
-                libxvidcore-dev,
-                libavcodec-dev,
-                libavformat-dev,
-                libavutil-dev,
-                libpostproc-dev,
-                libavfilter-dev,
                 yasm [i386 amd64],
+                zlib1g-dev
  
 -Package: ffmpeg
 -Section: video
 -Architecture: any
 -Depends: ${shlibs:Depends},
 -         ${misc:Depends}
 -Description: multimedia player, server and encoder
 - This package contains the ffplay multimedia player, the ffserver streaming
 - server and the ffmpeg audio and video encoder. They support most existing
 - file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
 - DivX, MPEG4, AC3, DV...).
 -
 -Package: ffmpeg-dbg
 -Section: debug
 -Priority: extra
 -Architecture: any
 -Depends: libavutil49 (= ${binary:Version}),
 -         libavcodec52 (= ${binary:Version}),
 -         libavdevice52 (= ${binary:Version}),
 -         libpostproc51 (= ${binary:Version}),
 -         libavformat52 (= ${binary:Version}),
 -         libswscale0 (= ${binary:Version}),
 -         ffmpeg (= ${binary:Version})
 -Description: Debug symbols for ffmpeg related packages
 - This package contains debug data of the ffmpeg related shared libraries.
 - .
 - Most people will not need this package. Please install it to produce useful
 - stacktraces to help debugging the ffmpeg library.
 -
 -Package: ffmpeg-doc
 -Section: doc
 -Architecture: all
 -Depends: ${misc:Depends}
 -Description: documentation of the ffmpeg API
 - This package contains the html doxygen documentation of the ffmpeg API.
 -
 -Package: libavutil49
 +Package: libavutil-extra-49
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}
 +Conflicts: libavutilcvs49, libavutil49
 +Replaces: libavutilcvs49, libavutil49
  Description: ffmpeg utility library
   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 libavutil shared
 + This package contains a unrestricted version of the libavutil shared
   object that should only be used by Debian packages.
  
 -Package: libavcodec52
 +Package: libavutil-unstripped-49
 +Architecture: any
 +Depends: libavutil-extra-49 (= ${binary:Version})
 +Description: ffmpeg utility library - transitional package
 + This package can be safely removed if no other packages depend on this
 +
 +Package: libavcodec-extra-52
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}
 +Suggests: libfaad0
 +Conflicts: libavcodec52
 +Replaces: libavcodec52
  Description: ffmpeg codec library
   This is the codec library from the ffmpeg project. It supports most existing
   encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
   .
 - This package contains a Debian-specific version of the libavcodec shared
 + This package contains a unrestricted version of the libavcodec shared
   object that should only be used by Debian packages.
  
 -Package: libavdevice52
 +Package: libavcodec-unstripped-52
 +Architecture: any
 +Depends: libavcodec-extra-52 (= ${binary:Version})
 +Description: ffmpeg utility library - transitional package
 + This package can be safely removed if no other packages depend on this
 +
 +Package: libavdevice-extra-52
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}
 +Conflicts: libavdevicecvs52, libavdevice52
 +Replaces: libavdevicecvs52, libavdevice52
  Description: ffmpeg device handling library
   This is the device handling library from the ffmpeg project.
   .
 - This package contains a Debian-specific version of the libavdevice shared
 + This package contains a unrestricted version of the libavdevice shared
   object that should only be used by Debian packages.
  
 -Package: libavformat52
 +Package: libavdevice-unstripped-52
  Architecture: any
 -Depends: ${shlibs:Depends},
 -         ${misc:Depends}
 -Breaks: libavcodec51 (<< 3:0.svn20090303-1)
 -Description: ffmpeg file format library
 - This is the demuxer library from the ffmpeg project. It supports most
 - existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
 - .
 - This package contains a Debian-specific version of the libavformat shared
 - object that should only be used by Debian packages.
 +Depends: libavdevice-extra-52 (= ${binary:Version})
 +Description: ffmpeg utility library - transitional package
 + This package can be safely removed if no other packages depend on this
  
 -Package: libavfilter0
 +Package: libavfilter-extra-0
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}
  Description: ffmpeg video filtering library
   This is the video filtering library from the ffmpeg project.
   .
 - This package contains a Debian-specific version of the libavfilter shared
 + This package contains a unrestricted version of the libavfilter shared
   object that should only be used by Debian packages.
  
 -Package: libpostproc51
 +Package: libavfilter-unstripped-0
  Architecture: any
 -Depends: ${shlibs:Depends},
 -         ${misc:Depends}
 -Description: ffmpeg video postprocessing library
 - This is the video postprocessing library from the ffmpeg project.
 - .
 - This package contains a Debian-specific version of the libpostproc shared
 - object that should only be used by Debian packages.
 +Depends: libavfilter-extra-0 (= ${binary:Version})
 +Description: ffmpeg utility library - transitional package
 + This package can be safely removed if no other packages depend on this
  
 -Package: libswscale0
 +Package: libpostproc-extra-51
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}
 -Description: ffmpeg video scaling library
 - This is the video scaling library from the ffmpeg project.
 +Conflicts: libpostproccvs51, libpostproc51
 +Replaces: libpostproccvs51, libpostproc51
 +Description: ffmpeg video postprocessing library
 + This is the video postprocessing library from the ffmpeg project.
   .
 - This package contains a Debian-specific version of the libswscale shared
 + This package contains a unrestricted version of the libpostproc shared
   object that should only be used by Debian packages.
  
 -Package: libavutil-dev
 -Section: libdevel
 -Architecture: any
 -Depends: libavutil49 (>= ${binary:Version}) | libavutil-unstripped-49 (>= ${binary:Version}),
 -         libavutil49 (<= ${source:Upstream-Version}-99) | libavutil-unstripped-49 (<= ${source:Upstream-Version}-99)
 -Description: development files for libavutil
 - This is the common utility library from the ffmpeg project. It is required
 - by all other ffmpeg libraries.
 - .
 - This package contains the header files and static libraries needed to
 - compile applications or shared objects that use libavutil.
 -
 -Package: libavcodec-dev
 -Section: libdevel
 -Architecture: any
 -Depends: libavcodec52 (>= ${binary:Version}) | libavcodec-unstripped-52 (>= ${binary:Version}),
 -         libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-unstripped-52 (<= ${source:Upstream-Version}-99),
 -         libavutil-dev (= ${binary:Version})
 -Suggests: libfaad-dev,
 -          libgsm1-dev,
 -          libogg-dev,
 -          libschroedinger-dev,
 -          libspeex-dev,
 -          libtheora-dev (>> 0.0.0.alpha4),
 -          libvorbis-dev,
 -          libx11-dev,
 -          libxext-dev,
 -          zlib1g-dev,
 -          ${lib1394-dev}
 -Description: development files for libavcodec
 - This is the codec library from the ffmpeg project. It supports most existing
 - encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
 - .
 - This package contains the header files and static libraries needed to
 - compile applications or shared objects that use libavcodec.
 -
 -Package: libavdevice-dev
 -Section: libdevel
 +Package: libavpostproc-unstripped-51
  Architecture: any
 -Depends: libavdevice52 (>= ${binary:Version}) | libavdevice-unstripped-52 (>= ${binary:Version}),
 -         libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-unstripped-52 (<= ${source:Upstream-Version}-99),
 -         libavformat-dev (= ${binary:Version})
 -Description: development files for libavdevice
 - This is the device handling library from the ffmpeg project.
 - .
 - This package contains the header files and static libraries needed to
 - compile applications or shared objects that use libavdevice.
 +Depends: libavpostproc-extra-51 (= ${binary:Version})
 +Description: ffmpeg utility library - transitional package
 + This package can be safely removed if no other packages depend on this
  
 -Package: libavformat-dev
 -Section: libdevel
 +Package: libavformat-extra-52
  Architecture: any
 -Depends: libavformat52 (>= ${binary:Version}) | libavformat-unstripped-52 (>= ${binary:Version}),
 -         libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-unstripped-52 (<= ${source:Upstream-Version}-99),
 -         libavcodec-dev (= ${binary:Version})
 -Description: development files for libavformat
 +Depends: ${shlibs:Depends},
 +         ${misc:Depends}
 +Conflicts: libavformatcvs52, libavformat52
 +Replaces: libavformatcvs52, libavformat52
 +Breaks: libavcodec51
 +Description: ffmpeg file format library
   This is the demuxer library from the ffmpeg project. It supports most
   existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
   .
 - This package contains the header files and static libraries needed to
 - compile applications or shared objects that use libavformat.
 + This package contains a unrestricted version of the libavformat shared
 + object that should only be used by Debian packages.
  
 -Package: libavfilter-dev
 -Section: libdevel
 +Package: libavformat-unstripped-52
  Architecture: any
 -Depends: libavfilter0 (>= ${binary:Version}) | libavfilter-unstripped-0 (>= ${binary:Version}),
 -         libavfilter0 (<= ${source:Upstream-Version}-99) | libavfilter-unstripped-0 (<= ${source:Upstream-Version}-99),
 -         libavcodec-dev (= ${binary:Version})
 -Description: development files for libavfilter
 - This is the video filtering library from the ffmpeg project.
 - .
 - This package contains the header files and static libraries needed to
 - compile applications or shared objects that use libavfilter.
 +Depends: libavformat-extra-52 (= ${binary:Version})
 +Description: ffmpeg utility library - transitional package
 + This package can be safely removed if no other packages depend on this
  
 -Package: libpostproc-dev
 -Section: libdevel
 +Package: libswscale-extra-0
  Architecture: any
 -Depends: libpostproc51 (>= ${binary:Version}) | libpostproc-unstripped-51 (>= ${binary:Version}),
 -         libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-unstripped-51 (<= ${source:Upstream-Version}-99),
 -         libavutil-dev (= ${binary:Version})
 -Description: development files for libpostproc
 - This is the video postprocessing library from the ffmpeg project.
 +Depends: ${shlibs:Depends},
 +         ${misc:Depends}
 +Conflicts: libswscalecvs0, libswscale0
 +Replaces: libswscalecvs0, libswscale0
 +Description: ffmpeg video scaling library
 + This is the video scaling library from the ffmpeg project.
   .
 - This package contains the header files and static libraries needed to
 - compile applications or shared objects that use libpostproc.
 + This package contains a unrestricted version of the libswscale shared
 + object that should only be used by Debian packages.
  
 -Package: libswscale-dev
 -Section: libdevel
 +Package: libswscale-unstripped-0
  Architecture: any
 -Depends: libswscale0 (>= ${binary:Version}) | libswscale-unstripped-0 (>= ${binary:Version}),
 -         libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-unstripped-0 (<= ${source:Upstream-Version}-99),
 -         libavutil-dev (= ${binary:Version})
 -Description: development files for libswscale
 - This is the video scaling library from the ffmpeg project.
 - .
 - This package contains the header files and static libraries needed to
 - compile applications or shared objects that use libswscale.
 +Depends: libswscale-extra-0 (= ${binary:Version})
 +Description: ffmpeg utility library - transitional package
 + This package can be safely removed if no other packages depend on this
 +
diff --combined debian/rules
index f547898,7dec70f..3edbcf0
--- a/debian/rules
+++ b/debian/rules
@@@ -13,13 -13,14 +13,14 @@@ ifeq ($(SVN_VERSION),
  $(error UPSTREAM_VERSION: $(UPSTREAM_VERSION) - but SVN_VERSION is empty! - check debian/rules)
  endif
  
 -LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-unstripped-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 +LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
  
  # we don't need to strip if we are not building the package ffmpeg-debian
  ifneq ($(DEB_SOURCE),ffmpeg-debian)
  DEB_BUILD_OPTIONS += ,internalencoders
  endif
  
+ # Support multiple makes at once
  ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
  NUMJOBS = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
  else
@@@ -71,11 -72,10 +72,10 @@@ clean-real
  	dh_testdir
  	dh_testroot
  	rm -f build-stamp $(addprefix build-stamp-, $(FLAVORS)) \
- 	    $(addprefix configure-stamp-, $(FLAVORS)) patch-stamp
+ 	    $(addprefix configure-stamp-, $(FLAVORS)) patch-stamp \
+ 	    build-doxy-stamp
  	rm -rf $(addprefix debian-, $(FLAVORS)) doxy
- 	dh_clean build-doxy-stamp EXTRA
- 	dh_clean config-extra-includes.h debian/tmp.debhelper.log
- 	dh_clean formats.txt
+ 	dh_clean
  
  get-orig-source:
  	dh_testdir
@@@ -93,7 -93,7 +93,7 @@@ ende
  install: build
  	dh_testdir
  	dh_testroot
- 	dh_clean -k
+ 	dh_prep
  	dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc
  	dh_installdirs -ptmp usr/share/doc/ffmpeg-doc/html
  	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
@@@ -129,7 -129,7 +129,7 @@@ binary-arch: build install formats.tx
  	dh_installdocs -A debian/README.Debian
  	dh_installdocs RELEASE
  ifeq ($(DEB_SOURCE),ffmpeg)
 -	dh_installdocs -p libavcodec-unstripped-52 formats.txt
 +	dh_installdocs -p libavcodec-extra-52 formats.txt
  else
  	dh_installdocs -p libavcodec52 formats.txt
  endif
@@@ -148,7 -148,7 +148,7 @@@ endi
  # strict internal dependencies
  ifeq ($(DEB_SOURCE),ffmpeg-debian)
  	for pkg in $(LIB_PKGS); do \
 -	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-unstripped-\1/'); \
 +	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
  	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(EPOCH)$(UPSTREAM_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
  	done
  else
@@@ -161,7 -161,7 +161,7 @@@ endi
  # target dependencies for external packages
  ifeq ($(DEB_SOURCE),ffmpeg-debian)
  	for pkg in $(LIB_PKGS); do \
 -	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-unstripped-\1/'); \
 +	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
  	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
  	done
  else

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list