[SCM] ffmpeg/jessie: Merge tag 'debian/7%3.2.4-1' into jessie
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Sun Feb 26 19:09:40 UTC 2017
Finalize changelog.
Drop patches, included upstream
Merge tag 'upstream/3.2.4'
New upstream version 3.2.4
Update changelog
Switch from libmodplug to libopenmpt. (Closes: #849840)
Update packaging copyright years.
Re-enable chromaprint on sh4 and libx264 on powerpcspe.
Fix heap-buffer-overflows when using libopenmpt.
Fix building with --disable-pic on gcc-4.8.
Fix building with chromaprint 1.4.
Start new upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/jessie
X-Git-Reftype: branch
X-Git-Oldrev: 22fdf6a0510af67659645ee7e3ca6d47ad80627b
X-Git-Newrev: bb6003397ae3386ae6b4765a54c943030a35d600
The following commit has been merged in the jessie branch:
commit 490c635fcaf84b85e8a3f4659f61f37c194cf25e
Merge: 22fdf6a0510af67659645ee7e3ca6d47ad80627b ec09d70da80173b1bc271e863865ec41595c299a
Author: Balint Reczey <balint at balintreczey.hu>
Date: Sat Feb 25 12:35:16 2017 +0100
Merge tag 'debian/7%3.2.4-1' into jessie
ffmpeg Debian release 7:3.2.4-1
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 4f5d12b,3010e1c..2803eca
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,25 +1,40 @@@
- ffmpeg (7:3.2.2-1~bpo8+1) jessie-backports; urgency=medium
++ffmpeg (7:3.2.4-1~bpo8+1) UNRELEASED; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Build-depend on yasm to work around nasm issues in jessie
+ * 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
+ * Omit -fstack-protector-strong from used CFLAGs, FFmpeg already sets -fstack-protector-all
+ * Use GCC 4.8 on i386 instead of disabling PIE
+ * Fix FTBFS on i386 due to PIC/PIE incompatible ASM
+
- -- Balint Reczey <balint at balintreczey.hu> Fri, 23 Dec 2016 16:21:05 +0100
++ -- Balint Reczey <balint at balintreczey.hu> Sat, 25 Feb 2017 12:34:25 +0100
++
+ ffmpeg (7:3.2.4-1) unstable; urgency=medium
+
+ * Import new upstream bugfix release 3.2.4.
+ - Fixes CVE-2016-9561, CVE-2017-5024 and CVE-2017-5025.
+ * Drop patches, included upstream:
+ - lavf-chromaprint-Update-for-version-1.4.patch
+ - libopenmpt-add-missing-avio_read-return-value-check.patch
+ - swscale-save-ebx-register-when-it-is-not-available.patch
+
+ -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> Fri, 10 Feb 2017 22:24:45 +0100
+
+ ffmpeg (7:3.2.2-2) unstable; urgency=medium
+
+ * Cherry-pick patches from upstream:
+ - Fix building with chromaprint 1.4. (Closes: #851026)
+ - Fix building with --disable-pic on gcc-4.8.
+ - Fix heap-buffer-overflows when using libopenmpt.
+ * Re-enable chromaprint on sh4 and libx264 on powerpcspe.
+ * Update packaging copyright years.
+ * Switch from libmodplug to libopenmpt. (Closes: #849840)
+
+ -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> Sat, 21 Jan 2017 22:39:40 +0100
ffmpeg (7:3.2.2-1) unstable; urgency=medium
diff --combined debian/control
index 283fd53,ec05196..6e9d95a
--- a/debian/control
+++ b/debian/control
@@@ -26,9 -26,6 +26,9 @@@ Build-Depends
flite1-dev,
# --enable-frei0r
frei0r-plugins-dev <!stage1>,
+# GCC 4.9 breaks the build with PIE enabled on i386
+ gcc-4.8 [i386],
+ g++-4.8 [i386],
# --enable-ladspa
ladspa-sdk,
# --enable-libass
@@@ -44,13 -41,13 +44,13 @@@
# --enable-libcdio
libcdio-paranoia-dev,
# --enable-libchromaprint
- libchromaprint-dev (>= 1.3.2-2~) [!sh4] <!stage1>,
- libchromaprint-dev <!stage1>,
++ libchromaprint-dev (>= 1.3.2-2~) <!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
@@@ -75,8 -72,6 +75,6 @@@
libleptonica-dev,
# autodetected for the tiff decoder
liblzma-dev,
- # --enable-libmodplug
- libmodplug-dev,
# --enable-libmp3lame
libmp3lame-dev,
# --enable-netcdf
@@@ -93,6 -88,8 +91,8 @@@
libopencv-imgproc-dev <!stage1>,
# --enable-libopenjpeg
libopenjp2-7-dev,
+ # --enable-libopenmpt
+ libopenmpt-dev,
# --enable-libopus
libopus-dev,
# --enable-libpulse
@@@ -137,7 -134,7 +137,7 @@@
# --enable-libwebp
libwebp-dev,
# --enable-libx264
- libx264-dev [!powerpcspe] <!stage1>,
+ libx264-dev <!stage1>,
# --enable-libx265
libx265-dev (>= 1.8),
# autodetected libxcb-shape
@@@ -164,7 -161,7 +164,7 @@@
# HTML documentation
texinfo,
# assembler optimizations
- nasm,
+ yasm,
# autodetected zlib
zlib1g-dev
diff --combined debian/rules
index dcdc11a,31af258..f4559b5
--- a/debian/rules
+++ b/debian/rules
@@@ -14,9 -14,6 +14,9 @@@ include /usr/share/dpkg/architecture.m
# Ubuntu ld adds -Bsymbolic-functions by default, but that prevents FFmpeg from building.
export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
+# Hardened toolchain already adds -fstack-protector-all and -fstack-protector-strong is not supported by Jessie's gcc-4.8
+export DEB_CFLAGS_MAINT_STRIP=-fstack-protector-strong
+
# 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 static
@@@ -31,9 -28,9 +31,9 @@@
# --enable-libilbc (see #675959 for the RFP bug)
# --enable-libkvazaar
# --enable-libmfx
+ # --enable-libmodplug (see #849840: replaced with libopenmpt)
# --enable-libnut
# --enable-libopenh264
- # --enable-libopenmpt
# --enable-libschroedinger (see #845037: removal due to security issues)
# --enable-libutvideo
# --enable-libvidstab (see #709193 for the RFP bug)
@@@ -60,16 -57,16 +60,16 @@@ CONFIG := --prefix=/usr
--enable-libbs2b \
--enable-libcaca \
--enable-libcdio \
- --enable-libebur128 \
+ --disable-libebur128 \
--enable-libflite \
--enable-libfontconfig \
--enable-libfreetype \
--enable-libfribidi \
--enable-libgme \
--enable-libgsm \
- --enable-libmodplug \
--enable-libmp3lame \
--enable-libopenjpeg \
+ --enable-libopenmpt \
--enable-libopus \
--enable-libpulse \
--enable-librubberband \
@@@ -103,7 -100,7 +103,7 @@@ CONFIG_extra = --enable-shared
--disable-programs \
--enable-libopencore_amrnb \
--enable-libopencore_amrwb \
- --enable-libtesseract \
+ --disable-libtesseract \
--enable-libvo_amrwbenc
# The static libraries should not be built with PIC.
@@@ -116,12 -113,6 +116,12 @@@ ifneq (,$(filter $(DEB_BUILD_OPTIONS),n
CONFIG += --disable-optimizations
endif
+# Compilation with PIE fails on i386 due to some ASM code with GCC 4.9
+ifneq (,$(filter $(DEB_HOST_ARCH),i386))
+ CC := gcc-4.8
+ CXX := g++-4.8
+endif
+
# Respect CC/CXX from the environment, if they differ from the default.
# Don't set them if they equal the default, because that disables autodetection needed for cross-building.
ifneq ($(CC),cc)
@@@ -150,14 -141,10 +150,10 @@@ ifneq ($(filter stage1,$(DEB_BUILD_PROF
--disable-libopencv \
--disable-libx264
else
- CONFIG += --enable-libopencv \
- --enable-frei0r
- ifeq (,$(filter $(DEB_HOST_ARCH),powerpcspe))
- CONFIG += --enable-libx264
- endif
- ifeq (,$(filter $(DEB_HOST_ARCH),sh4))
- CONFIG += --enable-chromaprint
- endif
+ CONFIG += --enable-chromaprint \
+ --enable-frei0r \
+ --enable-libopencv \
+ --enable-libx264
endif
# Disable altivec optimizations on powerpc, because they are not always available on this architecture.
--
ffmpeg packaging
More information about the pkg-multimedia-commits
mailing list