[proaudio] [1508] mixxx update

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 1508
Author:   gavlee
Date:     2009-08-28 05:07:18 +0200 (Fri, 28 Aug 2009)
Log Message:
-----------
mixxx update

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
    trunk/overlays/proaudio/media-sound/mixxx/Manifest
    trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.7.0.ebuild

Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog	2009-08-22 09:36:26 UTC (rev 1507)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog	2009-08-28 03:07:18 UTC (rev 1508)
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mixxx-1.7.0 (28 Aug 2009)
+
+  28 Aug 2009; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx> +mixxx-1.7.0.ebuild,
+  mixxx-9999.ebuild:
+  add latest 1.7.0 release, change bzr url in live ebuild, fix some deps
+
   10 Jun 2009; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx> ChangeLog:
   +mixxx-1.6.1-r1.ebuild: latest stable release with herc support
   +mixxx-1.7.0_beta1.ebuild: latest beta

Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest	2009-08-22 09:36:26 UTC (rev 1507)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest	2009-08-28 03:07:18 UTC (rev 1508)
@@ -1,11 +1,13 @@
 AUX mixxx-1.6.0_beta4-debug.patch 334 RMD160 75ff38e43eb55fae66e245a412c4a1089c091ee5 SHA1 92303420e019020c2d7abd50bdfb0ed7ef469177 SHA256 caf3ee6cbd09853c281a351c9dbabc845c63128cc60a5ceee183a8cec560a0ad
 AUX mixxx-9999-qt4_paths.patch 1422 RMD160 12f23b0c12b0af8ab54a4514c8048097f59df2f3 SHA1 2ff3b91299ac9fa2d2dcae79d5d835761a290610 SHA256 6917b59e0b8cbebdffed0c86a26f06d6c212bf1d66bb944cfcc54b8c56903d6f
 DIST mixxx-1.6.1-src.tar.gz 6833830 RMD160 7a62a541f7ba5910c69924575edff5f76561da84 SHA1 dc5e2c41d00878ec9833562c238cc3c967abf220 SHA256 1dc04e9d628c96c75a219384252d990659e9dd0a1f23aa72b8f0774395771df1
+DIST mixxx-1.7.0-src.tar.gz 8775170 RMD160 1cadbe191c72e5f7775ab353b833ddc3986dae39 SHA1 2940a6be35f02e87e50f04752b5dd9eb0f97cb37 SHA256 e1304935736da032f0395b2d2abce4336f6022b06a06e95cf42be5ec85d917a4
 DIST mixxx-1.7.0~beta1-src.tar.gz 8300845 RMD160 aef4dfc7f3ca6c962009a300b6aae66a630077c0 SHA1 827addc6b0f89b4cdcd2a01553fd323531c25819 SHA256 bd4319c0b48f3fe853bbe516f17ea4701cf694b3aab8839f5d09420fad534da8
 DIST mixxx_1.6.1+Herc.orig.tar.gz 7572307 RMD160 0748fa0d789291ab2175bef17a5ee8f93e0d1c34 SHA1 de2c4dd57d902ba5f99ea830422e677b82e131f5 SHA256 8d6cc65539ae899cc1d416e31e49630e265ad2b0fa442d3ae43c772ff32aa094
 EBUILD mixxx-1.6.1-r1.ebuild 2740 RMD160 65b40e100dc38472ee723b8c0bbf0e4269c75ec2 SHA1 643064f5e9e49f81433ca5634fc05a60807f9e64 SHA256 d9b0aec414ed911520df1a07015894264f2b593cc595e52cefe14e1f0faed633
 EBUILD mixxx-1.6.1.ebuild 1740 RMD160 9c402d7304bb0f373c0936b6bf6a01b84b29f79a SHA1 3f08ccd54a112e061ee589ba6cac19ae0e56102a SHA256 7aa1de0fb28cff1cf5d31b00fdcc3f4dcd2a8d7973905b62d5ad5fd5b19b01e7
