[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/files/, media-libs/qtav/, profiles/
commit: 506c569b5dd51f8a925b9492c2d96e81567b0abf Author: David Seifert gentoo org> AuthorDate: Sat Mar 18 16:43:04 2023 + Commit: David Seifert gentoo org> CommitDate: Sat Mar 18 16:43:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=506c569b media-libs/qtav: treeclean Closes: https://bugs.gentoo.org/758641 Closes: https://bugs.gentoo.org/834386 Signed-off-by: David Seifert gentoo.org> 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(-) diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest deleted file mode 100644 index d669b6b80ea6.. --- 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.. --- 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.. --- 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 - 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
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/
commit: ec9e242048db2de6959eff5b257ed183e6d6e0c6 Author: David Seifert gentoo org> AuthorDate: Sat Jun 12 13:41:29 2021 + Commit: David Seifert gentoo org> CommitDate: Sat Jun 12 13:41:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec9e2420 media-libs/qtav: drop inactive maintainer Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: David Seifert gentoo.org> media-libs/qtav/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/media-libs/qtav/metadata.xml b/media-libs/qtav/metadata.xml index 396b8768424..4128b9ccb89 100644 --- a/media-libs/qtav/metadata.xml +++ b/media-libs/qtav/metadata.xml @@ -1,10 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - j...@gentoo.org - Johannes Huber - + Build a video player gui
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/
commit: ec39603f69f278f3b1f0f4b87600ebee25d6bd6f Author: Sam James gentoo org> AuthorDate: Sun Apr 25 05:19:12 2021 + Commit: Sam James gentoo org> CommitDate: Sun Apr 25 05:19:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec39603f media-libs/qtav: Keyword 1.12.0-r3 arm64, #753365 Signed-off-by: Sam James gentoo.org> media-libs/qtav/qtav-1.12.0-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/qtav/qtav-1.12.0-r3.ebuild b/media-libs/qtav/qtav-1.12.0-r3.ebuild index 2635466a5bf..38c5d150a59 100644 --- a/media-libs/qtav/qtav-1.12.0-r3.ebuild +++ b/media-libs/qtav/qtav-1.12.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz; LICENSE="GPL-3+ LGPL-2.1+" SLOT="0/1" -KEYWORDS="amd64" +KEYWORDS="amd64 ~arm64" IUSE="gui portaudio pulseaudio vaapi" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/
commit: ab51cd220f3ab5849cd45dc5678acebeed4e58c2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 5 23:45:21 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 5 23:47:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab51cd22 media-libs/qtav: Revbump for revdep Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/qtav/{qtav-1.12.0-r2.ebuild => qtav-1.12.0-r3.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media-libs/qtav/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r3.ebuild similarity index 100% rename from media-libs/qtav/qtav-1.12.0-r2.ebuild rename to media-libs/qtav/qtav-1.12.0-r3.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/
commit: 222c703797ba2e2354bc34e6334f15475477e137 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 5 23:12:18 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 5 23:12:18 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=222c7037 media-libs/qtav: Drop IUSE=opengl Closes: https://bugs.gentoo.org/740172 Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/qtav/qtav-1.12.0-r2.ebuild | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/media-libs/qtav/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r2.ebuild index e9b3bbd54ae..2635466a5bf 100644 --- a/media-libs/qtav/qtav-1.12.0-r2.ebuild +++ b/media-libs/qtav/qtav-1.12.0-r2.ebuild @@ -15,17 +15,16 @@ https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz; LICENSE="GPL-3+ LGPL-2.1+" SLOT="0/1" KEYWORDS="amd64" -IUSE="gui opengl portaudio pulseaudio vaapi" -REQUIRED_USE="gui? ( opengl )" +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 - gui? ( dev-qt/qtsql:5 ) media-video/ffmpeg:= - opengl? ( dev-qt/qtopengl:5 ) + gui? ( dev-qt/qtsql:5 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) " @@ -50,8 +49,8 @@ src_configure() { local mycmakeargs=( -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF + -DBUILD_QT5OPENGL=ON # bug 740172 -DBUILD_PLAYERS=$(usex gui) - -DBUILD_QT5OPENGL=$(usex opengl) -DHAVE_PORTAUDIO=$(usex portaudio) -DHAVE_PULSE=$(usex pulseaudio) -DHAVE_VAAPI=$(usex vaapi)
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/, media-libs/qtav/files/
commit: ae5836a1f3059809069c07510c3ed960492accfe Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 21 17:28:20 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jun 22 18:31:26 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae5836a1 media-libs/qtav: Fix build with Qt 5.15 Reported-by: Daniel Rammelt icloud.com> Closes: https://bugs.gentoo.org/727410 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/qtav/files/qtav-1.12.0-qt5.15.patch | 22 ++ media-libs/qtav/qtav-1.12.0-r2.ebuild | 1 + 2 files changed, 23 insertions(+) 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 new file mode 100644 index 000..a992f59fac3 --- /dev/null +++ b/media-libs/qtav/files/qtav-1.12.0-qt5.15.patch @@ -0,0 +1,22 @@ +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/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r2.ebuild index 93df9f4f72c..e9b3bbd54ae 100644 --- a/media-libs/qtav/qtav-1.12.0-r2.ebuild +++ b/media-libs/qtav/qtav-1.12.0-r2.ebuild @@ -37,6 +37,7 @@ 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() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/files/
commit: 05c8eef392d6fa87fb0fc68ee48cd07e8d05873e Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Jun 16 18:26:49 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Wed Jun 17 17:49:46 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05c8eef3 media-libs/qtav: remove unused patch Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16279 Signed-off-by: Aaron Bauman gentoo.org> media-libs/qtav/files/qtav-1.12.0-multilib.patch | 19 --- 1 file changed, 19 deletions(-) diff --git a/media-libs/qtav/files/qtav-1.12.0-multilib.patch b/media-libs/qtav/files/qtav-1.12.0-multilib.patch deleted file mode 100644 index 608a67dfe0d..000 --- a/media-libs/qtav/files/qtav-1.12.0-multilib.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 87e54cc4d3fa76f3b226fbf2822a87af48cf3e51 -Author: Johannes Huber -Date: Wed Sep 6 23:30:42 2017 +0200 - -Fix multilib install - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ef7ade07..11f8603b 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,7 +66,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # for .moc - 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_LIBS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) - set(QTAV_INSTALL_BINS ${CMAKE_INSTALL_PREFIX}/bin) - set(QTAV_INSTALL_QML ${CMAKE_INSTALL_PREFIX}/qml) - else()
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/
commit: 0f88400d1e3551659f0c85fc1d899c080276d251 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Apr 26 09:18:20 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Apr 26 09:18:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f88400d media-libs/qtav: migrate from libav Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada gentoo.org> media-libs/qtav/qtav-1.12.0-r2.ebuild | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/media-libs/qtav/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r2.ebuild index 3cded19e179..93df9f4f72c 100644 --- a/media-libs/qtav/qtav-1.12.0-r2.ebuild +++ b/media-libs/qtav/qtav-1.12.0-r2.ebuild @@ -15,7 +15,7 @@ https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz; LICENSE="GPL-3+ LGPL-2.1+" SLOT="0/1" KEYWORDS="amd64" -IUSE="gui libav opengl portaudio pulseaudio vaapi" +IUSE="gui opengl portaudio pulseaudio vaapi" REQUIRED_USE="gui? ( opengl )" DEPEND=" @@ -24,11 +24,7 @@ DEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 gui? ( dev-qt/qtsql:5 ) - libav? ( - media-video/libav:= - x11-libs/libX11 - ) - !libav? ( media-video/ffmpeg:= ) + media-video/ffmpeg:= opengl? ( dev-qt/qtopengl:5 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio )
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/
commit: 70a0a4a5d0d8e92713e6b575ded56cc492700d43 Author: Johannes Huber gentoo org> AuthorDate: Sat Feb 29 10:25:34 2020 + Commit: Johannes Huber gentoo org> CommitDate: Sat Feb 29 10:26:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a0a4a5 media-libs/qtav: Remove 1.12.0 (r0) Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Johannes Huber gentoo.org> media-libs/qtav/qtav-1.12.0.ebuild | 63 -- 1 file changed, 63 deletions(-) diff --git a/media-libs/qtav/qtav-1.12.0.ebuild b/media-libs/qtav/qtav-1.12.0.ebuild deleted file mode 100644 index 9f203d800ef..000 --- a/media-libs/qtav/qtav-1.12.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="QtAV" -CAPI_HASH="b43aa93" -inherit cmake-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" -IUSE="gui libav opengl portaudio pulseaudio vaapi" -REQUIRED_USE="gui? ( opengl )" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - gui? ( dev-qt/qtsql:5 ) - libav? ( - media-video/libav:= - x11-libs/libX11 - ) - !libav? ( media-video/ffmpeg:= ) - opengl? ( dev-qt/qtopengl:5 ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( - "${FILESDIR}"/${P}-multilib.patch - "${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765 -) - -src_prepare() { - cmake-utils_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_PLAYERS=$(usex gui) - -DBUILD_QT5OPENGL=$(usex opengl) - -DHAVE_PORTAUDIO=$(usex portaudio) - -DHAVE_PULSE=$(usex pulseaudio) - -DHAVE_VAAPI=$(usex vaapi) - ) - - cmake-utils_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/
commit: 11e00ad8794084f100b4291ecd938dcaf617095a Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Feb 24 07:40:52 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Feb 24 07:40:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e00ad8 media-libs/qtav: amd64 stable wrt bug #708816 Package-Manager: Portage-2.3.84, Repoman-2.3.20 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-libs/qtav/qtav-1.12.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/qtav/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r2.ebuild index 8480fcb56a0..3cded19e179 100644 --- a/media-libs/qtav/qtav-1.12.0-r2.ebuild +++ b/media-libs/qtav/qtav-1.12.0-r2.ebuild @@ -14,7 +14,7 @@ https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz; LICENSE="GPL-3+ LGPL-2.1+" SLOT="0/1" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="gui libav opengl portaudio pulseaudio vaapi" REQUIRED_USE="gui? ( opengl )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/
commit: d25a304cfc73a36f295c5c36ccd14709ebee9d72 Author: Johannes Huber gentoo org> AuthorDate: Wed Feb 12 16:56:47 2020 + Commit: Johannes Huber gentoo org> CommitDate: Wed Feb 12 16:58:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d25a304c media-libs/qtav: Remove 1.12.0-r1 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Johannes Huber gentoo.org> media-libs/qtav/qtav-1.12.0-r1.ebuild | 64 --- 1 file changed, 64 deletions(-) diff --git a/media-libs/qtav/qtav-1.12.0-r1.ebuild b/media-libs/qtav/qtav-1.12.0-r1.ebuild deleted file mode 100644 index cac2cb20460..000 --- a/media-libs/qtav/qtav-1.12.0-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="QtAV" -CAPI_HASH="b43aa93" -inherit cmake - -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" -IUSE="gui libav opengl portaudio pulseaudio vaapi" -REQUIRED_USE="gui? ( opengl )" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - gui? ( dev-qt/qtsql:5 ) - libav? ( - media-video/libav:= - x11-libs/libX11 - ) - !libav? ( media-video/ffmpeg:= ) - opengl? ( dev-qt/qtopengl:5 ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( - "${FILESDIR}"/${P}-multilib.patch - "${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765 - "${FILESDIR}"/${P}-qt5.14.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_PLAYERS=$(usex gui) - -DBUILD_QT5OPENGL=$(usex opengl) - -DHAVE_PORTAUDIO=$(usex portaudio) - -DHAVE_PULSE=$(usex pulseaudio) - -DHAVE_VAAPI=$(usex vaapi) - ) - - cmake_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/, media-libs/qtav/files/
commit: d5c3e79fc73d87d3adcb0f0b15cba9e4f09c89d8 Author: David Haller dhaller de> AuthorDate: Sun Jan 26 17:14:12 2020 + Commit: Johannes Huber gentoo org> CommitDate: Sun Jan 26 17:15:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c3e79f media-libs/qtav: fix installed files Closes: https://bugs.gentoo.org/705326 Reported-by: David Haller dhaller.de> Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Johannes Huber gentoo.org> .../qtav/files/qtav-1.12.0-installpaths.patch | 17 + media-libs/qtav/qtav-1.12.0-r2.ebuild | 72 ++ 2 files changed, 89 insertions(+) diff --git a/media-libs/qtav/files/qtav-1.12.0-installpaths.patch b/media-libs/qtav/files/qtav-1.12.0-installpaths.patch new file mode 100644 index 000..7d491931d05 --- /dev/null +++ b/media-libs/qtav/files/qtav-1.12.0-installpaths.patch @@ -0,0 +1,17 @@ +diff -ub -purN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2017-06-21 03:47:15.0 +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/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r2.ebuild new file mode 100644 index 000..8480fcb56a0 --- /dev/null +++ b/media-libs/qtav/qtav-1.12.0-r2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 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" +IUSE="gui libav opengl portaudio pulseaudio vaapi" +REQUIRED_USE="gui? ( opengl )" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + gui? ( dev-qt/qtsql:5 ) + libav? ( + media-video/libav:= + x11-libs/libX11 + ) + !libav? ( media-video/ffmpeg:= ) + opengl? ( dev-qt/qtopengl: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 +) + +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_PLAYERS=$(usex gui) + -DBUILD_QT5OPENGL=$(usex opengl) + -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 +}
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/files/, media-libs/qtav/
commit: fc58ee0973adc018239f499f2715ef87de4a7857 Author: Johannes Huber gentoo org> AuthorDate: Tue Jan 7 21:52:50 2020 + Commit: Johannes Huber gentoo org> CommitDate: Tue Jan 7 21:53:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc58ee09 media-libs/qtav: Fix build w/ Qt 5.14 Thanks-to: David Haller dhaller.de> Closes: https://bugs.gentoo.org/703560 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Johannes Huber gentoo.org> media-libs/qtav/files/qtav-1.12.0-qt5.14.patch | 12 media-libs/qtav/qtav-1.12.0-r1.ebuild | 1 + 2 files changed, 13 insertions(+) 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 new file mode 100644 index 000..bf546c9e068 --- /dev/null +++ b/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch @@ -0,0 +1,12 @@ +diff -ub -purN -x '*~' a/qml/SGVideoNode.cpp b/qml/SGVideoNode.cpp +--- a/qml/SGVideoNode.cpp 2017-06-21 03:47:15.0 +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/qtav-1.12.0-r1.ebuild b/media-libs/qtav/qtav-1.12.0-r1.ebuild index 14df283f888..cac2cb20460 100644 --- a/media-libs/qtav/qtav-1.12.0-r1.ebuild +++ b/media-libs/qtav/qtav-1.12.0-r1.ebuild @@ -40,6 +40,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" PATCHES=( "${FILESDIR}"/${P}-multilib.patch "${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765 + "${FILESDIR}"/${P}-qt5.14.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/
commit: ebf960412b7e4c2e148b0534f6dfe6d4e327c63b Author: Johannes Huber gentoo org> AuthorDate: Sun Jan 5 13:08:48 2020 + Commit: Johannes Huber gentoo org> CommitDate: Sun Jan 5 13:09:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf96041 media-libs/qtav: Migrate to cmake eclass Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Johannes Huber gentoo.org> media-libs/qtav/qtav-1.12.0-r1.ebuild | 63 +++ 1 file changed, 63 insertions(+) diff --git a/media-libs/qtav/qtav-1.12.0-r1.ebuild b/media-libs/qtav/qtav-1.12.0-r1.ebuild new file mode 100644 index 000..14df283f888 --- /dev/null +++ b/media-libs/qtav/qtav-1.12.0-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="QtAV" +CAPI_HASH="b43aa93" +inherit cmake + +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" +IUSE="gui libav opengl portaudio pulseaudio vaapi" +REQUIRED_USE="gui? ( opengl )" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + gui? ( dev-qt/qtsql:5 ) + libav? ( + media-video/libav:= + x11-libs/libX11 + ) + !libav? ( media-video/ffmpeg:= ) + opengl? ( dev-qt/qtopengl:5 ) + portaudio? ( media-libs/portaudio ) + pulseaudio? ( media-sound/pulseaudio ) +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +PATCHES=( + "${FILESDIR}"/${P}-multilib.patch + "${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765 +) + +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_PLAYERS=$(usex gui) + -DBUILD_QT5OPENGL=$(usex opengl) + -DHAVE_PORTAUDIO=$(usex portaudio) + -DHAVE_PULSE=$(usex pulseaudio) + -DHAVE_VAAPI=$(usex vaapi) + ) + + cmake_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/files/, media-libs/qtav/
commit: c55e93a8acc7eb98dbbc618b2f81f112d260cdf1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 29 21:14:31 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 29 21:19:53 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c55e93a8 media-libs/qtav: Fix build with ffmpeg-4 Thanks-to: Marco Genasci gmail.com> Closes: https://bugs.gentoo.org/670765 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> ...-ffmpeg-4.patch => qtav-1.12.0-ffmpeg4-1.patch} | 0 media-libs/qtav/files/qtav-1.12.0-ffmpeg4-2.patch | 119 + media-libs/qtav/qtav-1.12.0.ebuild | 6 +- 3 files changed, 122 insertions(+), 3 deletions(-) diff --git a/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch b/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-1.patch similarity index 100% rename from media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch rename to media-libs/qtav/files/qtav-1.12.0-ffmpeg4-1.patch 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 new file mode 100644 index 000..1f78acfde49 --- /dev/null +++ b/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-2.patch @@ -0,0 +1,119 @@ +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 + 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, ), 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 + //
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/, media-libs/qtav/files/
commit: fc10c10272774119fe1d518101197b897e91ae8c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 16 08:14:34 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 16 08:17:32 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc10c102 media-libs/qtav: Fix build with ffmpeg-4 Closes: https://bugs.gentoo.org/660852 Package-Manager: Portage-2.3.49, Repoman-2.3.10 media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch | 36 media-libs/qtav/qtav-1.12.0.ebuild | 7 +++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch b/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch new file mode 100644 index 000..cb77e9adebb --- /dev/null +++ b/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch @@ -0,0 +1,36 @@ +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/qtav-1.12.0.ebuild b/media-libs/qtav/qtav-1.12.0.ebuild index 62a4f641959..f3e1ff02cc1 100644 --- a/media-libs/qtav/qtav-1.12.0.ebuild +++ b/media-libs/qtav/qtav-1.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -37,7 +37,10 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_PN}-${PV}" -PATCHES=( "${FILESDIR}/${P}-multilib.patch" ) +PATCHES=( + "${FILESDIR}/${P}-multilib.patch" + "${FILESDIR}/${P}-ffmpeg-4.patch" +) src_prepare() { cmake-utils_src_prepare
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/
commit: 1b2ce484dcf2d7447c5cb1aad4be4ace3d796b08 Author: Tobias Klausmann gentoo org> AuthorDate: Sat Dec 16 14:18:10 2017 + Commit: Tobias Klausmann gentoo org> CommitDate: Sat Dec 16 17:23:48 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b2ce484 media-libs/qtav-1.12.0-r0: amd64 stable Gentoo-Bug: http://bugs.gentoo.org/638400 media-libs/qtav/qtav-1.12.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/qtav/qtav-1.12.0.ebuild b/media-libs/qtav/qtav-1.12.0.ebuild index 6437e6a61b1..62a4f641959 100644 --- a/media-libs/qtav/qtav-1.12.0.ebuild +++ b/media-libs/qtav/qtav-1.12.0.ebuild @@ -14,7 +14,7 @@ https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz; LICENSE="GPL-3+ LGPL-2.1+" SLOT="0/1" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="gui libav opengl portaudio pulseaudio vaapi" REQUIRED_USE="gui? ( opengl )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/, media-libs/qtav/files/
commit: b82147b1da5ee75172aacba827cfc4afd9538243 Author: Johannes Huber gentoo org> AuthorDate: Thu Sep 7 21:25:09 2017 + Commit: Johannes Huber gentoo org> CommitDate: Thu Sep 7 21:41:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b82147b1 media-libs/qtav: New package Initial ebuild by me. Closes: https://bugs.gentoo.org/show_bug.cgi?id=613146 Package-Manager: Portage-2.3.8, Repoman-2.3.3 media-libs/qtav/Manifest | 2 + media-libs/qtav/files/qtav-1.12.0-multilib.patch | 19 media-libs/qtav/metadata.xml | 14 ++ media-libs/qtav/qtav-1.12.0.ebuild | 60 4 files changed, 95 insertions(+) diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest new file mode 100644 index 000..fb23381b9b9 --- /dev/null +++ b/media-libs/qtav/Manifest @@ -0,0 +1,2 @@ +DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 SHA256 0ce2bf82324698500a9cfa261a4a6089a6c351ce37e376ac71202744e377e442 SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7 WHIRLPOOL 4f233ed35725cf96b5e9dffccd82fb5e203ff9b4f2a599446de371f4ddf3c9ec04aaff8d525a3b6e939d8f9459c4edc08f44170a6701756256e970b456e31951 +DIST qtav-1.12.0.tar.gz 998117 SHA256 65ab859985d73521c2d17e72117baae0f3f6242b69f59994acada76fa5364193 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32 WHIRLPOOL e79a6d9f1caeac1e3fb38efa98b21fdc4e2120ff7c30b79e47ba370ae95614406ba4d8aebc633b57ffaa8975a16efaa83d614bdb3936c5c6d97ed3244011ce86 diff --git a/media-libs/qtav/files/qtav-1.12.0-multilib.patch b/media-libs/qtav/files/qtav-1.12.0-multilib.patch new file mode 100644 index 000..608a67dfe0d --- /dev/null +++ b/media-libs/qtav/files/qtav-1.12.0-multilib.patch @@ -0,0 +1,19 @@ +commit 87e54cc4d3fa76f3b226fbf2822a87af48cf3e51 +Author: Johannes Huber+Date: Wed Sep 6 23:30:42 2017 +0200 + +Fix multilib install + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ef7ade07..11f8603b 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -66,7 +66,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # for .moc + 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_LIBS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + set(QTAV_INSTALL_BINS ${CMAKE_INSTALL_PREFIX}/bin) + set(QTAV_INSTALL_QML ${CMAKE_INSTALL_PREFIX}/qml) + else() diff --git a/media-libs/qtav/metadata.xml b/media-libs/qtav/metadata.xml new file mode 100644 index 000..396b8768424 --- /dev/null +++ b/media-libs/qtav/metadata.xml @@ -0,0 +1,14 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + j...@gentoo.org + Johannes Huber + + + Build a video player gui + + + wang-bin/QtAV + + diff --git a/media-libs/qtav/qtav-1.12.0.ebuild b/media-libs/qtav/qtav-1.12.0.ebuild new file mode 100644 index 000..6437e6a61b1 --- /dev/null +++ b/media-libs/qtav/qtav-1.12.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_PN="QtAV" +CAPI_HASH="b43aa93" +inherit cmake-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" +IUSE="gui libav opengl portaudio pulseaudio vaapi" +REQUIRED_USE="gui? ( opengl )" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + gui? ( dev-qt/qtsql:5 ) + libav? ( + media-video/libav:= + x11-libs/libX11 + ) + !libav? ( media-video/ffmpeg:= ) + opengl? ( dev-qt/qtopengl:5 ) + portaudio? ( media-libs/portaudio ) + pulseaudio? ( media-sound/pulseaudio ) +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +PATCHES=( "${FILESDIR}/${P}-multilib.patch" ) + +src_prepare() { + cmake-utils_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_PLAYERS=$(usex gui) + -DBUILD_QT5OPENGL=$(usex opengl) + -DHAVE_PORTAUDIO=$(usex portaudio) + -DHAVE_PULSE=$(usex pulseaudio) + -DHAVE_VAAPI=$(usex vaapi) + ) + +