Initial import from sunrise (bug #310821, thanks to all contributors).

Package-Manager: portage-2.2.0_alpha92/cvs/Linux x86_64

8 files changed, 358 insertions, 0 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
new file mode 100644
index 000000000000..d27087a64bd7
--- /dev/null
+++ b/media-sound/mixxx/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for media-sound/mixxx
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.55 2012/03/20 21:47:03 radhermit Exp $
+
+*mixxx-1.10.0 (20 Mar 2012)
+
+  20 Mar 2012; Tim Harder <radhermit@gentoo.org> +mixxx-1.10.0.ebuild,
+  +files/mixxx-1.10.0-cflags.patch, +files/mixxx-1.10.0-docs.patch,
+  +files/mixxx-1.10.0-no-bzr.patch, +files/mixxx-1.10.0-system-libs.patch,
+  +metadata.xml:
+  Initial import from sunrise (bug #310821, thanks to all contributors).
+
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
new file mode 100644
index 000000000000..a669840dd9ea
--- /dev/null
+++ b/media-sound/mixxx/Manifest
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX mixxx-1.10.0-cflags.patch 573 RMD160 66a06953f624879241fa0b434ee43b0930f3ec4f SHA1 4ce1d76897ae1ab1fa3b2d65853d09a8eb993a04 SHA256 2e37a38c7ac7fa14e495b999b9e81d9a10ea2aa36ec1f17142e3299c91d4f738
+AUX mixxx-1.10.0-docs.patch 327 RMD160 bdb7680df3519667c84464bf1250a1d3517dc4d1 SHA1 fcc69619870f6b536b6a276edfe0297f0d05b552 SHA256 d092d360ccc533f1fa57d39577cd2fffb6089461744844ac3df3d4a0a60280bf
+AUX mixxx-1.10.0-no-bzr.patch 1503 RMD160 e4438b5ecd9a4175ebfce7d564ee927fc32ed611 SHA1 7579e8c7a9ed3c62f05484c7f424d7874f7c77f3 SHA256 7584acf4623f2dbbb70b675675242fe528729bf9d39c3eadff4fff87650f157c
+AUX mixxx-1.10.0-system-libs.patch 7152 RMD160 997fc54491efa54d9aec7f77e0fba40b1ce21f5e SHA1 2d3bf891ce824b1dede101ab9512639c7947929d SHA256 c3809896e75c6c4e5e714e75527ec5a970edca5e75124fa06bbe02fb9b08b0a1
+DIST mixxx-1.10.0-src.tar.gz 15852338 RMD160 dde454d7ff6200e33c401e87313ad399ff751d53 SHA1 b01ab69c0eeca99fa6b1da472cfede01bda71328 SHA256 9135f814262bf42eb05bf5d56c760ab462329c06785271d570be6a9d14ab1e97
+EBUILD mixxx-1.10.0.ebuild 2164 RMD160 9165feb5cf6a5db227a294b875811e68df28e69f SHA1 2aea1dd0b021fcb376fc54de26bae7a61941b753 SHA256 1150ae344d6c76e630cd82fd0b178780585bbe7ddcdf0151a7b967c4604fdf5e
+MISC ChangeLog 545 RMD160 9ca4b36f5c1f2dab5385435e7e32e6b0c570b010 SHA1 a5743fd2238bba3e85685e4b5fba4a9ca115080d SHA256 d0c0fbe78f1ca4c95957551b3c4082cfbe351f31b0d85c57e4a317ceb69ef6ee
+MISC metadata.xml 268 RMD160 6b11b58939c65abfda36f44663887e57c390637e SHA1 7ea890d152319f88e23844fe6345c7b0d44e82a9 SHA256 607c4390a6642fd00b7489c1a11be4efa57cf12c80e0418c56c9a6554c0ffade
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJPaPrdAAoJEEqz6FtPBkyjoKAH/3lYlQswTrXLg+28kNBSIz98
+2FZgJMu+0eSoUK3O5i8qiJ2DkC9zsdbEZ0Jowca+8N7xZLC+qKTk3BrZSt0Y7NhL
+09ZNwqsqj1TwRsPZjDmm7t9/Btz8q153wqI+/5ipR9qZvUALt60mI33XBq+1HRyO
+ml1+Hju08OEdT/8PIeK8DQOuNh8lkTD5AK8ZteOdrUhM4cVJ1jX6Svfd6BBtVs4J
+ufi9E7/IMgLTCD+bIv89afGB3/iKJbAH7SHFjwMY1qW6jewwj/J64MHwgzBLQWhW
+9A8BaZ/h+fjveRcm9m4E6FkwK0F/f1RTXgVytXOmH6SXYSBqoYaNQyFvcMWfF2c=
+=9c9o
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch b/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
new file mode 100644
index 000000000000..b6c8655a73a6
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
@@ -0,0 +1,13 @@
+--- mixxx-1.10.0/build/depends.py
++++ mixxx-1.10.0/build/depends.py
+@@ -623,10 +555,8 @@
+         if build.toolchain_is_gnu:
+             # Default GNU Options
+             # TODO(XXX) always generate debugging info?
+-            build.env.Append(CCFLAGS = '-pipe')
+             build.env.Append(CCFLAGS = '-Wall')
+             build.env.Append(CCFLAGS = '-Wextra')
+-            build.env.Append(CCFLAGS = '-g')
+ 
+             # Check that g++ is present (yeah, SCONS is a bit dumb here)
+             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-docs.patch b/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
new file mode 100644
index 000000000000..c9205179881c
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
@@ -0,0 +1,10 @@
+--- mixxx-1.10.0/src/SConscript
++++ mixxx-1.10.0/src/SConscript
+@@ -219,7 +218,6 @@
+ 		env.Alias('install', keyboardmappings)
+ 		if int(flags['ladspa']):
+ 			env.Alias('install', ladspapresets)
+-		env.Alias('install', docs)
+ 		env.Alias('install', dotdesktop)
+ 		env.Alias('install', icon)
+ 		env.Alias('install', promotracks)
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
new file mode 100644
index 000000000000..40f32266bb5e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
@@ -0,0 +1,37 @@
+--- mixxx-1.10.0/src/SConscript.env
++++ mixxx-1.10.0/src/SConscript.env
+@@ -19,21 +19,6 @@
+     print "Deleting deprecated build file: %s" % defs
+     os.remove(defs)
+ 
+-#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
+-## instead, embed BZR version into build
+-## Put version info into a file, so it doesn't force a rebuild of everything :)
+-f = open("build.h","w")
+-try:
+-    branch_name = util.get_bzr_branch_name()
+-    modified = util.get_bzr_modified() > 0
+-    # Do not emit BUILD_BRANCH on release branches.
+-    if not branch_name.startswith('release'):
+-        f.write('#define BUILD_BRANCH "%s"\n' % branch_name)
+-    f.write('#define BUILD_REV "%s%s"\n' % (util.get_bzr_revision(),
+-                                            '+' if modified else ''))
+-finally:
+-    f.close()
+-
+ #Check for dependencies if we're not doing a clean...
+ #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):
+ conf = Configure(env, custom_tests = { 'CheckForPKGConfig' : util.CheckForPKGConfig,
+--- mixxx-1.10.0/src/SConscript
++++ mixxx-1.10.0/src/SConscript
+@@ -12,8 +12,8 @@
+ from build import util
+ 
+ mixxx_version = util.get_mixxx_version()
+-branch_name = util.get_bzr_branch_name()
+-bazaar_revision = util.get_bzr_revision()
++#branch_name = util.get_bzr_branch_name()
++#bazaar_revision = util.get_bzr_revision()
+ print "WE ARE IN:", os.getcwd()
+ 
+ plugins = []
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch b/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
new file mode 100644
index 000000000000..d2e21f3e005b
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
@@ -0,0 +1,172 @@
+--- mixxx-1.10.0/build/depends.py
++++ mixxx-1.10.0/build/depends.py
+@@ -21,7 +21,7 @@
+ 
+     def configure(self, build, conf):
+         #Check for PortTime
+-        if not conf.CheckLib(['porttime', 'libporttime']) and \
++        if not conf.CheckLib(['porttime', 'libportmidi']) and \
+                 not conf.CheckHeader(['porttime.h']):
+             raise Exception("Did not find PortTime or its development headers.")
+         if not conf.CheckLib(['portmidi', 'libportmidi']) and \
+@@ -189,25 +189,10 @@
+ 
+ class FidLib(Dependence):
+ 
+-    def sources(self, build):
+-        symbol = None
+-        if build.platform_is_windows:
+-            if build.toolchain_is_msvs:
+-                symbol = 'T_MSVC'
+-            elif build.crosscompile:
+-                # Not sure why, but fidlib won't build with mingw32msvc and
+-                # T_MINGW
+-                symbol = 'T_LINUX'
+-            elif build.toolchain_is_gnu:
+-                symbol = 'T_MINGW'
+-        else:
+-            symbol = 'T_LINUX'
+-
+-        return [build.env.StaticObject('#lib/fidlib-0.9.9/fidlib.c',
+-                                       CPPDEFINES=symbol)]
+-
+     def configure(self, build, conf):
+-        build.env.Append(CPPPATH='#lib/fidlib-0.9.9/')
++        if not conf.CheckLib('fidlib'):
++            raise Exception('Did not find fidlib library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
+ 
+ class KissFFT(Dependence):
+ 
+@@ -226,68 +211,15 @@
+         build.env.Append(CPPPATH="#lib/replaygain")
+ 
+ class SoundTouch(Dependence):
+-    SOUNDTOUCH_PATH = 'soundtouch-1.5.0'
+ 
+     def sources(self, build):
+-        sources = ['engine/enginebufferscalest.cpp',
+-                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
+-        if build.platform_is_windows and build.toolchain_is_msvs:
+-            if build.machine_is_64bit:
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH)
+-            elif build.machine == 'x86':
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH)
+-            else:
+-                raise Exception("Unhandled CPU configuration for SoundTouch")
+-        elif build.toolchain_is_gnu:
+-            if build.machine == 'x86_64':
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH)
+-            else:
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH)
+-        else:
+-            raise Exception("Unhandled CPU configuration for SoundTouch")
+-
+-        # TODO(XXX) when we figure out a better way to represent features, fix
+-        # this.
+-        optimize = int(util.get_flags(build.env, 'optimize', 1))
+-        if build.machine_is_64bit or \
+-                (build.toolchain_is_msvs and optimize > 1) or \
+-                (build.toolchain_is_gnu and optimize > 2):
+-            sources.extend(
+-                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 ])
+-        if build.toolchain_is_msvs and not build.machine_is_64bit:
+-            sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH)
+-        else:
+-            # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have
+-            # it.
+-            pass
+-
+-        return sources
++        return ['engine/enginebufferscalest.cpp']
+ 
+     def configure(self, build, conf):
+-        if build.platform_is_windows:
+-            build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth)
+-        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
+-
+-        # TODO(XXX) when we figure out a better way to represent features, fix
+-        # this.
+-        optimize = int(util.get_flags(build.env, 'optimize', 1))
+-        if build.machine_is_64bit or \
+-                (build.toolchain_is_msvs and optimize > 1) or \
+-                (build.toolchain_is_gnu and optimize > 2):
+-            build.env.Append(CPPDEFINES='ALLOW_X86_OPTIMIZATIONS')
++        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
++            raise Exception('Did not find SoundTouch library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
++        build.env.Append(LIBS='SoundTouch')
+ 
+ class TagLib(Dependence):
+     def configure(self, build, conf):
+--- mixxx-1.10.0/build/features.py
++++ mixxx-1.10.0/build/features.py
+@@ -665,25 +659,15 @@
+         test_env.Append(CCFLAGS = '-pthread')
+         test_env.Append(LINKFLAGS = '-pthread')
+ 
+-        test_env.Append(CPPPATH="#lib/gtest-1.5.0/include")
+-        gtest_dir = test_env.Dir("#lib/gtest-1.5.0")
+-        #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
+-        #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example, optional
+-        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib'
+-
+-        env = test_env
+-        SCons.Export('env')
+-        env.SConscript(env.File('SConscript', gtest_dir))
+-
+-        # build and configure gmock
+-        test_env.Append(CPPPATH="#lib/gmock-1.5.0/include")
+-        gmock_dir = test_env.Dir("#lib/gmock-1.5.0")
+-        #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
+-        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib'
+-
+-        env.SConscript(env.File('SConscript', gmock_dir))
+-
+-        return []
++        if not conf.CheckLib('gtest'):
++            raise Exception('Did not find gtest library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
++        test_env.Append(LIBS='gtest')
++
++        if not conf.CheckLib('gmock'):
++            raise Exception('Did not find gmock library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
++        test_env.Append(LIBS='gmock')
+ 
+ class Shoutcast(Feature):
+     def description(self):
+--- mixxx-1.10.0/src/engine/enginefilterbutterworth8.cpp
++++ mixxx-1.10.0/src/engine/enginefilterbutterworth8.cpp
+@@ -20,7 +20,6 @@
+ #include "engine/enginefilterbutterworth8.h"

+ #include "engine/enginefilter.h"

+ #include "engine/engineobject.h"

+-#include "../lib/fidlib-0.9.9/fidlib.h"

+ 

+ /* Local Prototypes */

+ inline double _processLowpass(double *coef, double *buf, register double val);

+--- mixxx-1.10.0/src/engine/enginefilter.h
++++ mixxx-1.10.0/src/engine/enginefilter.h
+@@ -20,7 +20,7 @@
+ 
+ #define MIXXX
+ #include "engine/engineobject.h"
+-#include "../lib/fidlib-0.9.9/fidlib.h"
++#include "fidlib.h"
+ #include "defs.h"
+ 
+ enum filterType{

diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
new file mode 100644
index 000000000000..84869f56185a
--- /dev/null
+++ b/media-sound/mixxx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<use>
+		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/mixxx/mixxx-1.10.0.ebuild b/media-sound/mixxx/mixxx-1.10.0.ebuild
new file mode 100644
index 000000000000..e10cafa6c770
--- /dev/null
+++ b/media-sound/mixxx/mixxx-1.10.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.10.0.ebuild,v 1.1 2012/03/20 21:47:03 radhermit Exp $
+
+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="aac debug doc mp3 pulseaudio shout wavpack"
+
+RDEPEND="media-libs/fidlib
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/taglib
+	virtual/glu
+	virtual/opengl
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	x11-libs/qt-qt3support:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-webkit:4
+	x11-libs/qt-xmlpatterns:4
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2
+	)
+	mp3? ( media-libs/libmad )
+	pulseaudio? ( media-sound/pulseaudio )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-system-libs.patch
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-docs.patch
+	epatch "${FILESDIR}"/${P}-no-bzr.patch
+
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	# alter startup command when pulseaudio support is disabled
+	if ! use pulseaudio ; then
+		sed -i -e 's:pasuspender ::' src/mixxx.desktop || die
+	fi
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="/usr/$(get_libdir)" escons \
+		prefix=/usr \
+		qtdir=/usr/$(get_libdir)/qt4 \
+		hifieq=1 \
+		vinylcontrol=1 \
+		optimize=0 \
+		$(use_scons aac faad) \
+		$(use_scons debug qdebug) \
+		$(use_scons mp3 mad) \
+		$(use_scons shout shoutcast) \
+		$(use_scons wavpack wv)
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="/usr/$(get_libdir)" escons install \
+		prefix=/usr \
+		install_root="${D}"/usr
+
+	dodoc README Mixxx-Manual.pdf
+}