[proaudio] [1258] bump mixx-1.6.0_beta4

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


Revision: 1258
Author:   gimpel
Date:     2008-07-26 21:31:06 +0200 (Sat, 26 Jul 2008)

Log Message:
-----------
bump mixx-1.6.0_beta4

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

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.6.0_beta4-debug.patch
    trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta4.ebuild

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


Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog	2008-07-25 18:10:09 UTC (rev 1257)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog	2008-07-26 19:31:06 UTC (rev 1258)
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Jul 2008; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx>
+  +files/mixxx-1.6.0_beta4-debug.patch, -mixxx-1.5.0.ebuild,
+  -mixxx-1.6.0_beta1.ebuild, -mixxx-1.6.0_beta2.ebuild,
+  +mixxx-1.6.0_beta4.ebuild:
+  version bump
+
   09 Apr 2008; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx>
   -mixxx-1.5.0_beta1.ebuild, +mixxx-1.6.0_beta2.ebuild:
   version bump

Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest	2008-07-25 18:10:09 UTC (rev 1257)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest	2008-07-26 19:31:06 UTC (rev 1258)
@@ -1,12 +1,9 @@
+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-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
+DIST mixxx-1.6.0~beta4-src.tar.gz 23170767 RMD160 c3587a79a05bcecb33e963a3000b2d488a92c6b2 SHA1 d1f30830dacac2773f528239ec3cb7187533b712 SHA256 1233b19132aa6194a48a85906953866fb941e538ede83742768bcf318352f556
 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.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-1.6.0_beta4.ebuild 2311 RMD160 dec0345d44c8f654a691b8374febde70dd9700f7 SHA1 8a549c449f826077557bc26c04259c4431d8c52d SHA256 dd21a3fe81ce25f16e92e217c7753458e0b1bc98023fc72e717f86b387082ca6
 EBUILD mixxx-9999.ebuild 2430 RMD160 58e087f458b7505d569dd49390623e92a1bcd51c SHA1 8a91f3e1a7754d0b25f23b23b3cb2b28ee315ccb SHA256 71ce614d6eb448ccf5ccdf538818dfd8cd3271fba378faee859b3ea6849e941b
-MISC ChangeLog 972 RMD160 8bc71043a9830bc1e150e9069229fa0a50752141 SHA1 7776d8cb778ec81e9372ea28abdf4e36c3cbdf9d SHA256 9b5bdfa226e11aa8e9eba58e089393608bcde4a675a88e076baa14453839a9cf
+MISC ChangeLog 1189 RMD160 f2471601f4e3a2dfdb0311e3fa11c33f1c492658 SHA1 ccfb0f1fbf0cfa914248d722c426a8dfa018af3f SHA256 2f1f59d25e1348e7357e0bd868a3f4762f3ddfba43d3f8e0d063a3b057d90147
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.6.0_beta4-debug.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.6.0_beta4-debug.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.6.0_beta4-debug.patch	2008-07-26 19:31:06 UTC (rev 1258)
@@ -0,0 +1,10 @@
+--- src/enginefilterblock.cpp.orig	2008-05-22 09:27:10.000000000 -0700
++++ src/enginefilterblock.cpp	2008-05-22 09:27:16.000000000 -0700
+@@ -21,6 +21,7 @@
+ #include "enginefilteriir.h"
+ #include "enginefilter.h"
+ #include "enginefilterbutterworth8.h"
++#include <QtDebug>
+ 
+ EngineFilterBlock::EngineFilterBlock(const char * group)
+ {

Deleted: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.5.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.5.0.ebuild	2008-07-25 18:10:09 UTC (rev 1257)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.5.0.ebuild	2008-07-26 19:31:06 UTC (rev 1258)
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-IUSE="alsa jack lua"
-
-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}-src.tar.bz2"
-
-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-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_beta1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta1.ebuild	2008-07-25 18:10:09 UTC (rev 1257)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta1.ebuild	2008-07-26 19:31:06 UTC (rev 1258)
@@ -1,101 +0,0 @@
-# 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
-	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} ')/" \
-		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
-}

Deleted: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild	2008-07-25 18:10:09 UTC (rev 1257)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild	2008-07-26 19:31:06 UTC (rev 1258)
@@ -1,96 +0,0 @@
-# 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
-}

Added: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta4.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta4.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta4.ebuild	2008-07-26 19:31:06 UTC (rev 1258)
@@ -0,0 +1,83 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0_beta3.ebuild,v 1.2 2008/06/23 16:54:02 nixnut Exp $
+
+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-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
+}


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