diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/qt-gstreamer | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/qt-gstreamer')
-rw-r--r-- | media-libs/qt-gstreamer/Manifest | 1 | ||||
-rw-r--r-- | media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch | 34 | ||||
-rw-r--r-- | media-libs/qt-gstreamer/metadata.xml | 5 | ||||
-rw-r--r-- | media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild | 84 | ||||
-rw-r--r-- | media-libs/qt-gstreamer/qt-gstreamer-1.2.0.ebuild | 52 |
5 files changed, 176 insertions, 0 deletions
diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest new file mode 100644 index 000000000000..1458453d100a --- /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/files/qt-gstreamer-1.2.0-boost157.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch new file mode 100644 index 000000000000..a795420e3bcc --- /dev/null +++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch @@ -0,0 +1,34 @@ +From fbb9dc6e291eaa058f3ef1cd93711265bfbfd162 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Fri, 7 Nov 2014 00:11:02 +0100 +Subject: [PATCH] Workaround build failures with boost>=1.57 and moc + +Otherwise I get the following error message: +'usr/include/boost/type_traits/detail/has_binary_operator.hp:50: +Parse error at "BOOST_JOIN"'. See +https://bugreports.qt-project.org/browse/QTBUG-22829 for details. + +The old workaround to define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED +doesn't seem to work here. +--- + src/QGlib/connect.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/QGlib/connect.cpp b/src/QGlib/connect.cpp +index 9ff6fde..58a3367 100644 +--- a/src/QGlib/connect.cpp ++++ b/src/QGlib/connect.cpp +@@ -21,8 +21,10 @@ + #include <QtCore/QHash> + #include <QtCore/QMutex> + #include <boost/multi_index_container.hpp> ++#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 + #include <boost/multi_index/sequenced_index.hpp> + #include <boost/multi_index/ordered_index.hpp> ++#endif + #include <boost/multi_index/member.hpp> + + namespace QGlib { +-- +2.1.3 + diff --git a/media-libs/qt-gstreamer/metadata.xml b/media-libs/qt-gstreamer/metadata.xml new file mode 100644 index 000000000000..a23f444b67d6 --- /dev/null +++ b/media-libs/qt-gstreamer/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>kde</herd> +</pkgmetadata> diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild new file mode 100644 index 000000000000..a33c8fe6da8d --- /dev/null +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +if [[ ${PV} != *9999* ]]; then + SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~x86" +else + GIT_ECLASS="git-r3" + EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" ) + KEYWORDS="" +fi + +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="+qt4 qt5 test" + +REQUIRED_USE="|| ( qt4 qt5 )" + +RDEPEND=" + dev-libs/glib:2 + >=dev-libs/boost-1.40:= + 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/qtquick1:5 + dev-qt/qtwidgets:5 + ) + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 +" +DEPEND=" + ${RDEPEND} + test? ( + qt4? ( + dev-qt/qttest:4 + ) + ) +" + +PATCHES=( "${FILESDIR}/${P}-boost157.patch" ) + +# bug 497880 +RESTRICT="test" + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usex qt4 4 '') $(usex qt5 5 '') ) +} + +src_configure() { + myconfigure() { + local mycmakeargs=( + -DQTGSTREAMER_EXAMPLES=OFF + $(cmake-utils_use test QTGSTREAMER_TESTS) + -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 +} diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0.ebuild new file mode 100644 index 000000000000..95226909f246 --- /dev/null +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +QT_MINIMAL="4.7.0" + +if [[ ${PV} != *9999* ]]; then + SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz" + KEYWORDS="amd64 ~arm ppc ppc64 x86" +else + GIT_ECLASS="git-r3" + EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" ) + KEYWORDS="" +fi + +inherit cmake-utils ${GIT_ECLASS} + +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" + +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 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 +" +DEPEND=" + ${RDEPEND} + test? ( >=dev-qt/qttest-${QT_MINIMAL}:4 ) +" + +# bug 497880 +RESTRICT="test" + +src_configure() { + local mycmakeargs=( + -DQTGSTREAMER_EXAMPLES=OFF + $(cmake-utils_use test QTGSTREAMER_TESTS) + ) + + cmake-utils_src_configure +} |