[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 36cbf5737d778dacbb287b360a1628fdd370076c
Author: Jimi Huotari gentoo org>
AuthorDate: Sun May 28 17:53:03 2023 +
Commit: Jimi Huotari gentoo org>
CommitDate: Sun May 28 17:53:03 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=36cbf573
dev-qt/qtmultimedia: move linux-headers to DEPEND
Signed-off-by: Jimi Huotari gentoo.org>
dev-qt/qtmultimedia/qtmultimedia-6.5..ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-6..ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-6.5..ebuild
index ab321e9e..e4515ea9 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.5..ebuild
@@ -33,10 +33,10 @@ RDEPEND="
x11-libs/libXrandr
)
pulseaudio? ( media-libs/libpulse[glib] )
- v4l? ( sys-kernel/linux-headers )
"
DEPEND="${RDEPEND}
x11-base/xorg-proto
+ v4l? ( sys-kernel/linux-headers )
"
src_configure() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-6..ebuild
index ab321e9e..e4515ea9 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6..ebuild
@@ -33,10 +33,10 @@ RDEPEND="
x11-libs/libXrandr
)
pulseaudio? ( media-libs/libpulse[glib] )
- v4l? ( sys-kernel/linux-headers )
"
DEPEND="${RDEPEND}
x11-base/xorg-proto
+ v4l? ( sys-kernel/linux-headers )
"
src_configure() {
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 7ce7065c9400ed9ee9936ae8e925c9bfa9a93c44
Author: Jimi Huotari gentoo org>
AuthorDate: Sun May 28 13:07:39 2023 +
Commit: Jimi Huotari gentoo org>
CommitDate: Sun May 28 13:09:28 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7ce7065c
dev-qt/qtmultimedia: update DESCRIPTION and DEPENDENCIES
Signed-off-by: Jimi Huotari gentoo.org>
dev-qt/qtmultimedia/qtmultimedia-6.5..ebuild | 38 +++-
dev-qt/qtmultimedia/qtmultimedia-6..ebuild | 38 +++-
2 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-6.5..ebuild
index 508673ac..ab321e9e 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.5..ebuild
@@ -1,41 +1,51 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit qt6-build
-DESCRIPTION="Qt Multimedia"
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6
framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64"
fi
-IUSE="gstreamer"
+IUSE="alsa ffmpeg pulseaudio v4l"
RDEPEND="
=dev-qt/qtbase-${PV}*[gui,network,widgets]
=dev-qt/qtdeclarative-${PV}*
+ =dev-qt/qtquick3d-${PV}*
=dev-qt/qtshadertools-${PV}*
=dev-qt/qtsvg-${PV}*
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/libglvnd
+ dev-libs/glib:2
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/libglvnd
+ alsa? ( media-libs/alsa-lib )
+ ffmpeg? (
+ media-libs/libva:=
+ media-video/ffmpeg:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
)
+ pulseaudio? ( media-libs/libpulse[glib] )
+ v4l? ( sys-kernel/linux-headers )
"
DEPEND="${RDEPEND}
- gstreamer? ( x11-base/xorg-proto )
+ x11-base/xorg-proto
"
src_configure() {
- # TODO: linux_v4l automagic
local mycmakeargs=(
- -DQT_FEATURE_alsa=off
- -DQT_FEATURE_pulseaudio=off
- $(qt_feature gstreamer)
+ -DQT_FEATURE_gstreamer=on
+ $(qt_feature alsa)
+ $(qt_feature ffmpeg)
+ $(qt_feature v4l linux_v4l)
+ $(qt_feature pulseaudio)
)
qt6-build_src_configure
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-6..ebuild
index 508673ac..ab321e9e 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6..ebuild
@@ -1,41 +1,51 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit qt6-build
-DESCRIPTION="Qt Multimedia"
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6
framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64"
fi
-IUSE="gstreamer"
+IUSE="alsa ffmpeg pulseaudio v4l"
RDEPEND="
=dev-qt/qtbase-${PV}*[gui,network,widgets]
=dev-qt/qtdeclarative-${PV}*
+ =dev-qt/qtquick3d-${PV}*
=dev-qt/qtshadertools-${PV}*
=dev-qt/qtsvg-${PV}*
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/libglvnd
+ dev-libs/glib:2
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/libglvnd
+ alsa? ( media-libs/alsa-lib )
+ ffmpeg? (
+ media-libs/libva:=
+ media-video/ffmpeg:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
)
+ pulseaudio? ( media-libs/libpulse[glib] )
+ v4l? ( sys-kernel/linux-headers )
"
DEPEND="${RDEPEND}
- gstreamer? ( x11-base/xorg-proto )
+ x11-base/xorg-proto
"
src_configure() {
- # TODO: linux_v4l automagic
local mycmakeargs=(
- -DQT_FEATURE_alsa=off
- -DQT_FEATURE_pulseaudio=off
- $(qt_feature gstreamer)
+ -DQT_FEATURE_gstreamer=on
+ $(qt_feature alsa)
+ $(qt_feature ffmpeg)
+ $(qt_feature v4l linux_v4l)
+ $(qt_feature pulseaudio)
)
qt6-build_src_configure
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
commit: 51bb9b7819c2f252977cbe16fa8c6ef82a919194
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Apr 10 21:37:50 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Apr 10 21:37:50 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=51bb9b78
dev-qt/qtmultimedia: Patch upstreamed
Upstream commit ff4c7bc3bf7ba4b748fdeb9d09887271c2b28505
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/qtmultimedia-5.15.2-no-qtopengl.patch| 14 --
dev-qt/qtmultimedia/qtmultimedia-5.15.9..ebuild| 2 --
2 files changed, 16 deletions(-)
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
b/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
deleted file mode 100644
index 471bfabc..
--- a/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Widgets were ported away from QtOpenGL in 5.15.0 but bogus dependency
-remained: https://bugreports.qt.io/browse/QTBUG-81902
-
a/src/multimediawidgets/multimediawidgets.pro
-+++ b/src/multimediawidgets/multimediawidgets.pro
-@@ -2,8 +2,6 @@
- TARGET = QtMultimediaWidgets
- QT = core gui multimedia widgets-private
- QT_PRIVATE += multimedia-private
--qtHaveModule(opengl): \
-- QT_PRIVATE += opengl
-
- PRIVATE_HEADERS += \
- qvideowidget_p.h \
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.9..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.15.9..ebuild
index 531227bb..54a09964 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.9..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.9..ebuild
@@ -40,8 +40,6 @@ DEPEND="${RDEPEND}
gstreamer? ( x11-base/xorg-proto )
"
-PATCHES=( "${FILESDIR}/${PN}-5.15.2-no-qtopengl.patch" )
-
src_prepare() {
sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
src/multimedia/multimedia.pro || die
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 8f02be1748b5e9f8486742c3186c55d174cde672
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 5 09:07:34 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 5 09:07:34 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8f02be17
dev-qt/qtmultimedia: drop 6.4.0
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtmultimedia/Manifest | 1 -
dev-qt/qtmultimedia/qtmultimedia-6.4.0.ebuild | 42 ---
2 files changed, 43 deletions(-)
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
deleted file mode 100644
index a4f0a69e..
--- a/dev-qt/qtmultimedia/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtmultimedia-everywhere-src-6.4.0.tar.xz 5936088 BLAKE2B
7e469db96e145a4bc496daa6547685c84e199a8942452b406a3e661e9da2b8d4306b41fc82551e9257f6f41d2d269cc7a359b6087111d092073b8cdaf683a2c1
SHA512
fd5f0d73374290ecf70d30395b2ddbb05439979a29b5e6b37a1ac40338ffe602ea62b7bb8f3c053b2da35fa9c4101bd6e0a12ee9479c04bb2d63c527c77cb685
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.4.0.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-6.4.0.ebuild
deleted file mode 100644
index 508673ac..
--- a/dev-qt/qtmultimedia/qtmultimedia-6.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt Multimedia"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-IUSE="gstreamer"
-
-RDEPEND="
- =dev-qt/qtbase-${PV}*[gui,network,widgets]
- =dev-qt/qtdeclarative-${PV}*
- =dev-qt/qtshadertools-${PV}*
- =dev-qt/qtsvg-${PV}*
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/libglvnd
- )
-"
-DEPEND="${RDEPEND}
- gstreamer? ( x11-base/xorg-proto )
-"
-
-src_configure() {
- # TODO: linux_v4l automagic
- local mycmakeargs=(
- -DQT_FEATURE_alsa=off
- -DQT_FEATURE_pulseaudio=off
- $(qt_feature gstreamer)
- )
-
- qt6-build_src_configure
-}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 86e83246a70ea542373026f7a426663ba2f6567b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 24 20:25:10 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 24 20:25:10 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=86e83246
dev-qt/qtmultimedia: drop 6.3.
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtmultimedia/qtmultimedia-6.3..ebuild | 42
1 file changed, 42 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.3..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-6.3..ebuild
deleted file mode 100644
index 508673ac..
--- a/dev-qt/qtmultimedia/qtmultimedia-6.3..ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt Multimedia"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-IUSE="gstreamer"
-
-RDEPEND="
- =dev-qt/qtbase-${PV}*[gui,network,widgets]
- =dev-qt/qtdeclarative-${PV}*
- =dev-qt/qtshadertools-${PV}*
- =dev-qt/qtsvg-${PV}*
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/libglvnd
- )
-"
-DEPEND="${RDEPEND}
- gstreamer? ( x11-base/xorg-proto )
-"
-
-src_configure() {
- # TODO: linux_v4l automagic
- local mycmakeargs=(
- -DQT_FEATURE_alsa=off
- -DQT_FEATURE_pulseaudio=off
- $(qt_feature gstreamer)
- )
-
- qt6-build_src_configure
-}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: e09ecb661e816b67fd21e5fc7cf7a8d3f28e3c7d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 24 14:42:05 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 24 14:42:05 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e09ecb66
dev-qt/qtmultimedia: drop 6.3.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtmultimedia/Manifest | 1 -
dev-qt/qtmultimedia/qtmultimedia-6.3.2.ebuild | 42 ---
2 files changed, 43 deletions(-)
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
deleted file mode 100644
index 7c0bbe30..
--- a/dev-qt/qtmultimedia/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtmultimedia-everywhere-src-6.3.2.tar.xz 4746380 BLAKE2B
677f2cf3979cd132f9ef6ba9e47de2a328775e2fac767ed6e47c073b4e76b077a504c9b96b903310ea8727afa324630b8cbf0b5cbf135e4eac3afdf6a3ad1414
SHA512
d6b31aad99a71096cac0655da99245553efdeabb67f6625893d23a31ce7c8b7e15219558933174a6577913ef903092b3230f211dd36b29ecfac782d7f358df27
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.3.2.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-6.3.2.ebuild
deleted file mode 100644
index 508673ac..
--- a/dev-qt/qtmultimedia/qtmultimedia-6.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt Multimedia"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-IUSE="gstreamer"
-
-RDEPEND="
- =dev-qt/qtbase-${PV}*[gui,network,widgets]
- =dev-qt/qtdeclarative-${PV}*
- =dev-qt/qtshadertools-${PV}*
- =dev-qt/qtsvg-${PV}*
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/libglvnd
- )
-"
-DEPEND="${RDEPEND}
- gstreamer? ( x11-base/xorg-proto )
-"
-
-src_configure() {
- # TODO: linux_v4l automagic
- local mycmakeargs=(
- -DQT_FEATURE_alsa=off
- -DQT_FEATURE_pulseaudio=off
- $(qt_feature gstreamer)
- )
-
- qt6-build_src_configure
-}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: e37573e95f2bec60bfa06db17ea5277012c4ea83
Author: WANG Xuerui gentoo org>
AuthorDate: Wed Jun 29 03:51:06 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 8 09:28:45 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e37573e9
dev-qt/qtmultimedia: keyword 5.15.5 for ~loong
Signed-off-by: WANG Xuerui gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtmultimedia/qtmultimedia-5.15.5..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.15.5..ebuild
index ef56482a..fab06033 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.5..ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5
framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
fi
IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: fe1c66d43dcfa239816a713acdcd7b796cf7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jul 17 07:12:13 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jul 17 07:13:23 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fe1c66d4
dev-qt/qtmultimedia: Switch IUSE pulseaudio to media-libs/libpulse
Package-Manager: Portage-3.0.32, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtmultimedia/qtmultimedia-5.15.5..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.15.5..ebuild
index b0933398..ef56482a 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.5..ebuild
@@ -24,7 +24,7 @@ RDEPEND="
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-base:1.0
)
- pulseaudio? ( media-sound/pulseaudio[glib] )
+ pulseaudio? ( media-libs/libpulse[glib] )
qml? (
=dev-qt/qtdeclarative-${QT5_PV}*
gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 307262fe531712cae0e9c1ce2520624e2feb0889
Author: Jimi Huotari gentoo org>
AuthorDate: Mon Jun 20 16:17:17 2022 +
Commit: Jimi Huotari gentoo org>
CommitDate: Mon Jun 20 18:02:05 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=307262fe
dev-qt/qtmultimedia: adjust qt6 dependencies
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari gentoo.org>
dev-qt/qtmultimedia/qtmultimedia-6.3.1.ebuild| 4 +++-
dev-qt/qtmultimedia/qtmultimedia-6.3..ebuild | 6 --
dev-qt/qtmultimedia/qtmultimedia-6..ebuild | 6 --
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.3.1.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-6.3.1.ebuild
index 8928146f..508673ac 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.3.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.3.1.ebuild
@@ -14,9 +14,10 @@ fi
IUSE="gstreamer"
RDEPEND="
- =dev-qt/qtbase-${PV}*
+ =dev-qt/qtbase-${PV}*[gui,network,widgets]
=dev-qt/qtdeclarative-${PV}*
=dev-qt/qtshadertools-${PV}*
+ =dev-qt/qtsvg-${PV}*
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
@@ -36,5 +37,6 @@ src_configure() {
-DQT_FEATURE_pulseaudio=off
$(qt_feature gstreamer)
)
+
qt6-build_src_configure
}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.3..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-6.3..ebuild
index 4c0400d1..508673ac 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.3..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.3..ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,9 +14,10 @@ fi
IUSE="gstreamer"
RDEPEND="
- =dev-qt/qtbase-${PV}*
+ =dev-qt/qtbase-${PV}*[gui,network,widgets]
=dev-qt/qtdeclarative-${PV}*
=dev-qt/qtshadertools-${PV}*
+ =dev-qt/qtsvg-${PV}*
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
@@ -36,5 +37,6 @@ src_configure() {
-DQT_FEATURE_pulseaudio=off
$(qt_feature gstreamer)
)
+
qt6-build_src_configure
}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-6..ebuild
index 4c0400d1..508673ac 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6..ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,9 +14,10 @@ fi
IUSE="gstreamer"
RDEPEND="
- =dev-qt/qtbase-${PV}*
+ =dev-qt/qtbase-${PV}*[gui,network,widgets]
=dev-qt/qtdeclarative-${PV}*
=dev-qt/qtshadertools-${PV}*
+ =dev-qt/qtsvg-${PV}*
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:1.0
@@ -36,5 +37,6 @@ src_configure() {
-DQT_FEATURE_pulseaudio=off
$(qt_feature gstreamer)
)
+
qt6-build_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
commit: 085dd7532cb988e4fd4bc3f6ced67d7a4e5dd1d7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Sep 17 08:14:42 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 22 07:10:39 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=085dd753
dev-qt/qtmultimedia: Drop obsolete dev-qt/qtopengl dependency
Thanks-to: Davide Pesavento gentoo.org>
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/qtmultimedia-5.15.2-no-qtopengl.patch| 14 ++
dev-qt/qtmultimedia/qtmultimedia-5.15.2..ebuild| 3 ++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
b/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
new file mode 100644
index ..471bfabc
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
@@ -0,0 +1,14 @@
+Widgets were ported away from QtOpenGL in 5.15.0 but bogus dependency
+remained: https://bugreports.qt.io/browse/QTBUG-81902
+
+--- a/src/multimediawidgets/multimediawidgets.pro
b/src/multimediawidgets/multimediawidgets.pro
+@@ -2,8 +2,6 @@
+ TARGET = QtMultimediaWidgets
+ QT = core gui multimedia widgets-private
+ QT_PRIVATE += multimedia-private
+-qtHaveModule(opengl): \
+- QT_PRIVATE += opengl
+
+ PRIVATE_HEADERS += \
+ qvideowidget_p.h \
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.15.2..ebuild
index 46226e53..8148aa4f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2..ebuild
@@ -31,7 +31,6 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
- =dev-qt/qtopengl-${QT5_PV}*
=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
media-libs/libglvnd
)
@@ -40,6 +39,8 @@ DEPEND="${RDEPEND}
gstreamer? ( x11-base/xorg-proto )
"
+PATCHES=( "${FILESDIR}/${PN}-5.15.2-no-qtopengl.patch" )
+
src_prepare() {
sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
src/multimedia/multimedia.pro || die
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 8a52a6840f1fcbf9365423210e134de98a7d6b75
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 15 18:02:18 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Sep 17 17:24:37 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8a52a684
dev-qt/qtmultimedia: Add missing media-libs/libglvnd DEPEND
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtmultimedia/qtmultimedia-5.15.2..ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.15.2..ebuild
index 6db567a5..46226e53 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2..ebuild
@@ -33,6 +33,7 @@ RDEPEND="
widgets? (
=dev-qt/qtopengl-${QT5_PV}*
=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
+ media-libs/libglvnd
)
"
DEPEND="${RDEPEND}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 81d258bf9054f6f549327cf37e5d8f531b256088
Author: Haelwenn (lanodan) Monnier hacktivis me>
AuthorDate: Sat Nov 23 09:42:28 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 2 18:09:22 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=81d258bf
dev-qt/qtmultimedia: rename USE=gles2 to USE=gles2-only
Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me>
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtmultimedia/metadata.xml | 1 -
dev-qt/qtmultimedia/qtmultimedia-5.14..ebuild | 8
dev-qt/qtmultimedia/qtmultimedia-5.15..ebuild | 8
dev-qt/qtmultimedia/qtmultimedia-5..ebuild| 8
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index 3e53741f..6ffb1f85 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -6,7 +6,6 @@
Gentoo Qt Project
- Use GLES 2.0 or later instead of full
OpenGL
Enable audio support via
media-libs/gstreamer
Build QML/QtQuick bindings and imports
Build the QtMultimediaWidgets module
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.14..ebuild
index 349dd584..0b2c348a 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.14..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.14..ebuild
@@ -10,11 +10,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
RDEPEND="
~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}[gles2=]
+ ~dev-qt/qtgui-${PV}[gles2-only=]
~dev-qt/qtnetwork-${PV}
alsa? ( media-libs/alsa-lib )
gstreamer? (
@@ -26,12 +26,12 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio[glib] )
qml? (
~dev-qt/qtdeclarative-${PV}
- gles2? ( ~dev-qt/qtgui-${PV}[egl] )
+ gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
openal? ( media-libs/openal )
)
widgets? (
~dev-qt/qtopengl-${PV}
- ~dev-qt/qtwidgets-${PV}[gles2=]
+ ~dev-qt/qtwidgets-${PV}[gles2-only=]
)
"
DEPEND="${RDEPEND}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.15..ebuild
index 349dd584..0b2c348a 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15..ebuild
@@ -10,11 +10,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
RDEPEND="
~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}[gles2=]
+ ~dev-qt/qtgui-${PV}[gles2-only=]
~dev-qt/qtnetwork-${PV}
alsa? ( media-libs/alsa-lib )
gstreamer? (
@@ -26,12 +26,12 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio[glib] )
qml? (
~dev-qt/qtdeclarative-${PV}
- gles2? ( ~dev-qt/qtgui-${PV}[egl] )
+ gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
openal? ( media-libs/openal )
)
widgets? (
~dev-qt/qtopengl-${PV}
- ~dev-qt/qtwidgets-${PV}[gles2=]
+ ~dev-qt/qtwidgets-${PV}[gles2-only=]
)
"
DEPEND="${RDEPEND}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index 349dd584..0b2c348a 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -10,11 +10,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
RDEPEND="
~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}[gles2=]
+ ~dev-qt/qtgui-${PV}[gles2-only=]
~dev-qt/qtnetwork-${PV}
alsa? ( media-libs/alsa-lib )
gstreamer? (
@@ -26,12 +26,12 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio[glib] )
qml? (
~dev-qt/qtdeclarative-${PV}
- gles2? ( ~dev-qt/qtgui-${PV}[egl] )
+ gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
openal? ( media-libs/openal )
)
widgets? (
~dev-qt/qtopengl-${PV}
- ~dev-qt/qtwidgets-${PV}[gles2=]
+ ~dev-qt/qtwidgets-${PV}[gles2-only=]
)
"
DEPEND="${RDEPEND}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/files/
commit: 4ff48cd9e5fea109f8c01e231dba5b7a4c06b655
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Sep 23 18:29:14 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Sep 23 18:29:14 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4ff48cd9
dev-qt/qtmultimedia: Drop unused patch
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/qtmultimedia-5.12.4-fix-no-opengl.patch | 42 --
1 file changed, 42 deletions(-)
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch
b/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch
deleted file mode 100644
index 1e5d7551..
--- a/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001
-From: Val Doroshchuk
-Date: Mon, 17 Jun 2019 15:20:22 +0200
-Subject: [PATCH] Fix compile issue when no opengl in QVideoSurfacePainter
-
-error: invalid use of incomplete type 'class QGLContext'
-
-Change-Id: I4bc9bd4231e663b187d3cef917b7a551ba614ba9
-Fixes: QTBUG-76405
-Reviewed-by: Andy Shaw
- src/multimediawidgets/qpaintervideosurface.cpp | 8
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/multimediawidgets/qpaintervideosurface.cpp
b/src/multimediawidgets/qpaintervideosurface.cpp
-index 440d5c858..6af0c7588 100644
a/src/multimediawidgets/qpaintervideosurface.cpp
-+++ b/src/multimediawidgets/qpaintervideosurface.cpp
-@@ -57,10 +57,6 @@
- #ifndef GL_RGB8
- #define GL_RGB8 0x8051
- #endif
--#endif
--
--#include
--QT_BEGIN_NAMESPACE
-
- static void makeCurrent(QGLContext *context)
- {
-@@ -70,6 +66,10 @@ static void makeCurrent(QGLContext *context)
- if (handle && QOpenGLContext::currentContext() != handle)
- handle->makeCurrent(handle->surface());
- }
-+#endif
-+
-+#include
-+QT_BEGIN_NAMESPACE
-
- QVideoSurfacePainter::~QVideoSurfacePainter()
- {
---
-2.16.3
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
commit: c0f69728fe2538b50a9daf12ea241a76c4b5d131
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jun 18 10:39:05 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jun 18 12:22:47 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c0f69728
dev-qt/qtmultimedia: Fix build with -no-opengl
See also: https://bugreports.qt.io/browse/QTBUG-76405
Thanks-to: Rolf Eike Beer sf-mail.de>
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
.../files/qtmultimedia-5.12.4-fix-no-opengl.patch | 42 ++
dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild | 2 ++
2 files changed, 44 insertions(+)
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch
b/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch
new file mode 100644
index ..1e5d7551
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch
@@ -0,0 +1,42 @@
+From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001
+From: Val Doroshchuk
+Date: Mon, 17 Jun 2019 15:20:22 +0200
+Subject: [PATCH] Fix compile issue when no opengl in QVideoSurfacePainter
+
+error: invalid use of incomplete type 'class QGLContext'
+
+Change-Id: I4bc9bd4231e663b187d3cef917b7a551ba614ba9
+Fixes: QTBUG-76405
+Reviewed-by: Andy Shaw
+---
+ src/multimediawidgets/qpaintervideosurface.cpp | 8
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/multimediawidgets/qpaintervideosurface.cpp
b/src/multimediawidgets/qpaintervideosurface.cpp
+index 440d5c858..6af0c7588 100644
+--- a/src/multimediawidgets/qpaintervideosurface.cpp
b/src/multimediawidgets/qpaintervideosurface.cpp
+@@ -57,10 +57,6 @@
+ #ifndef GL_RGB8
+ #define GL_RGB8 0x8051
+ #endif
+-#endif
+-
+-#include
+-QT_BEGIN_NAMESPACE
+
+ static void makeCurrent(QGLContext *context)
+ {
+@@ -70,6 +66,10 @@ static void makeCurrent(QGLContext *context)
+ if (handle && QOpenGLContext::currentContext() != handle)
+ handle->makeCurrent(handle->surface());
+ }
++#endif
++
++#include
++QT_BEGIN_NAMESPACE
+
+ QVideoSurfacePainter::~QVideoSurfacePainter()
+ {
+--
+2.16.3
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild
index e56a2019..8a896cd1 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
gstreamer? ( x11-base/xorg-proto )
"
+PATCHES=( "${FILESDIR}/${P}-fix-no-opengl.patch" )
+
src_prepare() {
sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
src/multimedia/multimedia.pro || die
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: a7d1acecd37cf439b71d4402a952154818e16a29
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Mar 11 06:44:47 2019 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Mar 11 06:45:04 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a7d1acec
dev-qt/qtmultimedia: fix media-sound/pulseaudio USE dependency
Bug: https://bugs.gentoo.org/679372
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka gentoo.org>
dev-qt/qtmultimedia/qtmultimedia-5.12..ebuild | 4 ++--
dev-qt/qtmultimedia/qtmultimedia-5.13..ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5..ebuild| 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.12..ebuild
index 8dd9750e..6d824153 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.12..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.12..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-base:1.0
)
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-sound/pulseaudio[glib] )
qml? (
~dev-qt/qtdeclarative-${PV}
gles2? ( ~dev-qt/qtgui-${PV}[egl] )
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.13..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.13..ebuild
index 921705de..6d824153 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.13..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.13..ebuild
@@ -23,7 +23,7 @@ RDEPEND="
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-base:1.0
)
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-sound/pulseaudio[glib] )
qml? (
~dev-qt/qtdeclarative-${PV}
gles2? ( ~dev-qt/qtgui-${PV}[egl] )
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index 8dd9750e..6d824153 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-base:1.0
)
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-sound/pulseaudio[glib] )
qml? (
~dev-qt/qtdeclarative-${PV}
gles2? ( ~dev-qt/qtgui-${PV}[egl] )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/, dev-qt/qtsensors/, dev-qt/qtpositioning/, ...
commit: 648a26620094f0d6f3079918a094a0232b79ef64
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 8 20:31:38 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 8 20:31:38 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=648a2662
dev-qt: keyworded 5.11.3 for sparc, bug #672636
dev-qt/linguist-tools-5.11.
dev-qt/qtmultimedia-5.11.
dev-qt/qtpositioning-5.11.
dev-qt/qtsensors-5.11.
dev-qt/qttranslations-5.11.
dev-qt/qtwebsockets-5.11.
Thanks-to: Rolf Eike Beer sf-mail.de>
Thanks-to: Sergei Trofimovich gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-qt/linguist-tools/linguist-tools-5.11..ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild | 2 +-
dev-qt/qtpositioning/qtpositioning-5.11..ebuild | 2 +-
dev-qt/qtsensors/qtsensors-5.11..ebuild | 2 +-
dev-qt/qttranslations/qttranslations-5.11..ebuild | 2 +-
dev-qt/qtwebsockets/qtwebsockets-5.11..ebuild | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/linguist-tools/linguist-tools-5.11..ebuild
b/dev-qt/linguist-tools/linguist-tools-5.11..ebuild
index 72c04bdc..c544a070 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.11..ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.11..ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Tools for working with Qt translation data files"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
fi
IUSE="qml"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild
index 04cc34da..8dd9750e 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5
framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
fi
IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtpositioning/qtpositioning-5.11..ebuild
b/dev-qt/qtpositioning/qtpositioning-5.11..ebuild
index ff571ce7..282cf1bc 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.11..ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.11..ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Physical position determination library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
IUSE="geoclue +qml"
diff --git a/dev-qt/qtsensors/qtsensors-5.11..ebuild
b/dev-qt/qtsensors/qtsensors-5.11..ebuild
index d0b0c5b6..ffdc8260 100644
--- a/dev-qt/qtsensors/qtsensors-5.11..ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.11..ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Hardware sensor access library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
# TODO: simulator
diff --git a/dev-qt/qttranslations/qttranslations-5.11..ebuild
b/dev-qt/qttranslations/qttranslations-5.11..ebuild
index 02291152..6a321bc6 100644
--- a/dev-qt/qttranslations/qttranslations-5.11..ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.11..ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Translation files for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
fi
IUSE=""
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.11..ebuild
b/dev-qt/qtwebsockets/qtwebsockets-5.11..ebuild
index 362a0a81..1299e9e3 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.11..ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.11..ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
IUSE="qml +ssl"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: f01d371db828f6ece21072e67dc7f1dfaa893987
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Tue Apr 24 18:06:45 2018 +
Commit: Jimi Huotari gentoo org>
CommitDate: Tue Apr 24 19:11:58 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f01d371d
dev-qt/qtmultimedia: Depend on x11-base/xorg-proto.
All non-obsolete x11-proto/ packages except x11-proto/xcb-proto were
merged into x11-base/xorg-proto.
dev-qt/qtmultimedia/qtmultimedia-5.10.1.ebuild| 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5..ebuild| 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.10.1.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.10.1.ebuild
index 598421b6..04cc34da 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.10.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.10.1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- gstreamer? ( x11-proto/videoproto )
+ gstreamer? ( x11-base/xorg-proto )
"
src_prepare() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild
index 598421b6..04cc34da 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild
@@ -35,7 +35,7 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- gstreamer? ( x11-proto/videoproto )
+ gstreamer? ( x11-base/xorg-proto )
"
src_prepare() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild
index 598421b6..04cc34da 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild
@@ -35,7 +35,7 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- gstreamer? ( x11-proto/videoproto )
+ gstreamer? ( x11-base/xorg-proto )
"
src_prepare() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index 598421b6..04cc34da 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -35,7 +35,7 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- gstreamer? ( x11-proto/videoproto )
+ gstreamer? ( x11-base/xorg-proto )
"
src_prepare() {
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 6fb2e5c74e72cc5399db9af4399fea79694cdb6f
Author: Michael Palimaka gentoo org>
AuthorDate: Tue Feb 6 13:54:09 2018 +
Commit: Michael Palimaka gentoo org>
CommitDate: Tue Feb 6 13:54:21 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6fb2e5c7
dev-qt/qtmultimedia: avoid adding unrequested CFLAGS
Bug: https://bugs.gentoo.org/646756
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-qt/qtmultimedia/qtmultimedia-5.10.0.ebuild| 5 -
dev-qt/qtmultimedia/qtmultimedia-5.10..ebuild | 5 -
dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild | 3 +++
dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild | 5 -
dev-qt/qtmultimedia/qtmultimedia-5..ebuild| 5 -
5 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.10.0.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.10.0.ebuild
index d0626551..df0cf92c 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.10.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.10.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
@@ -39,6 +39,9 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+ src/multimedia/multimedia.pro || die
+
qt_use_disable_config openal openal \
src/imports/imports.pro
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.10..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.10..ebuild
index d0626551..df0cf92c 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.10..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.10..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
@@ -39,6 +39,9 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+ src/multimedia/multimedia.pro || die
+
qt_use_disable_config openal openal \
src/imports/imports.pro
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild
index a3c48dc0..df0cf92c 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild
@@ -39,6 +39,9 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+ src/multimedia/multimedia.pro || die
+
qt_use_disable_config openal openal \
src/imports/imports.pro
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild
index d0626551..df0cf92c 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9..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
@@ -39,6 +39,9 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+ src/multimedia/multimedia.pro || die
+
qt_use_disable_config openal openal \
src/imports/imports.pro
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index d0626551..df0cf92c 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..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
@@ -39,6 +39,9 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+ src/multimedia/multimedia.pro || die
+
qt_use_disable_config openal openal \
src/imports/imports.pro
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 4b6a9320ee8f2caa0e34b6783a4b99c21b082f0c
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jul 23 04:30:55 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jul 23 04:31:20 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4b6a9320
dev-qt/qtmultimedia: Qt 5.9 updates
Also remove gstreamer:0.10 support, as it's vulnerable and the maintainers
are looking to last rite it.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
dev-qt/qtmultimedia/qtmultimedia-5.9.1.ebuild| 25 +++-
dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild | 25 +++-
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 25 +++-
3 files changed, 21 insertions(+), 54 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.1.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.9.1.ebuild
index f28d3192..d0626551 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.1.ebuild
@@ -10,8 +10,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
-REQUIRED_USE="?? ( gstreamer gstreamer010 )"
+IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
RDEPEND="
~dev-qt/qtcore-${PV}
@@ -24,12 +23,6 @@ RDEPEND="
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-base:1.0
)
- gstreamer010? (
- dev-libs/glib:2
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-bad:0.10
- media-libs/gst-plugins-base:0.10
- )
pulseaudio? ( media-sound/pulseaudio )
qml? (
~dev-qt/qtdeclarative-${PV}
@@ -46,14 +39,8 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- # do not rely on qtbase configuration
- sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
- qtmultimedia.pro || die
-
- qt_use_compile_test alsa
- qt_use_compile_test gstreamer
- qt_use_compile_test openal
- qt_use_compile_test pulseaudio
+ qt_use_disable_config openal openal \
+ src/imports/imports.pro
qt_use_disable_mod qml quick \
src/src.pro \
@@ -69,8 +56,10 @@ src_prepare() {
src_configure() {
local myqmakeargs=(
- $(usex gstreamer 'GST_VERSION=1.0' '')
- $(usex gstreamer010 'GST_VERSION=0.10' '')
+ --
+ $(qt_use alsa)
+ $(qt_use gstreamer)
+ $(qt_use pulseaudio)
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild
index f28d3192..d0626551 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9..ebuild
@@ -10,8 +10,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
-REQUIRED_USE="?? ( gstreamer gstreamer010 )"
+IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
RDEPEND="
~dev-qt/qtcore-${PV}
@@ -24,12 +23,6 @@ RDEPEND="
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-base:1.0
)
- gstreamer010? (
- dev-libs/glib:2
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-bad:0.10
- media-libs/gst-plugins-base:0.10
- )
pulseaudio? ( media-sound/pulseaudio )
qml? (
~dev-qt/qtdeclarative-${PV}
@@ -46,14 +39,8 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- # do not rely on qtbase configuration
- sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
- qtmultimedia.pro || die
-
- qt_use_compile_test alsa
- qt_use_compile_test gstreamer
- qt_use_compile_test openal
- qt_use_compile_test pulseaudio
+ qt_use_disable_config openal openal \
+ src/imports/imports.pro
qt_use_disable_mod qml quick \
src/src.pro \
@@ -69,8 +56,10 @@ src_prepare() {
src_configure() {
local myqmakeargs=(
- $(usex gstreamer 'GST_VERSION=1.0' '')
- $(usex gstreamer010 'GST_VERSION=0.10' '')
+ --
+ $(qt_use alsa)
+ $(qt_use gstreamer)
+ $(qt_use pulseaudio)
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index f28d3192..d0626551 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -10,8 +10,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc6
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 56b80056287f756bf0f8d32c06a383fb8e38f52a
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jul 31 19:29:13 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jul 31 19:29:32 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=56b80056
dev-qt/qtmultimedia: copy ~ppc keyword from main tree
Package-Manager: portage-2.3.0
dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.7.0.ebuild| 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
index ee4bc0d..f2ea87f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5
framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.0.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.7.0.ebuild
index ee4bc0d..f2ea87f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.7.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.7.0.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5
framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild
index ee4bc0d..f2ea87f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5
framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index ee4bc0d..f2ea87f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5
framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: bc0867c3f1896bbd334024088c50d80266a3
Author: Davide Pesavento gentoo org>
AuthorDate: Wed Jul 13 17:53:02 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Wed Jul 13 17:53:02 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bc0867c3
dev-qt/qtmultimedia: improve DESCRIPTION
Package-Manager: portage-2.3.0
dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.7.0.ebuild| 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
index 1a2ca34..ee4bc0d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
@@ -5,7 +5,7 @@
EAPI=6
inherit qt5-build
-DESCRIPTION="The Multimedia module for the Qt5 framework"
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5
framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.0.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.7.0.ebuild
index 1a2ca34..ee4bc0d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.7.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.7.0.ebuild
@@ -5,7 +5,7 @@
EAPI=6
inherit qt5-build
-DESCRIPTION="The Multimedia module for the Qt5 framework"
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5
framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild
index 1a2ca34..ee4bc0d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild
@@ -5,7 +5,7 @@
EAPI=6
inherit qt5-build
-DESCRIPTION="The Multimedia module for the Qt5 framework"
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5
framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index 1a2ca34..ee4bc0d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -5,7 +5,7 @@
EAPI=6
inherit qt5-build
-DESCRIPTION="The Multimedia module for the Qt5 framework"
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5
framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: f0a4c0ad223346a8562fa617d08494bf463f6179 Author: Michael Palimaka gentoo org> AuthorDate: Sat Apr 23 17:00:41 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Apr 23 17:20:24 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f0a4c0ad dev-qt/qtmultimedia: sync metadata with main tree Package-Manager: portage-2.2.28 dev-qt/qtmultimedia/metadata.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index fbfb57b..ae83782 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -7,8 +7,8 @@ Use GLES 2.0 or later instead of full OpenGL - Enable audio support via media-libs/gstreamer:1.0 - Enable audio support via media-libs/gstreamer:0.10 + Enable audio support via media-libs/gstreamer using SLOT 1.0 + Enable audio support via media-libs/gstreamer using SLOT 0.10 Build QML/QtQuick bindings and imports Build the QtMultimediaWidgets module
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: b5f9f20ac6574bb63f382912a4ac624a85cef3a6 Author: Davide Pesavento gentoo org> AuthorDate: Sun Apr 10 12:22:21 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Sun Apr 10 12:22:21 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b5f9f20a dev-qt/qtmultimedia: use semi-standard description for USE=gles2 Package-Manager: portage-2.2.28 dev-qt/qtmultimedia/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index 6e9a474..b2b5338 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -6,7 +6,7 @@ Gentoo Qt Project - Enable EGL/GLES2 integration + Use GLES 2.0 or later instead of full OpenGL Enable audio support via media-libs/gstreamer:1.0 Enable audio support via media-libs/gstreamer:0.10 Build QML/QtQuick bindings and imports
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 0a3e292d14ae4b74a92f8886588444535d044188
Author: Davide Pesavento gentoo org>
AuthorDate: Sun Apr 10 12:08:28 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sun Apr 10 12:08:56 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0a3e292d
dev-qt/qtmultimedia: really fix egl/gles2 handling
The videonode plugin requires both egl and gles2, therefore depending
on [-gles2] is enough to disable the plugin, and makes much more sense
than depending on [-egl], since the USE flag is called 'gles2'.
Thanks to rhill for pointing this out.
While at it, use a [gles2=] dependency on both qtgui and qtwidgets,
like we do everywhere else in the Qt stack.
Gentoo-Bug: 576636
Package-Manager: portage-2.2.28
dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild | 7 +++
dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild| 7 +++
dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild | 7 +++
dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild| 7 +++
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 7 +++
5 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild
index cc48647..1a2ca34 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtgui-${PV}[gles2=]
~dev-qt/qtnetwork-${PV}
alsa? ( media-libs/alsa-lib )
gstreamer? (
@@ -34,13 +34,12 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
~dev-qt/qtdeclarative-${PV}
- gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
- !gles2? ( ~dev-qt/qtgui-${PV}[-egl] )
+ gles2? ( ~dev-qt/qtgui-${PV}[egl] )
openal? ( media-libs/openal )
)
widgets? (
~dev-qt/qtopengl-${PV}
- ~dev-qt/qtwidgets-${PV}
+ ~dev-qt/qtwidgets-${PV}[gles2=]
)
"
DEPEND="${RDEPEND}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
index cc48647..1a2ca34 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtgui-${PV}[gles2=]
~dev-qt/qtnetwork-${PV}
alsa? ( media-libs/alsa-lib )
gstreamer? (
@@ -34,13 +34,12 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
~dev-qt/qtdeclarative-${PV}
- gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
- !gles2? ( ~dev-qt/qtgui-${PV}[-egl] )
+ gles2? ( ~dev-qt/qtgui-${PV}[egl] )
openal? ( media-libs/openal )
)
widgets? (
~dev-qt/qtopengl-${PV}
- ~dev-qt/qtwidgets-${PV}
+ ~dev-qt/qtwidgets-${PV}[gles2=]
)
"
DEPEND="${RDEPEND}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild
index cc48647..1a2ca34 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtgui-${PV}[gles2=]
~dev-qt/qtnetwork-${PV}
alsa? ( media-libs/alsa-lib )
gstreamer? (
@@ -34,13 +34,12 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
~dev-qt/qtdeclarative-${PV}
- gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
- !gles2? ( ~dev-qt/qtgui-${PV}[-egl] )
+ gles2? ( ~dev-qt/qtgui-${PV}[egl] )
openal? ( media-libs/openal )
)
widgets? (
~dev-qt/qtopengl-${PV}
- ~dev-qt/qtwidgets-${PV}
+ ~dev-qt/qtwidgets-${PV}[gles2=]
)
"
DEPEND="${RDEPEND}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild
index cc48647..1a2ca34 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.7..ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtgui-${PV}[gles2=]
~dev-qt/qtnetwork-${PV}
alsa? ( media-libs/alsa-lib )
gstreamer? (
@@ -34,13 +34,12 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
~dev-qt/qtdeclarative-${PV}
- gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
-
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/, dev-qt/assistant/files/, dev-qt/qtdeclarative/, ...
commit: 3f9f3082c2a56e007c27483fb5e3eada906b7de5 Author: Davide Pesavento gentoo org> AuthorDate: Wed Jan 20 17:52:21 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Wed Jan 20 17:52:21 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3f9f3082 dev-qt: drop all Qt4 live ebuilds The 4.8 branch is completely locked down except for security fixes which we will backport to 4.8.7 anyway. Therefore the live ebuilds for Qt4 have no use case, and keeping them just creates confusion. Documentation/package.keywords/qt4-live| 24 --- dev-qt/assistant/assistant-4.8..ebuild | 54 --- .../assistant/files/assistant-4.8.2+gcc-4.7.patch | 12 -- dev-qt/assistant/files/disable-webkit.patch| 26 dev-qt/designer/designer-4.8..ebuild | 58 --- dev-qt/linguist/linguist-4.8..ebuild | 40 - dev-qt/pixeltool/pixeltool-4.8..ebuild | 33 dev-qt/qdbusviewer/qdbusviewer-4.8..ebuild | 40 - dev-qt/qt3support/metadata.xml | 13 -- dev-qt/qt3support/qt3support-4.8..ebuild | 34 - dev-qt/qtbearer/metadata.xml | 13 -- dev-qt/qtbearer/qtbearer-4.8..ebuild | 44 -- ...ExcludeSocketNotifiers-in-glib-event-loop.patch | 81 -- .../qtcore-4.8.5-moc-boost-lexical-cast.patch | 12 -- .../qtcore-4.8.5-qeventdispatcher-recursive.patch | 94 dev-qt/qtcore/qtcore-4.8..ebuild | 92 .../qtdbus-4.7-qdbusintegrator-no-const.patch | 11 -- ...bus-4.8.4-qdbusconnection-silence-warning.patch | 14 -- dev-qt/qtdbus/qtdbus-4.8..ebuild | 41 - dev-qt/qtdeclarative/qtdeclarative-4.8..ebuild | 52 --- dev-qt/qtdemo/files/qt-demo-4.6-plugandpaint.patch | 13 -- dev-qt/qtdemo/metadata.xml | 21 --- dev-qt/qtdemo/qtdemo-4.8..ebuild | 97 dev-qt/qtgui/Manifest | 1 - dev-qt/qtgui/files/qtgui-4.7.3-cups.patch | 84 --- .../qtgui-4.8.5-disable-gtk-theme-check.patch | 22 --- .../qtgui/files/qtgui-4.8.5-qclipboard-delay.patch | 33 dev-qt/qtgui/qtgui-4.8..ebuild | 167 - dev-qt/qthelp/Manifest | 2 - .../qthelp/files/qthelp-4.8.6-compat-install.patch | 35 - .../qthelp/files/qthelp-4.8.6-compat-syncqt.patch | 25 --- dev-qt/qthelp/qthelp-4.8..ebuild | 112 -- .../files/qtmultimedia-4.8.0-alsa.patch| 25 --- dev-qt/qtmultimedia/qtmultimedia-4.8..ebuild | 44 -- dev-qt/qtopengl/qtopengl-4.8..ebuild | 46 -- dev-qt/qtopenvg/metadata.xml | 13 -- dev-qt/qtopenvg/qtopenvg-4.8..ebuild | 43 -- dev-qt/qtphonon/metadata.xml | 15 -- dev-qt/qtphonon/qtphonon-4.8..ebuild | 51 --- dev-qt/qtscript/qtscript-4.8..ebuild | 37 - dev-qt/qtsql/qtsql-4.8..ebuild | 60 dev-qt/qtsvg/qtsvg-4.8..ebuild | 43 -- dev-qt/qttest/qttest-4.8..ebuild | 33 .../qttranslations/qttranslations-4.8..ebuild | 41 - .../qtwebkit/files/4.8.2-javascriptcore-x32.patch | 11 -- dev-qt/qtwebkit/qtwebkit-4.8..ebuild | 76 -- dev-qt/qtxmlpatterns/qtxmlpatterns-4.8..ebuild | 34 - sets/qt4-live | 27 48 files changed, 1999 deletions(-) diff --git a/Documentation/package.keywords/qt4-live b/Documentation/package.keywords/qt4-live deleted file mode 100644 index 75cef11..000 --- a/Documentation/package.keywords/qt4-live +++ /dev/null @@ -1,24 +0,0 @@ -~dev-qt/assistant-4.8. ** -~dev-qt/designer-4.8. ** -~dev-qt/linguist-4.8. ** -~dev-qt/pixeltool-4.8. ** -~dev-qt/qdbusviewer-4.8. ** -~dev-qt/qt3support-4.8. ** -~dev-qt/qtbearer-4.8. ** -~dev-qt/qtcore-4.8. ** -~dev-qt/qtdbus-4.8. ** -~dev-qt/qtdeclarative-4.8. ** -~dev-qt/qtdemo-4.8. ** -~dev-qt/qtgui-4.8. ** -~dev-qt/qthelp-4.8. ** -~dev-qt/qtmultimedia-4.8. ** -~dev-qt/qtopengl-4.8. ** -~dev-qt/qtopenvg-4.8. ** -~dev-qt/qtphonon-4.8. ** -~dev-qt/qtscript-4.8. ** -~dev-qt/qtsql-4.8. ** -~dev-qt/qtsvg-4.8. ** -~dev-qt/qttest-4.8. ** -~dev-qt/qttranslations-4.8. ** -~dev-qt/qtwebkit-4.8. ** -~dev-qt/qtxmlpatterns-4.8. ** diff --git a/dev-qt/assistant/assistant-4.8..ebuild b/dev-qt/assistant/assistant-4.8..ebuild deleted file mode 100644 index c2b608e..000 --- a/dev-qt/assistant/assistant-4.8..ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils qt4-buil
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 6a549174bb957dabc91737e5f8b39b87e7895306
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Nov 19 16:00:25 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Nov 19 16:00:30 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6a549174
dev-qt/qtmultimedia: rename egl USE flag -> gles2
This avoids conflicts where egl was enabled but gles2 was not (gles2 must have
the same setting across all Qt modules).
Gentoo-bug: 565588
Package-Manager: portage-2.2.25
dev-qt/qtmultimedia/metadata.xml | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild | 6 +++---
dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild | 6 +++---
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index c018a17..536277f 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -3,9 +3,9 @@
qt
- Enable EGL integration
Add support for exceptions - like
catching them
inside the event loop (recommended by upstream)
+ Enable EGL/GLES2 integration
Enable audio support via
media-libs/gstreamer:1.0
Enable audio support via
media-libs/gstreamer:0.10
Build QML/QtQuick bindings and imports
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
index d760a39..721ad83 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets"
+IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
@@ -34,8 +34,8 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
~dev-qt/qtdeclarative-${PV}:5
- egl? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] )
- !egl? ( ~dev-qt/qtgui-${PV}:5[-egl] )
+ gles2? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] )
+ !gles2? ( ~dev-qt/qtgui-${PV}:5[-egl] )
openal? ( media-libs/openal )
)
widgets? (
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
index d760a39..721ad83 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets"
+IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
@@ -34,8 +34,8 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
~dev-qt/qtdeclarative-${PV}:5
- egl? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] )
- !egl? ( ~dev-qt/qtgui-${PV}:5[-egl] )
+ gles2? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] )
+ !gles2? ( ~dev-qt/qtgui-${PV}:5[-egl] )
openal? ( media-libs/openal )
)
widgets? (
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index d760a39..721ad83 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets"
+IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
@@ -34,8 +34,8 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
~dev-qt/qtdeclarative-${PV}:5
- egl? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] )
- !egl? ( ~dev-qt/qtgui-${PV}:5[-egl] )
+ gles2? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] )
+ !gles2? ( ~dev-qt/qtgui-${PV}:5[-egl] )
openal? ( media-libs/openal )
)
widgets? (
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: bdedc5799c11d174d1e6481a858798b86207b996
Author: Michael Palimaka gentoo org>
AuthorDate: Sat Oct 17 14:07:55 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Oct 17 14:07:55 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bdedc579
dev-qt/qtmultimedia: improve dependency specification
Package-Manager: portage-2.2.20.1
dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild| 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild| 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild | 2 +-
dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild | 6 +-
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 6 +-
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
index e356a18..1b51234 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
@@ -34,8 +34,8 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
>=dev-qt/qtdeclarative-${PV}:5
- >=dev-qt/qtgui-${PV}:5[egl=]
egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] )
+ !egl? ( >=dev-qt/qtgui-${PV}:5[-egl] )
openal? ( media-libs/openal )
)
widgets? (
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
index e356a18..1b51234 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
@@ -34,8 +34,8 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
>=dev-qt/qtdeclarative-${PV}:5
- >=dev-qt/qtgui-${PV}:5[egl=]
egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] )
+ !egl? ( >=dev-qt/qtgui-${PV}:5[-egl] )
openal? ( media-libs/openal )
)
widgets? (
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
index e356a18..1b51234 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
@@ -34,8 +34,8 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
>=dev-qt/qtdeclarative-${PV}:5
- >=dev-qt/qtgui-${PV}:5[egl=]
egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] )
+ !egl? ( >=dev-qt/qtgui-${PV}:5[-egl] )
openal? ( media-libs/openal )
)
widgets? (
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
index dd56d86..1b51234 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets"
+IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets"
REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
@@ -20,11 +20,13 @@ RDEPEND="
>=dev-qt/qtnetwork-${PV}:5
alsa? ( media-libs/alsa-lib )
gstreamer? (
+ dev-libs/glib:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-base:1.0
)
gstreamer010? (
+ dev-libs/glib:2
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
@@ -32,6 +34,8 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
>=dev-qt/qtdeclarative-${PV}:5
+ egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] )
+ !egl? ( >=dev-qt/qtgui-${PV}:5[-egl] )
openal? ( media-libs/openal )
)
widgets? (
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index dd56d86..1b51234 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets"
+IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets"
REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
@@ -20,11 +20,13 @@ RDEPEND="
>=dev-qt/qtnetwork-${PV}:5
alsa? ( media-libs/alsa-lib )
gstreamer? (
+ dev-libs/glib:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-base:1.0
)
gstreamer010? (
+ dev-libs/glib:2
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
me
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 5e867829ffcd203afb15002c849032fc779b7823
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Oct 16 18:20:37 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Oct 16 18:21:05 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5e867829
dev-qt/qtmultimedia: add missing dependency
Package-Manager: portage-2.2.20.1
dev-qt/qtmultimedia/metadata.xml | 1 +
dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild| 6 +-
dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild| 6 +-
dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild | 6 +-
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index 285042b..c018a17 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -3,6 +3,7 @@
qt
+ Enable EGL integration
Add support for exceptions - like
catching them
inside the event loop (recommended by upstream)
Enable audio support via
media-libs/gstreamer:1.0
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
index dd56d86..e356a18 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets"
+IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets"
REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
@@ -20,11 +20,13 @@ RDEPEND="
>=dev-qt/qtnetwork-${PV}:5
alsa? ( media-libs/alsa-lib )
gstreamer? (
+ dev-libs/glib:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-base:1.0
)
gstreamer010? (
+ dev-libs/glib:2
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
@@ -32,6 +34,8 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
>=dev-qt/qtdeclarative-${PV}:5
+ >=dev-qt/qtgui-${PV}:5[egl=]
+ egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] )
openal? ( media-libs/openal )
)
widgets? (
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
index dd56d86..e356a18 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets"
+IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets"
REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
@@ -20,11 +20,13 @@ RDEPEND="
>=dev-qt/qtnetwork-${PV}:5
alsa? ( media-libs/alsa-lib )
gstreamer? (
+ dev-libs/glib:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-base:1.0
)
gstreamer010? (
+ dev-libs/glib:2
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
@@ -32,6 +34,8 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
qml? (
>=dev-qt/qtdeclarative-${PV}:5
+ >=dev-qt/qtgui-${PV}:5[egl=]
+ egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] )
openal? ( media-libs/openal )
)
widgets? (
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
index dd56d86..e356a18 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets"
+IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets"
REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
@@ -20,11 +20,13 @@ RDEPEND="
>=dev-qt/qtnetwork-${PV}:5
alsa? ( media-libs/alsa-lib )
gstreamer? (
+ dev-libs/glib:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-base:1.0
)
gstreamer010? (
+ dev-libs/glib:2
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
@@ -32,6 +34,8 @@ RDEPEND="
pulseaudio? ( media-sound/
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 18f084901a4995609c8dec743034b4eefb5cecf8 Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 16 16:07:30 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 16 16:07:30 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=18f08490 dev-qt/qtmultimedia: improve local USE flag descriptions Package-Manager: portage-2.2.20.1 dev-qt/qtmultimedia/metadata.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index 92a1217..285042b 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -5,8 +5,8 @@ Add support for exceptions - like catching them inside the event loop (recommended by upstream) - Enable HTML5 audio/video support via media-libs/gstreamer:1.0 - Enable HTML5 audio/video support via media-libs/gstreamer:0.10 + Enable audio support via media-libs/gstreamer:1.0 + Enable audio support via media-libs/gstreamer:0.10 Build QML/QtQuick bindings and imports Build the QtMultimediaWidgets module
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: a1bf4e9d98be833c07ac3193bcdd32bf92b25c34
Author: Pablo Cholaky slash cl>
AuthorDate: Sun Sep 27 17:13:49 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Oct 16 14:39:54 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a1bf4e9d
dev-qt/qtmultimedia: add gstreamer1.0 support
dev-qt/qtmultimedia/metadata.xml | 2 ++
dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild| 11 +--
dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild | 11 +--
dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild | 11 +--
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 11 +--
5 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index b408e5c..92a1217 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -5,6 +5,8 @@
Add support for exceptions - like
catching them
inside the event loop (recommended by upstream)
+ Enable HTML5 audio/video support via
media-libs/gstreamer:1.0
+ Enable HTML5 audio/video support via
media-libs/gstreamer:0.10
Build QML/QtQuick bindings and imports
Build the QtMultimediaWidgets module
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
index cac4c48..dd56d86 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa +gstreamer openal pulseaudio qml widgets"
+IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets"
+REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
>=dev-qt/qtcore-${PV}:5
@@ -19,6 +20,11 @@ RDEPEND="
>=dev-qt/qtnetwork-${PV}:5
alsa? ( media-libs/alsa-lib )
gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gstreamer010? (
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
@@ -61,7 +67,8 @@ src_prepare() {
src_configure() {
local myqmakeargs=(
- $(usex gstreamer 'GST_VERSION=0.10' '')
+ $(usex gstreamer 'GST_VERSION=1.0' '')
+ $(usex gstreamer010 'GST_VERSION=0.10' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
index cac4c48..dd56d86 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa +gstreamer openal pulseaudio qml widgets"
+IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets"
+REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
>=dev-qt/qtcore-${PV}:5
@@ -19,6 +20,11 @@ RDEPEND="
>=dev-qt/qtnetwork-${PV}:5
alsa? ( media-libs/alsa-lib )
gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gstreamer010? (
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
@@ -61,7 +67,8 @@ src_prepare() {
src_configure() {
local myqmakeargs=(
- $(usex gstreamer 'GST_VERSION=0.10' '')
+ $(usex gstreamer 'GST_VERSION=1.0' '')
+ $(usex gstreamer010 'GST_VERSION=0.10' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
index cac4c48..dd56d86 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa +gstreamer openal pulseaudio qml widgets"
+IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets"
+REQUIRED_USE="?? ( gstreamer gstreamer010 )"
RDEPEND="
>=dev-qt/qtcore-${PV}:5
@@ -19,6 +20,11 @@ RDEPEND="
>=dev-qt/qtnetwork-${PV}:5
alsa? ( media-libs/alsa-lib )
gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gstreamer010? (
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
@@ -61,7 +67,8 @@ src_prepa
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: fc848ac4a96c83dbad878d952d5c496bbf93374b
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Oct 9 16:04:40 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Oct 9 16:05:00 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fc848ac4
dev-qt/qtmultimedia: remove opengl USE flag
Gentoo-bug: 559182
Package-Manager: portage-2.2.20.1
dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild| 7 ++-
dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild | 7 ++-
dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild | 7 ++-
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 7 ++-
4 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
index a27967d..cac4c48 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal pulseaudio qml widgets"
RDEPEND="
>=dev-qt/qtcore-${PV}:5
@@ -29,8 +29,8 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
+ >=dev-qt/qtopengl-${PV}:5
>=dev-qt/qtwidgets-${PV}:5
- opengl? ( >=dev-qt/qtopengl-${PV}:5 )
)
"
DEPEND="${RDEPEND}
@@ -47,9 +47,6 @@ src_prepare() {
qt_use_compile_test openal
qt_use_compile_test pulseaudio
- qt_use_disable_mod opengl opengl \
- src/multimediawidgets/multimediawidgets.pro
-
qt_use_disable_mod qml quick \
src/src.pro \
src/plugins/plugins.pro
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
index a27967d..cac4c48 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal pulseaudio qml widgets"
RDEPEND="
>=dev-qt/qtcore-${PV}:5
@@ -29,8 +29,8 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
+ >=dev-qt/qtopengl-${PV}:5
>=dev-qt/qtwidgets-${PV}:5
- opengl? ( >=dev-qt/qtopengl-${PV}:5 )
)
"
DEPEND="${RDEPEND}
@@ -47,9 +47,6 @@ src_prepare() {
qt_use_compile_test openal
qt_use_compile_test pulseaudio
- qt_use_disable_mod opengl opengl \
- src/multimediawidgets/multimediawidgets.pro
-
qt_use_disable_mod qml quick \
src/src.pro \
src/plugins/plugins.pro
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
index a27967d..cac4c48 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.6..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal pulseaudio qml widgets"
RDEPEND="
>=dev-qt/qtcore-${PV}:5
@@ -29,8 +29,8 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
+ >=dev-qt/qtopengl-${PV}:5
>=dev-qt/qtwidgets-${PV}:5
- opengl? ( >=dev-qt/qtopengl-${PV}:5 )
)
"
DEPEND="${RDEPEND}
@@ -47,9 +47,6 @@ src_prepare() {
qt_use_compile_test openal
qt_use_compile_test pulseaudio
- qt_use_disable_mod opengl opengl \
- src/multimediawidgets/multimediawidgets.pro
-
qt_use_disable_mod qml quick \
src/src.pro \
src/plugins/plugins.pro
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index a27967d..cac4c48 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal pulseaudio qml widgets"
RDEPEND="
>=dev-qt/qtcore-${PV}:5
@@ -29,8 +29,8 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
+ >=dev-qt/qtopengl-${PV}:5
>=dev-qt/qtwidgets-${PV}:5
- opengl? ( >=dev-qt/qtopengl-${PV}:5 )
)
"
DEPEND="${RDEPEND}
@@ -47,9 +47,6 @@ src_prepare() {
qt_use_compile_test openal
qt_use_compile_test pulseaudio
- qt_use
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 5b951c9cb07ded35eb21306416942bc1c716929c
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Aug 4 21:39:58 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Aug 4 21:39:58 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5b951c9c
[dev-qt/qtmultimedia] Use myqmakeargs to specify GST_VERSION.
Should also fix bug #555484.
Package-Manager: portage-2.2.20
dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild| 9 -
dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild | 9 -
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 9 -
3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
index aeeb522..9972640 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
@@ -63,9 +63,8 @@ src_prepare() {
}
src_configure() {
- if use gstreamer; then
- qt5_qmake GST_VERSION=0.10
- else
- qt5-build_src_configure
- fi
+ local myqmakeargs=(
+ $(usex gstreamer 'GST_VERSION=0.10' '')
+ )
+ qt5-build_src_configure
}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
index aeeb522..9972640 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
@@ -63,9 +63,8 @@ src_prepare() {
}
src_configure() {
- if use gstreamer; then
- qt5_qmake GST_VERSION=0.10
- else
- qt5-build_src_configure
- fi
+ local myqmakeargs=(
+ $(usex gstreamer 'GST_VERSION=0.10' '')
+ )
+ qt5-build_src_configure
}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index aeeb522..9972640 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -63,9 +63,8 @@ src_prepare() {
}
src_configure() {
- if use gstreamer; then
- qt5_qmake GST_VERSION=0.10
- else
- qt5-build_src_configure
- fi
+ local myqmakeargs=(
+ $(usex gstreamer 'GST_VERSION=0.10' '')
+ )
+ qt5-build_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 59b6826f8c8db54549f288f0785d433d31ca2a76
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jul 19 14:02:43 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jul 19 14:03:35 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=59b6826f
[dev-qt/qtmultimedia] Explicitly choose gstreamer version.
Previously, gstreamear version was chosen based on QT_CONFIG.
Since we have no package setting that, gstreamer support was always disabled.
Upstream commit: df66e8a4ba6d2cf8b245c99dd54877d36fb8561d
Package-Manager: portage-2.2.20
dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild| 8
dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild | 8
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 8
3 files changed, 24 insertions(+)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
index 2362b52..aeeb522 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
@@ -61,3 +61,11 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_configure() {
+ if use gstreamer; then
+ qt5_qmake GST_VERSION=0.10
+ else
+ qt5-build_src_configure
+ fi
+}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
index 2362b52..aeeb522 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
@@ -61,3 +61,11 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_configure() {
+ if use gstreamer; then
+ qt5_qmake GST_VERSION=0.10
+ else
+ qt5-build_src_configure
+ fi
+}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index 2362b52..aeeb522 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -61,3 +61,11 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_configure() {
+ if use gstreamer; then
+ qt5_qmake GST_VERSION=0.10
+ else
+ qt5-build_src_configure
+ fi
+}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: f211f3f8abd2a544586da907f22a881e39bb214f
Author: Davide Pesavento gentoo org>
AuthorDate: Mon Jul 13 02:11:51 2015 +
Commit: Davide Pesavento gentoo org>
CommitDate: Mon Jul 13 02:11:51 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f211f3f8
[dev-qt/qtmultimedia] Make alsa and pulseaudio USE flags actually work.
Also stop enabling opengl by default.
Package-Manager: portage-2.2.20
dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild| 11 ---
dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild | 11 ---
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 11 ---
3 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
index 88cb621..2362b52 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
RDEPEND="
>=dev-qt/qtcore-${PV}:5
@@ -34,10 +34,14 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- x11-proto/videoproto
+ gstreamer? ( x11-proto/videoproto )
"
src_prepare() {
+ # do not rely on qtbase configuration
+ sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
+ qtmultimedia.pro || die
+
qt_use_compile_test alsa
qt_use_compile_test gstreamer
qt_use_compile_test openal
@@ -47,7 +51,8 @@ src_prepare() {
src/multimediawidgets/multimediawidgets.pro
qt_use_disable_mod qml quick \
- src/src.pro
+ src/src.pro \
+ src/plugins/plugins.pro
qt_use_disable_mod widgets widgets \
src/src.pro \
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
index 88cb621..2362b52 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
RDEPEND="
>=dev-qt/qtcore-${PV}:5
@@ -34,10 +34,14 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- x11-proto/videoproto
+ gstreamer? ( x11-proto/videoproto )
"
src_prepare() {
+ # do not rely on qtbase configuration
+ sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
+ qtmultimedia.pro || die
+
qt_use_compile_test alsa
qt_use_compile_test gstreamer
qt_use_compile_test openal
@@ -47,7 +51,8 @@ src_prepare() {
src/multimediawidgets/multimediawidgets.pro
qt_use_disable_mod qml quick \
- src/src.pro
+ src/src.pro \
+ src/plugins/plugins.pro
qt_use_disable_mod widgets widgets \
src/src.pro \
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index 88cb621..2362b52 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
fi
-IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
RDEPEND="
>=dev-qt/qtcore-${PV}:5
@@ -34,10 +34,14 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- x11-proto/videoproto
+ gstreamer? ( x11-proto/videoproto )
"
src_prepare() {
+ # do not rely on qtbase configuration
+ sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
+ qtmultimedia.pro || die
+
qt_use_compile_test alsa
qt_use_compile_test gstreamer
qt_use_compile_test openal
@@ -47,7 +51,8 @@ src_prepare() {
src/multimediawidgets/multimediawidgets.pro
qt_use_disable_mod qml quick \
- src/src.pro
+ src/src.pro \
+ src/plugins/plugins.pro
qt_use_disable_mod widgets widgets \
src/src.pro \
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 9676ce9898fcee32082770f5cc0d78924daf24a2
Author: Davide Pesavento gentoo org>
AuthorDate: Sat Oct 11 02:59:04 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sat Oct 11 02:59:04 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9676ce98
[dev-qt/qtmultimedia] No need to enable alsa by default.
Package-Manager: portage-2.2.14_rc1
---
dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild| 4 ++--
dev-qt/qtmultimedia/qtmultimedia-5.4.0_alpha.ebuild | 4 ++--
dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild| 4 ++--
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
index b66986b..7f9b9f9 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
@@ -14,7 +14,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="+alsa +gstreamer openal +opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
@@ -35,7 +35,7 @@ RDEPEND="
)
widgets? (
>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
+ >=dev-qt/qtwidgets-${PV}:5[debug=,opengl=]
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
)
"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4.0_alpha.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.4.0_alpha.ebuild
index 008ade7..5337a65 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.4.0_alpha.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.4.0_alpha.ebuild
@@ -14,7 +14,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="+alsa +gstreamer openal +opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
RDEPEND="
@@ -34,7 +34,7 @@ RDEPEND="
)
widgets? (
>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
+ >=dev-qt/qtwidgets-${PV}:5[debug=,opengl=]
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
)
"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild
index 008ade7..5337a65 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild
@@ -14,7 +14,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="+alsa +gstreamer openal +opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
RDEPEND="
@@ -34,7 +34,7 @@ RDEPEND="
)
widgets? (
>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
+ >=dev-qt/qtwidgets-${PV}:5[debug=,opengl=]
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
)
"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index 008ade7..5337a65 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -14,7 +14,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="+alsa +gstreamer openal +opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
RDEPEND="
@@ -34,7 +34,7 @@ RDEPEND="
)
widgets? (
>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
+ >=dev-qt/qtwidgets-${PV}:5[debug=,opengl=]
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
)
"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: a7dfd699d99943757f8223f76fda33769fb3b2c8 Author: Manuel Rüger rueg eu> AuthorDate: Sat Oct 11 02:15:23 2014 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Oct 11 02:15:23 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a7dfd699 [dev-qt/qtmultimedia] Pulseaudio and Alsa are not mutually exclusive anymore Upstream change: https://qt.gitorious.org/qt/qtmultimedia/commit/eb75bf8e3bde3a9b3efc91b54aa4dc2e34a3cde4 --- dev-qt/qtmultimedia/qtmultimedia-5.4.0_alpha.ebuild | 1 - dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild| 1 - dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 1 - 3 files changed, 3 deletions(-) diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4.0_alpha.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.4.0_alpha.ebuild index b66986b..008ade7 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.4.0_alpha.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.4.0_alpha.ebuild @@ -15,7 +15,6 @@ else fi IUSE="+alsa +gstreamer openal +opengl pulseaudio qml widgets" -REQUIRED_USE="?? ( alsa pulseaudio )" # "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2 RDEPEND=" diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild index b66986b..008ade7 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild @@ -15,7 +15,6 @@ else fi IUSE="+alsa +gstreamer openal +opengl pulseaudio qml widgets" -REQUIRED_USE="?? ( alsa pulseaudio )" # "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2 RDEPEND=" diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild index b66986b..008ade7 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild @@ -15,7 +15,6 @@ else fi IUSE="+alsa +gstreamer openal +opengl pulseaudio qml widgets" -REQUIRED_USE="?? ( alsa pulseaudio )" # "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2 RDEPEND="
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: ed3fbad2098ffcfededfc6b1bf69fc2005285704
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Aug 5 00:07:26 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Aug 5 00:07:26 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ed3fbad2
[dev-qt/qtmultimedia:5] Fix automagic deps, add opengl and widgets USE flags.
Based on pull request #67 by xhochy. Fixes bug #517532.
Package-Manager: portage-2.2.11
---
dev-qt/qtmultimedia/metadata.xml | 3 +-
dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild| 44 ++--
dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild | 44 ++--
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 44 ++--
4 files changed, 104 insertions(+), 31 deletions(-)
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index b4f8d68..a31be04 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -5,7 +5,8 @@
Add support for exceptions - like
catching them
inside the event loop (recommended by Nokia)
- Build QML/QtQuick bindings
+ Build QML/QtQuick bindings and imports
+ Build the QtMultimediaWidgets module
https://bugreports.qt-project.org/
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
index a36c3ac..3676f07 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
@@ -14,25 +14,49 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: probably lots of automagic deps
-# TODO: qt-widgets can be made optional
-# TODO: opengl, xv
+IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
+REQUIRED_USE="?? ( alsa pulseaudio )"
-IUSE="alsa gstreamer openal pulseaudio qml"
-
-DEPEND="
+RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
alsa? ( media-libs/alsa-lib )
gstreamer? (
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
)
- openal? ( media-libs/openal )
pulseaudio? ( media-sound/pulseaudio )
- qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+ qml? (
+ >=dev-qt/qtdeclarative-${PV}:5[debug=]
+ openal? ( media-libs/openal )
+ )
+ widgets? (
+ >=dev-qt/qtwidgets-${PV}:5[debug=]
+ opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+ )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ x11-proto/videoproto
+"
+
+src_prepare() {
+ qt_use_compile_test alsa
+ qt_use_compile_test gstreamer
+ qt_use_compile_test openal
+ qt_use_compile_test pulseaudio
+
+ qt_use_disable_mod opengl opengl \
+ src/multimediawidgets/multimediawidgets.pro
+
+ qt_use_disable_mod qml quick \
+ src/src.pro
+
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ src/gsttools/gsttools.pro \
+ src/plugins/gstreamer/common.pri
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
index a36c3ac..3676f07 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
@@ -14,25 +14,49 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: probably lots of automagic deps
-# TODO: qt-widgets can be made optional
-# TODO: opengl, xv
+IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
+REQUIRED_USE="?? ( alsa pulseaudio )"
-IUSE="alsa gstreamer openal pulseaudio qml"
-
-DEPEND="
+RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
alsa? ( media-libs/alsa-lib )
gstreamer? (
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
)
- openal? ( media-libs/openal )
pulseaudio? ( media-sound/pulseaudio )
- qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+ qml? (
+ >=dev-qt/qtdeclarative-${PV}:5[debug=]
+ openal? ( media-libs/openal )
+ )
+ widgets? (
+ >=dev-qt/qtwidgets-${PV}:5[debug=]
+ opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+ )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ x11-proto/videoproto
+"
+
+src_prepare() {
+ qt_use_compile_test alsa
+ qt_use_compile_test gstreamer
+ qt_use_compile_test openal
+ qt_use_compile_test pulseaudio
+
+
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 6de9ba556207b76804767ec450467bfa37c5adc3 Author: Davide Pesavento gentoo org> AuthorDate: Sun Aug 17 12:04:26 2014 + Commit: Davide Pesavento gentoo org> CommitDate: Sun Aug 17 12:04:26 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6de9ba55 [dev-qt/qtmultimedia:5] Enable alsa plugin by default instead of pulseaudio. Thanks to kensington for pointing this out. Package-Manager: portage-2.2.12 --- dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild| 2 +- dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild | 2 +- dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild | 2 +- dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild index 0ab538d..b66986b 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild @@ -14,7 +14,7 @@ else KEYWORDS="~amd64 ~x86" fi -IUSE="alsa +gstreamer openal +opengl +pulseaudio qml widgets" +IUSE="+alsa +gstreamer openal +opengl pulseaudio qml widgets" REQUIRED_USE="?? ( alsa pulseaudio )" # "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2 diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild index 0ab538d..b66986b 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild @@ -14,7 +14,7 @@ else KEYWORDS="~amd64 ~x86" fi -IUSE="alsa +gstreamer openal +opengl +pulseaudio qml widgets" +IUSE="+alsa +gstreamer openal +opengl pulseaudio qml widgets" REQUIRED_USE="?? ( alsa pulseaudio )" # "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2 diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild index 0ab538d..b66986b 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild @@ -14,7 +14,7 @@ else KEYWORDS="~amd64 ~x86" fi -IUSE="alsa +gstreamer openal +opengl +pulseaudio qml widgets" +IUSE="+alsa +gstreamer openal +opengl pulseaudio qml widgets" REQUIRED_USE="?? ( alsa pulseaudio )" # "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2 diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild index 0ab538d..b66986b 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild @@ -14,7 +14,7 @@ else KEYWORDS="~amd64 ~x86" fi -IUSE="alsa +gstreamer openal +opengl +pulseaudio qml widgets" +IUSE="+alsa +gstreamer openal +opengl pulseaudio qml widgets" REQUIRED_USE="?? ( alsa pulseaudio )" # "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: ea04ace482dc579e72e7aa74ecb412390fe19911
Author: Davide Pesavento gentoo org>
AuthorDate: Sat Aug 16 11:25:15 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sat Aug 16 11:25:15 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ea04ace4
[dev-qt/qtmultimedia:5] Workaround opengl headers inclusion issue.
See bug 518542 for details.
Package-Manager: portage-2.2.12
---
dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild| 2 ++
dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild | 2 ++
dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild | 2 ++
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 2 ++
4 files changed, 8 insertions(+)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
index 3676f07..d1e424f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
@@ -17,6 +17,7 @@ fi
IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
@@ -33,6 +34,7 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
+ >=dev-qt/qtgui-${PV}:5[debug=,opengl=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
index 3676f07..d1e424f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
@@ -17,6 +17,7 @@ fi
IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
@@ -33,6 +34,7 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
+ >=dev-qt/qtgui-${PV}:5[debug=,opengl=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild
index 3676f07..d1e424f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.4..ebuild
@@ -17,6 +17,7 @@ fi
IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
@@ -33,6 +34,7 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
+ >=dev-qt/qtgui-${PV}:5[debug=,opengl=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index 3676f07..d1e424f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -17,6 +17,7 @@ fi
IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
@@ -33,6 +34,7 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
+ >=dev-qt/qtgui-${PV}:5[debug=,opengl=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: ed3fbad2098ffcfededfc6b1bf69fc2005285704
Author: Davide Pesavento gentoo org>
AuthorDate: Tue Aug 5 00:07:26 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue Aug 5 00:07:26 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ed3fbad2
[dev-qt/qtmultimedia:5] Fix automagic deps, add opengl and widgets USE flags.
Based on pull request #67 by xhochy. Fixes bug #517532.
Package-Manager: portage-2.2.11
---
dev-qt/qtmultimedia/metadata.xml | 3 +-
dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild| 44 ++--
dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild | 44 ++--
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 44 ++--
4 files changed, 104 insertions(+), 31 deletions(-)
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index b4f8d68..a31be04 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -5,7 +5,8 @@
Add support for exceptions - like
catching them
inside the event loop (recommended by Nokia)
- Build QML/QtQuick bindings
+ Build QML/QtQuick bindings and imports
+ Build the QtMultimediaWidgets module
https://bugreports.qt-project.org/
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
index a36c3ac..3676f07 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
@@ -14,25 +14,49 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: probably lots of automagic deps
-# TODO: qt-widgets can be made optional
-# TODO: opengl, xv
+IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
+REQUIRED_USE="?? ( alsa pulseaudio )"
-IUSE="alsa gstreamer openal pulseaudio qml"
-
-DEPEND="
+RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
alsa? ( media-libs/alsa-lib )
gstreamer? (
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
)
- openal? ( media-libs/openal )
pulseaudio? ( media-sound/pulseaudio )
- qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+ qml? (
+ >=dev-qt/qtdeclarative-${PV}:5[debug=]
+ openal? ( media-libs/openal )
+ )
+ widgets? (
+ >=dev-qt/qtwidgets-${PV}:5[debug=]
+ opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+ )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ x11-proto/videoproto
+"
+
+src_prepare() {
+ qt_use_compile_test alsa
+ qt_use_compile_test gstreamer
+ qt_use_compile_test openal
+ qt_use_compile_test pulseaudio
+
+ qt_use_disable_mod opengl opengl \
+ src/multimediawidgets/multimediawidgets.pro
+
+ qt_use_disable_mod qml quick \
+ src/src.pro
+
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ src/gsttools/gsttools.pro \
+ src/plugins/gstreamer/common.pri
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
index a36c3ac..3676f07 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3..ebuild
@@ -14,25 +14,49 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: probably lots of automagic deps
-# TODO: qt-widgets can be made optional
-# TODO: opengl, xv
+IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
+REQUIRED_USE="?? ( alsa pulseaudio )"
-IUSE="alsa gstreamer openal pulseaudio qml"
-
-DEPEND="
+RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
alsa? ( media-libs/alsa-lib )
gstreamer? (
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
)
- openal? ( media-libs/openal )
pulseaudio? ( media-sound/pulseaudio )
- qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+ qml? (
+ >=dev-qt/qtdeclarative-${PV}:5[debug=]
+ openal? ( media-libs/openal )
+ )
+ widgets? (
+ >=dev-qt/qtwidgets-${PV}:5[debug=]
+ opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+ )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ x11-proto/videoproto
+"
+
+src_prepare() {
+ qt_use_compile_test alsa
+ qt_use_compile_test gstreamer
+ qt_use_compile_test openal
+ qt_use_compile_test pulseaudio
+
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: c09150daa3f7772cb06201053efa406e69c8ee65
Author: Davide Pesavento gentoo org>
AuthorDate: Sat Jul 12 16:59:57 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sat Jul 12 16:59:57 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c09150da
[dev-qt/qtmultimedia:5] Fix DESCRIPTION.
---
dev-qt/qtmultimedia/qtmultimedia-5..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
index 7609646..a36c3ac 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5..ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit qt5-build
-DESCRIPTION="The Qt framework is a comprehensive C++ application development
framework"
+DESCRIPTION="The Multimedia module for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=""
[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
commit: 4cb617e8db0ab70c901bf095646d4b936f590250
Author: Davide Pesavento gentoo org>
AuthorDate: Tue May 27 22:33:09 2014 +
Commit: Davide Pesavento gentoo org>
CommitDate: Tue May 27 22:33:09 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4cb617e8
[dev-qt/qtmultimedia:4] src.pro is not used.
Package-Manager: portage-2.2.10
---
dev-qt/qtmultimedia/qtmultimedia-4.8..ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8..ebuild
b/dev-qt/qtmultimedia/qtmultimedia-4.8..ebuild
index 4e74b56..d31a7a8 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8..ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8..ebuild
@@ -35,7 +35,6 @@ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
include/QtCore
include/QtGui
include/QtMultimedia
- src/src.pro
src/corelib
src/gui"
