[proaudio] [1473] big mixxx update, please see ChangeLog

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

To: proaudio@xxxxxxxxxxxxxxxxxxx
Subject: [proaudio] [1473] big mixxx update, please see ChangeLog
From: subversion@xxxxxxxxxxxxx
Date: Thu, 11 Jun 2009 13:41:05 +0200

Revision: 1473
Author:   gavlee
Date:     2009-06-11 13:41:05 +0200 (Thu, 11 Jun 2009)

Log Message:
-----------
big mixxx update, please see ChangeLog

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

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

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.5.0.1.ebuild
    trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta4.ebuild

Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog	2009-06-10 10:46:47 UTC (rev 1472)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog	2009-06-11 11:41:05 UTC (rev 1473)
@@ -1,7 +1,16 @@
 # ChangeLog for media-sound/mixxx
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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
+  ~mixxx-9999.ebuild: live ebuild changed from old svn to new bzr 1.7 branch
+  ~mixxx-1.6.1.ebuild: repoman cosmetic fixes
+  -mixxx-1.5.0.1.ebuild, -mixxx-1.6.0_beta4.ebuild: removed older ebuilds
+  amended metadata.xml and USE flags to match what each mixxx version expects
+  and match current gentoo ebuilds
+
   11 Oct 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx;
   +mixxx-1.6.1.ebuild:
   bumped

Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest	2009-06-10 10:46:47 UTC (rev 1472)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest	2009-06-11 11:41:05 UTC (rev 1473)
@@ -1,11 +1,11 @@
 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.5.0.1-src.tar.bz2 4034791 RMD160 14ed3139fa242a42ed234b778b23760d3b15ec17 SHA1 0b0d921ed8dfddfe0d19cd9d219e83340d7a7a84 SHA256 2b82a305bab89ca866f50f6d0fb5eaf2c567d5727ba2442802d21a02ab109855
-DIST mixxx-1.6.0~beta4-src.tar.gz 23170767 RMD160 c3587a79a05bcecb33e963a3000b2d488a92c6b2 SHA1 d1f30830dacac2773f528239ec3cb7187533b712 SHA256 1233b19132aa6194a48a85906953866fb941e538ede83742768bcf318352f556
 DIST mixxx-1.6.1-src.tar.gz 6833830 RMD160 7a62a541f7ba5910c69924575edff5f76561da84 SHA1 dc5e2c41d00878ec9833562c238cc3c967abf220 SHA256 1dc04e9d628c96c75a219384252d990659e9dd0a1f23aa72b8f0774395771df1
-EBUILD mixxx-1.5.0.1.ebuild 1639 RMD160 5ac5549d893ab21a7a05f00e8d7770d185e7332c SHA1 b4a9f408357244abe59c72215a130611ffcbbf90 SHA256 3f82e042df16b39cf173084f36fb8f1d03d5e253bc8d233ba23f3680c255b1c0
-EBUILD mixxx-1.6.0_beta4.ebuild 2234 RMD160 db0432465156e0f6c2186e4428dcc44d5f788c83 SHA1 6d8387b0ba251bcdf567205e0dfa801aa95227ea SHA256 cf995b95693fefc22e9f06ec44c7f7d91f673983d1e6fe7be97b03a67a23bc00
-EBUILD mixxx-1.6.1.ebuild 1741 RMD160 dde6cbfba051d92335470f6533580bfbe2a4f8a6 SHA1 68991accd5c478f4d6a95b7c8d4fbd14e80bbb46 SHA256 a83fa85d9c8027969a6d5d2415afbc8c48c508e124e1f328d2d724d01f57734c
-EBUILD mixxx-9999.ebuild 2531 RMD160 b99856f0397fc57d8a4fa82b20c45a278a316049 SHA1 0736583e4bec212e8f01b8c96025893cd278026d SHA256 4e94c2f367860940a108522de186d50383ba4ca341f0b9f7408941d6a60a15bf
-MISC ChangeLog 1433 RMD160 3c5f4749a5f65ba8947e8dd81ee527a834680f9a SHA1 5f9e52f026ea4993d74dd610cfc7acb1f11a2d45 SHA256 0e2a5fda907b7c95454ec5204868d0d4156becd4c60d057f7c3ac99c48fd82b1
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+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_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
+MISC metadata.xml 643 RMD160 6e17d15058bab43c631c88d488561d4473515cb9 SHA1 847a6a66ea57b00a78863b072ef615a12d4c1533 SHA256 4dba695d68599cdb2ca84c3cffd6be099caa9fd2e3ee190724a4be663ed35011

