gentoo resync : 16.04.2018

3 files changed, 107 insertions, 0 deletions

diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest
index 473da4a7d59e..0d4f19234638 100644
--- a/media-libs/qt-gstreamer/Manifest
+++ b/media-libs/qt-gstreamer/Manifest
@@ -1,5 +1,7 @@
 AUX qt-gstreamer-1.2.0-boost157.patch 5474 BLAKE2B 72827e5a70e9d204271450f3cdfbe4b400c748e4b0722301de6de3c62cd0ef8ac68e2986732238cf0e5767fb398b73c7c3acd904d7a3aa3e24305012dddc354d SHA512 81f0ff93cf66635283114c35c1e8b0299c9f0f29b2d5c0cbf4e493b0e1895069a813aa898d7a2c1d2110661feffc512f8c91fef1e4e63a83d1d0e807c77b0c28
 AUX qt-gstreamer-1.2.0-gstreamer15.patch 1494 BLAKE2B 1be10fb02d4a68406b17ccc758bb1bc79ad85fbde217de7ac12dd5c306326e68cddcdda82b55eebb24c6befb929008c85150b99d7bc6040e7b91984260287d3e SHA512 999ccdd8d9772887e5d302a43e14c2400519306332facc1e4a1c4a65d941ca278a473c84816e4a5358f08df2b42675e7ec9285e1616f77f755562942acaaa4a3
+AUX qt-gstreamer-1.2.0-qt-5.11b3.patch 1834 BLAKE2B 9869694e31a546d1c31bc965c7e0f44de28f5566076cee8d1bb36f274f42757256d5c77e4bf7be23e12260d235eb72868252a5b920a293adc71520bd91c70e3c SHA512 235418641f23e5bbbceef53f561bdfd3b06b5d247c8d81cfb5b72388f494142458bb0171e5b146f8be9613d22a5c286eec6730414d7cbd35b62744dcfc87e667
 DIST qt-gstreamer-1.2.0.tar.xz 313632 BLAKE2B e41fd7073e223a06b0115025dcfcd637f4803f953b4fe175f5b05713bd5282c7fa12039d5a5b4c98eff5a181bbb7cd4140a0f1de32a8aadeef5d7217b339eadf SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7
 EBUILD qt-gstreamer-1.2.0-r3.ebuild 1128 BLAKE2B e4000d90af874d1986748069ca1aea904911737a296e453fd0a96a20629f85399dcae76b3120d9042da124a0f969ac0c559261acdb5876e3b5197f3ce9ef3033 SHA512 73ebe2a3ad890ad1d87e58350d930adab57594017566ead036677b3d60d02ccd96f3d0c771b5990939bff1fa754c2fa0bbfdf4e96e01991476f206239993bc76
+EBUILD qt-gstreamer-1.2.0-r4.ebuild 1166 BLAKE2B 448bc1642dae8828012f03a2e4341a96ef1998bc9556f1186a479b1bc60475056e734cfe99060e02af0bc633133ef8c09062625fb55033153a77a60f5287b85e SHA512 6fa39286eefa219cd3e8cf26da7f6164c7094ba6b8921c1f3866bf0d0a2e34ee4f391f025ffc381237f65130465ca155b13b2a7465703fcce6811fa090d1ff4b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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 000000000000..537516db8ec1
--- /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 <andreas.sturmlechner@gmail.com>
+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 000000000000..474afd4d00dc
--- /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} != *9999* ]]; 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
+}