Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/, media-libs/qtav/files/
Date: Sun, 26 Jan 2020 17:15:47
Message-Id: 1580058930.d5c3e79fc73d87d3adcb0f0b15cba9e4f09c89d8.johu@gentoo
1 commit: d5c3e79fc73d87d3adcb0f0b15cba9e4f09c89d8
2 Author: David Haller <gentoo <AT> dhaller <DOT> de>
3 AuthorDate: Sun Jan 26 17:14:12 2020 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 26 17:15:30 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c3e79f
7
8 media-libs/qtav: fix installed files
9
10 Closes: https://bugs.gentoo.org/705326
11 Reported-by: David Haller <gentoo <AT> dhaller.de>
12 Package-Manager: Portage-2.3.85, Repoman-2.3.20
13 Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
14
15 .../qtav/files/qtav-1.12.0-installpaths.patch | 17 +++++
16 media-libs/qtav/qtav-1.12.0-r2.ebuild | 72 ++++++++++++++++++++++
17 2 files changed, 89 insertions(+)
18
19 diff --git a/media-libs/qtav/files/qtav-1.12.0-installpaths.patch b/media-libs/qtav/files/qtav-1.12.0-installpaths.patch
20 new file mode 100644
21 index 00000000000..7d491931d05
22 --- /dev/null
23 +++ b/media-libs/qtav/files/qtav-1.12.0-installpaths.patch
24 @@ -0,0 +1,17 @@
25 +diff -ub -purN a/CMakeLists.txt b/CMakeLists.txt
26 +--- a/CMakeLists.txt 2017-06-21 03:47:15.000000000 +0200
27 ++++ b/CMakeLists.txt 2020-01-12 02:51:41.692331365 +0100
28 +@@ -65,10 +65,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # for
29 + # Instruct CMake to run moc automatically when needed.
30 + set(CMAKE_AUTOMOC ON)
31 + if(NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
32 +- set(QTAV_INSTALL_HEADERS ${CMAKE_INSTALL_PREFIX}/include)
33 +- set(QTAV_INSTALL_LIBS ${CMAKE_INSTALL_PREFIX}/lib)
34 ++ set(QTAV_INSTALL_HEADERS ${QT_INSTALL_HEADERS})
35 ++ set(QTAV_INSTALL_LIBS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
36 + set(QTAV_INSTALL_BINS ${CMAKE_INSTALL_PREFIX}/bin)
37 +- set(QTAV_INSTALL_QML ${CMAKE_INSTALL_PREFIX}/qml)
38 ++ set(QTAV_INSTALL_QML ${QT_INSTALL_QML})
39 + else()
40 + set(CMAKE_INSTALL_PREFIX ${QT_INSTALL_PREFIX} CACHE PATH "default install path" FORCE)
41 + set(QTAV_INSTALL_HEADERS ${QT_INSTALL_HEADERS})
42
43 diff --git a/media-libs/qtav/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r2.ebuild
44 new file mode 100644
45 index 00000000000..8480fcb56a0
46 --- /dev/null
47 +++ b/media-libs/qtav/qtav-1.12.0-r2.ebuild
48 @@ -0,0 +1,72 @@
49 +# Copyright 1999-2020 Gentoo Authors
50 +# Distributed under the terms of the GNU General Public License v2
51 +
52 +EAPI=7
53 +
54 +MY_PN="QtAV"
55 +CAPI_HASH="b43aa93"
56 +inherit cmake qmake-utils
57 +
58 +DESCRIPTION="Multimedia playback framework based on Qt + FFmpeg"
59 +HOMEPAGE="https://www.qtav.org"
60 +SRC_URI="https://github.com/wang-bin/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
61 +https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz"
62 +
63 +LICENSE="GPL-3+ LGPL-2.1+"
64 +SLOT="0/1"
65 +KEYWORDS="~amd64"
66 +IUSE="gui libav opengl portaudio pulseaudio vaapi"
67 +REQUIRED_USE="gui? ( opengl )"
68 +
69 +DEPEND="
70 + dev-qt/qtcore:5
71 + dev-qt/qtdeclarative:5
72 + dev-qt/qtgui:5
73 + dev-qt/qtwidgets:5
74 + gui? ( dev-qt/qtsql:5 )
75 + libav? (
76 + media-video/libav:=
77 + x11-libs/libX11
78 + )
79 + !libav? ( media-video/ffmpeg:= )
80 + opengl? ( dev-qt/qtopengl:5 )
81 + portaudio? ( media-libs/portaudio )
82 + pulseaudio? ( media-sound/pulseaudio )
83 +"
84 +RDEPEND="${DEPEND}"
85 +
86 +S="${WORKDIR}/${MY_PN}-${PV}"
87 +
88 +PATCHES=(
89 + "${FILESDIR}"/${P}-installpaths.patch
90 + "${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765
91 + "${FILESDIR}"/${P}-qt5.14.patch
92 +)
93 +
94 +src_prepare() {
95 + cmake_src_prepare
96 + cp "${WORKDIR}/${P}-capi.h-${CAPI_HASH}" contrib/capi/capi.h \
97 + || die "Failed to add missing header"
98 +}
99 +
100 +src_configure() {
101 + local mycmakeargs=(
102 + -DBUILD_TESTS=OFF
103 + -DBUILD_EXAMPLES=OFF
104 + -DBUILD_PLAYERS=$(usex gui)
105 + -DBUILD_QT5OPENGL=$(usex opengl)
106 + -DHAVE_PORTAUDIO=$(usex portaudio)
107 + -DHAVE_PULSE=$(usex pulseaudio)
108 + -DHAVE_VAAPI=$(usex vaapi)
109 + )
110 +
111 + cmake_src_configure
112 + pushd tools/install_sdk >/dev/null
113 + eqmake5
114 + popd >/dev/null
115 +}
116 +
117 +src_install() {
118 + cmake_src_install
119 + emake -C tools/install_sdk INSTALL_ROOT="${ED}" install
120 +}