[SCM] ffmpeg/jessie: Merge tag 'debian/7%3.2-2' into jessie
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Thu Nov 10 08:54:01 UTC 2016
Finalize changelog
Add patch to fix test failures on ppc64.
Fix FTBFS on powerpc and arch-independent build.
Finalize changelog
Avoid needlessly re-running configure
Disable uninstallable BDs on m68k and powerpcspe
Build static libraries without -fPIC
Update debian/tests_encdec_list.txt
Add patches to fix autopkgtest failures and spelling errors
Update debian/copyright
Update comments in debian/rules and drop cruft
Switch to SDL 2.
Drop patches, included upstream.
New upstream release
Merge tag 'upstream/3.2'
New upstream version 3.2
Finalize changelog
Adapt lintian overrides to PIE by default.
Revert "Enable all hardening options except pie"
Use debhelper compat 10
Add patches from upstream
Drop patches, fixed differently upstream
Use nasm instead of yasm
Merge tag 'upstream/3.1.5'
New upstream version 3.1.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/jessie
X-Git-Reftype: branch
X-Git-Oldrev: b8d4527f96f6cd096e8bdd93748debfc83f3c709
X-Git-Newrev: f249c85a79f9ce18dc9c6a090370ae072c799335
The following commit has been merged in the jessie branch:
commit 916fa40cc313c25538bba7b62f561a6d38b7d290
Merge: b8d4527f96f6cd096e8bdd93748debfc83f3c709 7ad90f2f03cc69d71fcf44c2bc431e5563faef3b
Author: Balint Reczey <balint at balintreczey.hu>
Date: Wed Nov 9 22:53:35 2016 +0100
Merge tag 'debian/7%3.2-2' into jessie
ffmpeg Debian release 7:3.2-2
Conflicts:
debian/changelog
debian/control
debian/rules
diff --combined debian/changelog
index f014bcf,ce3e80d..67787a8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,64 +1,75 @@@
- ffmpeg (7:3.1.4-1~bpo8+1) jessie-backports; urgency=medium
++ffmpeg (7:3.2-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
- * Build-depend on libchromaprint-dev and libebur128-dev from
- jessie-backports
++ * Disable building with libebur128 because jessie's version breaks the
++ build
++ * Build-depend on libchromaprint-dev from jessie-backports
+ * Disable OCR with Tesseract because it is missing the pkg-config file on
+ jessie
+
+ -- Balint Reczey <balint at balintreczey.hu> Sun, 23 Oct 2016 12:34:56 +0200
+
+ ffmpeg (7:3.2-2) unstable; urgency=medium
+
+ * Fix FTBFS on powerpc and arch-independent build.
+ * Add patch to fix test failures on ppc64.
+ - pixblockdsp-disable-altivec-optimizations-on-ppc64be.patch
+
+ -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> Tue, 01 Nov 2016 00:42:03 +0100
+
+ ffmpeg (7:3.2-1) unstable; urgency=medium
+
+ * Import new major upstream release 3.2.
+ * Drop patches, included upstream:
+ - ffmpeg_opt-Suggest-to-use-file-.-if-a-protocol-was-not-fo.patch
+ - lavf-mp3enc-write-encoder-delay-padding-upon-closing.patch
+ - doc-fix-spelling-errors.patch
+ - faq-use-relative-links-to-own-documentation.patch
+ - tests-checkasm-pixblockdsp-Test-8-byte-aligned-positions.patch
+ * Switch to SDL 2.
+ * Update comments in debian/rules and drop cruft.
+ * Update debian/copyright.
+ * Add patches to fix autopkgtest failures and spelling errors:
+ - apng-use-side-data-to-pass-extradata-to-muxer.patch
+ - Revert-avformat-hls-Fix-missing-streams-in-some-case.patch
+ - doc-fix-spelling-errors.patch
+ * Update debian/tests_encdec_list.txt.
+ * Build static libraries without -fPIC as required by policy 10.2.
+ * Disable uninstallable BDs on m68k and powerpcspe:
+ - powerpcspe: openal, netcdf, frei0r, opencv, x264 and chromaprint.
+ - m68k: chromaprint
+ * Avoid needlessly re-running configure.
+
+ -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> Sun, 30 Oct 2016 10:15:11 +0100
+
+ ffmpeg (7:3.1.5-1) unstable; urgency=medium
+
+ * Import new upstream bugfix release 3.1.5.
+ * Use nasm instead of yasm.
+ - Unlike yasm it is actively maintained upstream.
+ - And it doesn't embed the full build path as DW_AT_comp_dir.
+ (This should make ffmpeg fully reproducible.)
+ * Drop patches, fixed differently upstream:
+ - disable-opj-static.patch
+ - libopenjpegenc-recreate-image-data-buffer.patch
+ * Add patches from upstream:
+ - doc-fix-spelling-errors.patch (Closes: #839542)
+ - faq-use-relative-links-to-own-documentation.patch (Closes: #841501)
+ - ffmpeg_opt-Suggest-to-use-file-.-if-a-protocol-was-not-fo.patch
+ (Closes: #785690)
+ - lavf-mp3enc-write-encoder-delay-padding-upon-closing.patch
+ (Closes: #797965)
+ - tests-checkasm-pixblockdsp-Test-8-byte-aligned-positions.patch
+ (LP: #1612058)
+ * Use debhelper compat 10.
+ - Parallel building is now the default.
+ * Revert: Enable all hardening options except pie.
+ - It doesn't have any effect, anyway.
+ - PIE is now the default.
+ * Adapt lintian overrides to PIE by default.
+
+ -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> Sat, 22 Oct 2016 22:33:02 +0200
+
ffmpeg (7:3.1.4-1) unstable; urgency=medium
[ Ondřej Nový ]
diff --combined debian/control
index c7f6c71,6c7d733..01d60d1
--- a/debian/control
+++ b/debian/control
@@@ -19,13 -19,13 +19,13 @@@ Build-Depends-Indep
node-less
Build-Depends:
# needed for dh
- debhelper (>= 9.20141010),
+ debhelper (>= 10),
# for build-profile support
dpkg-dev (>= 1.17.14),
# --enable-libflite
flite1-dev,
# --enable-frei0r
- frei0r-plugins-dev <!stage1>,
+ frei0r-plugins-dev [!powerpcspe] <!stage1>,
# --enable-ladspa
ladspa-sdk,
# --enable-libass
@@@ -41,13 -41,13 +41,13 @@@
# --enable-libcdio
libcdio-paranoia-dev,
# --enable-libchromaprint
- libchromaprint-dev (>= 1.3.2-2~) <!stage1>,
- libchromaprint-dev [!m68k !powerpcspe] <!stage1>,
++ libchromaprint-dev (>= 1.3.2-2~) [!m68k !powerpcspe] <!stage1>,
# autodetected 'crystalhd'
libcrystalhd-dev [amd64 i386],
# --enable-libdc1394
libdc1394-22-dev [linux-any],
# --enable-libebur128
- libebur128-dev,
+# libebur128-dev,
# --enable-libfontconfig
libfontconfig1-dev,
# --enable-libfreetype
@@@ -77,15 -77,15 +77,15 @@@
# --enable-libmp3lame
libmp3lame-dev,
# --enable-netcdf
- libnetcdf-dev,
+ libnetcdf-dev [!powerpcspe],
# --enable-openal
- libopenal-dev,
+ libopenal-dev [!powerpcspe],
# --enable-libopencore_amrnb
libopencore-amrnb-dev,
# --enable-libopencore_amrwb
libopencore-amrwb-dev,
# --enable-libopencv
- libopencv-imgproc-dev <!stage1>,
+ libopencv-imgproc-dev [!powerpcspe] <!stage1>,
# --enable-libopenjpeg
libopenjp2-7-dev,
# --enable-libopus
@@@ -98,8 -98,8 +98,8 @@@
libschroedinger-dev,
# autodetected: protocol 'sctp'
libsctp-dev [linux-any],
- # autodetected: SDL support
- libsdl-dev,
+ # --enable-sdl2
+ libsdl2-dev,
# --enable-libshine
libshine-dev (>= 3.0.0),
# --enable-libsnappy
@@@ -134,7 -134,7 +134,7 @@@
# --enable-libwebp
libwebp-dev,
# --enable-libx264
- libx264-dev <!stage1>,
+ libx264-dev [!powerpcspe] <!stage1>,
# --enable-libx265
libx265-dev (>= 1.8),
# --enable-x11grab
@@@ -155,7 -155,7 +155,7 @@@
# HTML documentation
texinfo,
# assembler optimizations
- yasm
+ nasm
Package: ffmpeg
Architecture: any
diff --combined debian/rules
index e69cbda,c69cfbc..b56ac70
--- a/debian/rules
+++ b/debian/rules
@@@ -2,28 -2,23 +2,23 @@@
export V=1
- # Determine the debian directory, which is the directory of this makefile.
- # The path of this makefile is the first word in the MAKEFILE_LIST.
- DEBIAN_DIR = $(dir $(firstword $(MAKEFILE_LIST)))
-
+ # sets DEBIAN_VERSION variable
include /usr/share/dpkg/pkg-info.mk
# Get the Debian version revision:
DEB_REVISION := $(word 2, $(subst -, ,$(DEB_VERSION)))
- # DEB_HOST_* variables
+ # sets DEB_HOST_* variables
include /usr/share/dpkg/architecture.mk
# Ubuntu ld adds -Bsymbolic-functions by default, but that prevents FFmpeg from building.
export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
- # build with all hardening flags except pie
- export DEB_MAINT_BUILD_OPTIONS=hardening=+all,-pie
# Package name for the extra flavor.
EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(.*extra[0-9]+)[[:space:]]*$$/\1/p' debian/control)
- FLAVORS = standard extra
+ FLAVORS = standard extra static
- # Enable as many features as possible, as long as the result is still GPLv2+ (a GPLv3+ variant is built as libavcodec-extra flavor).
+ # Enable as many features as possible, as long as the result is still GPLv2+ (a GPLv3+ variant is built as libavcodec-extra/libavfilter-extra flavor).
# The following flags (and build-dependencies) are not added, because they would require a libavformat-extra flavor:
# --enable-libsmbclient (libsmbclient-dev [!hurd-i386 !m68k !sparc64])
# The following flags are not added, because the necessary libraries are not in Debian:
@@@ -35,12 -30,13 +30,13 @@@
# --enable-libmfx
# --enable-libnut
# --enable-libopenh264
+ # --enable-libopenmpt
# --enable-libutvideo
# --enable-libvidstab (see #709193 for the RFP bug)
# --enable-libxavs
# --enable-libzimg
# The following flags are not added for various reasons:
- # * --enable-librtmp: ffmpeg has better built-in RTMP support with listen mode
+ # * --enable-librtmp: ffmpeg has better built-in RTMP support with listen mode.
# * --enable-libv4l2 [!hurd-any]: This is only needed for very old devices and may cause problems for others.
# Should anyone need it, using LD_PRELOAD pointing on libv4l2 has the same effect.
# * --enable-opencl [!hurd-any]: This is considered an experimental API.
@@@ -50,7 -46,6 +46,6 @@@ CONFIG := --prefix=/usr
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--incdir=/usr/include/$(DEB_HOST_MULTIARCH) \
--enable-gpl \
- --enable-shared \
--disable-libtesseract \
--disable-stripping \
--disable-decoder=libschroedinger \
@@@ -63,7 -58,7 +58,7 @@@
--enable-libbs2b \
--enable-libcaca \
--enable-libcdio \
- --enable-libebur128 \
+ --disable-libebur128 \
--enable-libflite \
--enable-libfontconfig \
--enable-libfreetype \
@@@ -92,22 -87,27 +87,27 @@@
--enable-libxvid \
--enable-libzmq \
--enable-libzvbi \
- --enable-openal \
--enable-opengl \
+ --enable-sdl2 \
--enable-x11grab
# The standard configuration only uses the shared CONFIG.
- CONFIG_standard =
+ CONFIG_standard = --enable-shared
# With these enabled, resulting binaries are effectively licensed as GPLv3+.
- CONFIG_extra = --enable-version3 \
+ CONFIG_extra = --enable-shared \
+ --enable-version3 \
--disable-doc \
--disable-programs \
--enable-libopencore_amrnb \
--enable-libopencore_amrwb \
- --enable-libtesseract \
+ --disable-libtesseract \
- --enable-libvo_amrwbenc \
- --enable-netcdf
+ --enable-libvo_amrwbenc
+
+ # The static libraries should not be built with PIC.
+ CONFIG_static = --disable-pic \
+ --disable-doc \
+ --disable-programs
# Disable optimizations if requested.
ifneq (,$(filter $(DEB_BUILD_OPTIONS),noopt))
@@@ -129,6 -129,12 +129,12 @@@ ifeq ($(DEB_HOST_ARCH_OS),linux
--enable-libiec61883
endif
+ # Some build-dependencies are not installable on some architectures.
+ ifeq (,$(filter $(DEB_HOST_ARCH),powerpcspe))
+ CONFIG += --enable-openal
+ CONFIG_extra += --enable-netcdf
+ endif
+
# ffmpeg is involed in build-dependency cycles with opencv, x264 and chromaprint, so disable them in stage one.
# Also disable frei0r, which build-depends on opencv.
ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
@@@ -137,11 -143,15 +143,15 @@@
--disable-libopencv \
--disable-libx264
else
+ ifeq (,$(filter $(DEB_HOST_ARCH),powerpcspe))
CONFIG += --enable-frei0r \
- --enable-chromaprint \
--enable-libopencv \
--enable-libx264
endif
+ ifeq (,$(filter $(DEB_HOST_ARCH),m68k powerpcspe))
+ CONFIG += --enable-chromaprint
+ endif
+ endif
# Disable altivec optimizations on powerpc, because they are not always available on this architecture.
ifeq ($(DEB_HOST_ARCH),powerpc)
@@@ -149,7 -159,8 +159,8 @@@
# Build an altivec flavor of the libraries on powerpc.
# This works around the problem that runtime cpu detection on powerpc currently does not work,
# because, if altivec is enabled, all files are build with '-maltivec' so that the compiler inserts altivec instructions, wherever it likes.
- CONFIG_altivec = --enable-altivec \
+ CONFIG_altivec = --enable-shared \
+ --enable-altivec \
--disable-doc \
--disable-programs
CONFIG_altivec-extra = $(CONFIG_altivec) $(CONFIG_extra)
@@@ -181,19 -192,15 +192,15 @@@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST
--target-os=$(DEB_HOST_ARCH_OS)
endif
- # export all *FLAG env vars
- export DPKG_EXPORT_BUILDFLAGS
- include /usr/share/dpkg/buildflags.mk
-
# Use the default debhelper scripts, where possible.
- # Enable parallel building.
%:
- dh $@ --parallel
+ dh $@
# Add configuration options:
override_dh_auto_configure:
$(foreach flavor,$(FLAVORS),mkdir -p debian/$(flavor);)
$(foreach flavor,$(FLAVORS),set -e; echo " *** $(flavor) ***"; cd debian/$(flavor); ../../configure $(CONFIG) $(CONFIG_$(flavor)) || (cat config.log && exit 1); cd ../.. ;)
+ touch override_dh_auto_configure
# Remove the subdirectories generated for the flavors.
override_dh_auto_clean:
@@@ -204,6 -211,7 +211,7 @@@ override_dh_auto_build-indep
dh_auto_build -i --sourcedirectory=debian/standard -- apidoc
# Create the minified CSS files.
lessc debian/missing-sources/ffmpeg-web/src/less/style.less | cleancss > debian/standard/doc/style.min.css
+ rm override_dh_auto_configure
override_dh_auto_build-arch:
# Copy built object files to avoid building them again for the extra flavor.
@@@ -233,7 -241,7 +241,7 @@@ override_dh_auto_test-arch
# No tests for indep build.
override_dh_auto_test-indep:
- override_dh_auto_install:
+ override_dh_auto_install-arch:
dh_auto_install --sourcedirectory=debian/standard
ifeq ($(DEB_HOST_ARCH),powerpc)
install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
@@@ -244,6 -252,11 +252,11 @@@ ifeq ($(DEB_HOST_ARCH),powerpc
install -d debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
install -m 644 debian/altivec-extra/*/*.so.* debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
endif
+ # Use the static libraries from the --disable-pic build
+ install -m 644 debian/static/*/lib*.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+
+ override_dh_auto_install-indep:
+ dh_auto_install --sourcedirectory=debian/standard
override_dh_install:
dh_install $(addprefix -p,$(EXTRA_PKGS)) --sourcedir=debian/tmp/extra
--
ffmpeg packaging
More information about the pkg-multimedia-commits
mailing list