From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-libs/qt-gstreamer/Manifest | 8 + .../files/qt-gstreamer-1.2.0-boost157.patch | 204 +++++++++++++++++++++ .../files/qt-gstreamer-1.2.0-gstreamer15.patch | 39 ++++ media-libs/qt-gstreamer/metadata.xml | 8 + .../qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild | 83 +++++++++ .../qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild | 54 ++++++ 6 files changed, 396 insertions(+) create mode 100644 media-libs/qt-gstreamer/Manifest create mode 100644 media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch create mode 100644 media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch create mode 100644 media-libs/qt-gstreamer/metadata.xml create mode 100644 media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild create mode 100644 media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild (limited to 'media-libs/qt-gstreamer') diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest new file mode 100644 index 000000000000..537189dc63da --- /dev/null +++ b/media-libs/qt-gstreamer/Manifest @@ -0,0 +1,8 @@ +AUX qt-gstreamer-1.2.0-boost157.patch 5474 SHA256 e0299539cdee184f7c4426db41d104930cb9997e6dbf5f09f615663ebd6dc542 SHA512 81f0ff93cf66635283114c35c1e8b0299c9f0f29b2d5c0cbf4e493b0e1895069a813aa898d7a2c1d2110661feffc512f8c91fef1e4e63a83d1d0e807c77b0c28 WHIRLPOOL a00f513ec19278492ed120f29c9c26f32897d78b468af207a96434ecef6f1b26dd12e954d904988ca84f1b179c5a89a688fb385966a4dbf14e820b28b475e835 +AUX qt-gstreamer-1.2.0-gstreamer15.patch 1494 SHA256 9c011ffc33eeeb2866a76a883b1085a970e79554706dedf3bedd58b23c07e25c SHA512 999ccdd8d9772887e5d302a43e14c2400519306332facc1e4a1c4a65d941ca278a473c84816e4a5358f08df2b42675e7ec9285e1616f77f755562942acaaa4a3 WHIRLPOOL d34fffa366022cfc8e9b7cb704dfa65d587b88e981cf634b532556265397f848ffabd1933cb0356f83fd186c5ad96ae2e43a294bfde98de1a6d21275b363e8d0 +DIST qt-gstreamer-1.2.0.tar.xz 313632 SHA256 9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4 SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7 WHIRLPOOL 2e8c5d70a384ee472dac265179c471369d64fb2deabe239c13cd4eb437358c97c316a486ae4292e8bdb3c823b521b656b665292392f0bb91d1c233869fb09789 +EBUILD qt-gstreamer-1.2.0-r2.ebuild 1638 SHA256 30f2733460acb7280bc1e8df87fb67a0575828fb385d61ea1ee2a1368fd739db SHA512 cdf77a2bc0f2ce039e3ce8572617e2079f4afc3658500dd63f2e0ac7bf2f94f7120d423f5af2fae5f39d27b30566c9faa70412de6c525962857bb3a4705a1f46 WHIRLPOOL e997e0aa9f8eb1a01c6702285231c8ecdcc60aaf8a3485796694d90bd0cbb041033f03d566aea7fabf5e277bfdca9104e84e1f590b3d4940a582e83a6b4484a7 +EBUILD qt-gstreamer-1.2.0-r3.ebuild 1130 SHA256 d41fac6d8e51d939529eb6eadf628cc0bc7bb3b1f0b6b8d574d3d4b5194fc647 SHA512 6162a6197513ac8f7ef9176bf6d5452dc6a4dea1e7a856902a3e5e924b8242c6730eed347e7102e117494105879dda516048aaebb6cd822357203d47e9e8d76e WHIRLPOOL 3bc55220f5724c41310d6228b627b536a7787461ee6ef08752177dddd270526cc53bc08f6a38c71680c5343f225f4d4f3c344693bff139ae350613f9d54b8649 +MISC ChangeLog 6277 SHA256 6f4820ec826374d91c3b6537051209d0cfd378ccbbe60396ad95e584b0197a38 SHA512 d2d6507ed77a64bb28d4d14853f8790509efe5149db99039ed15ec2dd8cfbe13d557967afb11f0a2ce26c720b47f892caaf5fce4a83029888de86abaeac8e5ec WHIRLPOOL 8418c86dde5fc5b180484eaef211f1be4c2b017e2db4002fc702042c522bc0ca8d87533c6a6d1e4e3d8bf5b5eeae8832eac4f37959bb2723d50e0901f7f294db +MISC ChangeLog-2015 3490 SHA256 cfb610b85da467400925c1a4466129cb43a704adb2165f9817e938fec88b5826 SHA512 47478cf3ea87c564ca153f873d4b2cc1d236d56aad9de927067a202f3b3ac585f602b74fceeabb4a2d9eccbe975b0cb18908c1a5badbba8324d7823a3f7c4720 WHIRLPOOL 3a8672611e41ccb90d76cc4d5ff85bc7ff5df0b1c72cf56dfd3fa049690f9dbefc3c702ace921a4550f31c264539371dff7f9d57f8395aea6c3084064de54ed8 +MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c 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..e8227393c1a8 --- /dev/null +++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch @@ -0,0 +1,204 @@ +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 + +--- 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 + #include + #include + #include ++#endif + + namespace QGlib { + 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 ++++ qt-gstreamer-1.2.0/src/QGlib/refpointer.h +@@ -23,8 +23,10 @@ + #include "type.h" + #include "wrap.h" + #include ++#ifndef Q_MOC_RUN + #include + #include ++#endif + #include + + namespace QGlib { +--- qt-gstreamer-1.2.0/src/QGlib/type.h ++++ qt-gstreamer-1.2.0/src/QGlib/type.h +@@ -21,7 +21,9 @@ + + #include "global.h" + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + /* + * This is a re-definition of GType inside the QGlib::Private namespace. +--- qt-gstreamer-1.2.0/src/QGlib/value.cpp ++++ qt-gstreamer-1.2.0/src/QGlib/value.cpp +@@ -19,7 +19,9 @@ + #include "value.h" + #include "string.h" + #include ++#ifndef Q_MOC_RUN + #include ++#endif + #include + #include + #include +--- qt-gstreamer-1.2.0/src/QGlib/value.h ++++ qt-gstreamer-1.2.0/src/QGlib/value.h +@@ -23,8 +23,10 @@ + #include "type.h" + #include "refpointer.h" + #include "error.h" ++#ifndef Q_MOC_RUN + #include + #include ++#endif + #include + #include + #include +--- qt-gstreamer-1.2.0/src/QGst/bin.h ++++ qt-gstreamer-1.2.0/src/QGst/bin.h +@@ -28,8 +28,10 @@ + #endif + + #if !QGLIB_HAVE_CXX0X ++#ifndef Q_MOC_RUN + # include + #endif ++#endif + + namespace QGst { + +--- qt-gstreamer-1.2.0/src/QGst/element.h ++++ qt-gstreamer-1.2.0/src/QGst/element.h +@@ -22,8 +22,10 @@ + #include "clocktime.h" + + #if !QGLIB_HAVE_CXX0X ++#ifndef Q_MOC_RUN + # include + #endif ++#endif + + namespace QGst { + +--- qt-gstreamer-1.2.0/src/QGst/gen.cpp ++++ qt-gstreamer-1.2.0/src/QGst/gen.cpp +@@ -19,7 +19,9 @@ + */ + + #define INCLUDED_FROM_CODEGEN ++#ifndef Q_MOC_RUN + #include ++#endif + + #define REGISTER_TYPE_IMPLEMENTATION(T, GTYPE) \ + namespace QGlib { \ 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 000000000000..6e875f678c2d --- /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/metadata.xml b/media-libs/qt-gstreamer/metadata.xml new file mode 100644 index 000000000000..2fdbf33d963d --- /dev/null +++ b/media-libs/qt-gstreamer/metadata.xml @@ -0,0 +1,8 @@ + + + + + kde@gentoo.org + Gentoo KDE Project + + 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 000000000000..0768a8596f23 --- /dev/null +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2017 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 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 +} 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 000000000000..327799a3a48a --- /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} != *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" +) + +# 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 +} -- cgit v1.2.3