diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-07-06 11:52:17 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-07-06 12:24:41 +0200 |
commit | 3b11b1c8844f17fd7f46fa10256b355317dc3a46 (patch) | |
tree | 3485743d2ab92535f66734aae79382c94e83149f /dev-qt/qtmultimedia | |
parent | media-libs/avidemux-plugins: Drop 2.6.20 (diff) | |
download | gentoo-3b11b1c8844f17fd7f46fa10256b355317dc3a46.tar.gz gentoo-3b11b1c8844f17fd7f46fa10256b355317dc3a46.tar.bz2 gentoo-3b11b1c8844f17fd7f46fa10256b355317dc3a46.zip |
dev-qt: Add Qt 5.12.4
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtmultimedia')
-rw-r--r-- | dev-qt/qtmultimedia/Manifest | 1 | ||||
-rw-r--r-- | dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch | 42 | ||||
-rw-r--r-- | dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild | 70 |
3 files changed, 113 insertions, 0 deletions
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 80dba314d41e..57f79b03e69e 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1 +1,2 @@ DIST qtmultimedia-everywhere-src-5.12.3.tar.xz 3742244 BLAKE2B 65cc184c2625c998ec0f12d5d2f72401693521c9b5e1f27db342279724789e88e0bd6c6cb741ccf28939e8edbb657dde391ceb24ab0cb97c786c114e7e95743d SHA512 4f10e40aaf73dda2d70502e6a1441149c2b4389e9c7de72245c850d926c3ecb57ca6b09c63d208eff4b9ec63b7f9845eb2740cd0df4e4b7eee8f51746a6d3963 +DIST qtmultimedia-everywhere-src-5.12.4.tar.xz 3743264 BLAKE2B c468c674e441ca6b400bf2149b4c56851697df5d644486f7ec902a175ecc2260fb0e7e3c366aaf7d542a2b263731c622702bf9b2f04a5257a5e1d8e985c9507c SHA512 28eaaf4a704649616cd77ae5560ddd6298c82e525f59fa4d5a0178826fe2d6c9b77dcb067f2b5b56e88da7d6043a3f8e34b5c810d12751c74fdc65e5440586fa diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch new file mode 100644 index 000000000000..1e5d7551d30c --- /dev/null +++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch @@ -0,0 +1,42 @@ +From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001 +From: Val Doroshchuk <valentyn.doroshchuk@qt.io> +Date: Mon, 17 Jun 2019 15:20:22 +0200 +Subject: [PATCH] Fix compile issue when no opengl in QVideoSurfacePainter + +error: invalid use of incomplete type 'class QGLContext' + +Change-Id: I4bc9bd4231e663b187d3cef917b7a551ba614ba9 +Fixes: QTBUG-76405 +Reviewed-by: Andy Shaw <andy.shaw@qt.io> +--- + src/multimediawidgets/qpaintervideosurface.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp +index 440d5c858..6af0c7588 100644 +--- a/src/multimediawidgets/qpaintervideosurface.cpp ++++ b/src/multimediawidgets/qpaintervideosurface.cpp +@@ -57,10 +57,6 @@ + #ifndef GL_RGB8 + #define GL_RGB8 0x8051 + #endif +-#endif +- +-#include <QtDebug> +-QT_BEGIN_NAMESPACE + + static void makeCurrent(QGLContext *context) + { +@@ -70,6 +66,10 @@ static void makeCurrent(QGLContext *context) + if (handle && QOpenGLContext::currentContext() != handle) + handle->makeCurrent(handle->surface()); + } ++#endif ++ ++#include <QtDebug> ++QT_BEGIN_NAMESPACE + + QVideoSurfacePainter::~QVideoSurfacePainter() + { +-- +2.16.3 diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild new file mode 100644 index 000000000000..8a896cd1ccfe --- /dev/null +++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit qt5-build + +DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +fi + +IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets" + +RDEPEND=" + ~dev-qt/qtcore-${PV} + ~dev-qt/qtgui-${PV}[gles2=] + ~dev-qt/qtnetwork-${PV} + alsa? ( media-libs/alsa-lib ) + gstreamer? ( + dev-libs/glib:2 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-bad:1.0 + media-libs/gst-plugins-base:1.0 + ) + pulseaudio? ( media-sound/pulseaudio[glib] ) + qml? ( + ~dev-qt/qtdeclarative-${PV} + gles2? ( ~dev-qt/qtgui-${PV}[egl] ) + openal? ( media-libs/openal ) + ) + widgets? ( + ~dev-qt/qtopengl-${PV} + ~dev-qt/qtwidgets-${PV}[gles2=] + ) +" +DEPEND="${RDEPEND} + gstreamer? ( x11-base/xorg-proto ) +" + +PATCHES=( "${FILESDIR}/${P}-fix-no-opengl.patch" ) + +src_prepare() { + sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ + src/multimedia/multimedia.pro || die + + qt_use_disable_config openal openal \ + src/imports/imports.pro + + qt_use_disable_mod qml quick \ + src/src.pro \ + src/plugins/plugins.pro + + qt_use_disable_mod widgets widgets \ + src/src.pro \ + src/gsttools/gsttools.pro \ + src/plugins/gstreamer/common.pri + + qt5-build_src_prepare +} + +src_configure() { + local myqmakeargs=( + -- + $(qt_use alsa) + $(qt_use gstreamer) + $(qt_use pulseaudio) + ) + qt5-build_src_configure +} |