[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/files/, media-libs/qt-gstreamer/
commit: fec3ff95d51445705b18ffa921880d55442c2355 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 19 14:51:35 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 19 15:51:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec3ff95 media-libs/qt-gstreamer: Fix build with >=gstreamer-16 and clang Fix BDEPEND while at it. Thanks-to: Peter Levine gmail.com> Closes: https://bugs.gentoo.org/698022 Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/qt-gstreamer-1.2.0-clang-38.patch| 67 ++ .../files/qt-gstreamer-1.2.0-gstreamer16.patch | 25 .../qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild | 9 ++- 3 files changed, 98 insertions(+), 3 deletions(-) diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch new file mode 100644 index 000..977a09d7f6c --- /dev/null +++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch @@ -0,0 +1,67 @@ +From fc159e5c4c8ffeabdc7319514c6bb19c9c9e1d3b Mon Sep 17 00:00:00 2001 +From: Aleix Pol +Date: Mon, 13 Jun 2016 10:36:34 +0200 +Subject: [PATCH] Fix build with Clang 3.8 + +error: invalid suffix on literal; C++11 requires a space between literal and identifier + +https://bugzilla.gnome.org/show_bug.cgi?id=767578 +--- + elements/gstqtvideosink/delegates/basedelegate.cpp | 2 +- + elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp | 2 +- + elements/gstqtvideosink/gstqtquick2videosink.cpp | 2 +- + elements/gstqtvideosink/gstqtvideosinkbase.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/elements/gstqtvideosink/delegates/basedelegate.cpp b/elements/gstqtvideosink/delegates/basedelegate.cpp +index 7dde59c..65f364c 100644 +--- a/elements/gstqtvideosink/delegates/basedelegate.cpp b/elements/gstqtvideosink/delegates/basedelegate.cpp +@@ -155,7 +155,7 @@ bool BaseDelegate::event(QEvent *event) + BufferEvent *bufEvent = dynamic_cast(event); + Q_ASSERT(bufEvent); + +-GST_TRACE_OBJECT(m_sink, "Received buffer %"GST_PTR_FORMAT, bufEvent->buffer); ++GST_TRACE_OBJECT(m_sink, "Received buffer %" GST_PTR_FORMAT, bufEvent->buffer); + + if (isActive()) { + gst_buffer_replace (_buffer, bufEvent->buffer); +diff --git a/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp b/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp +index 8f23dc2..c42513f 100644 +--- a/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp b/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp +@@ -36,7 +36,7 @@ QWidget *QWidgetVideoSinkDelegate::widget() const + + void QWidgetVideoSinkDelegate::setWidget(QWidget *widget) + { +-GST_LOG_OBJECT(m_sink, "Setting \"widget\" property to %"GST_PTR_FORMAT, widget); ++GST_LOG_OBJECT(m_sink, "Setting \"widget\" property to %" GST_PTR_FORMAT, widget); + + if (m_widget) { + m_widget.data()->removeEventFilter(this); +diff --git a/elements/gstqtvideosink/gstqtquick2videosink.cpp b/elements/gstqtvideosink/gstqtquick2videosink.cpp +index 7889fbf..bedc074 100644 +--- a/elements/gstqtvideosink/gstqtquick2videosink.cpp b/elements/gstqtvideosink/gstqtquick2videosink.cpp +@@ -248,7 +248,7 @@ gst_qt_quick2_video_sink_show_frame(GstVideoSink *sink, GstBuffer *buffer) + { + GstQtQuick2VideoSink *self = GST_QT_QUICK2_VIDEO_SINK (sink); + +-GST_TRACE_OBJECT(self, "Posting new buffer (%"GST_PTR_FORMAT") for rendering.", buffer); ++GST_TRACE_OBJECT(self, "Posting new buffer (%" GST_PTR_FORMAT ") for rendering.", buffer); + + QCoreApplication::postEvent(self->priv->delegate, new BaseDelegate::BufferEvent(buffer)); + +diff --git a/elements/gstqtvideosink/gstqtvideosinkbase.cpp b/elements/gstqtvideosink/gstqtvideosinkbase.cpp +index 118d0a2..a707e02 100644 +--- a/elements/gstqtvideosink/gstqtvideosinkbase.cpp b/elements/gstqtvideosink/gstqtvideosinkbase.cpp +@@ -207,7 +207,7 @@ GstFlowReturn GstQtVideoSinkBase::show_frame(GstVideoSink *video_sink, GstBuffer + { + GstQtVideoSinkBase *sink = GST_QT_VIDEO_SINK_BASE(video_sink); + +-GST_TRACE_OBJECT(sink, "Posting new buffer (%"GST_PTR_FORMAT") for rendering.", buffer); ++GST_TRACE_OBJECT(sink, "Posting new buffer (%" GST_PTR_FORMAT ") for rendering.", buffer); + + QCoreApplication::postEvent(sink->delegate, new BaseDelegate::BufferEvent(buffer)); + diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch new file mode 100644 index 000..6bb24048f6c --- /dev/null +++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch @@ -0,0 +1,25 @@ +From 6e4fb2f3fcfb453c5522c66457ac5ed8c3b1b05c Mon Sep 17
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 36f28c02938549c90718fc0a601c817817465c32 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 19 15:49:21 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 19 15:51:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f28c02 media-libs/qt-gstreamer: Drop obsolete live switch Unmaintained upstream and likely a dead end, live version is in kde overlay. Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild index 5732c473967..4adb838f82d 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild @@ -3,20 +3,15 @@ EAPI=7 -if [[ ${PV} != ** ]]; then - SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; - KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86" -else - EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git; - inherit git-r3 -fi inherit cmake-utils DESCRIPTION="C++ bindings for GStreamer with a Qt-style API" HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html; +SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; LICENSE="LGPL-2.1" SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86" IUSE="test" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: d58c51557a8f71de62d9e85946b242aa8cd42276 Author: Aaron Bauman gentoo org> AuthorDate: Mon Jul 29 00:44:32 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Jul 29 00:44:32 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d58c5155 media-libs/qt-gstreamer: arm64 stable Signed-off-by: Aaron Bauman gentoo.org> Package-Manager: Portage-2.3.69, Repoman-2.3.16 RepoMan-Options: --include-arches="arm64" media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild index 75bb4951571..72741f9402e 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild @@ -5,7 +5,7 @@ EAPI=7 if [[ ${PV} != ** ]]; then SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" + KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86" else EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git; inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: bb07e69df9f9fa94038a651415393bab7950314c Author: Roy Bamford gentoo org> AuthorDate: Sun Feb 17 21:47:05 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 19 18:04:43 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb07e69d media-libs/qt-gstreamer: added ~arm64 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Roy Bamford gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild index dea682c8c9e..75bb4951571 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 if [[ ${PV} != ** ]]; then SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; - KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" else EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git; inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: bf7d4fb7123673668971500d4d536eb0a925c6bb Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Dec 13 23:03:05 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Dec 13 23:03:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7d4fb7 media-libs/qt-gstreamer: Drop 1.2.0-r3 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild | 54 -- 1 file changed, 54 deletions(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild deleted file mode 100644 index 11e32d10e30..000 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} != ** ]]; then - SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; - KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" -else - EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git; - inherit git-r3 -fi - -inherit cmake-utils - -DESCRIPTION="C++ bindings for GStreamer with a Qt-style API" -HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html; - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="test" - -RDEPEND=" - dev-libs/glib:2 - 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 -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -PATCHES=( - "${FILESDIR}/${P}-gstreamer15.patch" - "${FILESDIR}/${P}-boost157.patch" -) - -# bug 497880 -RESTRICT="test" - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON - -DQTGSTREAMER_EXAMPLES=OFF - -DQTGSTREAMER_TESTS=$(usex test) - -DQT_VERSION=5 - ) - cmake-utils_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: f7a05045bb4a6f992c5c5a5ebe5c24c3bfa449f9 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Dec 13 20:44:58 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Dec 13 20:44:58 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a05045 media-libs/qt-gstreamer: amd64 stable wrt bug #673018 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild index 8a86f3cfd1d..dea682c8c9e 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild @@ -5,7 +5,7 @@ EAPI=7 if [[ ${PV} != ** ]]; then SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86" + KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" else EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git; inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 6245c9788a888af5bc04543ee07d9d40fed408b5 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Dec 13 12:32:08 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Dec 13 12:47:56 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6245c978 media-libs/qt-gstreamer: x86 stable (bug #673018) Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild index 4b5d03c5a93..8a86f3cfd1d 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild @@ -5,7 +5,7 @@ EAPI=7 if [[ ${PV} != ** ]]; then SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86" else EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git; inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 04a5d871c14c9fbbd27355df15e8ba1de5e1fafe Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 13 01:47:07 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 12 14:05:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04a5d871 media-libs/qt-gstreamer: EAPI-7 bump Package-Manager: Portage-2.3.49, Repoman-2.3.10 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild index b2f672cd232..4b5d03c5a93 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} != ** ]]; then SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; @@ -30,7 +30,8 @@ RDEPEND=" media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/glib-utils test? ( dev-qt/qttest:5 ) "
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 8b1aefb1303c3689eddffb089b45010d231ad7c2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 23 19:14:27 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 23 19:14:52 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1aefb1 media-libs/qt-gstreamer: Add missing dev-util/glib-utils DEPEND Closes: https://bugs.gentoo.org/669454 Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild index 474afd4d00d..b2f672cd232 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,6 @@ else EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git; inherit git-r3 fi - inherit cmake-utils DESCRIPTION="C++ bindings for GStreamer with a Qt-style API" @@ -21,8 +20,8 @@ SLOT="0" IUSE="test" RDEPEND=" - dev-libs/glib:2 dev-libs/boost:= + dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 @@ -32,6 +31,7 @@ RDEPEND=" media-libs/gst-plugins-base:1.0 " DEPEND="${RDEPEND} + dev-util/glib-utils test? ( dev-qt/qttest:5 ) "
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/files/, media-libs/qt-gstreamer/
commit: 6e829a8265e2085b82c71d3c6181e87938c45f1f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 15 22:14:47 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 15 22:16:14 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e829a82 media-libs/qt-gstreamer: Fix cmake w/ Qt 5.11_beta3 Package-Manager: Portage-2.3.28, Repoman-2.3.9 .../files/qt-gstreamer-1.2.0-qt-5.11b3.patch | 50 .../qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild | 55 ++ 2 files changed, 105 insertions(+) diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-qt-5.11b3.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-qt-5.11b3.patch new file mode 100644 index 000..537516db8ec --- /dev/null +++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-qt-5.11b3.patch @@ -0,0 +1,50 @@ +From 8ed5453b1b5e6e8b3c202fb03c2084e04e5f6b44 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner+Date: Sun, 15 Apr 2018 23:46:50 +0200 +Subject: [PATCH] Fix cmake with Qt 5.11_beta3 (dropping qt5_use_modules) + +--- + cmake/modules/FindQt4or5.cmake | 16 +--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/cmake/modules/FindQt4or5.cmake b/cmake/modules/FindQt4or5.cmake +index 855a48e..d73b3a2 100644 +--- a/cmake/modules/FindQt4or5.cmake b/cmake/modules/FindQt4or5.cmake +@@ -49,6 +49,16 @@ macro(_qt4or5_component_names_to_qt_components output_list) + list(REMOVE_DUPLICATES ${output_list}) + endmacro() + ++macro(_qt5_component_names_to_target_link_libaries output_list) ++ foreach(module ${ARGN}) ++_qt4or5_component_name_to_qt_component(qt_component ${module}) ++list(APPEND ${output_list} Qt5::${qt_component}) ++unset(qt_component) ++ endforeach() ++ ++ list(REMOVE_DUPLICATES ${output_list}) ++endmacro() ++ + if (Qt4or5_FIND_QUIETLY) + set(_Qt4or5_FIND_PACKAGE_ARGS QUIET) + endif() +@@ -195,13 +205,13 @@ function(qt4or5_use_modules _target _link_type) + set(modules ${_link_type} ${ARGN}) + endif() + +- _qt4or5_component_names_to_qt_components(real_modules ${modules}) +- + # Verify that Qt5 was found before using qt5_* macros, + # otherwise cmake will bail out if they are undefined. + if (${QT_VERSION} STREQUAL "5" AND Qt5Core_FOUND) +-qt5_use_modules(${_target} ${link_type} ${real_modules}) ++_qt5_component_names_to_target_link_libaries(real_modules ${modules}) ++target_link_libraries(${_target} ${link_type} ${real_modules}) + elseif (${QT_VERSION} STREQUAL "4") ++_qt4or5_component_names_to_qt_components(real_modules ${modules}) + qt4_use_modules(${_target} ${link_type} ${real_modules}) + endif() + endfunction() +-- +2.17.0 + diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild new file mode 100644 index 000..474afd4d00d --- /dev/null +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} != ** ]]; then + SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +else + EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git; + inherit git-r3 +fi + +inherit cmake-utils + +DESCRIPTION="C++ bindings for GStreamer with a Qt-style API" +HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html; + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="test" + +RDEPEND=" + dev-libs/glib:2 + 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 +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) +" + +PATCHES=( + "${FILESDIR}/${P}-gstreamer15.patch" + "${FILESDIR}/${P}-boost157.patch" + "${FILESDIR}/${P}-qt-5.11b3.patch" +) + +# bug 497880 +RESTRICT="test" + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON + -DQTGSTREAMER_EXAMPLES=OFF + -DQTGSTREAMER_TESTS=$(usex test) + -DQT_VERSION=5 + ) + cmake-utils_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 263f439ca6536f41f2d6f808863ac2f46bb9ae6f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 9 07:56:15 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 9 08:09:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=263f439c media-libs/qt-gstreamer: Drop old Package-Manager: Portage-2.3.17, Repoman-2.3.6 .../qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild | 83 -- 1 file changed, 83 deletions(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild deleted file mode 100644 index 0768a8596f2..000 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} != ** ]]; then - SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; - KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" -else - EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git; - inherit git-r3 -fi - -inherit cmake-utils multibuild - -DESCRIPTION="C++ bindings for GStreamer with a Qt-style API" -HOMEPAGE="https://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:= - 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 ) - ) -" - -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 -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 492de0309b4bf5d55446e95cddaf53b131040304 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Dec 8 20:36:36 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Dec 8 20:36:36 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=492de030 media-libs/qt-gstreamer: x86 stable (bug #639348) Package-Manager: Portage-2.3.16, Repoman-2.3.6 media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild index 1b62240399d..11e32d10e30 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild @@ -5,7 +5,7 @@ EAPI=6 if [[ ${PV} != ** ]]; then SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; - KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" else EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git; inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 098ce931dd0c89ef2df04bc4fa64476d7b194361 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 30 22:53:43 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 30 22:54:05 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=098ce931 media-libs/qt-gstreamer: amd64 stable, bug #639348 Package-Manager: Portage-2.3.16, Repoman-2.3.6 media-libs/qt-gstreamer/Manifest | 2 +- media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest index 1458453d100..4018bfeff4e 100644 --- a/media-libs/qt-gstreamer/Manifest +++ b/media-libs/qt-gstreamer/Manifest @@ -1 +1 @@ -DIST qt-gstreamer-1.2.0.tar.xz 313632 SHA256 9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4 SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7 WHIRLPOOL 2e8c5d70a384ee472dac265179c471369d64fb2deabe239c13cd4eb437358c97c316a486ae4292e8bdb3c823b521b656b665292392f0bb91d1c233869fb09789 +DIST qt-gstreamer-1.2.0.tar.xz 313632 BLAKE2B e41fd7073e223a06b0115025dcfcd637f4803f953b4fe175f5b05713bd5282c7fa12039d5a5b4c98eff5a181bbb7cd4140a0f1de32a8aadeef5d7217b339eadf SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7 diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild index 327799a3a48..1b62240399d 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild @@ -5,7 +5,7 @@ EAPI=6 if [[ ${PV} != ** ]]; then SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86" else EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git; inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: e7b7fc4078571468fbcd8776ba3857a1ce4fe98c Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 30 18:39:08 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 31 20:53:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b7fc40 media-libs/qt-gstreamer: Drop USE=qt4,qt5 Package-Manager: Portage-2.3.6, Repoman-2.3.1 .../qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild | 54 ++ 1 file changed, 54 insertions(+) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild new file mode 100644 index 000..327799a3a48 --- /dev/null +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} != ** ]]; then + SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz; + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +else + EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git; + inherit git-r3 +fi + +inherit cmake-utils + +DESCRIPTION="C++ bindings for GStreamer with a Qt-style API" +HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html; + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="test" + +RDEPEND=" + dev-libs/glib:2 + 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 +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) +" + +PATCHES=( + "${FILESDIR}/${P}-gstreamer15.patch" + "${FILESDIR}/${P}-boost157.patch" +) + +# bug 497880 +RESTRICT="test" + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON + -DQTGSTREAMER_EXAMPLES=OFF + -DQTGSTREAMER_TESTS=$(usex test) + -DQT_VERSION=5 + ) + cmake-utils_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: c54155057b8f02651e4653716c64de7ea591df1b Author: Michael Palimaka gentoo org> AuthorDate: Thu Jun 2 16:27:11 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jun 2 16:27:25 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5415505 media-libs/qt-gstreamer: remove old Package-Manager: portage-2.3.0_rc1 .../qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild | 86 -- 1 file changed, 86 deletions(-) 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 deleted file mode 100644 index 5203bda..000 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -if [[ ${PV} != ** ]]; then - SRC_URI="https://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}" ) -fi - -inherit cmake-utils ${GIT_ECLASS} multibuild - -DESCRIPTION="QtGStreamer provides C++ bindings for GStreamer with a Qt-style API" -HOMEPAGE="https://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}-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=( - -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 -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 41f2bfb5eb4217bf4b953f96235be3badd7e08a9 Author: Michael Palimaka gentoo org> AuthorDate: Thu Jun 2 16:26:37 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jun 2 16:27:25 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f2bfb5 media-libs/qt-gstreamer: x86 stable Gentoo-bug: 582650 Package-Manager: portage-2.3.0_rc1 media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild index ea9bd7b..fedc61e 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild @@ -6,7 +6,7 @@ EAPI=6 if [[ ${PV} != ** ]]; then SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz; - KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" else EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" ) inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 95797ef312435c66798046f2a2181da96dc199da Author: Johannes Huber gentoo org> AuthorDate: Fri May 27 09:33:36 2016 + Commit: Johannes Huber gentoo org> CommitDate: Fri May 27 09:34:24 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95797ef3 media-libs/qt-gstreamer: Drop ppc/ppc64 to testing No stable reverse dependencies left due to bfa4140c1969992bb8d5b7e38565bb1a99003095 Package-Manager: portage-2.3.0_rc1 media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index ac84b38..5203bda 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild @@ -6,11 +6,10 @@ EAPI=5 if [[ ${PV} != ** ]]; then SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz; - KEYWORDS="amd64 ~arm ppc ppc64 x86" + 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} multibuild
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 7ef729366327652b9add68942afc628bae373354 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri May 13 08:40:44 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri May 13 08:41:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef72936 media-libs/qt-gstreamer: amd64 stable wrt bug #582650 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild index 00dccc8..ea9bd7b 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild @@ -6,7 +6,7 @@ EAPI=6 if [[ ${PV} != ** ]]; then SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz; - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86" else EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" ) inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 4fff440a7c3b80515e33b89fdb4b4abab30ab7fe Author: Michael Palimaka gentoo org> AuthorDate: Sun Apr 10 19:10:04 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Apr 10 19:10:57 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fff440a fmedia-libs/qt-gstreamer: drop qtquick1 dependency Package-Manager: portage-2.2.28 .../qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild | 85 ++ 1 file changed, 85 insertions(+) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild new file mode 100644 index 000..cc6f216 --- /dev/null +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +if [[ ${PV} != ** ]]; 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}" ) + inherit git-r3 +fi + +inherit cmake-utils multibuild + +DESCRIPTION="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:= + 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 ) + ) +" + +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 +}
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: e516f1a5573f47a1824cc5f6a2abffedafd11469 Author: Michael Palimaka gentoo org> AuthorDate: Sun Apr 10 19:10:38 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Apr 10 19:10:57 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e516f1a5 media-libs/qt-gstreamer: remove unused variable Package-Manager: portage-2.2.28 media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild index cc6f216..433c941 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild @@ -8,7 +8,6 @@ if [[ ${PV} != ** ]]; 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}" ) inherit git-r3 fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/, media-libs/qt-gstreamer/files/
commit: 103250f25def17660ecaeb9d43e1959f5ea09721 Author: David Seifert gentoo org> AuthorDate: Sun Apr 3 17:11:04 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Apr 3 17:11:28 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=103250f2 media-libs/qt-gstreamer: Fix BOOST_JOIN with >=dev-libs/boost-1.60.0 Gentoo-Bug: 578906 Package-Manager: portage-2.2.28 .../files/qt-gstreamer-1.2.0-boost157.patch| 220 ++--- .../qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild | 4 +- 2 files changed, 197 insertions(+), 27 deletions(-) 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 index a795420..e822739 100644 --- 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 @@ -1,34 +1,204 @@ -From fbb9dc6e291eaa058f3ef1cd93711265bfbfd162 Mon Sep 17 00:00:00 2001 -From: Heiko Becker-Date: Fri, 7 Nov 2014 00:11:02 +0100 -Subject: [PATCH] Workaround build failures with boost>=1.57 and moc +Add include guards to all boost includes, as qt's moc trips +over nested BOOST_JOIN macros: +* AUTOGEN: error: process for /var/tmp/portage/media-libs/qt-gstreamer-1.2.0-r1/work/qt-gstreamer-1.2.0-4/src/QGst/moc_graphicsvideowidget.cpp failed: +* usr/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN" +https://bugs.gentoo.org/show_bug.cgi?id=578906 -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 @@ +--- qt-gstreamer-1.2.0/codegen/generator.cpp qt-gstreamer-1.2.0/codegen/generator.cpp +@@ -54,7 +54,9 @@ + << "*/" << endl + << endl + << "#define INCLUDED_FROM_CODEGEN" << endl ++<< "#ifndef Q_MOC_RUN" << endl + << "#include " << endl ++<< "#endif" << endl + << endl + << "#define REGISTER_TYPE_IMPLEMENTATION(T, GTYPE) \\" << endl + << "namespace QGlib { \\" << endl +--- qt-gstreamer-1.2.0/src/QGlib/connect.cpp qt-gstreamer-1.2.0/src/QGlib/connect.cpp +@@ -20,10 +20,12 @@ + #include #include #include ++#ifndef Q_MOC_RUN #include -+#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 #include #include -+#endif #include ++#endif namespace QGlib { --- -2.1.3 - + namespace Private { +--- qt-gstreamer-1.2.0/src/QGlib/connect.h qt-gstreamer-1.2.0/src/QGlib/connect.h +@@ -25,8 +25,10 @@ + #include + #include + #include ++#ifndef Q_MOC_RUN + #include + #include ++#endif + + namespace QGlib { + +--- qt-gstreamer-1.2.0/src/QGlib/connectimpl.h qt-gstreamer-1.2.0/src/QGlib/connectimpl.h +@@ -26,7 +26,9 @@ + # include "refpointer.h" + # include + # include ++#ifndef Q_MOC_RUN + # include ++#endif + + + namespace QGlib { +@@ -203,9 +205,11 @@ + + # else //QGLIB_HAVE_CXX0X + ++#ifndef Q_MOC_RUN + # include + # include + # include ++#endif + + // include the second part of this file as many times as QGLIB_CONNECT_MAX_ARGS specifies + # define BOOST_PP_ITERATION_PARAMS_1 (3,(0, QGLIB_CONNECT_MAX_ARGS, "QGlib/connectimpl.h")) +--- qt-gstreamer-1.2.0/src/QGlib/emitimpl.h qt-gstreamer-1.2.0/src/QGlib/emitimpl.h +@@ -125,7 +125,9 @@ + + # else //QGLIB_HAVE_CXX0X + ++#ifndef Q_MOC_RUN + # include ++#endif + + // include the second part of this file as many times as QGLIB_SIGNAL_MAX_ARGS specifies + # define BOOST_PP_ITERATION_PARAMS_1 (3,(0, QGLIB_SIGNAL_MAX_ARGS, "QGlib/emitimpl.h")) +--- qt-gstreamer-1.2.0/src/QGlib/gen.cpp qt-gstreamer-1.2.0/src/QGlib/gen.cpp +@@ -19,7 +19,9 @@ + */ + + #define INCLUDED_FROM_CODEGEN ++#ifndef Q_MOC_RUN + #include ++#endif + + #define REGISTER_TYPE_IMPLEMENTATION(T, GTYPE) \ + namespace QGlib { \ +--- qt-gstreamer-1.2.0/src/QGlib/global.h qt-gstreamer-1.2.0/src/QGlib/global.h +@@ -23,7 +23,9 @@ + #endif + + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + /* defined by cmake when building this library */ + #if defined(QtGLib_EXPORTS) || defined(Qt5GLib_EXPORTS) +@@ -84,7 +86,9 @@ + # define QGLIB_STATIC_ASSERT(expr, message) static_assert(expr, message) + # define QGLIB_HAVE_CXX0X_STATIC_ASSERT 1 + #else ++#ifndef Q_MOC_RUN + # include ++#endif + # define QGLIB_STATIC_ASSERT(expr, message) BOOST_STATIC_ASSERT(expr) + #endif + +--- qt-gstreamer-1.2.0/src/QGlib/refpointer.h
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 44ffaa2db8a83e6324f3ea85c848d75b1a0da6d4 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Mar 16 11:48:03 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Mar 16 11:51:08 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44ffaa2d media-libs/qt-gstreamer: ppc stable wrt bug #575404 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 09b5905..150ed5c 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild @@ -6,7 +6,7 @@ EAPI=5 if [[ ${PV} != ** ]]; then SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz; - KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" + KEYWORDS="amd64 ~arm ppc ~ppc64 x86" else GIT_ECLASS="git-r3" EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" )
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 2af3cdd6fdd2dbba69d06bcf5f2d0edeb62ee237 Author: Michael Palimaka gentoo org> AuthorDate: Thu Mar 17 10:57:00 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Mar 17 10:58:54 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af3cdd6 media-libs/qt-gstreamer: remove old Package-Manager: portage-2.2.28 media-libs/qt-gstreamer/qt-gstreamer-1.2.0.ebuild | 52 --- 1 file changed, 52 deletions(-) diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0.ebuild deleted file mode 100644 index 9522690..000 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# 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} != ** ]]; 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 -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 592fae45c4f4bbf44d0fae02d7083c00c1e57bc4 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Mar 15 15:25:25 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Mar 15 15:25:25 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592fae45 media-libs/qt-gstreamer: x86 stable wrt bug #575404 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 13dc1a2..09b5905 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild @@ -6,7 +6,7 @@ EAPI=5 if [[ ${PV} != ** ]]; then SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz; - KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" else GIT_ECLASS="git-r3" EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" )
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/files/, media-libs/qt-gstreamer/
commit: 8bde2c6895dd6bef4c5d7bee86f584b19fcbc080 Author: Michael Palimaka gentoo org> AuthorDate: Wed Nov 4 12:25:41 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Nov 4 12:26:03 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bde2c68 media-libs/qt-gstreamer: backport patch from upstream solving build failure with >=media-libs/gstreamer-1.5 Gentoo-bug: 564652 Package-Manager: portage-2.2.20.1 .../files/qt-gstreamer-1.2.0-gstreamer15.patch | 39 ++ .../qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild | 5 ++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch new file mode 100644 index 000..6e875f6 --- /dev/null +++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch @@ -0,0 +1,39 @@ +From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa?=+Date: Fri, 2 Oct 2015 15:00:29 +0300 +Subject: Fix compilation with GStreamer >= 1.5.1 + +apply gstreamer pkg-config definitions To ensure gstreamer builds correctly, +pick up its cflags in FindGstreamer and apply them to the build as definitions + +https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html + +https://bugzilla.gnome.org/show_bug.cgi?id=751382 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4d3e7dd..5744015 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -106,6 +106,7 @@ find_package(GObject) + macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/; TRUE) + + set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES}) ++add_definitions(${GSTREAMER_DEFINITIONS}) + include(CheckCXXSourceCompiles) + check_cxx_source_compiles(" + #include +diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake +index dab91ac..fe6cde1 100644 +--- a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake +@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND) + exec_program(${PKG_CONFIG_EXECUTABLE} + ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION} + OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR) ++set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) + endif() + + find_library(GSTREAMER_LIBRARY +-- +cgit v0.10.2 + 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 index a33c8fe..3995ad0 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild @@ -53,7 +53,10 @@ DEPEND=" ) " -PATCHES=( "${FILESDIR}/${P}-boost157.patch" ) +PATCHES=( + "${FILESDIR}/${P}-boost157.patch" + "${FILESDIR}/${P}-gstreamer15.patch" +) # bug 497880 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: media-libs/qt-gstreamer/
commit: 7b92ceb0947a28c80b589121012ae1b201f067d0 Author: Michael Palimaka gentoo org> AuthorDate: Wed Nov 4 13:14:24 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Nov 4 13:14:45 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b92ceb0 media-libs/qt-gstreamer: restore dropped keywords Package-Manager: portage-2.2.20.1 media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 3995ad0..dbd8a01 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild @@ -6,7 +6,7 @@ EAPI=5 if [[ ${PV} != ** ]]; then SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz; - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" else GIT_ECLASS="git-r3" EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" )