Modified: trunk/overlays/proaudio/media-sound/mixxx/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/metadata.xml	2009-06-10 10:46:47 UTC (rev 1472)
+++ trunk/overlays/proaudio/media-sound/mixxx/metadata.xml	2009-06-11 11:41:05 UTC (rev 1473)
@@ -6,4 +6,12 @@
 		<email>proaudio@xxxxxxxxxxxxx</email>
 		<name>pro-audio overlay team</name>
 	</maintainer>
+	<use>
+		<flag name="djconsole">Enable djconsole support</flag>
+		<flag name="hifieq">Enable hifi equalizer support</flag>
+		<flag name="recording">Enable experimental recording support</flag>
+		<flag name="shout">Enable shoutcast support</flag>
+		<flag name="tonal">Enable tonal analysis feature</flag>
+		<flag name="vinylcontrol">Enable vinylcontrol feature</flag>
+	</use>
 </pkgmetadata>

Deleted: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.5.0.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.5.0.1.ebuild	2009-06-10 10:46:47 UTC (rev 1472)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.5.0.1.ebuild	2009-06-11 11:41:05 UTC (rev 1473)
@@ -1,66 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-
-IUSE="alsa jack lua"
-
-inherit eutils qt3
-
-S="${WORKDIR}/${PN}-1.5.0/src"
-
-DESCRIPTION="Digital DJ tool using QT 3.x"
-HOMEPAGE="http://mixxx.sourceforge.net";
-SRC_URI="mirror://sourceforge/mixxx/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-
-DEPEND="=x11-libs/qt-3*
-	media-sound/madplay
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/audiofile
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	>=media-libs/portaudio-19
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lua? ( dev-lang/lua )"
-
-RDEPEND="${DEPEND}
-	 dev-lang/perl"
-
-DEPEND="${DEPEND}
-	sys-apps/sed"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	# fix gcc4 errors (virtual destructor)
-	sed -i -e "162,163s|SoundTouch::||" ../lib/soundtouch/SoundTouch.h || die
-	sed -i -e "48,49s|Rhythmogram::||" wavesegmentation.h || die
-	# fix cflags
-	sed -i -e "s:\(QMAKE_CXXFLAGS\)\(.*\):\1 += ${CFLAGS} -pipe:" \
-	     -e "s:\(QMAKE_CFLAGS\)\(.*\):\1 += ${CFLAGS} -pipe:" \
-		 mixxx.pro || die "patching failed"
-}
-
-src_compile() {
-	# econf won't work
-	./configure `use_enable alsa` `use_enable jack` || die "configure failed"
-
-	#sed -i -e "s/CFLAGS *= -pipe -w -O2/CFLAGS   = ${CFLAGS} -w/" \
-	#       -e "s/CXXFLAGS *= -pipe -w -O2/CXXFLAGS   = ${CXXFLAGS} -w/" Makefile
-	addpredict  ${QTDIR}/etc/settings
-	emake || die "make failed"
-}
-
-src_install() {
-	make COPY_FILE="cp -fpr" \
-	     INSTALL_ROOT="${D}" install || die "make install failed"
-
-	dodoc ../README ../README.ALSA ../Mixxx-Manual.pdf
-}

