From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A596C1389E2 for ; Mon, 1 Dec 2014 12:38:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B752DE0965; Mon, 1 Dec 2014 12:38:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CD70E0965 for ; Mon, 1 Dec 2014 12:38:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6D66340540 for ; Mon, 1 Dec 2014 12:38:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E448B4A6 for ; Mon, 1 Dec 2014 12:38:32 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1417437511.268b338e40d775beb07ed8a894f80eb01fac3676.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-libs/qt-gstreamer/ X-VCS-Repository: proj/kde X-VCS-Files: media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild X-VCS-Directories: media-libs/qt-gstreamer/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 268b338e40d775beb07ed8a894f80eb01fac3676 X-VCS-Branch: master Date: Mon, 1 Dec 2014 12:38:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 60f78b24-aea8-4469-ae22-75a9a0bc1489 X-Archives-Hash: 6da57d930902c4bd3285ea9f31e81469 commit: 268b338e40d775beb07ed8a894f80eb01fac3676 Author: Karol Herbst karolherbst de> AuthorDate: Wed Nov 26 21:38:53 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Mon Dec 1 12:38:31 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=268b338e [media-libs/qt-gstreamer] add qt5 support --- media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild | 68 +++++++++++++++++++----- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild index 3cb137a..d13dab7 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild @@ -4,7 +4,8 @@ EAPI=5 -QT_MINIMAL="4.7.0" +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" @@ -15,38 +16,79 @@ else KEYWORDS="" fi -inherit cmake-utils ${GIT_ECLASS} +inherit cmake-utils ${GIT_ECLASS} multibuild DESCRIPTION="QtGStreamer provides C++ bindings for GStreamer with a Qt-style API" HOMEPAGE="http://gstreamer.freedesktop.org/modules/qt-gstreamer.html" LICENSE="LGPL-2.1" SLOT="0" -IUSE="test" +IUSE="qt4 qt5 test" RDEPEND=" dev-libs/glib:2 >=dev-libs/boost-1.40:= - >=dev-qt/qtcore-${QT_MINIMAL}:4 - >=dev-qt/qtdeclarative-${QT_MINIMAL}:4 - >=dev-qt/qtgui-${QT_MINIMAL}:4 - >=dev-qt/qtopengl-${QT_MINIMAL}:4 + 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 + ) + 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 + ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 " DEPEND=" ${RDEPEND} - test? ( >=dev-qt/qttest-${QT_MINIMAL}:4 ) + test? ( + qt4? ( + >=dev-qt/qttest-${QT4_MINIMAL}:4 + ) + ) " # bug 497880 RESTRICT="test" +pkg_setup() { + MULTIBUILD_VARIANTS=() + if use qt4; then + MULTIBUILD_VARIANTS+=(qt4) + fi + if use qt5; then + MULTIBUILD_VARIANTS+=(qt5) + fi +} + src_configure() { - local mycmakeargs=( - -DQTGSTREAMER_EXAMPLES=OFF - $(cmake-utils_use test QTGSTREAMER_TESTS) - ) + myconfigure() { + local mycmakeargs=( + -DQTGSTREAMER_EXAMPLES=OFF + $(cmake-utils_use test QTGSTREAMER_TESTS) + ) + if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then + mycmakeargs+=(-DQT_VERSION=4) + fi + if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then + mycmakeargs+=(-DQT_VERSION=5) + fi + cmake-utils_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant cmake-utils_src_compile +} - cmake-utils_src_configure +src_install() { + multibuild_foreach_variant cmake-utils_src_install }