From cd0d9000770337b445051f1852fe3971ceb7a6e2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 18 Mar 2023 18:31:43 +0000 Subject: gentoo auto-resync : 18:03:2023 - 18:31:42 --- media-libs/Manifest.gz | Bin 68068 -> 67740 bytes media-libs/libextractor/Manifest | 5 - .../files/libextractor-1.8-exiv2-0.27.patch | 127 --------------------- .../files/libextractor-1.9-CVE-2019-15531.patch | 15 --- media-libs/libextractor/libextractor-1.9-r5.ebuild | 118 ------------------- media-libs/libextractor/metadata.xml | 13 --- media-libs/qtav/Manifest | 9 -- media-libs/qtav/files/qtav-1.12.0-ffmpeg4-1.patch | 36 ------ media-libs/qtav/files/qtav-1.12.0-ffmpeg4-2.patch | 119 ------------------- .../qtav/files/qtav-1.12.0-installpaths.patch | 17 --- media-libs/qtav/files/qtav-1.12.0-qt5.14.patch | 12 -- media-libs/qtav/files/qtav-1.12.0-qt5.15.patch | 22 ---- media-libs/qtav/metadata.xml | 11 -- media-libs/qtav/qtav-1.12.0-r3.ebuild | 68 ----------- 14 files changed, 572 deletions(-) delete mode 100644 media-libs/libextractor/Manifest delete mode 100644 media-libs/libextractor/files/libextractor-1.8-exiv2-0.27.patch delete mode 100644 media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch delete mode 100644 media-libs/libextractor/libextractor-1.9-r5.ebuild delete mode 100644 media-libs/libextractor/metadata.xml delete mode 100644 media-libs/qtav/Manifest delete mode 100644 media-libs/qtav/files/qtav-1.12.0-ffmpeg4-1.patch delete mode 100644 media-libs/qtav/files/qtav-1.12.0-ffmpeg4-2.patch delete mode 100644 media-libs/qtav/files/qtav-1.12.0-installpaths.patch delete mode 100644 media-libs/qtav/files/qtav-1.12.0-qt5.14.patch delete mode 100644 media-libs/qtav/files/qtav-1.12.0-qt5.15.patch delete mode 100644 media-libs/qtav/metadata.xml delete mode 100644 media-libs/qtav/qtav-1.12.0-r3.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index c4507486839c..7ef8a6d1c8a2 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest deleted file mode 100644 index 787378b84a30..000000000000 --- a/media-libs/libextractor/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX libextractor-1.8-exiv2-0.27.patch 3364 BLAKE2B da55735ccab9a3cf868f274b82951cf548a2f1340ee24c180244f8ba2bbd85c7002c963d06257aac0b0457c2afeda755d0aaacb501280b995001f7bbd49d6de9 SHA512 6411df1498fd3594088b3488e490b25009e9243684b777d35fa26189c20f410b42496b5fb42f762c468df746a9bdcd6a310f645db5ab0bbe3bd121e82aa9d48c -AUX libextractor-1.9-CVE-2019-15531.patch 518 BLAKE2B 2310c4863dcce5324706a96fb86cff7b72473d0027027bf8f40453cc863296a5c1880577af8a95f0875522da4d5251690c77cd8571e87d5c048f18240b8aee03 SHA512 5b50c20ce0e77f664578e1383e481694388e6200f01e3eef0029296deb3cc35cc76b2277d4a1f879f3f1d1b4d24235d2e17f26eacf0a5b963f1c1433a615eaa2 -DIST libextractor-1.9.tar.gz 8323852 BLAKE2B 71e81e57ce7857b7b7f0180a7b130b0808573d71384c61a1a079b0ce9c02bc4f1386d3b27c68d668b555a692e523a7998d6fbc675d15f8ee26b487b0b5b31927 SHA512 c2539b144d026fb0e871c5776aee4deaad4a987a730350744a7e5e74fbe98a4abb635dbe206b93c3aa9cd676b8797ea0b97271de0c903dfb035e245ab42ea149 -EBUILD libextractor-1.9-r5.ebuild 2849 BLAKE2B 63fac488179bd49f981cdff2ed733bd03286300a29ab267733bba59e30d23d91c73e7c96b2cdba245d16c27ad6417ac1ec87a78d4527d4fe61b9a19813c6c8cc SHA512 7924424b7a6e518049345bc53a2586ad3a4262512d80be3293df1c0046662346d5231c10f0c0e71bad1180a061494765ab0c57f243f9d9b8738c471e70726bb8 -MISC metadata.xml 549 BLAKE2B f25ce221cf80c66d32c5989cd0b6a2e61ef5a665152d95fc20f2a7959cf185a33c50c223b81428feb77ebb1550ae2aa448d105db5c9b3b21f35751d1d9bb3954 SHA512 7405ef5efde10dfe76f12c0936371c9f504d1ccc3922b868cab680fabb2bd6bb8ea8a5d57f452237fc2697b63fe1225582a0d8418b3b0ca7a89b4d9e80403643 diff --git a/media-libs/libextractor/files/libextractor-1.8-exiv2-0.27.patch b/media-libs/libextractor/files/libextractor-1.8-exiv2-0.27.patch deleted file mode 100644 index cfdb6426408d..000000000000 --- a/media-libs/libextractor/files/libextractor-1.8-exiv2-0.27.patch +++ /dev/null @@ -1,127 +0,0 @@ -From bbe21db4bf8face03adf0efd2eb18540582cb5ba Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 30 Dec 2018 00:46:57 +0100 -Subject: [PATCH] Fix build with exiv2-0.27 - ---- - src/plugins/exiv2_extractor.cc | 35 +++++++++++++++++++++++++++------- - 1 file changed, 28 insertions(+), 7 deletions(-) - -diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc -index 8741d40..ef402a8 100644 ---- a/src/plugins/exiv2_extractor.cc -+++ b/src/plugins/exiv2_extractor.cc -@@ -27,10 +27,7 @@ - #include - #include - #include --#include --#include --#include --#include -+#include - - /** - * Enable debugging to get error messages. -@@ -180,7 +177,7 @@ public: - * - * @return -1 on error - */ --#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) -+#if EXIV2_TEST_VERSION(0,26,0) - virtual size_t size (void) const; - #else - virtual long int size (void) const; -@@ -316,7 +313,11 @@ ExtractorIO::getb () - const unsigned char *r; - - if (1 != ec->read (ec->cls, &data, 1)) -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - r = (const unsigned char *) data; - return *r; - } -@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data) - void - ExtractorIO::transfer (Exiv2::BasicIo& src) - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - - -@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset, - Exiv2::byte * - ExtractorIO::mmap (bool isWritable) - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - - -@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const - * - * @return -1 on error - */ --#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) -+#if EXIV2_TEST_VERSION(0,26,0) - size_t - #else - long int -@@ -504,7 +513,11 @@ ExtractorIO::eof () const - std::string - ExtractorIO::path () const - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - - -@@ -517,7 +530,11 @@ ExtractorIO::path () const - std::wstring - ExtractorIO::wpath () const - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - #endif - -@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr - ExtractorIO::temporary () const - { - fprintf (stderr, "throwing temporary error\n"); -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - - -@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec) - { - try - { --#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION -+#if !EXIV2_TEST_VERSION(0,24,0) - Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute); - #endif - std::auto_ptr eio(new ExtractorIO (ec)); --- -2.20.1 - diff --git a/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch b/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch deleted file mode 100644 index 11344d3946af..000000000000 --- a/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: fix heap-based buffer over-read. -Origin: upstream, commit: d2b032452241708bee68d02aa02092cfbfba951a -Author: Christian Grothoff - ---- a/src/plugins/dvi_extractor.c -+++ b/src/plugins/dvi_extractor.c -@@ -182,6 +182,8 @@ - size = ec->get_size (ec->cls); - if (size > 16 * 1024 * 1024) - return; /* too large */ -+ if (klen + 15 > size) -+ return; /* malformed klen */ - if (NULL == (data = malloc ((size_t) size))) - return; /* out of memory */ - memcpy (data, buf, iret); diff --git a/media-libs/libextractor/libextractor-1.9-r5.ebuild b/media-libs/libextractor/libextractor-1.9-r5.ebuild deleted file mode 100644 index 6645ffc5cc52..000000000000 --- a/media-libs/libextractor/libextractor-1.9-r5.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Library to extract metadata from files of arbitrary type" -HOMEPAGE="https://www.gnu.org/software/libextractor/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 x86" -IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test - -RESTRICT="test" - -DEPEND=" - app-text/iso-codes - dev-libs/glib:2 - media-gfx/exiv2:= - sys-devel/libtool - virtual/libiconv - virtual/libintl - apparmor? ( sys-libs/libapparmor ) - archive? ( app-arch/libarchive:= ) - bzip2? ( app-arch/bzip2 ) - ffmpeg? ( media-video/ffmpeg:= ) - flac? ( - media-libs/flac:= - media-libs/libogg - ) - gif? ( media-libs/giflib:= ) - gsf? ( gnome-extra/libgsf:= ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gtk? ( x11-libs/gtk+:3 ) - jpeg? ( media-libs/libjpeg-turbo:= ) - magic? ( sys-apps/file ) - midi? ( media-libs/libsmf ) - mp4? ( media-libs/libmp4v2 ) - mpeg? ( media-libs/libmpeg2 ) - tidy? ( >=app-text/htmltidy-5.0.0 ) - tiff? ( media-libs/tiff:= ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - zlib? ( sys-libs/zlib ) -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" -# test? ( app-forensics/zzuf ) -RDEPEND="${DEPEND} - !sci-biology/glimmer -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8-exiv2-0.27.patch # bug #674046 - "${FILESDIR}"/${P}-CVE-2019-15531.patch -) - -src_prepare() { - default - - # m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs: - sed -i \ - -e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \ - configure src/plugins/html_extractor.c || die - - if ! use tidy; then - sed -i -e 's:tidy.h:dIsAbLe&:' configure || die - fi -} - -src_configure() { - e_ac_cv() { - export ac_cv_"$@" - } - - e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no - - e_ac_cv header_FLAC_all_h=$(usex flac) - e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac) - e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac) - - e_ac_cv header_sys_apparmor_h=$(usex apparmor) - e_ac_cv header_archive_h=$(usex archive) - e_ac_cv header_bzlib_h=$(usex bzip2) - e_ac_cv header_gif_lib_h=$(usex gif) - e_ac_cv header_jpeglib_h=$(usex jpeg) - e_ac_cv header_magic_h=$(usex magic) - e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg) - e_ac_cv header_tiffio_h=$(usex tiff) - e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis) - e_ac_cv header_zlib_h=$(usex zlib) - e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4) - e_ac_cv lib_smf_smf_load_from_memory=$(usex midi) - - local myeconfargs=( - --disable-static - --enable-experimental - --enable-glib - --disable-gsf-gnome - $(use_enable ffmpeg) - $(use_enable gsf) - $(use_with gstreamer) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml deleted file mode 100644 index 88d3c6282813..000000000000 --- a/media-libs/libextractor/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Enable archive support using app-arch/libarchive - Enable OLE2 (MS Office) plug-in support using gnome-extra/libgsf - Enable MIDI support through media-libs/libsmf - - - libextractor - - diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest deleted file mode 100644 index ca6b157e59ba..000000000000 --- a/media-libs/qtav/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX qtav-1.12.0-ffmpeg4-1.patch 1225 BLAKE2B 392c7290067aef2132e7024e268af250221b4138942c882b3c6955616f66561a067520f389731b53cc689e96cbbd43d1294a25efcdb4bdd61275f5d067a92014 SHA512 a46d37f00f92860d0b4e9d7c0bb2ec2aabf9517b39876b0ade58081955005eb8be7b4c18d16abcdaf98441c6179924b0bd1974041ede04467e7b7f5953a4fe8b -AUX qtav-1.12.0-ffmpeg4-2.patch 5467 BLAKE2B b638548b1b66aeef0d10f381a2484528c93be1b14e6eb1099c36b77d9667ae4c20dd69279ba7e182da95be1e76048edac3e221f7a545563b2fe860d58814e0a0 SHA512 cc1c57444cae170498e2eff713c68106e3b829db3334f40a63530466a7a8c92532b41ee47a58e10676b8515929e6d3b5b1865c7842e3eaa676d7f89d820137c8 -AUX qtav-1.12.0-installpaths.patch 894 BLAKE2B d5e964a15566c5df08e35ad3dc6a666ce88a71bb260b0a0b56e2f6dfc1cc421a893e8104c740d911f805746ed4fd00f716453e58bd14ad80349a3b4c459f2006 SHA512 0eb3b37c86e29467db10263c94ea2efcd2fed014e49b1dc280c40c4ba0f63a7537260572aa786817df8e6bd503012b7e193ab0c9e66883f2eaf04c23976fa527 -AUX qtav-1.12.0-qt5.14.patch 443 BLAKE2B 80f2e2da6ef67cdd300257aba988dcdcb0a6a5215b806c862cf0a7d2fba7652aae27f5aa568f0bfbb1067b768be4c4d1a1458dab3e468cb7f55a1938e1c63b81 SHA512 1976e312bad83d0493be3af8652d537cca8905a1559d6dd021e4a3c234ac3e65e5743db6f2ac28bfd69ef8c2e0021b7d2144c8a4efea72dcc718bfc53e6d2370 -AUX qtav-1.12.0-qt5.15.patch 650 BLAKE2B cf5d5d5b4a30a1eb32ee38cd3f87c9df3a813eca19d342ba720521da8cc2c32eaabeb8a93bd56a25e456ef8fa9523bbbc4c832dbf22fd3831324bc96523a084e SHA512 156d6feb8bf0d9a3660f0341ceb3d2728d7b044ef4e3a9c7f81adbc262e3d30c4e8769a6059ef90601006d17f50f2259dcc533f223d0bcdc7467376b11f10899 -DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7 -DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32 -EBUILD qtav-1.12.0-r3.ebuild 1560 BLAKE2B 855361a6efc04b0819ad199fa7e1bc7d1a343eefeb4e6609c97e6a72944dc341bdf5047094f05f8c7034cc858fabb5bd58ea947a38cbfed942a879097bb78103 SHA512 722a498d686f1ef798259cb0b6f00484823f05bca80ef39d4449355a486c9a95a5031018df44896f01dfb45c7b5a3d446909550b93e5432fe921f746d64fb8f2 -MISC metadata.xml 312 BLAKE2B b8171e7b2ecbd6acb0c2ce006102d16454867f0ef84ecd8134ffa6fec93088a3eae6d79512fb78c6ab30bdc7a12d132e9266671f044b589fc4f48902e08b89c0 SHA512 10270381e10f7595d4ad8f6ef573cef8c0fbadfc2c659de60502c796acce3a4dc9476896ddfe711a0d552f2353de5d0372575f3e65c2db51eed8fbb8f3375945 diff --git a/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-1.patch b/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-1.patch deleted file mode 100644 index cb77e9adebb2..000000000000 --- a/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-1.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1633f2962e195eb2a013072e694a2e1c701613a8 Mon Sep 17 00:00:00 2001 -From: 0xFelix -Date: Tue, 12 Dec 2017 13:24:34 +0100 -Subject: [PATCH] Remove usage of deprecated avfiltergraph.h header - -avfiltergraph.h was replaced by avfilter.h in libavfilter version -3.8.0+ so only include it when the used libavfilter version -is older than 3.8.0 ---- - src/QtAV/private/AVCompat.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/QtAV/private/AVCompat.h b/src/QtAV/private/AVCompat.h -index 6c38596d1..944cfd7de 100644 ---- a/src/QtAV/private/AVCompat.h -+++ b/src/QtAV/private/AVCompat.h -@@ -59,6 +59,7 @@ extern "C" - #include - #include - #include -+#include - - #if !FFMPEG_MODULE_CHECK(LIBAVUTIL, 51, 73, 101) - #include -@@ -79,8 +80,11 @@ extern "C" - #endif //QTAV_HAVE(AVRESAMPLE) - - #if QTAV_HAVE(AVFILTER) -+#if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,8,0) - #include /*code is here for old version*/ -+#else - #include -+#endif - #include - #include - #endif //QTAV_HAVE(AVFILTER) diff --git a/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-2.patch b/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-2.patch deleted file mode 100644 index 1f78acfde491..000000000000 --- a/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-2.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 7f6929b49c25ca475a08f87e8b52aa1642d109dd Mon Sep 17 00:00:00 2001 -From: Felix Matouschek -Date: Sat, 11 Nov 2017 10:13:06 +0100 -Subject: [PATCH] Make QtAV build with newer versions of FFmpeg - -Some defines changed their name in newer versions of FFmpeg, this -patch uses preprocessor instructions in AVCompat.h to use the -correct define names. Also filter names retrieved by -'avfilter_get_by_name' should be used as const variables in -libavfilter versions starting at 7.0.0. ---- - src/AVMuxer.cpp | 2 +- - src/QtAV/private/AVCompat.h | 12 ++++++++++++ - src/codec/audio/AudioEncoderFFmpeg.cpp | 4 ++-- - src/codec/video/VideoEncoderFFmpeg.cpp | 2 +- - src/filter/LibAVFilter.cpp | 8 +++++++- - src/subtitle/SubtitleProcessorFFmpeg.cpp | 2 +- - 6 files changed, 24 insertions(+), 6 deletions(-) - -diff --git a/src/AVMuxer.cpp b/src/AVMuxer.cpp -index 2f0b40d05..d2eb3dde8 100644 ---- a/src/AVMuxer.cpp -+++ b/src/AVMuxer.cpp -@@ -124,7 +124,7 @@ AVStream *AVMuxer::Private::addStream(AVFormatContext* ctx, const QString &codec - c->time_base = s->time_base; - /* Some formats want stream headers to be separate. */ - if (ctx->oformat->flags & AVFMT_GLOBALHEADER) -- c->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - // expose avctx to encoder and set properties in encoder? - // list codecs for a given format in ui - return s; -diff --git a/src/QtAV/private/AVCompat.h b/src/QtAV/private/AVCompat.h -index e387868a8..6c38596d1 100644 ---- a/src/QtAV/private/AVCompat.h -+++ b/src/QtAV/private/AVCompat.h -@@ -456,3 +456,15 @@ const char *get_codec_long_name(AVCodecID id); - } } while(0) - - #endif //QTAV_COMPAT_H -+ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,33,0) -+#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER -+#endif -+ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,56,100) -+#define AV_INPUT_BUFFER_MIN_SIZE FF_MIN_BUFFER_SIZE -+#endif -+ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,56,100) -+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE -+#endif -diff --git a/src/codec/audio/AudioEncoderFFmpeg.cpp b/src/codec/audio/AudioEncoderFFmpeg.cpp -index a74f4f31d..3811e11a6 100644 ---- a/src/codec/audio/AudioEncoderFFmpeg.cpp -+++ b/src/codec/audio/AudioEncoderFFmpeg.cpp -@@ -151,8 +151,8 @@ bool AudioEncoderFFmpegPrivate::open() - } else { - buffer_size = frame_size*format_used.bytesPerSample()*format_used.channels()*2+200; - } -- if (buffer_size < FF_MIN_BUFFER_SIZE) -- buffer_size = FF_MIN_BUFFER_SIZE; -+ if (buffer_size < AV_INPUT_BUFFER_MIN_SIZE) -+ buffer_size = AV_INPUT_BUFFER_MIN_SIZE; - buffer.resize(buffer_size); - return true; - } -diff --git a/src/codec/video/VideoEncoderFFmpeg.cpp b/src/codec/video/VideoEncoderFFmpeg.cpp -index 7c5ed42d0..671efa7d3 100644 ---- a/src/codec/video/VideoEncoderFFmpeg.cpp -+++ b/src/codec/video/VideoEncoderFFmpeg.cpp -@@ -245,7 +245,7 @@ bool VideoEncoderFFmpegPrivate::open() - applyOptionsForContext(); - AV_ENSURE_OK(avcodec_open2(avctx, codec, &dict), false); - // from mpv ao_lavc -- const int buffer_size = qMax(qMax(width*height*6+200, FF_MIN_BUFFER_SIZE), sizeof(AVPicture));//?? -+ const int buffer_size = qMax(qMax(width*height*6+200, AV_INPUT_BUFFER_MIN_SIZE), sizeof(AVPicture));//?? - buffer.resize(buffer_size); - return true; - } -diff --git a/src/filter/LibAVFilter.cpp b/src/filter/LibAVFilter.cpp -index 191512040..8993a91f7 100644 ---- a/src/filter/LibAVFilter.cpp -+++ b/src/filter/LibAVFilter.cpp -@@ -120,7 +120,10 @@ class LibAVFilter::Private - // pixel_aspect==sar, pixel_aspect is more compatible - QString buffersrc_args = args; - qDebug("buffersrc_args=%s", buffersrc_args.toUtf8().constData()); -- AVFilter *buffersrc = avfilter_get_by_name(video ? "buffer" : "abuffer"); -+#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(7,0,0) -+ const -+#endif -+ AVFilter *buffersrc = avfilter_get_by_name(video ? "buffer" : "abuffer"); - Q_ASSERT(buffersrc); - AV_ENSURE_OK(avfilter_graph_create_filter(&in_filter_ctx, - buffersrc, -@@ -128,6 +131,9 @@ class LibAVFilter::Private - filter_graph) - , false); - /* buffer video sink: to terminate the filter chain. */ -+#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(7,0,0) -+ const -+#endif - AVFilter *buffersink = avfilter_get_by_name(video ? "buffersink" : "abuffersink"); - Q_ASSERT(buffersink); - AV_ENSURE_OK(avfilter_graph_create_filter(&out_filter_ctx, buffersink, "out", -diff --git a/src/subtitle/SubtitleProcessorFFmpeg.cpp b/src/subtitle/SubtitleProcessorFFmpeg.cpp -index 30ee9367c..1755c3816 100644 ---- a/src/subtitle/SubtitleProcessorFFmpeg.cpp -+++ b/src/subtitle/SubtitleProcessorFFmpeg.cpp -@@ -249,7 +249,7 @@ bool SubtitleProcessorFFmpeg::processHeader(const QByteArray &codec, const QByte - codec_ctx->time_base.den = 1000; - if (!data.isEmpty()) { - av_free(codec_ctx->extradata); -- codec_ctx->extradata = (uint8_t*)av_mallocz(data.size() + FF_INPUT_BUFFER_PADDING_SIZE); -+ codec_ctx->extradata = (uint8_t*)av_mallocz(data.size() + AV_INPUT_BUFFER_PADDING_SIZE); - if (!codec_ctx->extradata) - return false; - codec_ctx->extradata_size = data.size(); \ No newline at end of file diff --git a/media-libs/qtav/files/qtav-1.12.0-installpaths.patch b/media-libs/qtav/files/qtav-1.12.0-installpaths.patch deleted file mode 100644 index 7d491931d05e..000000000000 --- a/media-libs/qtav/files/qtav-1.12.0-installpaths.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ub -purN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2017-06-21 03:47:15.000000000 +0200 -+++ b/CMakeLists.txt 2020-01-12 02:51:41.692331365 +0100 -@@ -65,10 +65,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # for - # Instruct CMake to run moc automatically when needed. - set(CMAKE_AUTOMOC ON) - if(NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -- set(QTAV_INSTALL_HEADERS ${CMAKE_INSTALL_PREFIX}/include) -- set(QTAV_INSTALL_LIBS ${CMAKE_INSTALL_PREFIX}/lib) -+ set(QTAV_INSTALL_HEADERS ${QT_INSTALL_HEADERS}) -+ set(QTAV_INSTALL_LIBS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) - set(QTAV_INSTALL_BINS ${CMAKE_INSTALL_PREFIX}/bin) -- set(QTAV_INSTALL_QML ${CMAKE_INSTALL_PREFIX}/qml) -+ set(QTAV_INSTALL_QML ${QT_INSTALL_QML}) - else() - set(CMAKE_INSTALL_PREFIX ${QT_INSTALL_PREFIX} CACHE PATH "default install path" FORCE) - set(QTAV_INSTALL_HEADERS ${QT_INSTALL_HEADERS}) diff --git a/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch b/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch deleted file mode 100644 index bf546c9e068d..000000000000 --- a/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ub -purN -x '*~' a/qml/SGVideoNode.cpp b/qml/SGVideoNode.cpp ---- a/qml/SGVideoNode.cpp 2017-06-21 03:47:15.000000000 +0200 -+++ b/qml/SGVideoNode.cpp 2020-01-07 05:37:05.304897727 +0100 -@@ -25,6 +25,8 @@ - #include "QtAV/VideoFrame.h" - #include - #include -+#include -+#include - #include - - // all in QSGRenderThread diff --git a/media-libs/qtav/files/qtav-1.12.0-qt5.15.patch b/media-libs/qtav/files/qtav-1.12.0-qt5.15.patch deleted file mode 100644 index a992f59fac31..000000000000 --- a/media-libs/qtav/files/qtav-1.12.0-qt5.15.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 5263d9d9ee29303a919d33d52b15acda554226c5 Mon Sep 17 00:00:00 2001 -From: rezso -Date: Mon, 1 Jun 2020 13:30:21 +0200 -Subject: [PATCH] Fix build with Qt 5.15 - -Solves https://github.com/wang-bin/QtAV/issues/1309 ---- - src/QtAV/FilterContext.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/QtAV/FilterContext.h b/src/QtAV/FilterContext.h -index 6d2f9a041..7cc2fc1c5 100644 ---- a/src/QtAV/FilterContext.h -+++ b/src/QtAV/FilterContext.h -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - /* - * QPainterFilterContext, D2DFilterContext, ... - */ diff --git a/media-libs/qtav/metadata.xml b/media-libs/qtav/metadata.xml deleted file mode 100644 index e35c6288e69e..000000000000 --- a/media-libs/qtav/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - Build a video player gui - - - wang-bin/QtAV - - diff --git a/media-libs/qtav/qtav-1.12.0-r3.ebuild b/media-libs/qtav/qtav-1.12.0-r3.ebuild deleted file mode 100644 index 38c5d150a590..000000000000 --- a/media-libs/qtav/qtav-1.12.0-r3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="QtAV" -CAPI_HASH="b43aa93" -inherit cmake qmake-utils - -DESCRIPTION="Multimedia playback framework based on Qt + FFmpeg" -HOMEPAGE="https://www.qtav.org" -SRC_URI="https://github.com/wang-bin/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz -https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz" - -LICENSE="GPL-3+ LGPL-2.1+" -SLOT="0/1" -KEYWORDS="amd64 ~arm64" -IUSE="gui portaudio pulseaudio vaapi" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - media-video/ffmpeg:= - gui? ( dev-qt/qtsql:5 ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( - "${FILESDIR}"/${P}-installpaths.patch - "${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765 - "${FILESDIR}"/${P}-qt5.14.patch - "${FILESDIR}"/${P}-qt5.15.patch -) - -src_prepare() { - cmake_src_prepare - cp "${WORKDIR}/${P}-capi.h-${CAPI_HASH}" contrib/capi/capi.h \ - || die "Failed to add missing header" -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=OFF - -DBUILD_EXAMPLES=OFF - -DBUILD_QT5OPENGL=ON # bug 740172 - -DBUILD_PLAYERS=$(usex gui) - -DHAVE_PORTAUDIO=$(usex portaudio) - -DHAVE_PULSE=$(usex pulseaudio) - -DHAVE_VAAPI=$(usex vaapi) - ) - - cmake_src_configure - pushd tools/install_sdk >/dev/null - eqmake5 - popd >/dev/null -} - -src_install() { - cmake_src_install - emake -C tools/install_sdk INSTALL_ROOT="${ED}" install -} -- cgit v1.2.3