From e9e3d10bcc53333ceb9ec723959fae971599ba17 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 23 Jun 2010 17:00:01 +0000 Subject: [PATCH] Remove broken VLC engine wrt #325237 by Lars Wendler. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-sound/clementine/ChangeLog | 5 ++- media-sound/clementine/Manifest | 6 ++-- media-sound/clementine/clementine-0.2.ebuild | 33 -------------------- media-sound/clementine/clementine-0.3.ebuild | 16 ++++------ 4 files changed, 12 insertions(+), 48 deletions(-) delete mode 100644 media-sound/clementine/clementine-0.2.ebuild diff --git a/media-sound/clementine/ChangeLog b/media-sound/clementine/ChangeLog index 179041dbdfba..6bd685e351b1 100644 --- a/media-sound/clementine/ChangeLog +++ b/media-sound/clementine/ChangeLog @@ -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 clementine-0.3.ebuild: + Remove broken VLC engine wrt #325237 by Lars Wendler. 09 Jun 2010; Samuli Suominen clementine-0.3.ebuild: Fix missing glib-2.0 include dirs wrt #320699 by Elias Probst and Vicente diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest index 5bd504b4e9d4..3b26b2bd4134 100644 --- a/media-sound/clementine/Manifest +++ b/media-sound/clementine/Manifest @@ -1,6 +1,4 @@ -DIST clementine-0.2.tar.gz 3647928 RMD160 54216323302f3a155385b80cdbb6a8d65bc7186e SHA1 cff040b2b738e7c673297bdd690cd81dfbbbb1f9 SHA256 9c04956dfe8ec244b50ffc2bf43047c616ec1f580ebd0c2f862237bdf740114a DIST clementine-0.3.tar.gz 3917108 RMD160 b5238aa0b5dd16758205a6dde7f44bbc759b3225 SHA1 7d0337f8bbe93f6320a10776c14d211f5ba507e9 SHA256 4041f55d6bc2f3388bfc070867d1f22f7430a66aa656003c311679f548e9c582 -EBUILD clementine-0.2.ebuild 935 RMD160 4423894e7c3d9584028c0694dcd0a22093c3e75a SHA1 2659a53cb24eef881df3c33f986d04447a06350c SHA256 000badd2fd217e62ae3e130e0f011182ee21a147b68c742853c1b1a902cf4401 -EBUILD clementine-0.3.ebuild 1743 RMD160 5b36ba20930824d4a7ad3bfc82046d72a4bf2474 SHA1 b883600b18d75b55af38b9fdeea71d0be46eac3f SHA256 4f5bbec16568011aea5adc849ea00a24df90c47be701297f28b56cc85e9e176e -MISC ChangeLog 1178 RMD160 d5fdd6c292eb6bd1be9c79d55c771b80a1442ac3 SHA1 be9f97128a1f32391085edfe549c554fd9017ac5 SHA256 6a5725b2730dc267eab8ba58833ae47a4414f963826b67b6ceba743c8ae660f9 +EBUILD clementine-0.3.ebuild 1596 RMD160 7f83f9e4ba56d45f6f30436cb7258a87645316b0 SHA1 cc34c6d7222c99db3e0ad33f76b7c7d6cb40cd1d SHA256 8ad36051985d854167b845ca25dc6b4980755c12b02ac657ee6e602cb01c756e +MISC ChangeLog 1312 RMD160 4c4d1734375e41a22654a1d48f042e580a079a12 SHA1 59a54053ea3e2f64243d9f6a4215e7a80ae25981 SHA256 d0e5b61b2c5e6539b735905150533156c790961780eff05f3f51b1eef417d10a MISC metadata.xml 235 RMD160 6f309833614adcd4f183adbe30278fd96fe1f35c SHA1 df4fbbdee548de206f30f5f9240aa03d1801091a SHA256 e8c2f672d53da40e31ebed04d574c032decfb25fb096fee08ab6c1d1344f066f diff --git a/media-sound/clementine/clementine-0.2.ebuild b/media-sound/clementine/clementine-0.2.ebuild deleted file mode 100644 index d7f5ed91ca9d..000000000000 --- a/media-sound/clementine/clementine-0.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# 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.2.ebuild,v 1.3 2010/05/14 11:10:23 ssuominen Exp $ - -EAPI=2 -inherit cmake-utils gnome2-utils - -DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4" -HOMEPAGE="http://code.google.com/p/clementine-player/" -SRC_URI="http://clementine-player.googlecode.com/files/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/qt-gui:4 - x11-libs/qt-sql:4[sqlite] - x11-libs/qt-opengl:4 - media-libs/liblastfm - x11-libs/libnotify - media-libs/xine-lib - >=media-libs/taglib-1.6 - dev-libs/glib:2" -DEPEND="${RDEPEND} - >=dev-libs/boost-1.39 - dev-util/pkgconfig" - -DOCS="Changelog TODO" - -pkg_preinst() { gnome2_icon_savelist; } -pkg_postinst() { gnome2_icon_cache_update; } -pkg_postrm() { gnome2_icon_cache_update; } diff --git a/media-sound/clementine/clementine-0.3.ebuild b/media-sound/clementine/clementine-0.3.ebuild index bb72bd967eee..2c5510dacaaf 100644 --- a/media-sound/clementine/clementine-0.3.ebuild +++ b/media-sound/clementine/clementine-0.3.ebuild @@ -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 @@ SRC_URI="http://clementine-player.googlecode.com/files/${P}.tar.gz" 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 @@ COMMON_DEPEND="x11-libs/qt-gui:4 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 @@ DEPEND="${COMMON_DEPEND} 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" ) -- 2.26.2