From 506c569b5dd51f8a925b9492c2d96e81567b0abf Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 18 Mar 2023 17:43:04 +0100 Subject: media-libs/qtav: treeclean Closes: https://bugs.gentoo.org/758641 Closes: https://bugs.gentoo.org/834386 Signed-off-by: David Seifert --- media-libs/qtav/Manifest | 2 - 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 ------------ profiles/package.mask | 1 - 9 files changed, 288 deletions(-) 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 diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest deleted file mode 100644 index d669b6b80ea6..000000000000 --- a/media-libs/qtav/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -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 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 -} diff --git a/profiles/package.mask b/profiles/package.mask index 40a973454e7a..4e15e72ac0e4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -304,7 +304,6 @@ acct-group/jabber # # Removal on 2023-02-20. media-libs/libextractor -media-libs/qtav # David Seifert (2023-01-14) # Py3.8 only backports -- cgit v1.2.3-65-gdbad