Deleted: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta4.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta4.ebuild	2009-06-10 10:46:47 UTC (rev 1472)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta4.ebuild	2009-06-11 11:41:05 UTC (rev 1473)
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-
-inherit eutils
-
-MY_P=${P/_/-}
-MY_TMP=${P/_/\~}
-
-DESCRIPTION="a QT based Digital DJ tool"
-HOMEPAGE="http://mixxx.sourceforge.net";
-SRC_URI="http://downloads.mixxx.org/${MY_P}/${MY_TMP}-src.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug djconsole hifieq ladspa recording shout +vinylcontrol"
-
-# TODO. It bundles libs, like samplerate, why?
-RDEPEND="media-libs/mesa
-	media-libs/libmad
-	media-libs/libid3tag
-	media-libs/libvorbis
-	media-libs/libsndfile
-	>=media-libs/portaudio-19_pre
-	djconsole? ( media-libs/libdjconsole )
-	shout? ( media-libs/libshout )
-	ladspa? ( media-libs/ladspa-sdk )
-	virtual/glu
-	|| ( ( x11-libs/qt-core
-		x11-libs/qt-gui
-		x11-libs/qt-opengl 
-		x11-libs/qt-xmlpatterns )
-		>=x11-libs/qt-4.3:4 )"
-DEPEND="${RDEPEND}
-	dev-util/scons
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${P/_/\~}
-
-pkg_setup() {
-	if ! has_version x11-libs/qt-opengl && ! built_with_use -a =x11-libs/qt-4* opengl qt3support; then
-		die "Re-emerge x11-libs/qt with USE flags opengl and qt3support."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's:-O3::g' lib/cmetrics/SConscript || die "sed failed."
-	epatch "${FILESDIR}"/${P}-debug.patch
-}
-
-src_compile() {
-	local myconf="optimize=0 ffmpeg=0 script=0 prefix=/usr"
-
-	use djconsole && myconf+=" djconsole=1" || myconf+=" djconsole=0"
-	use hifieq && myconf+=" hifieq=1" || myconf+=" hifieq=0"
-	use debug && myconf+=" cmetrics=1" || myconf+=" cmetrics=0"
-	use shout && myconf+=" shoutcast=1" || myconf+=" shoutcast=0"
-	use ladspa && myconf+=" ladspa=1" || myconf+=" ladspa=0"
-	use recording && myconf+=" experimentalrecord=1" || myconf+=" experimentalrecord=0"
-	use vinylcontrol && myconf+=" vinylcontrol=1" || myconf+=" vinylcontrol=0"
-
-	$(type -P scons) ${myconf} -c . || die "scons -c . failed."
-	$(type -P scons) ${myconf} || die "scons failed."
-}
-
-src_install() {
-	dobin mixxx || die "dobin failed."
-
-	insinto /usr/share/mixxx
-	doins -r src/{skins,midi,keyboard} || die "doins failed."
-
-	doicon src/mixxx-icon.png
-	domenu src/mixxx.desktop
-
-	dodoc HERCULES.txt README*
-
-	insinto /usr/share/doc/${PF}
-	doins Mixxx-Manual.pdf
-}

