clean_ffmpeg.sh: Add missing ARM files (fix FTBFS on ARM)

Also remove an unused #include of a file we do not ship from an ARM
file. (fft_init_arm.c wants synth_filter.h, but does not actually use
anything from it. We ship neither synth_filter.h nor synth_filter.c.)

Mention the change in the qt5-qtwebengine.spec %changelog.
epel9
Kevin Kofler 9 years ago
parent 1120e4b80b
commit 4844045435

@ -36,6 +36,13 @@ header_files=" libavutil/x86/asm.h \
libavutil/x86/intmath.h \ libavutil/x86/intmath.h \
libavutil/x86/intreadwrite.h \ libavutil/x86/intreadwrite.h \
libavutil/x86/timer.h \ libavutil/x86/timer.h \
libavutil/arm/asm.S \
libavutil/arm/bswap.h \
libavutil/arm/cpu.h \
libavutil/arm/float_dsp_arm.h \
libavutil/arm/intmath.h \
libavutil/arm/intreadwrite.h \
libavutil/arm/timer.h \
libavutil/atomic_gcc.h \ libavutil/atomic_gcc.h \
libavutil/attributes.h \ libavutil/attributes.h \
libavutil/audio_fifo.h \ libavutil/audio_fifo.h \
@ -73,6 +80,10 @@ header_files=" libavutil/x86/asm.h \
libavcodec/x86/inline_asm.h \ libavcodec/x86/inline_asm.h \
libavcodec/x86/mathops.h \ libavcodec/x86/mathops.h \
libavcodec/x86/vp56_arith.h \ libavcodec/x86/vp56_arith.h \
libavcodec/arm/mathops.h \
libavcodec/arm/videodsp_arm.h \
libavcodec/arm/vp56_arith.h \
libavcodec/arm/vp8.h \
libavcodec/avcodec.h \ libavcodec/avcodec.h \
libavcodec/blockdsp.h \ libavcodec/blockdsp.h \
libavcodec/bytestream.h \ libavcodec/bytestream.h \
@ -225,9 +236,13 @@ do
cp -p $f ../tmp_ffmpeg/$dir_name 2>/dev/null cp -p $f ../tmp_ffmpeg/$dir_name 2>/dev/null
done done
# whole directory
mkdir -p ../tmp_ffmpeg/chromium mkdir -p ../tmp_ffmpeg/chromium
cp -pr chromium/config ../tmp_ffmpeg/chromium/ cp -pr chromium/config ../tmp_ffmpeg/chromium/
# unused include
sed -i -e '/synth_filter\.h/d' ../tmp_ffmpeg/libavcodec/arm/fft_init_arm.c
cd .. cd ..
rm -rf ffmpeg rm -rf ffmpeg
mv tmp_ffmpeg ffmpeg mv tmp_ffmpeg ffmpeg

@ -303,6 +303,7 @@ popd
%changelog %changelog
* Sat Jan 09 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.6.0-0.5.beta * Sat Jan 09 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.6.0-0.5.beta
- Fix FTBFS on ARM: linux-pri patch: Set use_system_yasm only on x86_64 and i386 - Fix FTBFS on ARM: linux-pri patch: Set use_system_yasm only on x86_64 and i386
- Fix FTBFS on ARM: Respin tarball with: clean_ffmpeg.sh: Add missing ARM files
* Sat Jan 09 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.6.0-0.4.beta.1 * Sat Jan 09 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.6.0-0.4.beta.1
- Use more specific BuildRequires for docs (thanks to rdieter) - Use more specific BuildRequires for docs (thanks to rdieter)
Loading…
Cancel
Save