+EBUILD mixxx-1.7.0.ebuild 2386 RMD160 cdfeadb4e8f461b74085e0bd76cdb0e19c3d5f9b SHA1 79dbc46f00da8f34e203393b8f766c9e29562ec2 SHA256 1b72831a70be56a526dee5702bd2223e73bfd7e3a49db7e1b8f9fae7b7e49337
 EBUILD mixxx-1.7.0_beta1.ebuild 2734 RMD160 e4536789b1e071159da31f3f4e5fa72fc54c1359 SHA1 4cd3bebe301860bcb89c09fe2e4dfd495df68b86 SHA256 41c22043cf2630d6ab37e2d39d723b80150c975f79740b10f93c4ab41b947670
-EBUILD mixxx-9999.ebuild 2613 RMD160 441ca2267aeab89c94eb59b3e3d889771f182c10 SHA1 1c1f69ac0a4a5e68d3f22f711dcce3304e40f69b SHA256 ea17ecf2df3ea8db3423d19ac180d5cc80598a51974ae54cf22906596ad6e5f7
-MISC ChangeLog 1918 RMD160 d47eaf79f8bbeb91bfdd69059dba1678b2fdfe83 SHA1 f1371966a2a9f7c3f2de2b67f530850175d69a32 SHA256 cee01d161611ec8ac0d3f06d24cc518af6887664d83d43930d751fd99ccf9b81
+EBUILD mixxx-9999.ebuild 2246 RMD160 66bf1786e9f3c6c9acb988f4e0a0c4bca25c226a SHA1 a91f0d5b5dc3f0020c3d22d557c5f03e6ecd59a1 SHA256 c15e785e53a342f6ba90665e7858dcfecc4ee998d4afb874bdd4033a8981510e
+MISC ChangeLog 2118 RMD160 84d78588e9b8ebdd1fb028833b89e7f5a7e4e53c SHA1 feb9ab5e97604aaf67302a135e9118da322f6271 SHA256 fb6d76bb28c3592c2f6d2d822d1cd0d1a2368c279168960d734b988cfb0d77f6
 MISC metadata.xml 643 RMD160 6e17d15058bab43c631c88d488561d4473515cb9 SHA1 847a6a66ea57b00a78863b072ef615a12d4c1533 SHA256 4dba695d68599cdb2ca84c3cffd6be099caa9fd2e3ee190724a4be663ed35011

