[SCM] libav/experimental: Merge branch 'master' into experimental
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat May 12 17:55:43 UTC 2012
prepare next upload
update debian/changelog
temporarily disable opencv to work around dependency troubles
Fix epoch in strict internal dependencies. Closes: #670861
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/experimental
X-Git-Reftype: branch
X-Git-Oldrev: bcc42be5c0bba8a70217e2511d350e61a40c31ae
X-Git-Newrev: 52e06ca15770a3ee0418c547c392af30af6f13b1
The following commit has been merged in the experimental branch:
commit 305c1e7c0e2c2158d6079b274cfc6859ced5170e
Merge: 7ae80b0e1763e7adfac375a61b6ddbc603de5b4d ea485127d13987d7061aad530e14b85b90535546
Author: Reinhard Tartler <siretart at tauware.de>
Date: Tue May 1 17:53:52 2012 +0200
Merge branch 'master' into experimental
diff --combined debian/confflags
index 9d4705d,68e210f..63167ab
--- a/debian/confflags
+++ b/debian/confflags
@@@ -88,6 -88,7 +88,6 @@@ ende
# Configuration flags causing the libs to be GPL tainted
gpl_confflags += --enable-gpl
-gpl_confflags += --enable-postproc
gpl_confflags += --enable-swscale
gpl_confflags += --enable-x11grab
@@@ -103,7 -104,6 +103,6 @@@ confflags += --enable-frei0
confflags += --enable-gnutls
confflags += --enable-libcdio
confflags += --enable-libgsm
- confflags += --enable-libopencv
confflags += --enable-libschroedinger
confflags += --enable-libspeex
confflags += --enable-libtheora
@@@ -129,6 -129,7 +128,6 @@@ confflags += $(extra_common_confflags
confflags += $(call cond_enable,/usr/include/pulse/simple.h,libpulse)
# this part below is intended for the 'Libav' package in ubuntu/multiverse
-gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
diff --combined debian/control
index adc7adf,cdb4d48..7da1cab
--- a/debian/control
+++ b/debian/control
@@@ -24,8 -24,8 +24,7 @@@ Build-Depends
libcdio-cdda-dev,
libcdio-dev,
libcdio-paranoia-dev,
- libcv-dev,
libdc1394-22-dev [linux-any],
- libdirac-dev,
libfreetype6-dev,
libgnutls-dev,
libgsm1-dev,
@@@ -34,7 -34,6 +33,6 @@@
libmp3lame-dev,
libopencore-amrnb-dev,
libopencore-amrwb-dev,
- libopencv-dev,
libopenjpeg-dev,
libpulse-dev [!hurd-any],
libraw1394-dev [linux-any],
@@@ -63,12 -62,17 +61,12 @@@
Package: libav-tools
Section: video
Architecture: any
-Provides:
- ffmpeg
Replaces:
- ffmpeg (<< 4:0.8~),
libavcodec-extra-53 (<< 4:0.6~),
libavcodec53 (<< ${source:Version})
Depends:
${misc:Depends},
${shlibs:Depends}
-Breaks:
- ffmpeg (<< 4:0.8~)
Conflicts:
ffprobe
Description: Multimedia player, server, encoder and transcoder
@@@ -81,6 -85,41 +79,6 @@@
OGG, Matroska, ASF...) and encoding formats (MPEG, DivX, MPEG4, AC3,
DV...).
-Package: ffmpeg
-Section: oldlibs
-Priority: extra
-Architecture: any
-Depends:
- libav-tools,
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Multimedia player, server, encoder and transcoder (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package contains the deprecated ffmpeg program. This package also serves
- as a transitional package to libav-tools. Users are advised to use avconv from
- the libav-tools package instead of ffmpeg.
-
-Package: ffmpeg-dbg
-Section: oldlibs
-Priority: extra
-Architecture: any
-Depends:
- libav-dbg,
- ${misc:Depends}
-Description: Debug symbols for Libav related packages (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package contains debug data of the Libav related shared libraries.
- .
- Most people will not need this package. Please install it to produce useful
- stacktraces to help debugging the Libav libraries.
- .
- This package contains the debug symbols for the deprecated ffmpeg program.
- It also serves as a transitional package to libav-tools-dbg.
-
Package: libav-dbg
Section: debug
Priority: extra
@@@ -96,6 -135,7 +94,6 @@@ Depends
libavdevice53 (= ${binary:Version}),
libavformat53 (= ${binary:Version}),
libavutil51 (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
libswscale2 (= ${binary:Version}),
${misc:Depends}
Description: Debug symbols for Libav related packages
@@@ -139,6 -179,24 +137,6 @@@ Description: Debug symbols for Libav re
Most people will not need this package. Please install it to produce useful
stacktraces to help debugging the Libav library.
-Package: ffmpeg-doc
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libav-doc,
- ${misc:Depends}
-Description: Documentation of the Libav API (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package contains the html doxygen documentation of the Libav API.
- .
- Only application developers will find this package useful.
- .
- This package is only used for transitional purposes and can be safely
- removed.
-
Package: libav-doc
Section: doc
Architecture: all
@@@ -255,6 -313,25 +253,6 @@@ Description: Libav video filtering libr
.
This is the video filtering library from Libav.
-Package: libpostproc52
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Provides:
- libpostproc-extra-52
-Replaces:
- libpostproc-extra-52
-Breaks:
- libpostproc-extra-52 (<< 5:0.8.1-2)
-Description: Libav video postprocessing library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the video postprocessing library from Libav.
-
Package: libswscale2
Architecture: any
Multi-Arch: same
@@@ -368,50 -445,37 +366,50 @@@ Description: Development files for liba
This package contains the header files and static libraries needed to
compile applications or shared objects that use libavfilter.
-Package: libpostproc-dev
+Package: libswscale-dev
Section: libdevel
Architecture: any
Depends:
libavutil-dev (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
+ libswscale2 (= ${binary:Version}),
${misc:Depends}
-Description: Development files for libpostproc
+Description: Development files for libswscale
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
.
- This is the video postprocessing library from Libav.
+ This is the video scaling library from Libav.
.
This package contains the header files and static libraries needed to
- compile applications or shared objects that use libpostproc.
+ compile applications or shared objects that use libswscale.
-Package: libswscale-dev
+Package: libavresample-dev
Section: libdevel
Architecture: any
Depends:
libavutil-dev (= ${binary:Version}),
- libswscale2 (= ${binary:Version}),
+ libavresample0 (= ${binary:Version}),
${misc:Depends}
-Description: Development files for libswscale
+Description: Development files for libavresample
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
.
This is the video scaling library from Libav.
.
This package contains the header files and static libraries needed to
- compile applications or shared objects that use libswscale.
+ compile applications or shared objects that use libswrescale.
+
+Package: libavresample0
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Libav audo resampling library
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This is the audio software resampling library from Libav.
Package: libavutil-extra-51
Section: oldlibs
@@@ -489,6 -553,21 +487,6 @@@ Description: Libav filter library (tran
convert and stream audio and video.
.
This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
-
-Package: libpostproc-extra-52
-Section: oldlibs
-Priority: extra
-Architecture: all
-Multi-Arch: foreign
-Depends:
- libpostproc52,
- ${misc:Depends},
-Description: Libav video postprocessing library (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package is only used for transitional purposes and can be safely
removed when no other packages depend on this package.
Package: libavformat-extra-53
diff --combined debian/rules
index ad466e4,401aa46..5907d9b
--- a/debian/rules
+++ b/debian/rules
@@@ -1,12 -1,12 +1,12 @@@
#!/usr/bin/make -f
- EPOCH=5:
+ EPOCH=6:
DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
SHLIBS_VERSION := 5:0.8-2~
-LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avdevice|avformat|avfilter|avresample|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
LIB_PKGS2 := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec[0-9]+)[[:space:]]*$$/\1/p' debian/control)
LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec-extra-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
DEV_PKGS := $(shell echo $(LIB_PKGS) $(LIB_PKGS2) | sed 's/[0-9]\+\>/-dev/g')
@@@ -125,11 -125,13 +125,11 @@@ install-common: build $(DH_INSTALL_FILE
install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/libav/html/
install -m 644 -D doc/avserver.conf debian/tmp/etc/
install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
- dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) -Nffmpeg -Xffmpeg \
- -Xffmpeg.1 -Xusr/share/doc/libav-doc \
+ dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) \
+ -Xusr/share/doc/libav-doc \
-Xusr/share/doc/libav --fail-missing --sourcedir=debian/tmp
- dh_install -pffmpeg --sourcedir=debian/tmp
- dh_strip $(addprefix -N,$(LIB_PKGS2)) -Nffmpeg --dbg-package=libav-dbg
+ dh_strip $(addprefix -N,$(LIB_PKGS2)) --dbg-package=libav-dbg
dh_strip $(addprefix -p,$(LIB_PKGS2)) --dbg-package=libav-regular-dbg
- dh_strip -pffmpeg --dbg-package=ffmpeg-dbg
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
debian/tmp/usr/bin/avconv -formats | tee formats-$(DEB_HOST_ARCH).txt
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
@@@ -157,7 -159,7 +157,7 @@@ binary-arch: build instal
dh_installdocs doc/optimization.txt
dh_installdocs -A debian/README.Debian
dh_installdocs -p libavcodec-dev -plibavdevice-dev \
- -plibavformat-dev -plibavfilter-dev -plibpostproc-dev \
+ -plibavformat-dev -plibavfilter-dev -plibavresample-dev \
-plibswscale-dev -plibavutil-dev -plibav-doc \
doc/APIchanges
dh_installexamples -p libav-tools doc/avserver.conf debian/recordshow.sh
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list