[gentoo-commits] gentoo-x86 commit in media-sound/clementine: ChangeLog clementine-0.3.ebuild clementine-0.2.ebuild

[gentoo-commits] gentoo-x86 commit in media-sound/clementine: ChangeLog clementine-0.3.ebuild clementine-0.2.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    10/06/23 17:00:01

  Modified:             ChangeLog clementine-0.3.ebuild
  Removed:              clementine-0.2.ebuild
  Log:
  Remove broken VLC engine wrt #325237 by Lars Wendler.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.8                  media-sound/clementine/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/clementine/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/clementine/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/clementine/ChangeLog?r1=1.7&r2=1.8

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog	9 Jun 2010 15:50:06 -0000	1.7
+++ ChangeLog	23 Jun 2010 17:00:01 -0000	1.8
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/clementine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.7 2010/06/09 15:50:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.8 2010/06/23 17:00:01 ssuominen Exp $
+
+  23 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> clementine-0.3.ebuild:
+  Remove broken VLC engine wrt #325237 by Lars Wendler.
 
   09 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> clementine-0.3.ebuild:
   Fix missing glib-2.0 include dirs wrt #320699 by Elias Probst and Vicente



1.5                  media-sound/clementine/clementine-0.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/clementine/clementine-0.3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/clementine/clementine-0.3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/clementine/clementine-0.3.ebuild?r1=1.4&r2=1.5

Index: clementine-0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clementine-0.3.ebuild	9 Jun 2010 15:51:46 -0000	1.4
+++ clementine-0.3.ebuild	23 Jun 2010 17:00:01 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.3.ebuild,v 1.4 2010/06/09 15:51:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.3.ebuild,v 1.5 2010/06/23 17:00:01 ssuominen Exp $
 
 EAPI=2
 inherit cmake-utils gnome2-utils flag-o-matic
@@ -12,7 +12,7 @@
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer vlc +xine"
+IUSE="gstreamer +xine"
 
 COMMON_DEPEND="x11-libs/qt-gui:4
 	x11-libs/qt-opengl:4
@@ -22,9 +22,8 @@
 	dev-libs/glib:2
 	gstreamer? ( >=media-libs/gstreamer-0.10
 		>=media-libs/gst-plugins-base-0.10 )
-	vlc? ( media-video/vlc )
 	xine? ( media-libs/xine-lib )
-	!gstreamer? ( !vlc? ( media-libs/xine-lib ) )"
+	!gstreamer? ( media-libs/xine-lib )"
 RDEPEND="${COMMON_DEPEND}
 	gstreamer? ( >=media-plugins/gst-plugins-meta-0.10
 		>=media-plugins/gst-plugins-gio-0.10 )"
@@ -35,19 +34,16 @@
 DOCS="Changelog TODO"
 
 src_configure() {
-	# -DENGINE_QT_PHONON_ENABLED=ON doesn't compile
-
-	# Harmless workaround for bug 320699.
-	append-cppflags $(pkg-config --cflags-only-I glib-2.0)
+	append-cppflags "$(pkg-config --cflags-only-I glib-2.0)" #320699
 
 	mycmakeargs=(
 		$(cmake-utils_use gstreamer ENGINE_GSTREAMER_ENABLED)
-		$(cmake-utils_use vlc ENGINE_LIBVLC_ENABLED)
+		"-DENGINE_LIBVLC_ENABLED=OFF"
 		$(cmake-utils_use xine ENGINE_LIBXINE_ENABLED)
 		"-DENGINE_QT_PHONON_ENABLED=OFF"
 		)
 
-	if ! use gstreamer && ! use vlc; then
+	if ! use gstreamer; then
 		mycmakeargs+=(
 			"-DENGINE_LIBXINE_ENABLED=ON"
 			)