diff options
| author |   Karol Herbst <git@karolherbst.de> | 2015-03-05 16:44:21 +0100 |
|---|---|---|
| committer |   Johannes Huber <johu@gentoo.org> | 2015-03-05 20:38:49 +0100 |
| commit | d3c9b24a1d061b7631dd200b91e99be140fc63cd (patch) | |
| tree | a6e676b8829b7e6264c71b72f9ae53bb812ecd0a | |
| parent | [kde-apps/ktp-common-internals] Drop media-libs/qt-gstreamer from DEPEND (diff) | |
| download | kde-d3c9b24a.tar.gz kde-d3c9b24a.tar.bz2 kde-d3c9b24a.zip | |
[media-libs/qt-gstreamer] Sync with tree
Package-Manager: portage-2.2.18
| -rw-r--r-- | media-libs/qt-gstreamer/Manifest | 1 | ||||
| -rw-r--r-- | media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild | 34 |
2 files changed, 14 insertions, 21 deletions
diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest new file mode 100644 index 0000000000..1458453d10 --- /dev/null +++ b/media-libs/qt-gstreamer/Manifest @@ -0,0 +1 @@ +DIST qt-gstreamer-1.2.0.tar.xz 313632 SHA256 9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4 SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7 WHIRLPOOL 2e8c5d70a384ee472dac265179c471369d64fb2deabe239c13cd4eb437358c97c316a486ae4292e8bdb3c823b521b656b665292392f0bb91d1c233869fb09789 diff --git a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild index 677e6c2e10..120f738a98 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild @@ -4,9 +4,6 @@ EAPI=5 -QT4_MINIMAL="4.7.0" -QT5_MINIMAL="5.0.0" - if [[ ${PV} != *9999* ]]; then SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" @@ -29,18 +26,18 @@ RDEPEND=" dev-libs/glib:2 >=dev-libs/boost-1.40:= qt4? ( - >=dev-qt/qtcore-${QT4_MINIMAL}:4 - >=dev-qt/qtdeclarative-${QT4_MINIMAL}:4 - >=dev-qt/qtgui-${QT4_MINIMAL}:4 - >=dev-qt/qtopengl-${QT4_MINIMAL}:4 + dev-qt/qtcore:4 + dev-qt/qtdeclarative:4 + dev-qt/qtgui:4 + dev-qt/qtopengl:4 ) qt5? ( - >=dev-qt/qtcore-${QT5_MINIMAL}:5 - >=dev-qt/qtdeclarative-${QT5_MINIMAL}:5 - >=dev-qt/qtgui-${QT5_MINIMAL}:5 - >=dev-qt/qtopengl-${QT5_MINIMAL}:5 - >=dev-qt/qtquick1-${QT5_MINIMAL}:5 - >=dev-qt/qtwidgets-${QT5_MINIMAL}:5 + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtquick1:5 + dev-qt/qtwidgets:5 ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 @@ -49,7 +46,7 @@ DEPEND=" ${RDEPEND} test? ( qt4? ( - >=dev-qt/qttest-${QT4_MINIMAL}:4 + dev-qt/qttest:4 ) ) " @@ -58,7 +55,7 @@ DEPEND=" RESTRICT="test" pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) + MULTIBUILD_VARIANTS=( $(usex qt4 4 '') $(usex qt5 5 '') ) } src_configure() { @@ -66,13 +63,8 @@ src_configure() { local mycmakeargs=( -DQTGSTREAMER_EXAMPLES=OFF $(cmake-utils_use test QTGSTREAMER_TESTS) + -DQT_VERSION=${MULTIBUILD_VARIANT} ) - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=(-DQT_VERSION=4) - fi - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=(-DQT_VERSION=5) - fi cmake-utils_src_configure } |