Revision: 2048
Author: keenblade
Date: 2011-12-25 14:25:51 +0100 (Sun, 25 Dec 2011)
Log Message:
-----------
media-sound/mixxx: version bump to 1.10.0, removed older ebuilds
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.10.0.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.6.0_beta4-debug.patch
trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1-r1.ebuild
trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1.ebuild
trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.7.0_beta1.ebuild
Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2011-12-25 13:24:41 UTC
(rev 2047)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2011-12-25 13:25:51 UTC
(rev 2048)
@@ -1,7 +1,12 @@
# ChangeLog for media-sound/mixxx
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mixxx-1.10.0 (25 Dec 2011)
+
+ 25 Dec 2011; Hakan Demiralp <[email protected]> +mixxx-1.10.0.ebuild:
+ media-sound/mixxx: version bump to 1.10.0, removed older ebuilds
+
*mixxx-1.7.0 (28 Aug 2009)
28 Aug 2009; Gavin Pryke <[email protected]> +mixxx-1.7.0.ebuild,
Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest 2011-12-25 13:24:41 UTC
(rev 2047)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest 2011-12-25 13:25:51 UTC
(rev 2048)
@@ -1,13 +1,8 @@
-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.10.0-src.tar.gz 15852338 RMD160
dde454d7ff6200e33c401e87313ad399ff751d53 SHA1
b01ab69c0eeca99fa6b1da472cfede01bda71328 SHA256
9135f814262bf42eb05bf5d56c760ab462329c06785271d570be6a9d14ab1e97
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.10.0.ebuild 2242 RMD160
d2e17182bfe222a927aa461ac853c2b025a1bdb5 SHA1
080d5798c04126e4d01498a33ceec7bb5f7c5360 SHA256
85743d3544c974f0aaed24a35638f8346a13e272be67045a96584dfb0f0d5885
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 2246 RMD160 66bf1786e9f3c6c9acb988f4e0a0c4bca25c226a
SHA1 a91f0d5b5dc3f0020c3d22d557c5f03e6ecd59a1 SHA256
c15e785e53a342f6ba90665e7858dcfecc4ee998d4afb874bdd4033a8981510e
-MISC ChangeLog 2118 RMD160 84d78588e9b8ebdd1fb028833b89e7f5a7e4e53c SHA1
feb9ab5e97604aaf67302a135e9118da322f6271 SHA256
fb6d76bb28c3592c2f6d2d822d1cd0d1a2368c279168960d734b988cfb0d77f6
+MISC ChangeLog 2293 RMD160 eb02393213716d5a1de696e36684e3cbacea9bd1 SHA1
ba285a7ba8e068aa6ce60187b466e31aa8c160a3 SHA256
18433b6794af99e769a6ae742761a45f7ccac33820aeb115a361f6eebfe40588
MISC metadata.xml 643 RMD160 6e17d15058bab43c631c88d488561d4473515cb9 SHA1
847a6a66ea57b00a78863b072ef615a12d4c1533 SHA256
4dba695d68599cdb2ca84c3cffd6be099caa9fd2e3ee190724a4be663ed35011
Deleted:
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
2011-12-25 13:24:41 UTC (rev 2047)
+++
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.6.0_beta4-debug.patch
2011-12-25 13:25:51 UTC (rev 2048)
@@ -1,10 +0,0 @@
---- 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)
- {
Copied: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.0.ebuild (from rev
2045, trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.7.0.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.0.ebuild
(rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.0.ebuild
2011-12-25 13:25:51 UTC (rev 2048)
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils multilib scons-utils toolchain-funcs
+
+DESCRIPTION="a QT based Digital DJ tool"
+HOMEPAGE="http://mixxx.sourceforge.net";
+SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz";
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug mp4 pulseaudio"
+
+RDEPEND="media-libs/libmad
+ media-libs/libid3tag
+ media-libs/libmad
+ media-libs/libogg
+ media-libs/libvorbis
+ media-libs/libsndfile
+ media-libs/portmidi
+ >=media-libs/libsoundtouch-1.5
+ >=media-libs/portaudio-19_pre
+ virtual/opengl
+ virtual/glu
+ x11-libs/qt-gui:4
+ x11-libs/qt-svg:4
+ x11-libs/qt-opengl:4
+ x11-libs/qt-qt3support:4
+ x11-libs/qt-webkit:4
+ x11-libs/qt-xmlpatterns:4
+ mp4? ( media-libs/libmp4v2 )
+ pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+ dev-util/scons
+ dev-util/pkgconfig"
+
+pkg_setup() {
+ mysconsargs="prefix=/usr
+ qtdir=/usr/$(get_libdir)/qt4
+ install_root=${D}/usr
+ hifieq=1
+ vinylcontrol=1"
+
+ use debug && mysconsargs+=" qdebug=1" || mysconsargs+=" qdebug=0"
+ use mp4 && mysconsargs+=" m4a=1" || mysconsargs+=" m4a=0"
+}
+
+src_prepare() {
+
+ # patch bzr revisoon issue.
+ sed -i -e 's:return os.popen("bzr revno").readline().strip():return
"gentoo":' \
+ src/SConscript.env || die "sed revno failed"
+
+ # fix issues with cxxflags
+ sed -i -e "s:-pipe -Wall -W -g::" \
+ src/SConscript.env || die "sed failed"
+
+ # Patch startup command if not using pulse audio
+ use pulseaudio || sed -i -e 's:pasuspender:nice -n 0:' src/mixxx.desktop
+
+ # add addtional flags for debugging.
+ local extraflags=""
+ use debug && extraflags="${extraflags} -g"
+
+ #Export paths for SConscript
+ #Respect {C,CXX,LD}FLAGS. Bug #317519
+ unset CFLAGS
+ export CXXFLAGS="${CXXFLAGS} ${extraflags}"
+ #export LINKFLAGS="${LDFLAGS}"
+ export LIBPATH="/usr/$(get_libdir)"
+}
+
+src_compile() {
+
+ # chicanery to use the correct compiler
+ local cxx=$(type -P $(tc-getCXX))
+ mkdir -p "${T}/bin"
+ ln -s "${cxx}" "${T}/bin/g++" && \
+ export PATH="${T}/bin:${PATH}"
+
+ scons ${MAKEOPTS} ${mysconsargs} || die
+}
+
+src_install() {
+
+ scons ${MAKEOPTS} ${mysconsargs} install || die
+
+ dodoc README*
+
+ insinto /usr/share/doc/${PF}/pdf
+ doins Mixxx-Manual.pdf
+}
Deleted: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1-r1.ebuild
2011-12-25 13:24:41 UTC (rev 2047)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1-r1.ebuild
2011-12-25 13:25:51 UTC (rev 2048)
@@ -1,110 +0,0 @@
-# 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
-}
Deleted: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1.ebuild
2011-12-25 13:24:41 UTC (rev 2047)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.1.ebuild
2011-12-25 13:25:51 UTC (rev 2048)
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit exteutils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="a QT based Digital DJ tool"
-HOMEPAGE="http://mixxx.sourceforge.net";
-SRC_URI="http://downloads.mixxx.org/${MY_P}/${MY_P}-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[opengl,qt3support] )"
-DEPEND="${RDEPEND}
- dev-util/scons
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${P/_/\~}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- sed -i -e 's:-O3::g' lib/cmetrics/SConscript || die "sed failed."
-}
-
-src_configure() {
- local myconf="optimize=0 ffmpeg=0 script=0 prefix=/usr \
- $(scons_use_enable djconsole) \
- $(scons_use_enable hifieq) \
- $(scons_use_enable debug) \
- $(scons_use_enable shout) \
- $(scons_use_enable ladspa) \
- $(scons_use_enable recording) \
- $(scons_use_enable vinylcontrol)"
- escons ${myconf} -c . || die "scons -c . failed."
-}
-
-src_compile() {
- escons ${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
-}
Deleted: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.7.0_beta1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.7.0_beta1.ebuild
2011-12-25 13:24:41 UTC (rev 2047)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.7.0_beta1.ebuild
2011-12-25 13:25:51 UTC (rev 2048)
@@ -1,111 +0,0 @@
-# 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
-}