Copied: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.7.0.ebuild (from rev 1507, trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.7.0.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.7.0.ebuild	2009-08-28 03:07:18 UTC (rev 1508)
@@ -0,0 +1,97 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=1
+
+inherit exteutils qt4 toolchain-funcs
+
+MY_PD="${P/_/-}"
+MY_PF="${P/_/~}"
+
+DESCRIPTION="Digital DJ tool using QT 4.x"
+HOMEPAGE="http://mixxx.sourceforge.net";
+SRC_URI="http://downloads.mixxx.org/${MY_PD}/${MY_PF}-src.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=x11-libs/qt-core-4.3:4
+		x11-libs/qt-gui:4
+		x11-libs/qt-svg:4
+		x11-libs/qt-opengl:4
+		x11-libs/qt-qt3support:4
+		media-libs/libmad
+		media-libs/libvorbis
+		media-libs/libsndfile
+		media-libs/libid3tag
+		>=media-libs/portaudio-19_pre
+		virtual/glu
+		alsa? ( media-libs/alsa-lib )
+		jack? ( media-sound/jack-audio-connection-kit )
+		djconsole? ( media-libs/libdjconsole )
+		ffmpeg? ( media-video/ffmpeg
+				  media-sound/gsm
+				  media-libs/libdc1394
+				  sys-libs/libraw1394
+				  media-libs/libdca
+				  media-libs/a52dec )
+		ladspa? ( media-libs/ladspa-sdk )
+		shout? ( media-libs/libshout )"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	dev-util/scons
+	dev-lang/perl
+	dev-util/pkgconfig"
+
+IUSE="alsa jack ladspa djconsole hifieq shout tonal +vinylcontrol"
+
+S="${WORKDIR}/${MY_PF}"
+
+pkg_setup() {
+	if use jack; then
+		if ! built_with_use media-libs/portaudio jack; then
+			eerror "To have jack support, you need to compile portaudio"
+			eerror "with USE=\"jack\"!"
+			die
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# use our own CXXFLAGS/CFLAGS
+	esed_check -i \
+		-e "0,/\(^env.Append.*\)/s//\1\nenv.Append(CCFLAGS = Split(\"\"\" \
+		${CFLAGS} \"\"\"))/" \
+		-e "0,/\(^env.Append.*\)/s//\1\nenv.Append(CXXFLAGS = ' ${CXXFLAGS} ')/" \
+		"${S}/src/SConscript"
+}
+
+src_compile() {
+	myconf=""
+	! use ladspa; myconf="ladspa=$?"
+	# disable ffmpeg for now, it doesn't compile as of 20090429
+	#! use ffmpeg; myconf="${myconf} ffmpeg=$?"
+	myconf="${myconf} ffmpeg=0"
+	! use djconsole; myconf="${myconf} djconsole=$?"
+	! use hifieq; myconf="${myconf} hifieq=$?"
+	! use shout; myconf="${myconf} shoutcast=$?"
+	! use tonal; myconf="${myconf} tonal=$?"
+	myconf="${myconf} prefix=/usr"
+	myconf="${myconf} qtdir=/usr/share/qt4"
+
+	mkdir -p "${D}/usr"
+	einfo "selected options: ${myconf}"
+	tc-export CC CXX
+	scons ${myconf} || die "scons failed"
+}
+
+src_install() {
+	mkdir -p "${D}/usr"
+	scons ${myconf} install_root="${D}/usr" install || die
+	dodoc README Mixxx-Manual.pdf
+}

Modified: trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild	2009-08-22 09:36:26 UTC (rev 1507)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild	2009-08-28 03:07:18 UTC (rev 1508)
@@ -9,46 +9,39 @@
 DESCRIPTION="Digital DJ tool using QT 4.x"
 HOMEPAGE="http://mixxx.sourceforge.net";
 
-EBZR_REPO_URI="lp:mixxx/1.7"
-EBZR_BRANCH=""
+EBZR_REPO_URI="lp:mixxx"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-DEPEND="|| ( ( x11-libs/qt-core
-		x11-libs/qt-gui
-		x11-libs/qt-opengl
-		x11-libs/qt-xmlpatterns )
-		>=x11-libs/qt-4.3:4 )
-	media-sound/madplay
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/audiofile
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	media-libs/libid3tag
-	=media-libs/portaudio-19*
-	virtual/glu
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	djconsole? ( media-libs/libdjconsole )
-	ffmpeg? ( media-video/ffmpeg
-			media-sound/gsm
-			media-libs/libdc1394
-			sys-libs/libraw1394
-			media-libs/libdca
-			media-libs/a52dec )
-	ladspa? ( media-libs/ladspa-sdk )
-	shout? ( media-libs/libshout )"
+RDEPEND=">=x11-libs/qt-core-4.3:4
+		x11-libs/qt-gui:4
+		x11-libs/qt-svg:4
+		x11-libs/qt-opengl:4
+		x11-libs/qt-qt3support:4
+		media-libs/libmad
+		media-libs/libvorbis
+		media-libs/libsndfile
+		media-libs/libid3tag
+		>=media-libs/portaudio-19_pre
+		virtual/glu
+		alsa? ( media-libs/alsa-lib )
+		jack? ( media-sound/jack-audio-connection-kit )
+		djconsole? ( media-libs/libdjconsole )
+		ffmpeg? ( media-video/ffmpeg
+				  media-sound/gsm
+				  media-libs/libdc1394
+				  sys-libs/libraw1394
+				  media-libs/libdca
+				  media-libs/a52dec )
+		ladspa? ( media-libs/ladspa-sdk )
+		shout? ( media-libs/libshout )"
 
-RDEPEND="${DEPEND}
-	 dev-lang/perl"
-
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	sys-apps/sed
 	dev-util/scons
+	dev-lang/perl
 	dev-util/pkgconfig"
 
 IUSE="alsa jack ladspa djconsole hifieq shout tonal +vinylcontrol"
@@ -63,14 +56,6 @@
 			die
 		fi
 	fi
-	# we need qt4 with opengl and qt3support
-	if ! built_with_use x11-libs/qt qt3support; then
-		eerror "You need to compile qt4 with USE="\"qt3support\"!"
-		die
-	elif ! built_with_use x11-libs/qt opengl; then
-		eerror "You need to compile qt4 with USE="\"opengl\"!"
-		die
-	fi
 }
 
 src_unpack() {


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/