Copied: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1-r1.ebuild (from rev 1472, trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1-r1.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1-r1.ebuild	2009-06-11 11:41:05 UTC (rev 1473)
@@ -0,0 +1,110 @@
+# 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_P="${P/-/_}"
+
+DESCRIPTION="Digital DJ tool using QT 4.x"
+HOMEPAGE="http://mixxx.sourceforge.net";
+SRC_URI="http://mixxx.org/download/${P}+Herc/${MY_P}+Herc.orig.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+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="${DEPEND}
+	 dev-lang/perl"
+
+DEPEND="${DEPEND}
+	sys-apps/sed
+	dev-util/scons
+	dev-util/pkgconfig"
+
+IUSE="alsa jack ladspa djconsole hifieq recording shout +vinylcontrol"
+
+S="${WORKDIR}/${P}+Herc"
+
+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
+	# 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() {
+	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 vinylcontrol; myconf="${myconf} vinylcontrol=$?"
+	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-1.6.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1.ebuild	2009-06-10 10:46:47 UTC (rev 1472)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1.ebuild	2009-06-11 11:41:05 UTC (rev 1473)
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -47,7 +47,7 @@
 src_configure() {
 	local myconf="optimize=0 ffmpeg=0 script=0 prefix=/usr \
 		$(scons_use_enable djconsole) \
-		$(scons_use_enable hifieq) \ 
+		$(scons_use_enable hifieq) \
 		$(scons_use_enable debug) \
 		$(scons_use_enable shout) \
 		$(scons_use_enable ladspa) \

Copied: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.7.0_beta1.ebuild (from rev 1472, trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.7.0_beta1.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.7.0_beta1.ebuild	2009-06-11 11:41:05 UTC (rev 1473)
@@ -0,0 +1,111 @@
+# 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"
+
+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="${DEPEND}
+	 dev-lang/perl"
+
+DEPEND="${DEPEND}
+	sys-apps/sed
+	dev-util/scons
+	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
+	# 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() {
+	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-06-10 10:46:47 UTC (rev 1472)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild	2009-06-11 11:41:05 UTC (rev 1473)
@@ -1,15 +1,16 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=1
 
-inherit exteutils qt4 subversion toolchain-funcs
+inherit exteutils qt4 bzr toolchain-funcs
 
 DESCRIPTION="Digital DJ tool using QT 4.x"
 HOMEPAGE="http://mixxx.sourceforge.net";
 
-ESVN_REPO_URI="https://mixxx.svn.sourceforge.net/svnroot/mixxx/trunk/mixxx";
+EBZR_REPO_URI="lp:mixxx/1.7"
+EBZR_BRANCH=""
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,7 +18,7 @@
 
 DEPEND="|| ( ( x11-libs/qt-core
 		x11-libs/qt-gui
-		x11-libs/qt-opengl 
+		x11-libs/qt-opengl
 		x11-libs/qt-xmlpatterns )
 		>=x11-libs/qt-4.3:4 )
 	media-sound/madplay
@@ -39,7 +40,8 @@
 			sys-libs/libraw1394
 			media-libs/libdca
 			media-libs/a52dec )
-	ladspa? ( media-libs/ladspa-sdk )"
+	ladspa? ( media-libs/ladspa-sdk )
+	shout? ( media-libs/libshout )"
 
 RDEPEND="${DEPEND}
 	 dev-lang/perl"
@@ -49,8 +51,10 @@
 	dev-util/scons
 	dev-util/pkgconfig"
 
-IUSE="alsa jack ffmpeg ladspa djconsole hifieq exbpm exrecord"
+IUSE="alsa jack ladspa djconsole hifieq shout tonal +vinylcontrol"
 
+S="${WORKDIR}/${P}/mixxx"
+
 pkg_setup() {
 	if use jack; then
 		if ! built_with_use media-libs/portaudio jack; then
@@ -70,25 +74,27 @@
 }
 
 src_unpack() {
-	subversion_src_unpack
-	cd "${S}"
+	bzr_fetch
 	# 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} ')/" \
-		src/SConscript
+		"${S}/src/SConscript"
 }
 
 src_compile() {
 	myconf=""
 	! use ladspa; myconf="ladspa=$?"
-	! use ffmpeg; myconf="${myconf} ffmpeg=$?"
+	# disable ffmpeg for now
+	#! use ffmpeg; myconf="${myconf} ffmpeg=$?"
+	myconf="${myconf} ffmpeg=0"
 	! use djconsole; myconf="${myconf} djconsole=$?"
 	! use hifieq; myconf="${myconf} hifieq=$?"
-	! use exbpm; myconf="${myconf} experimentalbpm=$?"
-	! use exrecord; myconf="${myconf} experimentalrecord=$?"
+	! 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}"

Messages sorted by: [ date | thread ]
Prev by Date: Re: [proaudio] JackMixDesk-0.3-r2 Release
Next by Date: [proaudio] [1474] remove obsolete ebuild
Previous by thread: [proaudio] [1472] jackmixdesk update, thanks Ulrich.
Next by thread: [proaudio] [1474] remove obsolete ebuild

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/