* [gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/, media-libs/qtav/files/
@ 2017-09-07 21:42 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2017-09-07 21:42 UTC (permalink / raw
To: gentoo-commits
commit: b82147b1da5ee75172aacba827cfc4afd9538243
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 7 21:25:09 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Sep 7 21:41:28 2017 +0000
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 00000000000..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 00000000000..608a67dfe0d
--- /dev/null
+++ b/media-libs/qtav/files/qtav-1.12.0-multilib.patch
@@ -0,0 +1,19 @@
+commit 87e54cc4d3fa76f3b226fbf2822a87af48cf3e51
+Author: Johannes Huber <johu@gentoo.org>
+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 00000000000..396b8768424
--- /dev/null
+++ b/media-libs/qtav/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>johu@gentoo.org</email>
+ <name>Johannes Huber</name>
+ </maintainer>
+ <use>
+ <flag name="gui">Build a video player gui</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">wang-bin/QtAV</remote-id>
+ </upstream>
+</pkgmetadata>
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 00000000000..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)
+ )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/, media-libs/qtav/files/
@ 2018-09-16 8:17 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-09-16 8:17 UTC (permalink / raw
To: gentoo-commits
commit: fc10c10272774119fe1d518101197b897e91ae8c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 08:14:34 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 08:17:32 2018 +0000
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 00000000000..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 <evostar@gmx.de>
+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 <libavutil/parseutils.h>
+ #include <libavutil/pixdesc.h>
+ #include <libavutil/avstring.h>
++#include <libavfilter/version.h>
+
+ #if !FFMPEG_MODULE_CHECK(LIBAVUTIL, 51, 73, 101)
+ #include <libavutil/channel_layout.h>
+@@ -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 <libavfilter/avfiltergraph.h> /*code is here for old version*/
++#else
+ #include <libavfilter/avfilter.h>
++#endif
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+ #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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/, media-libs/qtav/files/
@ 2020-01-26 17:15 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2020-01-26 17:15 UTC (permalink / raw
To: gentoo-commits
commit: d5c3e79fc73d87d3adcb0f0b15cba9e4f09c89d8
Author: David Haller <gentoo <AT> dhaller <DOT> de>
AuthorDate: Sun Jan 26 17:14:12 2020 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 17:15:30 2020 +0000
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 <gentoo <AT> dhaller.de>
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Johannes Huber <johu <AT> 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 00000000000..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.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/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r2.ebuild
new file mode 100644
index 00000000000..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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/, media-libs/qtav/files/
@ 2020-06-22 18:32 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-06-22 18:32 UTC (permalink / raw
To: gentoo-commits
commit: ae5836a1f3059809069c07510c3ed960492accfe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 17:28:20 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 18:31:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae5836a1
media-libs/qtav: Fix build with Qt 5.15
Reported-by: Daniel Rammelt <d.rammelt <AT> icloud.com>
Closes: https://bugs.gentoo.org/727410
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 00000000000..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 <rezso@rezso.net>
+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 <QtCore/QByteArray>
+ #include <QtCore/QRect>
+ #include <QtGui/QPainter>
++#include <QtGui/QPainterPath>
+ /*
+ * 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() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-22 18:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-07 21:42 [gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/, media-libs/qtav/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2018-09-16 8:17 Andreas Sturmlechner
2020-01-26 17:15 Johannes Huber
2020-06-22 18:32 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox