From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: media-libs/qt-gstreamer/
Date: Wed, 30 Aug 2017 21:29:46 +0000 (UTC) [thread overview]
Message-ID: <1504121479.fbb8dad122c69ac485679238757a8e262d0d0603.asturm@gentoo> (raw)
commit: fbb8dad122c69ac485679238757a8e262d0d0603
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 19:31:19 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 19:31:19 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fbb8dad1
media-libs/qt-gstreamer: Drop USE=qt4,qt5
Package-Manager: Portage-2.3.6, Repoman-2.3.1
media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild | 72 ++++++++----------------
1 file changed, 24 insertions(+), 48 deletions(-)
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
index c27fe7eaf7..33ca17cbea 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
@@ -4,75 +4,51 @@
EAPI=6
if [[ ${PV} != *9999* ]]; then
- SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
else
- EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" )
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/${PN}.git"
inherit git-r3
fi
-inherit cmake-utils multibuild
+inherit cmake-utils
DESCRIPTION="C++ bindings for GStreamer with a Qt-style API"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="+qt4 qt5 test"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE="test"
RDEPEND="
dev-libs/glib:2
- >=dev-libs/boost-1.40:=
+ dev-libs/boost:=
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtdeclarative:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
"
DEPEND="${RDEPEND}
- test? (
- qt4? ( dev-qt/qttest:4 )
- qt5? ( dev-qt/qttest:5 )
- )
+ test? ( dev-qt/qttest:5 )
"
+PATCHES=(
+ "${FILESDIR}/${P}-gstreamer15.patch"
+ "${FILESDIR}/${P}-boost157.patch"
+)
+
# bug 497880
RESTRICT="test"
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usex qt4 4 '') $(usex qt5 5 '') )
-}
-
src_configure() {
- myconfigure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
- -DQTGSTREAMER_EXAMPLES=OFF
- -DQTGSTREAMER_TESTS=$(usex test)
- -DQT_VERSION=${MULTIBUILD_VARIANT}
- )
- cmake-utils_src_configure
- }
-
- multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
- multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_install() {
- multibuild_foreach_variant cmake-utils_src_install
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
+ -DQTGSTREAMER_EXAMPLES=OFF
+ -DQTGSTREAMER_TESTS=$(usex test)
+ -DQT_VERSION=5
+ )
+ cmake-utils_src_configure
}
next reply other threads:[~2017-08-30 21:29 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-30 21:29 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-03 13:56 [gentoo-commits] proj/kde:master commit in: media-libs/qt-gstreamer/ Andreas Sturmlechner
2019-10-19 18:04 Andreas Sturmlechner
2019-02-17 11:11 Andreas Sturmlechner
2018-12-12 14:05 Andreas Sturmlechner
2018-10-23 19:17 Andreas Sturmlechner
2018-10-13 12:11 Andreas Sturmlechner
2016-04-10 19:10 Michael Palimaka
2016-04-10 19:09 Michael Palimaka
2016-03-23 17:23 Johannes Huber
2015-03-09 11:07 Michael Palimaka
2015-03-05 19:39 Johannes Huber
2015-01-30 20:54 Johannes Huber
2014-12-01 12:38 Michael Palimaka
2014-07-28 12:06 Michael Palimaka
2014-04-28 21:54 Johannes Huber
2014-02-12 19:07 David Heidelberger
2013-10-13 17:03 Johannes Huber
2013-03-03 16:08 Michael Palimaka
2012-09-11 10:22 Johannes Huber
2012-08-30 18:09 Andreas Hüttel
2012-07-12 21:36 Johannes Huber
2012-04-16 14:31 Johannes Huber
2012-04-16 13:51 Johannes Huber
2012-04-16 13:30 Johannes Huber
2012-04-15 22:45 Johannes Huber
2012-03-29 13:03 Johannes Huber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1504121479.fbb8dad122c69ac485679238757a8e262d0d0603.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox