[proaudio] [1194] bump mixxx-1.6.0_beta2

[subversion@xxxxxxxxxxxxx]

Revision: 1194
Author:   gimpel
Date:     2008-04-09 18:41:21 +0200 (Wed, 09 Apr 2008)

Log Message:
-----------
bump mixxx-1.6.0_beta2

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

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

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.5.0_beta1.ebuild


Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog	2008-04-05 12:09:06 UTC (rev 1193)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog	2008-04-09 16:41:21 UTC (rev 1194)
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Apr 2008; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx>
+  -mixxx-1.5.0_beta1.ebuild, +mixxx-1.6.0_beta2.ebuild:
+  version bump
+
   18 Jan 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>;
   mixxx-1.6.0_beta1.ebuild:
   fixed libdca dependency

Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest	2008-04-05 12:09:06 UTC (rev 1193)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest	2008-04-09 16:41:21 UTC (rev 1194)
@@ -1,12 +1,12 @@
 AUX mixxx-9999-qt4_paths.patch 1422 RMD160 12f23b0c12b0af8ab54a4514c8048097f59df2f3 SHA1 2ff3b91299ac9fa2d2dcae79d5d835761a290610 SHA256 6917b59e0b8cbebdffed0c86a26f06d6c212bf1d66bb944cfcc54b8c56903d6f
-DIST mixxx-1.5.0-beta1.tar.gz 4271527 RMD160 a9b4bf21180ce24fbdd652442c24d461c68985ac SHA1 02803dc00fe153c9101712ee8335abc8aaf77fb6 SHA256 c1194a191af2fac698a7b91c63baf909ab8bb1c393d00520284a4f6ad1348c80
 DIST mixxx-1.5.0-src.tar.bz2 4034791 RMD160 14ed3139fa242a42ed234b778b23760d3b15ec17 SHA1 0b0d921ed8dfddfe0d19cd9d219e83340d7a7a84 SHA256 2b82a305bab89ca866f50f6d0fb5eaf2c567d5727ba2442802d21a02ab109855
 DIST mixxx-1.5.0.1-src.tar.bz2 4034791 RMD160 14ed3139fa242a42ed234b778b23760d3b15ec17 SHA1 0b0d921ed8dfddfe0d19cd9d219e83340d7a7a84 SHA256 2b82a305bab89ca866f50f6d0fb5eaf2c567d5727ba2442802d21a02ab109855
 DIST mixxx-1.6.0-beta1-src.tar.gz 7131246 RMD160 72d4a04d9dbfd94020a4cda77cb2ebedb86e0649 SHA1 133f34f1228a6a7f10ad7dff2887f09b8f6b68b0 SHA256 cfad6b8500232e124e39ff913100e673e1ff5ea288268ded8e00b1e24664c7fd
+DIST mixxx-1.6.0-beta2-src.tar.gz 7081765 RMD160 1464294e1f0c5c4109d44b0740c523ac64ca8a91 SHA1 ecf8910c3505a8ea44e663b157572e6032b8e4dc SHA256 82a9eef7ed75c32a025e3093619c255977177f1265cd317693765a4838c7cd8c
 EBUILD mixxx-1.5.0.1.ebuild 1637 RMD160 2ffec645c60783c234aa1a22d639c962adcf3d72 SHA1 800d5056bec561a0a79c876d750c1c9719dba367 SHA256 2c2074fab63b77078950afb0cdf151faab11e67e8f5f8793d24644904738e0d2
 EBUILD mixxx-1.5.0.ebuild 1652 RMD160 eee83dd612fa1d88c452edf05230cc7248cf4ea1 SHA1 a99b88a37f377d514817e098a174f334fbc186f2 SHA256 311d86120777ac2d3590e74fd6dc7a5329ff18a2a522bb7a1c5ada0d03cf0f23
-EBUILD mixxx-1.5.0_beta1.ebuild 1615 RMD160 88daf1af9f1570835b237dce1516ca0bafe0be56 SHA1 9e2456ce3e239ec56e069878bb2bdf97680703ec SHA256 415ad032b452145974e27d075bfb6af2bb2c51bbbd774bea8bba9dc68cb8ad93
 EBUILD mixxx-1.6.0_beta1.ebuild 2565 RMD160 7160c8706ce0d2f9f522f3c54ef67d093fbd660a SHA1 580029213de9a6f405e4bac645c7a992344d9602 SHA256 325f06208f4e05e3bac8a1e2b29fdd59d40bc90170eee3693a5428a614030afa
