Hello community, here is the log from the commit of package ffmpeg for openSUSE:Factory checked in at 2016-09-12 13:23:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpeg (Old) and /work/SRC/openSUSE:Factory/.ffmpeg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpeg" Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg.changes 2016-08-31 14:28:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg.changes 2016-09-12 13:23:14.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 29 00:36:30 UTC 2016 - [email protected] + +- Fix linking errors for arm and aarch64 builds, boo#995937 + * Add ffmpeg-fix-CONFIG_VC1DSP-changes.patch + +------------------------------------------------------------------- New: ---- ffmpeg-fix-CONFIG_VC1DSP-changes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpeg.spec ++++++ --- /var/tmp/diff_new_pack.ye7UHz/_old 2016-09-12 13:23:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ye7UHz/_new 2016-09-12 13:23:15.000000000 +0200 @@ -54,6 +54,7 @@ Patch3: ffmpeg-pkgconfig-version.patch Patch4: ffmpeg-new-coder-errors.diff Patch5: ffmpeg-codec-choice.diff +Patch6: ffmpeg-fix-CONFIG_VC1DSP-changes.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: pkg-config @@ -356,7 +357,7 @@ %prep %setup -q -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1 %build perl -i -pe 's{__TIME__|__DATE__}{"$&"}g' *.c ++++++ ffmpeg-fix-CONFIG_VC1DSP-changes.patch ++++++ From: Stefan Brüns <[email protected]> Date: 2016-08-29T00:39:13 Upstream shuffled around some options, but missed some occasions. Some of the code previously enabled by CONFIG_VC1_DECODER now should be enabled by CONFIG_VC1DSP. The ARM code has not been updated correctly. The VC1 demuxer adds CONFIG_VC1DSP, but not all dependent code is enabled, leading to linking errors. --- libavcodec/aarch64/Makefile | 2 +- libavcodec/aarch64/h264cmc_neon.S | 2 +- libavcodec/arm/h264cmc_neon.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Index: ffmpeg-3.1.3/libavcodec/aarch64/Makefile =================================================================== --- ffmpeg-3.1.3.orig/libavcodec/aarch64/Makefile +++ ffmpeg-3.1.3/libavcodec/aarch64/Makefile @@ -14,7 +14,7 @@ OBJS-$(CONFIG_VIDEODSP) # decoders/encoders OBJS-$(CONFIG_DCA_DECODER) += aarch64/synth_filter_init.o OBJS-$(CONFIG_RV40_DECODER) += aarch64/rv40dsp_init_aarch64.o -OBJS-$(CONFIG_VC1_DECODER) += aarch64/vc1dsp_init_aarch64.o +OBJS-$(CONFIG_VC1DSP) += aarch64/vc1dsp_init_aarch64.o OBJS-$(CONFIG_VORBIS_DECODER) += aarch64/vorbisdsp_init.o # ARMv8 optimizations Index: ffmpeg-3.1.3/libavcodec/aarch64/h264cmc_neon.S =================================================================== --- ffmpeg-3.1.3.orig/libavcodec/aarch64/h264cmc_neon.S +++ ffmpeg-3.1.3/libavcodec/aarch64/h264cmc_neon.S @@ -445,7 +445,7 @@ endconst h264_chroma_mc4 avg, rv40 #endif -#if CONFIG_VC1_DECODER +#if CONFIG_VC1DSP h264_chroma_mc8 put, vc1 h264_chroma_mc8 avg, vc1 h264_chroma_mc4 put, vc1 Index: ffmpeg-3.1.3/libavcodec/arm/h264cmc_neon.S =================================================================== --- ffmpeg-3.1.3.orig/libavcodec/arm/h264cmc_neon.S +++ ffmpeg-3.1.3/libavcodec/arm/h264cmc_neon.S @@ -455,7 +455,7 @@ endconst h264_chroma_mc4 avg, rv40 #endif -#if CONFIG_VC1_DECODER +#if CONFIG_VC1DSP h264_chroma_mc8 put, vc1 h264_chroma_mc8 avg, vc1 h264_chroma_mc4 put, vc1
