From 6706fec270b1c4c8239a581d93ed358e6bbc5653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Larcher?= Date: Thu, 8 Mar 2018 18:32:21 +0100 Subject: [PATCH] ffmpeg: bump to 3.2.11 and provide 64-bit --- components/encumbered/ffmpeg/Makefile | 19 +-- components/encumbered/ffmpeg/ffmpeg.p5m | 145 ++++++++++++++---- .../ffmpeg/manifests/sample-manifest.p5m | 114 ++++++++++---- .../ffmpeg/patches/02-openjpeg2.patch | 44 ------ 4 files changed, 205 insertions(+), 117 deletions(-) delete mode 100644 components/encumbered/ffmpeg/patches/02-openjpeg2.patch diff --git a/components/encumbered/ffmpeg/Makefile b/components/encumbered/ffmpeg/Makefile index f8091f6a9d9..a9550c5c86a 100644 --- a/components/encumbered/ffmpeg/Makefile +++ b/components/encumbered/ffmpeg/Makefile @@ -13,16 +13,17 @@ # Copyright 2015 Alexander Pyhalov # +PREFERRED_BITS=64 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= ffmpeg -COMPONENT_VERSION= 2.8.13 -COMPONENT_REVISION= 1 +COMPONENT_VERSION= 3.2.11 COMPONENT_SUMMARY= A very fast video and audio converter COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 COMPONENT_ARCHIVE_HASH= \ - sha256:df9b98cb584a004ce8e29b4c954cfb8d9e45dac52b4c6d036f25dfbaa3086778 + sha256:9180652c08bfb3d7a539a9420f92992a083c4cec5b8060a300bdc2299d78c373 COMPONENT_ARCHIVE_URL= \ http://www.ffmpeg.org/releases/$(COMPONENT_ARCHIVE) COMPONENT_PROJECT_URL = http://www.ffmpeg.org/ @@ -43,7 +44,6 @@ CFLAGS.32 += -mpreferred-stack-boundary=4 CFLAGS += $(CFLAGS.$(BITS)) CFLAGS += -I/usr/X11/include CFLAGS += $(CPP_LARGEFILES) -CFLAGS += -DHAVE_OPENJPEG_2_0_OPENJPEG_H CPPFLAGS += $($(COMPILER)_C99_ENABLE) @@ -94,14 +94,15 @@ CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)" COMPONENT_TEST_ENV+= PATH=$(PROTO_DIR)/usr/bin:$(PATH) COMPONENT_TEST_ENV+= LD_LIBRARY_PATH=$(PROTO_DIR)/usr/lib -$(TEST_32): $(INSTALL_32) +$(TEST_32_and_64): $(INSTALL_32_and_64) -build: $(BUILD_32) +build: $(BUILD_32_and_64) -install: $(INSTALL_32) +install: $(INSTALL_32_and_64) -test: $(TEST_32) +test: $(TEST_32_and_64) +# Auto-generated dependencies REQUIRED_PACKAGES += audio/lame REQUIRED_PACKAGES += codec/libtheora REQUIRED_PACKAGES += codec/speex @@ -112,7 +113,7 @@ REQUIRED_PACKAGES += library/audio/libgsm REQUIRED_PACKAGES += library/audio/openal REQUIRED_PACKAGES += library/graphics/libvdpau REQUIRED_PACKAGES += library/libvorbis -REQUIRED_PACKAGES += library/sdl +REQUIRED_PACKAGES += library/sdl2 REQUIRED_PACKAGES += library/security/openssl REQUIRED_PACKAGES += library/video/libass REQUIRED_PACKAGES += library/video/libschroedinger diff --git a/components/encumbered/ffmpeg/ffmpeg.p5m b/components/encumbered/ffmpeg/ffmpeg.p5m index b2dadb92c74..17021474e2f 100644 --- a/components/encumbered/ffmpeg/ffmpeg.p5m +++ b/components/encumbered/ffmpeg/ffmpeg.p5m @@ -22,16 +22,23 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' +file path=usr/bin/$(MACH32)/ffmpeg +file path=usr/bin/$(MACH32)/ffplay +file path=usr/bin/$(MACH32)/ffprobe +file path=usr/bin/$(MACH32)/ffserver file path=usr/bin/ffmpeg file path=usr/bin/ffplay file path=usr/bin/ffprobe file path=usr/bin/ffserver file path=usr/include/libavcodec/avcodec.h +file path=usr/include/libavcodec/avdct.h file path=usr/include/libavcodec/avfft.h file path=usr/include/libavcodec/d3d11va.h +file path=usr/include/libavcodec/dirac.h file path=usr/include/libavcodec/dv_profile.h file path=usr/include/libavcodec/dxva2.h -file path=usr/include/libavcodec/old_codec_ids.h +file path=usr/include/libavcodec/jni.h +file path=usr/include/libavcodec/mediacodec.h file path=usr/include/libavcodec/qsv.h file path=usr/include/libavcodec/vaapi.h file path=usr/include/libavcodec/vda.h @@ -42,8 +49,6 @@ file path=usr/include/libavcodec/vorbis_parser.h file path=usr/include/libavcodec/xvmc.h file path=usr/include/libavdevice/avdevice.h file path=usr/include/libavdevice/version.h -file path=usr/include/libavfilter/asrc_abuffer.h -file path=usr/include/libavfilter/avcodec.h file path=usr/include/libavfilter/avfilter.h file path=usr/include/libavfilter/avfiltergraph.h file path=usr/include/libavfilter/buffersink.h @@ -56,9 +61,9 @@ file path=usr/include/libavresample/avresample.h file path=usr/include/libavresample/version.h file path=usr/include/libavutil/adler32.h file path=usr/include/libavutil/aes.h +file path=usr/include/libavutil/aes_ctr.h file path=usr/include/libavutil/attributes.h file path=usr/include/libavutil/audio_fifo.h -file path=usr/include/libavutil/audioconvert.h file path=usr/include/libavutil/avassert.h file path=usr/include/libavutil/avconfig.h file path=usr/include/libavutil/avstring.h @@ -74,6 +79,7 @@ file path=usr/include/libavutil/channel_layout.h file path=usr/include/libavutil/common.h file path=usr/include/libavutil/cpu.h file path=usr/include/libavutil/crc.h +file path=usr/include/libavutil/des.h file path=usr/include/libavutil/dict.h file path=usr/include/libavutil/display.h file path=usr/include/libavutil/downmix_info.h @@ -85,6 +91,12 @@ file path=usr/include/libavutil/file.h file path=usr/include/libavutil/frame.h file path=usr/include/libavutil/hash.h file path=usr/include/libavutil/hmac.h +file path=usr/include/libavutil/hwcontext.h +file path=usr/include/libavutil/hwcontext_cuda.h +file path=usr/include/libavutil/hwcontext_dxva2.h +file path=usr/include/libavutil/hwcontext_qsv.h +file path=usr/include/libavutil/hwcontext_vaapi.h +file path=usr/include/libavutil/hwcontext_vdpau.h file path=usr/include/libavutil/imgutils.h file path=usr/include/libavutil/intfloat.h file path=usr/include/libavutil/intreadwrite.h @@ -92,12 +104,12 @@ file path=usr/include/libavutil/lfg.h file path=usr/include/libavutil/log.h file path=usr/include/libavutil/lzo.h file path=usr/include/libavutil/macros.h +file path=usr/include/libavutil/mastering_display_metadata.h file path=usr/include/libavutil/mathematics.h file path=usr/include/libavutil/md5.h file path=usr/include/libavutil/mem.h file path=usr/include/libavutil/motion_vector.h file path=usr/include/libavutil/murmur3.h -file path=usr/include/libavutil/old_pix_fmts.h file path=usr/include/libavutil/opt.h file path=usr/include/libavutil/parseutils.h file path=usr/include/libavutil/pixdesc.h @@ -105,6 +117,7 @@ file path=usr/include/libavutil/pixelutils.h file path=usr/include/libavutil/pixfmt.h file path=usr/include/libavutil/random_seed.h file path=usr/include/libavutil/rational.h +file path=usr/include/libavutil/rc4.h file path=usr/include/libavutil/replaygain.h file path=usr/include/libavutil/ripemd.h file path=usr/include/libavutil/samplefmt.h @@ -116,6 +129,7 @@ file path=usr/include/libavutil/threadmessage.h file path=usr/include/libavutil/time.h file path=usr/include/libavutil/timecode.h file path=usr/include/libavutil/timestamp.h +file path=usr/include/libavutil/tree.h file path=usr/include/libavutil/twofish.h file path=usr/include/libavutil/version.h file path=usr/include/libavutil/xtea.h @@ -125,33 +139,69 @@ file path=usr/include/libswresample/swresample.h file path=usr/include/libswresample/version.h file path=usr/include/libswscale/swscale.h file path=usr/include/libswscale/version.h -link path=usr/lib/libavcodec.so target=libavcodec.so.56.60.100 -link path=usr/lib/libavcodec.so.56 target=libavcodec.so.56.60.100 -file path=usr/lib/libavcodec.so.56.60.100 -link path=usr/lib/libavdevice.so target=libavdevice.so.56.4.100 -link path=usr/lib/libavdevice.so.56 target=libavdevice.so.56.4.100 -file path=usr/lib/libavdevice.so.56.4.100 -link path=usr/lib/libavfilter.so target=libavfilter.so.5.40.101 -link path=usr/lib/libavfilter.so.5 target=libavfilter.so.5.40.101 -file path=usr/lib/libavfilter.so.5.40.101 -link path=usr/lib/libavformat.so target=libavformat.so.56.40.101 -link path=usr/lib/libavformat.so.56 target=libavformat.so.56.40.101 -file path=usr/lib/libavformat.so.56.40.101 -link path=usr/lib/libavresample.so target=libavresample.so.2.1.0 -link path=usr/lib/libavresample.so.2 target=libavresample.so.2.1.0 -file path=usr/lib/libavresample.so.2.1.0 -link path=usr/lib/libavutil.so target=libavutil.so.54.31.100 -link path=usr/lib/libavutil.so.54 target=libavutil.so.54.31.100 -file path=usr/lib/libavutil.so.54.31.100 -link path=usr/lib/libpostproc.so target=libpostproc.so.53.3.100 -link path=usr/lib/libpostproc.so.53 target=libpostproc.so.53.3.100 -file path=usr/lib/libpostproc.so.53.3.100 -link path=usr/lib/libswresample.so target=libswresample.so.1.2.101 -link path=usr/lib/libswresample.so.1 target=libswresample.so.1.2.101 -file path=usr/lib/libswresample.so.1.2.101 -link path=usr/lib/libswscale.so target=libswscale.so.3.1.101 -link path=usr/lib/libswscale.so.3 target=libswscale.so.3.1.101 -file path=usr/lib/libswscale.so.3.1.101 +link path=usr/lib/$(MACH64)/libavcodec.so target=libavcodec.so.57.64.101 +link path=usr/lib/$(MACH64)/libavcodec.so.57 target=libavcodec.so.57.64.101 +file path=usr/lib/$(MACH64)/libavcodec.so.57.64.101 +link path=usr/lib/$(MACH64)/libavdevice.so target=libavdevice.so.57.1.100 +link path=usr/lib/$(MACH64)/libavdevice.so.57 target=libavdevice.so.57.1.100 +file path=usr/lib/$(MACH64)/libavdevice.so.57.1.100 +link path=usr/lib/$(MACH64)/libavfilter.so target=libavfilter.so.6.65.100 +link path=usr/lib/$(MACH64)/libavfilter.so.6 target=libavfilter.so.6.65.100 +file path=usr/lib/$(MACH64)/libavfilter.so.6.65.100 +link path=usr/lib/$(MACH64)/libavformat.so target=libavformat.so.57.56.101 +link path=usr/lib/$(MACH64)/libavformat.so.57 target=libavformat.so.57.56.101 +file path=usr/lib/$(MACH64)/libavformat.so.57.56.101 +link path=usr/lib/$(MACH64)/libavresample.so target=libavresample.so.3.1.0 +link path=usr/lib/$(MACH64)/libavresample.so.3 target=libavresample.so.3.1.0 +file path=usr/lib/$(MACH64)/libavresample.so.3.1.0 +link path=usr/lib/$(MACH64)/libavutil.so target=libavutil.so.55.34.101 +link path=usr/lib/$(MACH64)/libavutil.so.55 target=libavutil.so.55.34.101 +file path=usr/lib/$(MACH64)/libavutil.so.55.34.101 +link path=usr/lib/$(MACH64)/libpostproc.so target=libpostproc.so.54.1.100 +link path=usr/lib/$(MACH64)/libpostproc.so.54 target=libpostproc.so.54.1.100 +file path=usr/lib/$(MACH64)/libpostproc.so.54.1.100 +link path=usr/lib/$(MACH64)/libswresample.so target=libswresample.so.2.3.100 +link path=usr/lib/$(MACH64)/libswresample.so.2 target=libswresample.so.2.3.100 +file path=usr/lib/$(MACH64)/libswresample.so.2.3.100 +link path=usr/lib/$(MACH64)/libswscale.so target=libswscale.so.4.2.100 +link path=usr/lib/$(MACH64)/libswscale.so.4 target=libswscale.so.4.2.100 +file path=usr/lib/$(MACH64)/libswscale.so.4.2.100 +file path=usr/lib/$(MACH64)/pkgconfig/libavcodec.pc +file path=usr/lib/$(MACH64)/pkgconfig/libavdevice.pc +file path=usr/lib/$(MACH64)/pkgconfig/libavfilter.pc +file path=usr/lib/$(MACH64)/pkgconfig/libavformat.pc +file path=usr/lib/$(MACH64)/pkgconfig/libavresample.pc +file path=usr/lib/$(MACH64)/pkgconfig/libavutil.pc +file path=usr/lib/$(MACH64)/pkgconfig/libpostproc.pc +file path=usr/lib/$(MACH64)/pkgconfig/libswresample.pc +file path=usr/lib/$(MACH64)/pkgconfig/libswscale.pc +link path=usr/lib/libavcodec.so target=libavcodec.so.57.64.101 +link path=usr/lib/libavcodec.so.57 target=libavcodec.so.57.64.101 +file path=usr/lib/libavcodec.so.57.64.101 +link path=usr/lib/libavdevice.so target=libavdevice.so.57.1.100 +link path=usr/lib/libavdevice.so.57 target=libavdevice.so.57.1.100 +file path=usr/lib/libavdevice.so.57.1.100 +link path=usr/lib/libavfilter.so target=libavfilter.so.6.65.100 +link path=usr/lib/libavfilter.so.6 target=libavfilter.so.6.65.100 +file path=usr/lib/libavfilter.so.6.65.100 +link path=usr/lib/libavformat.so target=libavformat.so.57.56.101 +link path=usr/lib/libavformat.so.57 target=libavformat.so.57.56.101 +file path=usr/lib/libavformat.so.57.56.101 +link path=usr/lib/libavresample.so target=libavresample.so.3.1.0 +link path=usr/lib/libavresample.so.3 target=libavresample.so.3.1.0 +file path=usr/lib/libavresample.so.3.1.0 +link path=usr/lib/libavutil.so target=libavutil.so.55.34.101 +link path=usr/lib/libavutil.so.55 target=libavutil.so.55.34.101 +file path=usr/lib/libavutil.so.55.34.101 +link path=usr/lib/libpostproc.so target=libpostproc.so.54.1.100 +link path=usr/lib/libpostproc.so.54 target=libpostproc.so.54.1.100 +file path=usr/lib/libpostproc.so.54.1.100 +link path=usr/lib/libswresample.so target=libswresample.so.2.3.100 +link path=usr/lib/libswresample.so.2 target=libswresample.so.2.3.100 +file path=usr/lib/libswresample.so.2.3.100 +link path=usr/lib/libswscale.so target=libswscale.so.4.2.100 +link path=usr/lib/libswscale.so.4 target=libswscale.so.4.2.100 +file path=usr/lib/libswscale.so.4.2.100 file path=usr/lib/pkgconfig/libavcodec.pc file path=usr/lib/pkgconfig/libavdevice.pc file path=usr/lib/pkgconfig/libavfilter.pc @@ -161,6 +211,37 @@ file path=usr/lib/pkgconfig/libavutil.pc file path=usr/lib/pkgconfig/libpostproc.pc file path=usr/lib/pkgconfig/libswresample.pc file path=usr/lib/pkgconfig/libswscale.pc +file path=usr/share/doc/ffmpeg/developer.html +file path=usr/share/doc/ffmpeg/faq.html +file path=usr/share/doc/ffmpeg/fate.html +file path=usr/share/doc/ffmpeg/ffmpeg-all.html +file path=usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html +file path=usr/share/doc/ffmpeg/ffmpeg-codecs.html +file path=usr/share/doc/ffmpeg/ffmpeg-devices.html +file path=usr/share/doc/ffmpeg/ffmpeg-filters.html +file path=usr/share/doc/ffmpeg/ffmpeg-formats.html +file path=usr/share/doc/ffmpeg/ffmpeg-protocols.html +file path=usr/share/doc/ffmpeg/ffmpeg-resampler.html +file path=usr/share/doc/ffmpeg/ffmpeg-scaler.html +file path=usr/share/doc/ffmpeg/ffmpeg-utils.html +file path=usr/share/doc/ffmpeg/ffmpeg.html +file path=usr/share/doc/ffmpeg/ffplay-all.html +file path=usr/share/doc/ffmpeg/ffplay.html +file path=usr/share/doc/ffmpeg/ffprobe-all.html +file path=usr/share/doc/ffmpeg/ffprobe.html +file path=usr/share/doc/ffmpeg/ffserver-all.html +file path=usr/share/doc/ffmpeg/ffserver.html +file path=usr/share/doc/ffmpeg/general.html +file path=usr/share/doc/ffmpeg/git-howto.html +file path=usr/share/doc/ffmpeg/libavcodec.html +file path=usr/share/doc/ffmpeg/libavdevice.html +file path=usr/share/doc/ffmpeg/libavfilter.html +file path=usr/share/doc/ffmpeg/libavformat.html +file path=usr/share/doc/ffmpeg/libavutil.html +file path=usr/share/doc/ffmpeg/libswresample.html +file path=usr/share/doc/ffmpeg/libswscale.html +file path=usr/share/doc/ffmpeg/nut.html +file path=usr/share/doc/ffmpeg/platform.html file path=usr/share/ffmpeg/examples/Makefile file path=usr/share/ffmpeg/examples/README file path=usr/share/ffmpeg/examples/avio_dir_cmd.c diff --git a/components/encumbered/ffmpeg/manifests/sample-manifest.p5m b/components/encumbered/ffmpeg/manifests/sample-manifest.p5m index 24d81812e78..96c49039994 100644 --- a/components/encumbered/ffmpeg/manifests/sample-manifest.p5m +++ b/components/encumbered/ffmpeg/manifests/sample-manifest.p5m @@ -22,16 +22,23 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' +file path=usr/bin/$(MACH32)/ffmpeg +file path=usr/bin/$(MACH32)/ffplay +file path=usr/bin/$(MACH32)/ffprobe +file path=usr/bin/$(MACH32)/ffserver file path=usr/bin/ffmpeg file path=usr/bin/ffplay file path=usr/bin/ffprobe file path=usr/bin/ffserver file path=usr/include/libavcodec/avcodec.h +file path=usr/include/libavcodec/avdct.h file path=usr/include/libavcodec/avfft.h file path=usr/include/libavcodec/d3d11va.h +file path=usr/include/libavcodec/dirac.h file path=usr/include/libavcodec/dv_profile.h file path=usr/include/libavcodec/dxva2.h -file path=usr/include/libavcodec/old_codec_ids.h +file path=usr/include/libavcodec/jni.h +file path=usr/include/libavcodec/mediacodec.h file path=usr/include/libavcodec/qsv.h file path=usr/include/libavcodec/vaapi.h file path=usr/include/libavcodec/vda.h @@ -42,8 +49,6 @@ file path=usr/include/libavcodec/vorbis_parser.h file path=usr/include/libavcodec/xvmc.h file path=usr/include/libavdevice/avdevice.h file path=usr/include/libavdevice/version.h -file path=usr/include/libavfilter/asrc_abuffer.h -file path=usr/include/libavfilter/avcodec.h file path=usr/include/libavfilter/avfilter.h file path=usr/include/libavfilter/avfiltergraph.h file path=usr/include/libavfilter/buffersink.h @@ -56,9 +61,9 @@ file path=usr/include/libavresample/avresample.h file path=usr/include/libavresample/version.h file path=usr/include/libavutil/adler32.h file path=usr/include/libavutil/aes.h +file path=usr/include/libavutil/aes_ctr.h file path=usr/include/libavutil/attributes.h file path=usr/include/libavutil/audio_fifo.h -file path=usr/include/libavutil/audioconvert.h file path=usr/include/libavutil/avassert.h file path=usr/include/libavutil/avconfig.h file path=usr/include/libavutil/avstring.h @@ -74,6 +79,7 @@ file path=usr/include/libavutil/channel_layout.h file path=usr/include/libavutil/common.h file path=usr/include/libavutil/cpu.h file path=usr/include/libavutil/crc.h +file path=usr/include/libavutil/des.h file path=usr/include/libavutil/dict.h file path=usr/include/libavutil/display.h file path=usr/include/libavutil/downmix_info.h @@ -85,6 +91,12 @@ file path=usr/include/libavutil/file.h file path=usr/include/libavutil/frame.h file path=usr/include/libavutil/hash.h file path=usr/include/libavutil/hmac.h +file path=usr/include/libavutil/hwcontext.h +file path=usr/include/libavutil/hwcontext_cuda.h +file path=usr/include/libavutil/hwcontext_dxva2.h +file path=usr/include/libavutil/hwcontext_qsv.h +file path=usr/include/libavutil/hwcontext_vaapi.h +file path=usr/include/libavutil/hwcontext_vdpau.h file path=usr/include/libavutil/imgutils.h file path=usr/include/libavutil/intfloat.h file path=usr/include/libavutil/intreadwrite.h @@ -92,12 +104,12 @@ file path=usr/include/libavutil/lfg.h file path=usr/include/libavutil/log.h file path=usr/include/libavutil/lzo.h file path=usr/include/libavutil/macros.h +file path=usr/include/libavutil/mastering_display_metadata.h file path=usr/include/libavutil/mathematics.h file path=usr/include/libavutil/md5.h file path=usr/include/libavutil/mem.h file path=usr/include/libavutil/motion_vector.h file path=usr/include/libavutil/murmur3.h -file path=usr/include/libavutil/old_pix_fmts.h file path=usr/include/libavutil/opt.h file path=usr/include/libavutil/parseutils.h file path=usr/include/libavutil/pixdesc.h @@ -105,6 +117,7 @@ file path=usr/include/libavutil/pixelutils.h file path=usr/include/libavutil/pixfmt.h file path=usr/include/libavutil/random_seed.h file path=usr/include/libavutil/rational.h +file path=usr/include/libavutil/rc4.h file path=usr/include/libavutil/replaygain.h file path=usr/include/libavutil/ripemd.h file path=usr/include/libavutil/samplefmt.h @@ -116,6 +129,7 @@ file path=usr/include/libavutil/threadmessage.h file path=usr/include/libavutil/time.h file path=usr/include/libavutil/timecode.h file path=usr/include/libavutil/timestamp.h +file path=usr/include/libavutil/tree.h file path=usr/include/libavutil/twofish.h file path=usr/include/libavutil/version.h file path=usr/include/libavutil/xtea.h @@ -125,33 +139,69 @@ file path=usr/include/libswresample/swresample.h file path=usr/include/libswresample/version.h file path=usr/include/libswscale/swscale.h file path=usr/include/libswscale/version.h -link path=usr/lib/libavcodec.so target=libavcodec.so.56.60.100 -link path=usr/lib/libavcodec.so.56 target=libavcodec.so.56.60.100 -file path=usr/lib/libavcodec.so.56.60.100 -link path=usr/lib/libavdevice.so target=libavdevice.so.56.4.100 -link path=usr/lib/libavdevice.so.56 target=libavdevice.so.56.4.100 -file path=usr/lib/libavdevice.so.56.4.100 -link path=usr/lib/libavfilter.so target=libavfilter.so.5.40.101 -link path=usr/lib/libavfilter.so.5 target=libavfilter.so.5.40.101 -file path=usr/lib/libavfilter.so.5.40.101 -link path=usr/lib/libavformat.so target=libavformat.so.56.40.101 -link path=usr/lib/libavformat.so.56 target=libavformat.so.56.40.101 -file path=usr/lib/libavformat.so.56.40.101 -link path=usr/lib/libavresample.so target=libavresample.so.2.1.0 -link path=usr/lib/libavresample.so.2 target=libavresample.so.2.1.0 -file path=usr/lib/libavresample.so.2.1.0 -link path=usr/lib/libavutil.so target=libavutil.so.54.31.100 -link path=usr/lib/libavutil.so.54 target=libavutil.so.54.31.100 -file path=usr/lib/libavutil.so.54.31.100 -link path=usr/lib/libpostproc.so target=libpostproc.so.53.3.100 -link path=usr/lib/libpostproc.so.53 target=libpostproc.so.53.3.100 -file path=usr/lib/libpostproc.so.53.3.100 -link path=usr/lib/libswresample.so target=libswresample.so.1.2.101 -link path=usr/lib/libswresample.so.1 target=libswresample.so.1.2.101 -file path=usr/lib/libswresample.so.1.2.101 -link path=usr/lib/libswscale.so target=libswscale.so.3.1.101 -link path=usr/lib/libswscale.so.3 target=libswscale.so.3.1.101 -file path=usr/lib/libswscale.so.3.1.101 +link path=usr/lib/$(MACH64)/libavcodec.so target=libavcodec.so.57.64.101 +link path=usr/lib/$(MACH64)/libavcodec.so.57 target=libavcodec.so.57.64.101 +file path=usr/lib/$(MACH64)/libavcodec.so.57.64.101 +link path=usr/lib/$(MACH64)/libavdevice.so target=libavdevice.so.57.1.100 +link path=usr/lib/$(MACH64)/libavdevice.so.57 target=libavdevice.so.57.1.100 +file path=usr/lib/$(MACH64)/libavdevice.so.57.1.100 +link path=usr/lib/$(MACH64)/libavfilter.so target=libavfilter.so.6.65.100 +link path=usr/lib/$(MACH64)/libavfilter.so.6 target=libavfilter.so.6.65.100 +file path=usr/lib/$(MACH64)/libavfilter.so.6.65.100 +link path=usr/lib/$(MACH64)/libavformat.so target=libavformat.so.57.56.101 +link path=usr/lib/$(MACH64)/libavformat.so.57 target=libavformat.so.57.56.101 +file path=usr/lib/$(MACH64)/libavformat.so.57.56.101 +link path=usr/lib/$(MACH64)/libavresample.so target=libavresample.so.3.1.0 +link path=usr/lib/$(MACH64)/libavresample.so.3 target=libavresample.so.3.1.0 +file path=usr/lib/$(MACH64)/libavresample.so.3.1.0 +link path=usr/lib/$(MACH64)/libavutil.so target=libavutil.so.55.34.101 +link path=usr/lib/$(MACH64)/libavutil.so.55 target=libavutil.so.55.34.101 +file path=usr/lib/$(MACH64)/libavutil.so.55.34.101 +link path=usr/lib/$(MACH64)/libpostproc.so target=libpostproc.so.54.1.100 +link path=usr/lib/$(MACH64)/libpostproc.so.54 target=libpostproc.so.54.1.100 +file path=usr/lib/$(MACH64)/libpostproc.so.54.1.100 +link path=usr/lib/$(MACH64)/libswresample.so target=libswresample.so.2.3.100 +link path=usr/lib/$(MACH64)/libswresample.so.2 target=libswresample.so.2.3.100 +file path=usr/lib/$(MACH64)/libswresample.so.2.3.100 +link path=usr/lib/$(MACH64)/libswscale.so target=libswscale.so.4.2.100 +link path=usr/lib/$(MACH64)/libswscale.so.4 target=libswscale.so.4.2.100 +file path=usr/lib/$(MACH64)/libswscale.so.4.2.100 +file path=usr/lib/$(MACH64)/pkgconfig/libavcodec.pc +file path=usr/lib/$(MACH64)/pkgconfig/libavdevice.pc +file path=usr/lib/$(MACH64)/pkgconfig/libavfilter.pc +file path=usr/lib/$(MACH64)/pkgconfig/libavformat.pc +file path=usr/lib/$(MACH64)/pkgconfig/libavresample.pc +file path=usr/lib/$(MACH64)/pkgconfig/libavutil.pc +file path=usr/lib/$(MACH64)/pkgconfig/libpostproc.pc +file path=usr/lib/$(MACH64)/pkgconfig/libswresample.pc +file path=usr/lib/$(MACH64)/pkgconfig/libswscale.pc +link path=usr/lib/libavcodec.so target=libavcodec.so.57.64.101 +link path=usr/lib/libavcodec.so.57 target=libavcodec.so.57.64.101 +file path=usr/lib/libavcodec.so.57.64.101 +link path=usr/lib/libavdevice.so target=libavdevice.so.57.1.100 +link path=usr/lib/libavdevice.so.57 target=libavdevice.so.57.1.100 +file path=usr/lib/libavdevice.so.57.1.100 +link path=usr/lib/libavfilter.so target=libavfilter.so.6.65.100 +link path=usr/lib/libavfilter.so.6 target=libavfilter.so.6.65.100 +file path=usr/lib/libavfilter.so.6.65.100 +link path=usr/lib/libavformat.so target=libavformat.so.57.56.101 +link path=usr/lib/libavformat.so.57 target=libavformat.so.57.56.101 +file path=usr/lib/libavformat.so.57.56.101 +link path=usr/lib/libavresample.so target=libavresample.so.3.1.0 +link path=usr/lib/libavresample.so.3 target=libavresample.so.3.1.0 +file path=usr/lib/libavresample.so.3.1.0 +link path=usr/lib/libavutil.so target=libavutil.so.55.34.101 +link path=usr/lib/libavutil.so.55 target=libavutil.so.55.34.101 +file path=usr/lib/libavutil.so.55.34.101 +link path=usr/lib/libpostproc.so target=libpostproc.so.54.1.100 +link path=usr/lib/libpostproc.so.54 target=libpostproc.so.54.1.100 +file path=usr/lib/libpostproc.so.54.1.100 +link path=usr/lib/libswresample.so target=libswresample.so.2.3.100 +link path=usr/lib/libswresample.so.2 target=libswresample.so.2.3.100 +file path=usr/lib/libswresample.so.2.3.100 +link path=usr/lib/libswscale.so target=libswscale.so.4.2.100 +link path=usr/lib/libswscale.so.4 target=libswscale.so.4.2.100 +file path=usr/lib/libswscale.so.4.2.100 file path=usr/lib/pkgconfig/libavcodec.pc file path=usr/lib/pkgconfig/libavdevice.pc file path=usr/lib/pkgconfig/libavfilter.pc diff --git a/components/encumbered/ffmpeg/patches/02-openjpeg2.patch b/components/encumbered/ffmpeg/patches/02-openjpeg2.patch deleted file mode 100644 index b1427bd6d62..00000000000 --- a/components/encumbered/ffmpeg/patches/02-openjpeg2.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://trac.ffmpeg.org/ticket/2016 - ---- ffmpeg-2.7.2/configure.~2~ 2015-07-24 23:41:43.016451238 +0300 -+++ ffmpeg-2.7.2/configure 2015-07-24 23:43:45.494055319 +0300 -@@ -5113,7 +5113,8 @@ - enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb - enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader - enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion --enabled libopenjpeg && { check_lib openjpeg.h opj_version -lopenmj2 -DOPJ_STATIC || -+enabled libopenjpeg && { check_lib openjpeg-2.1/openmj2.h opj_version -lopenmj2 || -+ check_lib openjpeg.h opj_version -lopenmj2 -DOPJ_STATIC || - check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || - check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || - die "ERROR: libopenjpeg not found"; } ---- ffmpeg-2.7.2/libavcodec/libopenjpegenc.c.~1~ 2015-06-19 23:44:39.000000000 +0300 -+++ ffmpeg-2.7.2/libavcodec/libopenjpegenc.c 2015-07-24 23:41:43.023290629 +0300 -@@ -37,7 +37,11 @@ - #if HAVE_OPENJPEG_1_5_OPENJPEG_H - # include - #else --# include -+ #if HAVE_OPENJPEG_2_0_OPENJPEG_H -+ # include -+ #else -+ # include -+ #endif - #endif - - typedef struct LibOpenJPEGContext { ---- ffmpeg-2.7.2/libavcodec/libopenjpegdec.c.~1~ 2015-07-25 00:01:25.945133666 +0300 -+++ ffmpeg-2.7.2/libavcodec/libopenjpegdec.c 2015-07-25 00:02:08.560600649 +0300 -@@ -39,7 +39,11 @@ - #if HAVE_OPENJPEG_1_5_OPENJPEG_H - # include - #else --# include -+ #if HAVE_OPENJPEG_2_0_OPENJPEG_H -+ # include -+ #else -+ # include -+ #endif - #endif - - #define JP2_SIG_TYPE 0x6A502020