[SCM] ffmpeg/jessie: Merge tag 'debian/7%3.2.2-1' into jessie
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Fri Dec 9 21:52:36 UTC 2016
Finalize changelog.
Drop --disable-tesseract.
Enable frei0r on powerpcspe.
Fix log messages in autopkgtest.
Merge tag 'upstream/3.2.2'
New upstream version 3.2.2
Finalize changelog
Update encdec_list.txt
Add streamcopy testing to the autopkgtest.
Update build-dependencies for some ports.
Enable omx.
Disable libschroedinger entirely. (see #845037)
Remove patches, fixed upstream.
Update changelog
Merge tag 'upstream/3.2.1'
New upstream version 3.2.1
Add explicit build-dependencies for autodetected features.
Add build-dependency on autodetected libxcb-shm0-dev. (Closes: #843144)
Don't enable x11grab, which has been replaced with xcb.
Call dh_auto_install with -a/-i for -arch and for -indep targets respectively
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/jessie
X-Git-Reftype: branch
X-Git-Oldrev: 228035a4e5a5fd4f606ff50dc806d58429fd97f6
X-Git-Newrev: a3eebf3adbf2a20c8fc60d9866225429d2d4c6e7
The following commit has been merged in the jessie branch:
commit a3eebf3adbf2a20c8fc60d9866225429d2d4c6e7
Merge: 228035a4e5a5fd4f606ff50dc806d58429fd97f6 242b7a52bee78c88653d094a11315357a6e888be
Author: Balint Reczey <balint at balintreczey.hu>
Date: Fri Dec 9 20:53:11 2016 +0100
Merge tag 'debian/7%3.2.2-1' into jessie
ffmpeg Debian release 7:3.2.2-1
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 3058278,5191c31..8bc44b5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,38 +1,51 @@@
- ffmpeg (7:3.2-2~bpo8+2) jessie-backports; urgency=medium
++ffmpeg (7:3.2.2-1~bpo8+1) jessie-backports; urgency=medium
+
++ * Rebuild for jessie-backports.
+ * Build-depend on yasm to work around nasm issues in jessie
- * Revert Disabling AVX optimization
+ * Disable PIE on i386 by patching configure to fix FTBFS
-
- -- Balint Reczey <balint at balintreczey.hu> Fri, 11 Nov 2016 10:06:45 +0100
-
- ffmpeg (7:3.2-2~bpo8+1) jessie-backports; urgency=medium
-
- * Rebuild for 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
- * Disable AVX optimization.
- It causes an error on jessie:
- nasm -f elf64 -DPIC -g -F dwarf -I./ -Isrc// -Pconfig.asm \
- -I /<<PKGBUILDDIR>>/libavcodec/x86/ -o libavcodec/x86/imdct36.o \
- src/libavcodec/x86/imdct36.asm
- src/libavcodec/x86/imdct36.asm:393: error: operation size not specified
- ...
-
- -- Balint Reczey <balint at balintreczey.hu> Thu, 10 Nov 2016 09:38:18 +0100
++
++ -- Balint Reczey <balint at balintreczey.hu> Fri, 09 Dec 2016 20:51:26 +0100
++
+ ffmpeg (7:3.2.2-1) unstable; urgency=medium
+
+ * Import new upstream bugfix release 3.2.2.
+ * Fix log messages in autopkgtest.
+ * Enable frei0r on powerpcspe.
+ * Drop --disable-tesseract.
+
+ -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> Tue, 06 Dec 2016 23:58:20 +0100
+
+ ffmpeg (7:3.2.1-1) unstable; urgency=medium
+
+ [ Balint Reczey ]
+ * Call dh_auto_install with -a/-i for -arch and for -indep targets
+ respectively
+
+ [ Andreas Cadhalpun ]
+ * Import new upstream bugfix release 3.2.1.
+ * Don't enable x11grab, which has been replaced with xcb.
+ * Add build-dependency on autodetected libxcb-shm0-dev. (Closes: #843144)
+ * Add explicit build-dependencies for autodetected features.
+ * Remove patches, fixed upstream.
+ - Revert-avformat-hls-Fix-missing-streams-in-some-case.patch
+ - apng-use-side-data-to-pass-extradata-to-muxer.patch
+ - doc-fix-spelling-errors.patch
+ - pixblockdsp-disable-altivec-optimizations-on-ppc64be.patch
+ * Disable libschroedinger entirely. (see #845037)
+ * Enable omx.
+ * Update build-dependencies for some ports.
+ - m68k: enable chromaprint
+ - powerpcspe: enable chromaprint, openal, opencv
+ - sh4: disable chromaprint
+ * Add streamcopy testing to the autopkgtest.
+ * Update encdec_list.txt.
+
+ -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> Sat, 26 Nov 2016 23:44:53 +0100
ffmpeg (7:3.2-2) unstable; urgency=medium
diff --combined debian/control
index c1e5dd9,35d19b8..5373e12
--- a/debian/control
+++ b/debian/control
@@@ -25,7 -25,7 +25,7 @@@ Build-Depends
# --enable-libflite
flite1-dev,
# --enable-frei0r
- frei0r-plugins-dev [!powerpcspe] <!stage1>,
+ frei0r-plugins-dev <!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~) [!m68k !powerpcspe] <!stage1>,
- libchromaprint-dev [!sh4] <!stage1>,
++ libchromaprint-dev (>= 1.3.2-2~) [!sh4] <!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
@@@ -79,13 -79,15 +79,15 @@@
# --enable-netcdf
libnetcdf-dev [!powerpcspe],
# --enable-openal
- libopenal-dev [!powerpcspe],
+ libopenal-dev,
+ # --enable-omx
+ libomxil-bellagio-dev,
# --enable-libopencore_amrnb
libopencore-amrnb-dev,
# --enable-libopencore_amrwb
libopencore-amrwb-dev,
# --enable-libopencv
- libopencv-imgproc-dev [!powerpcspe] <!stage1>,
+ libopencv-imgproc-dev <!stage1>,
# --enable-libopenjpeg
libopenjp2-7-dev,
# --enable-libopus
@@@ -94,8 -96,6 +96,6 @@@
libpulse-dev,
# --enable-librubberband
librubberband-dev,
- # --enable-libschroedinger
- libschroedinger-dev,
# autodetected: protocol 'sctp'
libsctp-dev [linux-any],
# --enable-sdl2
@@@ -137,8 -137,14 +137,14 @@@
libx264-dev [!powerpcspe] <!stage1>,
# --enable-libx265
libx265-dev (>= 1.8),
- # --enable-x11grab
- libxext-dev,
+ # autodetected libxcb-shape
+ libxcb-shape0-dev,
+ # autodetected libxcb-shm
+ libxcb-shm0-dev,
+ # autodetected libxcb-xfixes
+ libxcb-xfixes0-dev,
+ # autodetected xlib
+ libxv-dev,
# --enable-libxvid
libxvidcore-dev,
# autodetected: decoder 'mpeg_xvmc'; outdev 'xv'
@@@ -147,8 -153,6 +153,8 @@@
libzmq3-dev,
# --enable-libzvbi
libzvbi-dev,
+# For applying patches conditionally
+ patch,
# The opencl API is considered experimental.
# # --enable-opencl
# ocl-icd-opencl-dev [!hurd-any] | opencl-dev [!hurd-any],
@@@ -157,7 -161,9 +163,9 @@@
# HTML documentation
texinfo,
# assembler optimizations
- yasm
- nasm,
++ yasm,
+ # autodetected zlib
+ zlib1g-dev
Package: ffmpeg
Architecture: any
diff --combined debian/rules
index 705efaf,391f1eb..1153907
--- a/debian/rules
+++ b/debian/rules
@@@ -31,6 -31,7 +31,7 @@@ FLAVORS = standard extra stati
# --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)
# --enable-libxavs
@@@ -46,9 -47,7 +47,7 @@@ CONFIG := --prefix=/usr
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--incdir=/usr/include/$(DEB_HOST_MULTIARCH) \
--enable-gpl \
- --disable-libtesseract \
--disable-stripping \
- --disable-decoder=libschroedinger \
--enable-avresample \
--enable-avisynth \
--enable-gnutls \
@@@ -58,7 -57,7 +57,7 @@@
--enable-libbs2b \
--enable-libcaca \
--enable-libcdio \
- --enable-libebur128 \
+ --disable-libebur128 \
--enable-libflite \
--enable-libfontconfig \
--enable-libfreetype \
@@@ -71,7 -70,6 +70,6 @@@
--enable-libopus \
--enable-libpulse \
--enable-librubberband \
- --enable-libschroedinger \
--enable-libshine \
--enable-libsnappy \
--enable-libsoxr \
@@@ -87,9 -85,10 +85,10 @@@
--enable-libxvid \
--enable-libzmq \
--enable-libzvbi \
+ --enable-omx \
+ --enable-openal \
--enable-opengl \
- --enable-sdl2 \
- --enable-x11grab
+ --enable-sdl2
# The standard configuration only uses the shared CONFIG.
CONFIG_standard = --enable-shared
@@@ -101,7 -100,7 +100,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.
@@@ -131,7 -130,6 +130,6 @@@ endi
# Some build-dependencies are not installable on some architectures.
ifeq (,$(filter $(DEB_HOST_ARCH),powerpcspe))
- CONFIG += --enable-openal
CONFIG_extra += --enable-netcdf
endif
@@@ -143,12 -141,12 +141,12 @@@ ifneq ($(filter stage1,$(DEB_BUILD_PROF
--disable-libopencv \
--disable-libx264
else
+ CONFIG += --enable-libopencv \
+ --enable-frei0r
ifeq (,$(filter $(DEB_HOST_ARCH),powerpcspe))
- CONFIG += --enable-frei0r \
- --enable-libopencv \
- --enable-libx264
+ CONFIG += --enable-libx264
endif
- ifeq (,$(filter $(DEB_HOST_ARCH),m68k powerpcspe))
+ ifeq (,$(filter $(DEB_HOST_ARCH),sh4))
CONFIG += --enable-chromaprint
endif
endif
@@@ -198,20 -196,12 +196,20 @@@ endi
# Add configuration options:
override_dh_auto_configure:
+ # Compilation with PIE fails on i386 due to some ASM code
+ifneq (,$(filter $(DEB_HOST_ARCH),i386))
+ patch -p1 < debian/patches/disable-pie.patch
+endif
+
$(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:
+ifneq (,$(filter $(DEB_HOST_ARCH),i386))
+ -patch -R -p1 < debian/patches/disable-pie.patch
+endif
$(foreach flavor,$(FLAVORS),[ ! -d debian/$(flavor) ] || rm -r debian/$(flavor);)
# Create doxygen documentation:
@@@ -250,12 -240,12 +248,12 @@@ override_dh_auto_test-arch
override_dh_auto_test-indep:
override_dh_auto_install-arch:
- dh_auto_install --sourcedirectory=debian/standard
+ dh_auto_install -a --sourcedirectory=debian/standard
ifeq ($(DEB_HOST_ARCH),powerpc)
install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
install -m 644 debian/altivec/*/*.so.* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
endif
- dh_auto_install --sourcedirectory=debian/extra --destdir=debian/tmp/extra
+ dh_auto_install -a --sourcedirectory=debian/extra --destdir=debian/tmp/extra
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
@@@ -264,7 -254,7 +262,7 @@@ endi
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
+ dh_auto_install -i --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