[gentoo-commits] gentoo-x86 commit in media-libs/phonon: metadata.xml phonon-9999.ebuild phonon-4.6.0.ebuild ChangeLog

[Johannes Huber (johu)]

johu        11/12/23 13:17:06

  Modified:             metadata.xml phonon-9999.ebuild ChangeLog
  Added:                phonon-4.6.0.ebuild
  Log:
  Version bump.
  
  (Portage version: 2.2.0_alpha81/cvs/Linux i686)

Revision  Changes    Path
1.2                  media-libs/phonon/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	26 Mar 2011 16:07:01 -0000	1.1
+++ metadata.xml	23 Dec 2011 13:17:06 -0000	1.2
@@ -4,5 +4,6 @@
 <herd>kde</herd>
 <use>
 	<flag name="vlc">Install VLC Phonon backend</flag>
+	<flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
 </use>
 </pkgmetadata>



1.13                 media-libs/phonon/phonon-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?r1=1.12&r2=1.13

Index: phonon-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- phonon-9999.ebuild	8 Nov 2011 19:04:23 -0000	1.12
+++ phonon-9999.ebuild	23 Dec 2011 13:17:06 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.12 2011/11/08 19:04:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.13 2011/12/23 13:17:06 johu Exp $
 
 EAPI=4
 
@@ -20,10 +20,10 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="aqua debug +gstreamer pulseaudio vlc xine"
+IUSE="aqua debug +gstreamer pulseaudio vlc xine zeitgeist"
 
 COMMON_DEPEND="
-	!x11-libs/qt-phonon:4
+	!!x11-libs/qt-phonon:4
 	>=x11-libs/qt-core-4.6.0:4
 	>=x11-libs/qt-dbus-4.6.0:4
 	>=x11-libs/qt-gui-4.6.0:4
@@ -32,6 +32,7 @@
 		dev-libs/glib:2
 		>=media-sound/pulseaudio-0.9.21[glib]
 	)
+	zeitgeist? ( dev-libs/libqzeitgeist )
 "
 # directshow? ( media-sound/phonon-directshow )
 # mmf? ( media-sound/phonon-mmf )



1.27                 media-libs/phonon/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?r1=1.26&r2=1.27

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog	2 Dec 2011 19:22:19 -0000	1.26
+++ ChangeLog	23 Dec 2011 13:17:06 -0000	1.27
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.26 2011/12/02 19:22:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.27 2011/12/23 13:17:06 johu Exp $
+
+*phonon-4.6.0 (23 Dec 2011)
+
+  23 Dec 2011; Johannes Huber <johu@g.o> +phonon-4.6.0.ebuild,
+  metadata.xml, phonon-9999.ebuild:
+  Version bump.
 
   02 Dec 2011; Andreas K. Huettel <dilfridge@g.o> phonon-4.4.2.ebuild,
   phonon-4.4.3.ebuild, phonon-4.5.0.ebuild, phonon-4.5.1-r1.ebuild:



1.1                  media-libs/phonon/phonon-4.6.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.6.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.6.0.ebuild?rev=1.1&content-type=text/plain

Index: phonon-4.6.0.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.6.0.ebuild,v 1.1 2011/12/23 13:17:06 johu Exp $

EAPI=4

if [[ ${PV} != *9999* ]]; then
	SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
else
	SCM_ECLASS="git-2"
	EGIT_REPO_URI="git://anongit.kde.org/${PN}"
	KEYWORDS=""
fi

inherit cmake-utils ${SCM_ECLASS}

DESCRIPTION="KDE multimedia API"
HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"

LICENSE="LGPL-2.1"
SLOT="0"
IUSE="aqua debug +gstreamer pulseaudio vlc xine zeitgeist"

COMMON_DEPEND="
	!!x11-libs/qt-phonon:4
	>=x11-libs/qt-core-4.6.0:4
	>=x11-libs/qt-dbus-4.6.0:4
	>=x11-libs/qt-gui-4.6.0:4
	>=x11-libs/qt-test-4.6.0:4
	pulseaudio? (
		dev-libs/glib:2
		>=media-sound/pulseaudio-0.9.21[glib]
	)
	zeitgeist? ( dev-libs/libqzeitgeist )
"
# directshow? ( media-sound/phonon-directshow )
# mmf? ( media-sound/phonon-mmf )
# mplayer? ( media-sound/phonon-mplayer )
# waveout? ( media-sound/phonon-waveout )
PDEPEND="
	aqua? ( media-libs/phonon-qt7 )
	gstreamer? ( media-libs/phonon-gstreamer )
	vlc? ( >=media-libs/phonon-vlc-0.3.2 )
	xine? ( >=media-libs/phonon-xine-0.4.4 )
"
RDEPEND="${COMMON_DEPEND}
	!kde-base/phonon-xine
"
DEPEND="${COMMON_DEPEND}
	>=dev-util/automoc-0.9.87
	dev-util/pkgconfig
"

REQUIRED_USE="|| ( aqua gstreamer vlc xine )"

PATCHES=( "${FILESDIR}/${PN}-4.5.1-qmakeworkaround.patch" )

src_configure() {
	local mycmakeargs=(
		$(cmake-utils_use_with pulseaudio GLIB2)
		$(cmake-utils_use_with pulseaudio PulseAudio)
	)
	cmake-utils_src_configure
}