From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-qt/qtmultimedia/Manifest | 11 -- .../files/qtmultimedia-4.8.0-alsa.patch | 25 ---- ...4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch | 155 --------------------- dev-qt/qtmultimedia/metadata.xml | 25 ---- dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild | 44 ------ dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild | 68 --------- dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild | 69 --------- dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild | 68 --------- 8 files changed, 465 deletions(-) delete mode 100644 dev-qt/qtmultimedia/Manifest delete mode 100644 dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch delete mode 100644 dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch delete mode 100644 dev-qt/qtmultimedia/metadata.xml delete mode 100644 dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild delete mode 100644 dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild delete mode 100644 dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild delete mode 100644 dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild (limited to 'dev-qt/qtmultimedia') diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest deleted file mode 100644 index afdb29eec404..000000000000 --- a/dev-qt/qtmultimedia/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX qtmultimedia-4.8.0-alsa.patch 2155 BLAKE2B 23b713531f7e4c63f568fd284d74586506acee583afe897bb40b53f2eb5e2a0178b353107e64f8d85d1fdd2c2f04a7eb0dbdcdfa648bfa6d2d4769c05275c36d SHA512 725dc78b861c82393ecd97ce293f9c165067ca940332fab22ecc252880e1c08aae301d54ddcdf38df9d32907c57bc70d772891a6dc9fdacf740de32b363f4aa4 -AUX qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch 6852 BLAKE2B fb9507a5ee7793c20e435896e553df808860f0ba1a1a9495325b8ecd06b06b0070f03bcec9313c509cad0cef8dc844ff48e00073d8c5b320b980ff8d9b694fef SHA512 ff513b5c68a02179e0a36803367b4dfe9f8c351fb76296570a2b382d2a1dd43fcb99033ab7844c52253c95124e2246cb81d68aa8e64e16c89d37bccaffcd9dea -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 -DIST qtmultimedia-everywhere-src-5.11.1.tar.xz 3711548 BLAKE2B 93d282725293c0750803e4cf00dfd4fdd2ceb23b5105eb339c60416cddcca2e39a51277ff60ad524b6225cfb6c2177fd52015bb7d10521a04973a4d24188fe0f SHA512 cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c -DIST qtmultimedia-opensource-src-5.9.4.tar.xz 3608792 BLAKE2B ac377b3cf33d727fa129fe623cc9ba9ea75555b2af7f70cf07524598d4044a94617b3627f7fd3a915596e51ac53040b9d72a5fcaa2faf316150a2c1ead220def SHA512 7a60434736f655900d00e70a68e5781f336446938f4f2b617e1d93205b7319bf01be987c001a9e6838ba5fd9e3afe3f20137597b6c27f6f77ee55486e283d425 -DIST qtmultimedia-opensource-src-5.9.6.tar.xz 3585964 BLAKE2B fdd18b1abcfbc8a1f81c9a99e75748dd68112ae4fd534e038d73d1f8fa33b76119824ade231e7b1c283ff109ee2473774d08c67bffa04383e7328437539aadbf SHA512 2d5f1341ef1f2d7e99ced28945f70b283630ce4ed9ac968c34ffc7d215c59a9b895681ee519aca64fe8a41ae574577ce834e486281db7e1f337245f9b6506207 -EBUILD qtmultimedia-4.8.7.ebuild 1298 BLAKE2B 2e78e5f2f0dfbf43aaabd1abcf06fb05a3612029bb9ed2f1007cda90ed32665cea64b2f56e7b64b879400a3a66ba4907fbacefa5bd431fce1a08b0db3c61c8cc SHA512 d7a6fb8aa9927fadfd23e59a695818b8e066ccba71877848669358fa640064a6dee16c38ba988e2501e3350939fddc13c6ec90791c1b7c670f1e654b6a5fe6d0 -EBUILD qtmultimedia-5.11.1.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61 -EBUILD qtmultimedia-5.9.4-r1.ebuild 1460 BLAKE2B e845058b50a99d2744c32adc8044b0144988bfe898770e9f5f7a316eee2e5ed17974a36ad1e9ddef786ae8f789b16221534d56eea9d84ca713b7960e8810a764 SHA512 f5f1131f8915e62c8978663187f3a02b4f19fcb8285b4557f809fa1bef9c4277d7b2fe8b4c6fe92b3f55333bea1e4244f94e5af52539968aa15b98b810d55c5a -EBUILD qtmultimedia-5.9.6.ebuild 1449 BLAKE2B 1b08fa5e1abc5fd5350f8d2d2200e0684ab3df4751318fbbca21168fe89dbd2a31b069cfbee06f3a545b45032293296e3b83d44bdcfe7f9cc30ec03ae77b863d SHA512 dee126b3d0c9c0dec01d25362d3ac357f97259980bbf08daa12d14d779d9b5d3d6fb7922f6a59197cc7e5f962710d464bcf9a44155664a42969d2e7bce287753 -MISC metadata.xml 937 BLAKE2B 804145c6bfe640955c5de227bdf2ba51570749541d5febec508b874fa823a2386da52648b2ba2bff959de2ef1371fa6384007591606410829d6fe4c12afd7ce4 SHA512 b5007c578748a64091105fd04aec3133587dcf0f8cf22b758520776e903699de80555fa2e69206edaf8415dad037018f8c169966fb48c1d402118a6e32509d31 diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch deleted file mode 100644 index 8bd40edb1e80..000000000000 --- a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- qt-everywhere-opensource-src-4.8.0.orig/configure 2012-03-13 00:45:02.502205702 +0100 -+++ qt-everywhere-opensource-src-4.8.0/configure 2012-03-13 00:47:40.386231881 +0100 -@@ -1049,7 +1049,7 @@ - VAL=no - ;; - #Qt style yes options -- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu) -+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu|-alsa) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - VAL=yes - ;; -@@ -2399,6 +2399,13 @@ - else - UNKNOWN_OPT=yes - fi -+ ;; -+ alsa) -+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then -+ CFG_ALSA="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi - ;; - *) - UNKNOWN_OPT=yes diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch deleted file mode 100644 index 6a040b2d88a5..000000000000 --- a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 7737e5f851fdf33ea3e8e60cf7856f47565f09d3 Mon Sep 17 00:00:00 2001 -From: Davide Pesavento -Date: Fri, 22 Jan 2016 23:17:16 +0100 -Subject: [PATCH] Relax ALSA version checks for alsa-lib >= 1.1.0 - -Backport of qtmultimedia/3b322323d036ae2fc9f685bfc74d1ebcd5532159 ---- - config.tests/unix/alsa/alsatest.cpp | 2 +- - src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | 16 ++++++++-------- - src/multimedia/audio/qaudiodeviceinfo_alsa_p.h | 2 +- - src/multimedia/audio/qaudioinput_alsa_p.cpp | 4 ++-- - src/multimedia/audio/qaudiooutput_alsa_p.cpp | 4 ++-- - 5 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp -index ac5f1e1..8d78f95 100644 ---- a/config.tests/unix/alsa/alsatest.cpp -+++ b/config.tests/unix/alsa/alsatest.cpp -@@ -40,7 +40,7 @@ - ****************************************************************************/ - - #include --#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) -+#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10))) - #error "Alsa version found too old, require >= 1.0.10" - #endif - -diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp -index 973cbab..a09dcf6 100644 ---- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp -+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp -@@ -63,7 +63,7 @@ QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode - device = QLatin1String(dev); - this->mode = mode; - --#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - checkSurround(); - #endif - } -@@ -159,13 +159,13 @@ bool QAudioDeviceInfoInternal::open() - QList devices = availableDevices(mode); - - if(dev.compare(QLatin1String("default")) == 0) { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(devices.first().constData()); - #else - dev = QLatin1String("hw:0,0"); - #endif - } else { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = device; - #else - int idx = 0; -@@ -212,13 +212,13 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const - QList devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput); - - if(dev.compare(QLatin1String("default")) == 0) { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(devices.first().constData()); - #else - dev = QLatin1String("hw:0,0"); - #endif - } else { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = device; - #else - int idx = 0; -@@ -396,7 +396,7 @@ void QAudioDeviceInfoInternal::updateLists() - } - channelz.append(1); - channelz.append(2); --#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - if (surround40) channelz.append(4); - if (surround51) channelz.append(6); - if (surround71) channelz.append(8); -@@ -419,7 +419,7 @@ QList QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode) - QList devices; - QByteArray filter; - --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - // Create a list of all current audio devices that support mode - void **hints, **n; - char *name, *descr, *io; -@@ -498,7 +498,7 @@ QByteArray QAudioDeviceInfoInternal::defaultOutputDevice() - return devices.first(); - } - --#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - void QAudioDeviceInfoInternal::checkSurround() - { - QList devices; -diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h -index 96febf4..714bf60 100644 ---- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h -+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h -@@ -98,7 +98,7 @@ private: - bool open(); - void close(); - --#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - void checkSurround(); - bool surround40; - bool surround51; -diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp -index 339fd9f..202a5b2 100644 ---- a/src/multimedia/audio/qaudioinput_alsa_p.cpp -+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp -@@ -284,13 +284,13 @@ bool QAudioInputPrivate::open() - QString dev = QString(QLatin1String(m_device.constData())); - QList devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioInput); - if(dev.compare(QLatin1String("default")) == 0) { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(devices.first()); - #else - dev = QLatin1String("hw:0,0"); - #endif - } else { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(m_device); - #else - int idx = 0; -diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp -index bf85de5..fe4b010 100644 ---- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp -+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp -@@ -299,13 +299,13 @@ bool QAudioOutputPrivate::open() - QString dev = QString(QLatin1String(m_device.constData())); - QList devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput); - if(dev.compare(QLatin1String("default")) == 0) { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(devices.first()); - #else - dev = QLatin1String("hw:0,0"); - #endif - } else { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(m_device); - #else - int idx = 0; --- -2.7.0 - diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml deleted file mode 100644 index c6f5fc3b1269..000000000000 --- a/dev-qt/qtmultimedia/metadata.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - qt@gentoo.org - Gentoo Qt Project - - - Add support for exceptions - like catching them - inside the event loop (recommended by upstream) - Use GLES 2.0 or later instead of full OpenGL - Enable audio support via media-libs/gstreamer using SLOT 1.0 - Build QML/QtQuick bindings and imports - Build the QtMultimediaWidgets module - - - https://bugreports.qt.io/ - https://doc.qt.io/ - - - - Must only be used by packages that are known to use private parts of the Qt API. - - - diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild deleted file mode 100644 index eb03bb3922ac..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The Multimedia module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86" -fi - -IUSE="alsa" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.0-alsa.patch" - "${FILESDIR}/${PN}-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch" # bug 572426 -) - -QT4_TARGET_DIRECTORIES="src/multimedia" - -QCONFIG_ADD="multimedia" -QCONFIG_DEFINE="QT_MULTIMEDIA" - -multilib_src_configure() { - local myconf=( - -multimedia -audio-backend - $(qt_use alsa) - -no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend - -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild deleted file mode 100644 index 04cc34da1d15..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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 ~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 ) - 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 ) -" - -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 -} diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild deleted file mode 100644 index 07c0609fcc71..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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 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 ) - 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 ) -" - -src_prepare() { - # bug 646756 - 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 -} diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild deleted file mode 100644 index b2da4c14dd87..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-5.9.6.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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 ~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 ) - 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 ) -" - -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 -} -- cgit v1.2.3