+EBUILD mixxx-1.6.0_beta2.ebuild 2394 RMD160 69cab132b5e18138cc18f393a0ff9ff296f6d976 SHA1 abe6ff2d25acbc5eedb0a539de034b5ec580dd91 SHA256 026d04ec0951d37e932a1bfc2e6c217662bd426597a4e640a6e371038750a700
 EBUILD mixxx-9999.ebuild 2430 RMD160 58e087f458b7505d569dd49390623e92a1bcd51c SHA1 8a91f3e1a7754d0b25f23b23b3cb2b28ee315ccb SHA256 71ce614d6eb448ccf5ccdf538818dfd8cd3271fba378faee859b3ea6849e941b
-MISC ChangeLog 845 RMD160 74b38c5b3492bb39fd521f8bd43bf93cfc15c748 SHA1 d34c4d8199a6a071d8237ff8aea45ba084be49f0 SHA256 dc96aa3479087a9702542039d9a921606a7a0893f9fbafb3665397d5c59f3836
+MISC ChangeLog 972 RMD160 8bc71043a9830bc1e150e9069229fa0a50752141 SHA1 7776d8cb778ec81e9372ea28abdf4e36c3cbdf9d SHA256 9b5bdfa226e11aa8e9eba58e089393608bcde4a675a88e076baa14453839a9cf
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Deleted: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.5.0_beta1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.5.0_beta1.ebuild	2008-04-05 12:09:06 UTC (rev 1193)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.5.0_beta1.ebuild	2008-04-09 16:41:21 UTC (rev 1194)
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-IUSE="alsa jack"
-
-inherit eutils qt3
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}/src"
-
-DESCRIPTION="Digital DJ tool using QT 3.x"
-HOMEPAGE="http://mixxx.sourceforge.net";
-SRC_URI="mirror://sourceforge/mixxx/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-
-DEPEND="$(qt_min_version 3.1)
-	media-sound/madplay
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/audiofile
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	media-libs/portaudio
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )"
-
-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
-}

Added: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild	2008-04-09 16:41:21 UTC (rev 1194)
@@ -0,0 +1,96 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+RESTRICT="nomirror"
+
+inherit exteutils qt4 toolchain-funcs versionator
+MY_P="${PN}-$(replace_version_separator "3" "-")"
+S="${WORKDIR}/$(replace_version_separator "4" "" "${MY_P}")"
+
+DESCRIPTION="Digital DJ tool using QT 4.x"
+HOMEPAGE="http://mixxx.sourceforge.net";
+SRC_URI="mirror://sourceforge/mixxx/${MY_P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+
+DEPEND="$(qt4_min_version 4.3)
+	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 )"
+
+RDEPEND="${DEPEND}
+	 dev-lang/perl"
+
+DEPEND="${DEPEND}
+	sys-apps/sed
+	dev-util/scons
+	dev-util/pkgconfig"
+
+IUSE="alsa jack ladspa djconsole hifieq exbpm exrecord"
+
+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
+	QT4_BUILT_WITH_USE_CHECK="opengl qt3support"
+	qt4_pkg_setup
+}
+
+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} ')/" \
+		src/SConscript
+}
+
+src_compile() {
+	myconf=""
+	! use ladspa; myconf="ladspa=$?"
+	myconf="${myconf} ffmpeg=0"
+	! use djconsole; myconf="${myconf} djconsole=$?"
+	! use hifieq; myconf="${myconf} hifieq=$?"
+	! use exbpm; myconf="${myconf} experimentalbpm=$?"
+	! use exrecord; myconf="${myconf} experimentalrecord=$?"
+	myconf="${myconf} prefix=/usr"
+
+	mkdir -p "${D}/usr"
+	einfo "selected options: ${myconf}"
+	tc-export CC CXX
+	scons ${myconf} || die "scons failed"
+}
+
+src_install() {
+	mkdir -p "${D}/usr"
+	einfo "selected options: ${myconf}"
+	scons ${myconf} install_root="${D}/usr" install || die
+	dodoc README Mixxx-Manual.pdf
+}