diff options
author | 2012-12-29 13:45:09 +0000 | |
---|---|---|
committer | 2012-12-29 13:45:09 +0000 | |
commit | 6edd96497e52a054bc83ced15e121a50bb8cec9a (patch) | |
tree | 30089230321c924e5c565cbbd25105b518333f97 /x11-libs/qt-phonon | |
parent | Remove old. (diff) | |
download | gentoo-2-6edd96497e52a054bc83ced15e121a50bb8cec9a.tar.gz gentoo-2-6edd96497e52a054bc83ced15e121a50bb8cec9a.tar.bz2 gentoo-2-6edd96497e52a054bc83ced15e121a50bb8cec9a.zip |
Remove old.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'x11-libs/qt-phonon')
-rw-r--r-- | x11-libs/qt-phonon/ChangeLog | 7 | ||||
-rw-r--r-- | x11-libs/qt-phonon/files/4.8.2-qatomic-x32.patch | 50 | ||||
-rw-r--r-- | x11-libs/qt-phonon/qt-phonon-4.7.4.ebuild | 46 | ||||
-rw-r--r-- | x11-libs/qt-phonon/qt-phonon-4.8.1.ebuild | 52 | ||||
-rw-r--r-- | x11-libs/qt-phonon/qt-phonon-4.8.2.ebuild | 60 | ||||
-rw-r--r-- | x11-libs/qt-phonon/qt-phonon-4.8.3.ebuild | 56 |
6 files changed, 6 insertions, 265 deletions
diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog index f9d6f9bd7259..f51acd2e2a3d 100644 --- a/x11-libs/qt-phonon/ChangeLog +++ b/x11-libs/qt-phonon/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt-phonon # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.134 2012/12/25 14:55:50 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.135 2012/12/29 13:45:09 kensington Exp $ + + 29 Dec 2012; Michael Palimaka <kensington@gentoo.org> + -files/4.8.2-qatomic-x32.patch, -qt-phonon-4.7.4.ebuild, + -qt-phonon-4.8.1.ebuild, -qt-phonon-4.8.2.ebuild, -qt-phonon-4.8.3.ebuild: + Remove old. 25 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-phonon-4.8.4.ebuild: Stable for arm, wrt bug #445956 diff --git a/x11-libs/qt-phonon/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-phonon/files/4.8.2-qatomic-x32.patch deleted file mode 100644 index 5f352b1acc83..000000000000 --- a/x11-libs/qt-phonon/files/4.8.2-qatomic-x32.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 -From: Davide Pesavento <davidepesa@gmail.com> -Date: Thu, 14 Jun 2012 00:44:43 +0200 -Subject: [PATCH] Fix qatomic inline asm for x32 ABI. - -Drop the 'q' suffix from x86_64 asm instructions. It's not needed, -because the assembler can automatically determine the proper size -based on the target, and it is in fact causing compilation failures -on x32. - -Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- - src/corelib/arch/qatomic_x86_64.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h -index c2627c8..dc78140 100644 ---- a/src/corelib/arch/qatomic_x86_64.h -+++ b/src/corelib/arch/qatomic_x86_64.h -@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValu - { - unsigned char ret; - asm volatile("lock\n" -- "cmpxchgq %3,%2\n" -+ "cmpxchg %3,%2\n" - "sete %1\n" - : "=a" (newValue), "=qm" (ret), "+m" (_q_value) - : "r" (newValue), "0" (expectedValue) -@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValu - template <typename T> - Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue) - { -- asm volatile("xchgq %0,%1" -+ asm volatile("xchg %0,%1" - : "=r" (newValue), "+m" (_q_value) - : "0" (newValue) - : "memory"); -@@ -192,7 +192,7 @@ template <typename T> - Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd) - { - asm volatile("lock\n" -- "xaddq %0,%1" -+ "xadd %0,%1" - : "=r" (valueToAdd), "+m" (_q_value) - : "0" (valueToAdd * sizeof(T)) - : "memory"); --- -1.7.10 - diff --git a/x11-libs/qt-phonon/qt-phonon-4.7.4.ebuild b/x11-libs/qt-phonon/qt-phonon-4.7.4.ebuild deleted file mode 100644 index 20bef3a84478..000000000000 --- a/x11-libs/qt-phonon/qt-phonon-4.7.4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.7.4.ebuild,v 1.6 2012/09/11 10:47:23 johu Exp $ - -EAPI="3" -inherit qt4-build - -DESCRIPTION="The Phonon module for the Qt toolkit" -SLOT="4" -KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="dbus qt3support" - -DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,qt3support=] - !kde-base/phonon-kde - !kde-base/phonon-xine - !media-libs/phonon - !media-sound/phonon - !aqua? ( media-libs/gstreamer:0.10 - media-plugins/gst-plugins-meta:0.10 ) - aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,qt3support=] ) - dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/phonon - src/plugins/phonon - tools/designer/src/plugins/phononwidgets" - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/ - src - tools" - - QCONFIG_ADD="phonon" - use aqua || QCONFIG_DEFINE="QT_GSTREAMER" - - qt4-build_pkg_setup -} - -src_configure() { - myconf="${myconf} -phonon -phonon-backend -no-opengl -no-svg - $(qt_use dbus qdbus) - $(qt_use qt3support)" - - qt4-build_src_configure -} diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.1.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.1.ebuild deleted file mode 100644 index 2de76111094d..000000000000 --- a/x11-libs/qt-phonon/qt-phonon-4.8.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.8.1.ebuild,v 1.8 2012/09/11 10:47:23 johu Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Phonon module for the Qt toolkit" -SLOT="4" -KEYWORDS="amd64 arm hppa ~ia64 ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="dbus qt3support" - -DEPEND=" - ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=] - !kde-base/phonon-kde - !kde-base/phonon-xine - !media-libs/phonon - !media-sound/phonon - !aqua? ( media-libs/gstreamer:0.10 - media-plugins/gst-plugins-meta:0.10 ) - aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,debug=,qt3support=] ) - dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] ) -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/phonon - src/plugins/phonon - tools/designer/src/plugins/phononwidgets" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include - src - tools" - - QCONFIG_ADD="phonon" - QCONFIG_DEFINE="QT_PHONON - $(use !aqua && echo QT_GSTREAMER)" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -phonon -phonon-backend -no-opengl -no-svg - $(qt_use dbus qdbus) - $(qt_use qt3support)" - - qt4-build_src_configure -} diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.2.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.2.ebuild deleted file mode 100644 index 3ca90168474a..000000000000 --- a/x11-libs/qt-phonon/qt-phonon-4.8.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.8.2.ebuild,v 1.8 2012/09/11 10:47:23 johu Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Phonon module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="dbus qt3support" - -DEPEND=" - ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=] - !kde-base/phonon-kde - !kde-base/phonon-xine - !media-libs/phonon - !media-sound/phonon - !aqua? ( media-libs/gstreamer:0.10 - media-plugins/gst-plugins-meta:0.10 ) - aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,debug=,qt3support=] ) - dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PV}-qatomic-x32.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/phonon - src/plugins/phonon - tools/designer/src/plugins/phononwidgets" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include - src - tools" - - QCONFIG_ADD="phonon" - QCONFIG_DEFINE="QT_PHONON - $(use !aqua && echo QT_GSTREAMER)" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -phonon -phonon-backend -no-opengl -no-svg - $(qt_use dbus qdbus) - $(qt_use qt3support)" - - qt4-build_src_configure -} diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.3.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.3.ebuild deleted file mode 100644 index 41f7d1a556c8..000000000000 --- a/x11-libs/qt-phonon/qt-phonon-4.8.3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.8.3.ebuild,v 1.2 2012/09/16 04:35:50 yngwin Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Phonon module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="dbus qt3support" - -DEPEND=" - ~x11-libs/qt-gui-${PV}[aqua=,debug=,qt3support=] - !kde-base/phonon-kde - !kde-base/phonon-xine - !media-libs/phonon - !media-sound/phonon - !aqua? ( media-libs/gstreamer:0.10 - media-plugins/gst-plugins-meta:0.10 ) - aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,debug=,qt3support=] ) - dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] ) -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/phonon - src/plugins/phonon - tools/designer/src/plugins/phononwidgets" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include - src - tools" - - QCONFIG_ADD="phonon" - QCONFIG_DEFINE="QT_PHONON - $(use !aqua && echo QT_GSTREAMER)" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -phonon -phonon-backend -no-opengl -no-svg - $(qt_use dbus qdbus) - $(qt_use qt3support)" - - qt4-build_src_configure -} |