| 1 |
commit: d3c9b24a1d061b7631dd200b91e99be140fc63cd |
| 2 |
Author: Karol Herbst <git <AT> karolherbst <DOT> de> |
| 3 |
AuthorDate: Thu Mar 5 15:44:21 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 5 19:38:49 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d3c9b24a |
| 7 |
|
| 8 |
[media-libs/qt-gstreamer] Sync with tree |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.18 |
| 11 |
|
| 12 |
media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild | 34 +++++++++--------------- |
| 13 |
1 file changed, 13 insertions(+), 21 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild |
| 16 |
index 677e6c2..120f738 100644 |
| 17 |
--- a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild |
| 18 |
+++ b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild |
| 19 |
@@ -4,9 +4,6 @@ |
| 20 |
|
| 21 |
EAPI=5 |
| 22 |
|
| 23 |
-QT4_MINIMAL="4.7.0" |
| 24 |
-QT5_MINIMAL="5.0.0" |
| 25 |
- |
| 26 |
if [[ ${PV} != *9999* ]]; then |
| 27 |
SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz" |
| 28 |
KEYWORDS="~amd64 ~arm ~x86" |
| 29 |
@@ -29,18 +26,18 @@ RDEPEND=" |
| 30 |
dev-libs/glib:2 |
| 31 |
>=dev-libs/boost-1.40:= |
| 32 |
qt4? ( |
| 33 |
- >=dev-qt/qtcore-${QT4_MINIMAL}:4 |
| 34 |
- >=dev-qt/qtdeclarative-${QT4_MINIMAL}:4 |
| 35 |
- >=dev-qt/qtgui-${QT4_MINIMAL}:4 |
| 36 |
- >=dev-qt/qtopengl-${QT4_MINIMAL}:4 |
| 37 |
+ dev-qt/qtcore:4 |
| 38 |
+ dev-qt/qtdeclarative:4 |
| 39 |
+ dev-qt/qtgui:4 |
| 40 |
+ dev-qt/qtopengl:4 |
| 41 |
) |
| 42 |
qt5? ( |
| 43 |
- >=dev-qt/qtcore-${QT5_MINIMAL}:5 |
| 44 |
- >=dev-qt/qtdeclarative-${QT5_MINIMAL}:5 |
| 45 |
- >=dev-qt/qtgui-${QT5_MINIMAL}:5 |
| 46 |
- >=dev-qt/qtopengl-${QT5_MINIMAL}:5 |
| 47 |
- >=dev-qt/qtquick1-${QT5_MINIMAL}:5 |
| 48 |
- >=dev-qt/qtwidgets-${QT5_MINIMAL}:5 |
| 49 |
+ dev-qt/qtcore:5 |
| 50 |
+ dev-qt/qtdeclarative:5 |
| 51 |
+ dev-qt/qtgui:5 |
| 52 |
+ dev-qt/qtopengl:5 |
| 53 |
+ dev-qt/qtquick1:5 |
| 54 |
+ dev-qt/qtwidgets:5 |
| 55 |
) |
| 56 |
media-libs/gstreamer:1.0 |
| 57 |
media-libs/gst-plugins-base:1.0 |
| 58 |
@@ -49,7 +46,7 @@ DEPEND=" |
| 59 |
${RDEPEND} |
| 60 |
test? ( |
| 61 |
qt4? ( |
| 62 |
- >=dev-qt/qttest-${QT4_MINIMAL}:4 |
| 63 |
+ dev-qt/qttest:4 |
| 64 |
) |
| 65 |
) |
| 66 |
" |
| 67 |
@@ -58,7 +55,7 @@ DEPEND=" |
| 68 |
RESTRICT="test" |
| 69 |
|
| 70 |
pkg_setup() { |
| 71 |
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
| 72 |
+ MULTIBUILD_VARIANTS=( $(usex qt4 4 '') $(usex qt5 5 '') ) |
| 73 |
} |
| 74 |
|
| 75 |
src_configure() { |
| 76 |
@@ -66,13 +63,8 @@ src_configure() { |
| 77 |
local mycmakeargs=( |
| 78 |
-DQTGSTREAMER_EXAMPLES=OFF |
| 79 |
$(cmake-utils_use test QTGSTREAMER_TESTS) |
| 80 |
+ -DQT_VERSION=${MULTIBUILD_VARIANT} |
| 81 |
) |
| 82 |
- if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
| 83 |
- mycmakeargs+=(-DQT_VERSION=4) |
| 84 |
- fi |
| 85 |
- if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
| 86 |
- mycmakeargs+=(-DQT_VERSION=5) |
| 87 |
- fi |
| 88 |
cmake-utils_src_configure |
| 89 |
} |
Archives