[SCM] ffmpeg/wheezy: Merge branch 'master' into wheezy
aca-guest at users.alioth.debian.org
aca-guest at users.alioth.debian.org
Sun Jun 21 22:07:43 UTC 2015
finalize changelog
Remove unused, optional and private avpriv_emms_yasm from symbols file.
Enable opencv and zvbi on m68k, disable opencv on alpha.
Add libavresample-ffmpeg2 and qt-faststart dependencies to ffmpeg-dbg.
Disable DH_VERBOSE in debian/rules.
Use lissh-gcrypt-dev to avoid linking against libssl.
Use DEB_LDFLAGS_MAINT_STRIP for removing the Bsymbolic-functions flag.
Start new upload
Merge tag 'upstream/2.7.1'
Imported Upstream version 2.7.1
finalize changelog
update encdec_list.txt
update debian/copyright
adapt debian/rules to changes in configure
mention fix for bug #781510
add new symbols
use '-strict -2' in the encdec autopkgtest also for probing/decoding
restrict shlib-with-non-pic-code lintian override to i386
fix encdec autopkgtest to not fail, when skipping tests
let ffmpeg suggest ffmpeg-doc
update changelog
Merge tag 'upstream/2.7'
Imported Upstream version 2.7
change maintainer to pkg-multimedia team
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/wheezy
X-Git-Reftype: branch
X-Git-Oldrev: 748090c566e1621708812fb47f47e4844976d852
X-Git-Newrev: 0948e663adac1c1bc64632b692bd12d77239991d
The following commit has been merged in the wheezy branch:
commit 5d86f4830b41a60c18f4a657c5ec2a5356339044
Merge: 748090c566e1621708812fb47f47e4844976d852 6cbd84eb8fcba8890ea7f858fe4ca89ae17b4bb9
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Sun Jun 21 23:52:50 2015 +0200
Merge branch 'master' into wheezy
Conflicts:
debian/changelog
diff --combined debian/changelog
index faff98a,b1821f2..152e565
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,34 +1,49 @@@
- ffmpeg (7:2.6.3-1~wheezy1) wheezy; urgency=medium
++ffmpeg (7:2.7.1-1~wheezy1) wheezy; urgency=medium
+
+ * Backport to wheezy.
+ * Remove unavailable build-dependencies:
+ - cleancss
+ - node-less
+ - libshine
+ - libsoxr
+ - libx265
+ - libzmq3
+ - libgnutls28-dev (use libgnutls-dev instead)
+ * Add texi2html build-dependency, because texinfo is too old.
+
+ -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> Sun, 17 May 2015 22:11:14 +0200
+
+ ffmpeg (7:2.7.1-1) UNRELEASED; urgency=medium
+
+ * Import new upstream bugfix release 2.7.1.
+ * Use DEB_LDFLAGS_MAINT_STRIP for removing the Bsymbolic-functions flag.
+ * Use lissh-gcrypt-dev to avoid linking against libssl.
+ * Disable DH_VERBOSE in debian/rules.
+ * Add libavresample-ffmpeg2 and qt-faststart dependencies to ffmpeg-dbg.
+ * Enable opencv and zvbi on m68k, disable opencv on alpha.
+ * Remove unused, optional and private avpriv_emms_yasm from symbols file.
+
+ -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> Sun, 21 Jun 2015 23:38:07 +0200
+
+ ffmpeg (7:2.7-1) unstable; urgency=medium
+
+ * Import new major upstream release 2.7.
+ - Suggest new mpeg4_unpack_bframes bitstream filter instead of
+ VirtualDub/Avidemux. (Closes: #781510)
+ * Add new symbols.
+ * Change maintainer to the pkg-multimedia team and move myself to uploaders.
+ * Let ffmpeg suggest ffmpeg-doc.
+ * Fix encdec autopkgtest to not fail, when skipping tests.
+ * Restrict shlib-with-non-pic-code lintian override to i386.
+ Thanks to Jakub Wilk for the hint.
+ * Use '-strict -2' in the encdec autopkgtest also for probing/decoding.
+ * Disable loongson3 optimizations on mips, because they are not always
+ available.
+ * Update debian/copyright.
+ * Update debian/tests/encdec_list.txt.
+
+ -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> Thu, 11 Jun 2015 00:47:35 +0200
+
ffmpeg (7:2.6.3-1) unstable; urgency=medium
* Import new upstream bugfix release 2.6.3.
@@@ -41,7 -57,6 +72,7 @@@ ffmpeg (7:2.6.2-1) unstable; urgency=me
ffmpeg (7:2.6.1-1) unstable; urgency=medium
+
* Import new major upstream release 2.6.1.
* Add Breaks and Replaces on libav-tools (<< 6:9~), which shipped ff*
symlinks. Thanks to Andreas Beckmann. (Closes: #779664)
diff --combined debian/control
index b3269e8,b56391a..80dc1a6
--- a/debian/control
+++ b/debian/control
@@@ -1,19 -1,20 +1,20 @@@
Source: ffmpeg
Section: video
Priority: optional
- Maintainer: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
- Uploaders: Alexander Strasser <eclipse7 at gmx.net>
+ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+ Uploaders: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>,
+ Alexander Strasser <eclipse7 at gmx.net>
Homepage: https://ffmpeg.org/
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/collab-maint/ffmpeg.git
Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ffmpeg.git
Build-Depends-Indep:
# needed to minify the CSS files
- cleancss,
+# cleancss,
# Autogenerated documentation
doxygen,
# needed to create the CSS files for the HTML manuals
- node-less
+# node-less
Build-Depends:
# needed for dh
debhelper (>= 9),
@@@ -52,7 -53,7 +53,7 @@@
# --enable-libgme
libgme-dev,
# --enable-gnutls
- libgnutls28-dev | libgnutls-dev,
+ libgnutls-dev,
# --enable-libgsm
libgsm1-dev,
# Fails to be detected by configure script, if not also libavc1394-dev is installed.
@@@ -68,7 -69,7 +69,7 @@@
# --enable-openal
libopenal-dev [!sparc64],
# --enable-libopencv
- libopencv-dev [!m68k !sh4 !sparc64 !x32],
+ libopencv-dev [!alpha !sh4 !sparc64 !x32],
# --enable-libopenjpeg
libopenjpeg-dev,
# --enable-libopus
@@@ -87,13 -88,13 +88,13 @@@
# autodetected: SDL support
libsdl-dev,
# --enable-libshine
- libshine-dev (>= 3.0.0),
+# libshine-dev (>= 3.0.0),
# --enable-libsoxr
- libsoxr-dev [!sparc64],
+# libsoxr-dev [!sparc64],
# --enable-libspeex
libspeex-dev,
# --enable-libssh
- libssh-dev,
+ libssh-gcrypt-dev,
# --enable-libtheora
libtheora-dev,
# --enable-libtwolame
@@@ -116,7 -117,7 +117,7 @@@
# --enable-libx264
libx264-dev [!x32],
# --enable-libx265
- libx265-dev [!sparc64 !x32],
+# libx265-dev [!sparc64 !x32],
# --enable-x11grab
libxext-dev,
# --enable-libxvid
@@@ -124,9 -125,9 +125,9 @@@
# autodetected: decoder 'mpeg_xvmc'; outdev 'xv'
libxvmc-dev,
# --enable-libzmq
- libzmq3-dev [!hurd-any],
+# libzmq3-dev [!hurd-any],
# --enable-libzvbi
- libzvbi-dev [!m68k],
+ libzvbi-dev,
# The opencl API is considered experimental.
# # --enable-opencl
# ocl-icd-opencl-dev [!hurd-any] | opencl-dev [!hurd-any],
@@@ -134,7 -135,6 +135,7 @@@
pkg-config,
# HTML documentation
texinfo,
+ texi2html,
# assembler optimizations
yasm
@@@ -146,6 -146,8 +147,8 @@@ Depends
${misc:Depends}
Recommends:
qt-faststart
+ Suggests:
+ ffmpeg-doc
Breaks: libav-tools (<< 6:9~)
Replaces: libav-tools (<< 6:9~)
Description: Tools for transcoding, streaming and playing of multimedia files
@@@ -197,8 -199,10 +200,10 @@@ Depends
libavformat-ffmpeg56 (= ${binary:Version}),
libavutil-ffmpeg54 (= ${binary:Version}),
libpostproc-ffmpeg53 (= ${binary:Version}),
+ libavresample-ffmpeg2 (= ${binary:Version}),
libswresample-ffmpeg1 (= ${binary:Version}),
libswscale-ffmpeg3 (= ${binary:Version}),
+ qt-faststart (= ${binary:Version}),
${misc:Depends}
Description: Debug symbols for the FFmpeg multimedia framework
FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
diff --combined debian/rules
index bee78cb,cbe8b0d..f76edc9
--- a/debian/rules
+++ b/debian/rules
@@@ -1,7 -1,7 +1,7 @@@
#!/usr/bin/make -f
# This enables verbose mode.
- export DH_VERBOSE=1
+ #export DH_VERBOSE=1
export V=1
# Determine the debian directory, which is the directory of this makefile.
@@@ -9,7 -9,7 +9,7 @@@
DEBIAN_DIR = $(dir $(firstword $(MAKEFILE_LIST)))
# Get the Debian version revision:
-DEB_VERSION := $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)changelog -SVersion)
+DEB_VERSION := $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)changelog | sed -n 's/^Version: //p')
DEB_REVISION := $(word 2, $(subst -, ,$(DEB_VERSION)))
# Get the architecture triplet:
@@@ -20,7 -20,7 +20,7 @@@ DEB_HOST_ARCH_OS ?= $(shell dpkg-arch
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
# Ubuntu ld adds -Bsymbolic-functions by default, but that prevents FFmpeg from building.
- LDFLAGS := $(filter-out %-Bsymbolic-functions,$(shell dpkg-buildflags --get LDFLAGS))
+ export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
# Enable as many features as possible, as long as the result is still GPLv2+ (and not only GPLv3+).
# Therefore the following flags (and build-dependencies) are not added:
@@@ -32,6 -32,7 +32,7 @@@
# The following flags are not added, because the necessary libraries are not in Debian:
# --enable-decklink
# --enable-libcelt (see #676592: removed from Debian as abandoned upstream, replaced by opus)
+ # --enable-libdcadec
# --enable-libilbc (see #675959 for the RFP bug)
# --enable-libmfx
# --enable-libnut
@@@ -83,7 -84,7 +84,7 @@@ CONFIG := --prefix=/usr
--enable-libpulse \
--enable-librtmp \
--enable-libschroedinger \
- --enable-libshine \
+# --enable-libshine \
--enable-libspeex \
--enable-libssh \
--enable-libtheora \
@@@ -93,6 -94,7 +94,7 @@@
--enable-libwavpack \
--enable-libwebp \
--enable-libxvid \
+ --enable-libzvbi \
--enable-opengl \
--enable-x11grab
@@@ -107,14 -109,9 +109,9 @@@ ifeq ($(DEB_HOST_ARCH_OS),linux
--enable-libiec61883
endif
- # libzvbi is not available on m68k
- ifneq ($(DEB_HOST_ARCH),m68k)
- CONFIG += --enable-libzvbi
- endif
-
# Some libraries are not build on hurd.
ifneq ($(DEB_HOST_ARCH_OS),hurd)
- CONFIG += --enable-libzmq
+# CONFIG += --enable-libzmq
endif
# Some libraries are not available on x32.
@@@ -125,22 -122,22 +122,22 @@@ endi
# Some libraries are not available on sparc64.
ifneq ($(DEB_HOST_ARCH),sparc64)
- CONFIG += --enable-libsoxr \
- --enable-openal
+ CONFIG += --enable-openal \
+# --enable-libsoxr
else
# added temporarily to debug SIGBUS errors in the fate tests on sparc64
CONFIG += --target-exec="gdb --batch -ex r -ex 'bt full' -ex q --args"
endif
# OpenCV is not available on some architectures.
- ifeq (,$(filter $(DEB_HOST_ARCH),m68k sh4 sparc64 x32))
+ ifeq (,$(filter $(DEB_HOST_ARCH),alpha sh4 sparc64 x32))
CONFIG += --enable-libopencv
endif
# X265 is not (yet) available on some architectures.
-ifeq (,$(filter $(DEB_HOST_ARCH),sparc64 x32))
- CONFIG += --enable-libx265
-endif
+#ifeq (,$(filter $(DEB_HOST_ARCH),sparc64 x32))
+# CONFIG += --enable-libx265
+#endif
# Disable i686 optimizations on i386, because they are not always available on this architecture.
ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386))
@@@ -160,7 -157,8 +157,8 @@@ endi
# Disable optimizations on mips(el) and some on mips64(el), because they are not always available on these architectures.
ifneq (,$(filter $(DEB_HOST_ARCH),mips mipsel mips64 mips64el))
CONFIG += --disable-mipsdspr1 \
- --disable-mipsdspr2
+ --disable-mipsdspr2 \
+ --disable-loongson3
endif
ifneq (,$(filter $(DEB_HOST_ARCH),mips mipsel))
CONFIG += --disable-mipsfpu
@@@ -190,11 -188,11 +188,11 @@@ override_dh_auto_clean
override_dh_auto_build-indep:
dh_auto_build -i -- apidoc
# Backup the minified CSS files distributed by upstream.
- mv doc/bootstrap.min.css debian/bootstrap.min.css.bak
- mv doc/style.min.css debian/style.min.css.bak
+# mv doc/bootstrap.min.css debian/bootstrap.min.css.bak
+# mv doc/style.min.css debian/style.min.css.bak
# Create the minified CSS files.
- lessc debian/missing-sources/bootstrap/less/bootstrap.less | cleancss | cat debian/missing-sources/bootstrap_copyright_notice.txt - > doc/bootstrap.min.css
- lessc debian/missing-sources/ffmpeg-web/src/less/style.less | cleancss > doc/style.min.css
+# lessc debian/missing-sources/bootstrap/less/bootstrap.less | cleancss | cat debian/missing-sources/bootstrap_copyright_notice.txt - > doc/bootstrap.min.css
+# lessc debian/missing-sources/ffmpeg-web/src/less/style.less | cleancss > doc/style.min.css
override_dh_auto_build-arch:
# Build qt-faststart here, to make it possible to build with 'nocheck'.
--
ffmpeg packaging
More information about the pkg-multimedia-commits
mailing list