summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2016-12-04 04:52:43 +0100
committerDavide Pesavento <pesa@gentoo.org>2016-12-04 04:52:43 +0100
commit2ef83c43456d4812e8a94255cca1ff1bbf32fff6 (patch)
tree71f45e3576615dcd4832539430b540ed38a695cf /dev-qt/qtmultimedia
parentnet-analyzer/nagios{,-core}: new version 4.2.3 to fix CVE-2016-8641. (diff)
downloadgentoo-2ef83c43456d4812e8a94255cca1ff1bbf32fff6.tar.gz
gentoo-2ef83c43456d4812e8a94255cca1ff1bbf32fff6.tar.bz2
gentoo-2ef83c43456d4812e8a94255cca1ff1bbf32fff6.zip
dev-qt: remove Qt 5.5.1
Package-Manager: portage-2.3.2
Diffstat (limited to 'dev-qt/qtmultimedia')
-rw-r--r--dev-qt/qtmultimedia/Manifest1
-rw-r--r--dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch118
-rw-r--r--dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild83
3 files changed, 0 insertions, 202 deletions
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 5d83b8dc4b5f..7ee48c88ac8e 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,6 +1,5 @@
DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtmultimedia-opensource-src-5.5.1.tar.xz 3464340 SHA256 7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f SHA512 e38a3bc0ed77ab6fe7f3a68e2b0dcfebe3fb29c860a1ca48391a1519ebc4c564f25469082b4e9ef78e31093724df24b33aa83158fa9211221fa2c6d9154ce0d0 WHIRLPOOL 8e70821769a86a5de40754e303232c5e1441cc5c04b88082bac349d56360c7ad25af8d7893a3b3f2d9255ff6d18af8051bb369444c331fc4ecf5bce3de330bed
DIST qtmultimedia-opensource-src-5.6.1-1.tar.xz 3487908 SHA256 4e28dcc696a9996b03a124b0f56fc86646bc2e9d29d383dc923b926040774e5d SHA512 d28e85752a2daa58293ffc4c36a83020fece7dad5c1e88567c0f2d2d66733ff93bfd86b0d94756dfa38ac57ad963f9aeae89f42d81e0145d14f02f3954645d3c WHIRLPOOL 4f2fe48c77d93a89a0eede5603dedd06abac3059304a5c85209230da7aeb153c5f313dd6fc3f6247ebe36dc5a513e60aad3f587bc4854886aadb2e03ba1f3064
DIST qtmultimedia-opensource-src-5.6.2.tar.xz 3492628 SHA256 cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf SHA512 e4750b1033f4ffbc139c14475fa07019bbb51a373d72a608035da583e88979fc7cc8694be90661c3977f6a1e0be2c27a98b348a632f62b2d40c224af927f9ccc WHIRLPOOL 1a9872996146371e4bf7d877c18a829986db63fca3ce57b250d9282d884a1479a7309b981c29c7bfedd4d965c5b76e94cafd11ea9c0e3c1d07852ebabb58365d
DIST qtmultimedia-opensource-src-5.7.0.tar.xz 3513016 SHA256 05ae705bda224a600b06e390aa7b1448c4a6a52d2d37842d2121fb4a5d84b559 SHA512 fdac8d63f48515dad46ba659e65d0c857c5d82d56a7fbadf8b436c57cdfeff3a681e0a53236df8d159dc8758c228fde9ca425708fed9a6a925682cdfe84f1908 WHIRLPOOL c70c8dc1715308f8fc043c652f9046e079c6fb71f133bce6fa720def245ab4a00cf6cdf93d1cf7adb1c09cb5a034dc984b70d4f9140ad10f1ec0ec2a499dd6cd
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch
deleted file mode 100644
index 33002056288a..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 3b322323d036ae2fc9f685bfc74d1ebcd5532159 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Fri, 27 Nov 2015 14:36:50 +0100
-Subject: [PATCH] alsa: Relax ALSA version checks for 1.1.x to be detected.
-
-Relax the check for SND_LIB_MINOR and SND_LIB_SUBMINOR so that ALSA
-1.1.x is not considered older than 1.0.10. QtMultimedia builds fine with
-ALSA 1.1.
-
-Change-Id: If697c34cc7d9bbe2f2a3413d0c25ac4de4e93b34
-Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
----
- config.tests/alsa/alsatest.cpp | 2 +-
- src/plugins/alsa/qalsaaudiodeviceinfo.cpp | 8 ++++----
- src/plugins/alsa/qalsaaudioinput.cpp | 4 ++--
- src/plugins/alsa/qalsaaudiooutput.cpp | 4 ++--
- 4 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp
-index a9f9c24..1b59cb1 100644
---- a/config.tests/alsa/alsatest.cpp
-+++ b/config.tests/alsa/alsatest.cpp
-@@ -32,7 +32,7 @@
- ****************************************************************************/
-
- #include <alsa/asoundlib.h>
--#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/plugins/alsa/qalsaaudiodeviceinfo.cpp b/src/plugins/alsa/qalsaaudiodeviceinfo.cpp
-index be90ca6..3d31087 100644
---- a/src/plugins/alsa/qalsaaudiodeviceinfo.cpp
-+++ b/src/plugins/alsa/qalsaaudiodeviceinfo.cpp
-@@ -141,7 +141,7 @@ bool QAlsaAudioDeviceInfo::open()
- QList<QByteArray> 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))
- if (devices.size() > 0)
- dev = QLatin1String(devices.first().constData());
- else
-@@ -150,7 +150,7 @@ bool QAlsaAudioDeviceInfo::open()
- 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;
-@@ -194,7 +194,7 @@ bool QAlsaAudioDeviceInfo::testSettings(const QAudioFormat& format) const
- snd_pcm_hw_params_t *params;
- QString dev;
-
--#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;
- if (dev.compare(QLatin1String("default")) == 0) {
- QList<QByteArray> devices = availableDevices(QAudio::AudioOutput);
-@@ -335,7 +335,7 @@ QList<QByteArray> QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode)
- QList<QByteArray> 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;
-diff --git a/src/plugins/alsa/qalsaaudioinput.cpp b/src/plugins/alsa/qalsaaudioinput.cpp
-index 4a8dd80..d6d8adc 100644
---- a/src/plugins/alsa/qalsaaudioinput.cpp
-+++ b/src/plugins/alsa/qalsaaudioinput.cpp
-@@ -303,7 +303,7 @@ bool QAlsaAudioInput::open()
- QString dev = QString(QLatin1String(m_device.constData()));
- QList<QByteArray> devices = QAlsaAudioDeviceInfo::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))
- if (devices.size() > 0)
- dev = QLatin1String(devices.first());
- else
-@@ -312,7 +312,7 @@ bool QAlsaAudioInput::open()
- 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/plugins/alsa/qalsaaudiooutput.cpp b/src/plugins/alsa/qalsaaudiooutput.cpp
-index 7b7da50..f8f0f58 100644
---- a/src/plugins/alsa/qalsaaudiooutput.cpp
-+++ b/src/plugins/alsa/qalsaaudiooutput.cpp
-@@ -306,7 +306,7 @@ bool QAlsaAudioOutput::open()
- QString dev = QString(QLatin1String(m_device.constData()));
- QList<QByteArray> devices = QAlsaAudioDeviceInfo::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))
- if (devices.size() > 0)
- dev = QLatin1String(devices.first());
- else
-@@ -315,7 +315,7 @@ bool QAlsaAudioOutput::open()
- 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/qtmultimedia-5.5.1-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild
deleted file mode 100644
index 7e8356080221..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt5-build
-
-DESCRIPTION="The Multimedia module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm hppa ppc64 x86"
-fi
-
-IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
-REQUIRED_USE="?? ( gstreamer gstreamer010 )"
-
-RDEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}
- ~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
- )
- gstreamer010? (
- dev-libs/glib:2
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-bad:0.10
- media-libs/gst-plugins-base:0.10
- )
- pulseaudio? ( media-sound/pulseaudio )
- qml? (
- ~dev-qt/qtdeclarative-${PV}
- gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
- !gles2? ( ~dev-qt/qtgui-${PV}[-egl] )
- openal? ( media-libs/openal )
- )
- widgets? (
- ~dev-qt/qtopengl-${PV}
- ~dev-qt/qtwidgets-${PV}
- )
-"
-DEPEND="${RDEPEND}
- gstreamer? ( x11-proto/videoproto )
-"
-
-PATCHES=(
- # bug 572426
- "${FILESDIR}/${P}-Relax-ALSA-version-checks-for-1.1.x.patch"
-)
-
-src_prepare() {
- # do not rely on qtbase configuration
- sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
- qtmultimedia.pro || die
-
- qt_use_compile_test alsa
- qt_use_compile_test gstreamer
- qt_use_compile_test openal
- qt_use_compile_test pulseaudio
-
- 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=(
- $(usex gstreamer 'GST_VERSION=1.0' '')
- $(usex gstreamer010 'GST_VERSION=0.10' '')
- )
- qt5-build_src_configure
-}