| [proaudio] [2102] mixxx-9999.ebuild: ebuild and patches are updated. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2102
Author: keenblade
Date: 2012-03-25 05:59:43 +0200 (Sun, 25 Mar 2012)
Log Message:
-----------
mixxx-9999.ebuild: ebuild and patches are updated. Thanks to Alex Barker
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-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-cflags.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-docs.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-no-bzr.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-qt4_paths.patch
Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2012-03-14 03:34:39 UTC (rev 2101)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2012-03-25 03:59:43 UTC (rev 2102)
@@ -1,7 +1,13 @@
# ChangeLog for media-sound/mixxx
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Mar 2012; Hakan Demiralp <keenblade@xxxxxxxxxxxxx> mixxx-9999.ebuild,
+ +files/mixxx-9999-cflags.patch, +files/mixxx-9999-docs.patch,
+ +files/mixxx-9999-no-bzr.patch, -files/mixxx-9999-qt4_paths.patch,
+ +files/mixxx-9999-system-libs.patch, metadata.xml:
+ mixxx-9999.ebuild: ebuild and patches are updated. Thanks to Alex Barker
+
*mixxx-1.10.0 (25 Dec 2011)
25 Dec 2011; Hakan Demiralp <keenblade@xxxxxxxxxxxxx> +mixxx-1.10.0.ebuild:
Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest 2012-03-14 03:34:39 UTC (rev 2101)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest 2012-03-25 03:59:43 UTC (rev 2102)
@@ -1,8 +1,11 @@
-AUX mixxx-9999-qt4_paths.patch 1422 RMD160 12f23b0c12b0af8ab54a4514c8048097f59df2f3 SHA1 2ff3b91299ac9fa2d2dcae79d5d835761a290610 SHA256 6917b59e0b8cbebdffed0c86a26f06d6c212bf1d66bb944cfcc54b8c56903d6f
+AUX mixxx-9999-cflags.patch 641 RMD160 53c31d4ef1ce971ca57a4fc08ab25c13b33f445c SHA1 7b49db41361db9dfaf462987a9aa1f87f8fea2a9 SHA256 5a4a4256cabc06bf10c532c82f055737748f79f066758ae20038815ca8342549
+AUX mixxx-9999-docs.patch 323 RMD160 953d86c79cd920f0366963152e40099ed1d8b5ea SHA1 5403af1456b57017fbb9d1f28fa273a4dab74e15 SHA256 5bf3ed311fa6832b5f4f0378e702a1ccab4f9a08c9fa4587fd501754577b5dc7
+AUX mixxx-9999-no-bzr.patch 1496 RMD160 2f10537abe9fe373d791e77984c3abc1b9f7f82c SHA1 245b85509d038ada45612c64781875e049331b61 SHA256 b50722573af57129892a92f9e7502ddc2d679f29435b27581352dc075d40c5c0
+AUX mixxx-9999-system-libs.patch 5878 RMD160 3349088b72e854bf06a1e22cfda3bbbb8f292e4a SHA1 4538ec5d125da83fb173980a912a8998c80e1793 SHA256 35f4a30e2aa6a6c66f175d2223e74fcb49407339cea60040da753199c9070b93
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
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-9999.ebuild 2246 RMD160 66bf1786e9f3c6c9acb988f4e0a0c4bca25c226a SHA1 a91f0d5b5dc3f0020c3d22d557c5f03e6ecd59a1 SHA256 c15e785e53a342f6ba90665e7858dcfecc4ee998d4afb874bdd4033a8981510e
-MISC ChangeLog 2293 RMD160 eb02393213716d5a1de696e36684e3cbacea9bd1 SHA1 ba285a7ba8e068aa6ce60187b466e31aa8c160a3 SHA256 18433b6794af99e769a6ae742761a45f7ccac33820aeb115a361f6eebfe40588
-MISC metadata.xml 643 RMD160 6e17d15058bab43c631c88d488561d4473515cb9 SHA1 847a6a66ea57b00a78863b072ef615a12d4c1533 SHA256 4dba695d68599cdb2ca84c3cffd6be099caa9fd2e3ee190724a4be663ed35011
+EBUILD mixxx-9999.ebuild 2106 RMD160 eda613761c05db5c12ec9082f8a49f6903e0f69d SHA1 612c55fdc3319ce782209ba54e0b26f2667d68ee SHA256 b12ceeb8e2fbd930ff2c52ffb064408c919812a6a66d937a734598ddb433f4e1
+MISC ChangeLog 2630 RMD160 6e955b81e5d507247bfc577c6c3e26c60465afea SHA1 6a1d9c9bf7f3bc891e1e0c4413f7d4d50bcc4125 SHA256 7844b4f3f07a0fdb3633b8312cbcbc19512860f179d1fe6fe0e00462fa427c86
+MISC metadata.xml 754 RMD160 3a4507c7280aeba4befbf07479cc3149526ec968 SHA1 07e5cb6c41989b25648616b5e0fc702addb8e312 SHA256 83057c5b52668f9b0a507bf324a031a7714f83390bd43752b94df888a1e85141
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-cflags.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-cflags.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-cflags.patch 2012-03-25 03:59:43 UTC (rev 2102)
@@ -0,0 +1,13 @@
+--- mixxx-9999/build/depends.py 2010-12-22 11:13:22.000000000 -0800
++++ mixxx-9999/build/depends.py 2010-12-22 11:14:02.000000000 -0800
+@@ -587,10 +587,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
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-docs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-docs.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-docs.patch 2012-03-25 03:59:43 UTC (rev 2102)
@@ -0,0 +1,10 @@
+--- mixxx-9999/src/SConscript
++++ mixxx-9999/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)
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-no-bzr.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-no-bzr.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-no-bzr.patch 2012-03-25 03:59:43 UTC (rev 2102)
@@ -0,0 +1,38 @@
+--- mixxx-9999/src/SConscript.env
++++ mixxx-9999/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-9999/src/SConscript
++++ mixxx-9999/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 = []
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-qt4_paths.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-qt4_paths.patch 2012-03-14 03:34:39 UTC (rev 2101)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-qt4_paths.patch 2012-03-25 03:59:43 UTC (rev 2102)
@@ -1,22 +0,0 @@
---- src/SConscript.orig 2007-07-21 13:59:44.000000000 +0200
-+++ src/SConscript 2007-07-21 14:02:01.000000000 +0200
-@@ -325,7 +325,7 @@
- env.Append(LIBS = 'shell32')
-
- env.Append(CXXFLAGS = ' -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT') #Stolen from Mixxx's build output
--env.Append(CXXFLAGS = ' -I$QTDIR/include/Qt3Support -I$QTDIR/include/QtCore -I$QTDIR/include/QtGui -I$QTDIR/include/QtXml -I$QTDIR/include/QtOpenGl -I$QTDIR/include/Qt -I"$VCINSTALLDIR/include/atl"')
-+env.Append(CXXFLAGS = ' -I/usr/include/qt4 -I/usr/include/qt4/Qt3Support -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtOpenGl -I/usr/include/qt4/Qt -I"$VCINSTALLDIR/include/atl"')
-
- if not platform == 'win32':
- env.Append(CXXFLAGS = ' -pipe -O3 -pipe -Wall -W -g -D_REENTRANT') # omghax
---- src/qt4.py.orig 2007-07-21 15:29:25.000000000 +0200
-+++ src/qt4.py 2007-07-21 15:31:06.000000000 +0200
-@@ -246,7 +246,7 @@
- QTDIR = _detect(env),
- QT4_BINPATH = os.path.join('$QTDIR', 'bin'),
- QT4_CPPPATH = os.path.join('$QTDIR', 'include'),
-- QT4_LIBPATH = os.path.join('$QTDIR', 'lib'),
-+ QT4_LIBPATH = os.path.join('/usr/lib/qt4'),
- # TODO: This is not reliable to QTDIR value changes but needed in order to support '-qt4' variants
- QT4_MOC = locateQt4Command(env,'moc', env['QTDIR']),
- QT4_UIC = locateQt4Command(env,'uic', env['QTDIR']),
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch 2012-03-25 03:59:43 UTC (rev 2102)
@@ -0,0 +1,142 @@
+--- mixxx-9999/build/depends.py 2012-03-12 05:23:47 +0000
++++ mixxx-9999/build/depends.py 2012-03-21 20:41:47 +0000
+@@ -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.10/fidlib.c',
+- CPPDEFINES=symbol)]
+-
+ def configure(self, build, conf):
+- build.env.Append(CPPPATH='#lib/fidlib-0.9.10/')
++ if not conf.CheckLib('fidlib'):
++ raise Exception('Did not find fidlib library, exiting!')
++ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
+
+ class ReplayGain(Dependence):
+
+@@ -218,34 +203,15 @@
+ build.env.Append(CPPPATH="#lib/replaygain")
+
+ class SoundTouch(Dependence):
+- SOUNDTOUCH_PATH = 'soundtouch-1.6.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,
+- '#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,]
+-
+- # SoundTouch CPU optimizations are only for x86
+- # architectures. SoundTouch automatically ignores these files when it is
+- # not being built for an architecture that supports them.
+- cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \
+- '#lib/%s/cpu_detect_x86_gcc.cpp'
+- sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
+- return sources
++ return ['engine/enginebufferscalest.cpp']
+
+ def configure(self, build, conf):
+- if build.platform_is_windows:
+- # Regardless of the bitwidth, ST checks for WIN32
+- build.env.Append(CPPDEFINES = 'WIN32')
+- build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
++ 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-9999/build/features.py 2011-12-08 11:47:54 +0000
++++ mixxx-9999/build/features.py 2012-03-21 20:41:47 +0000
+@@ -595,25 +595,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-9999/src/engine/enginefilter.h 2011-07-24 21:50:31 +0000
++++ mixxx-9999/src/engine/enginefilter.h 2012-03-21 20:41:47 +0000
+@@ -20,7 +20,7 @@
+
+ #define MIXXX
+ #include "engine/engineobject.h"
+-#include "../lib/fidlib-0.9.10/fidlib.h"
++#include "fidlib.h"
+ #include "defs.h"
+
+ enum filterType{
+
+--- mixxx-9999/src/engine/enginefilterbutterworth8.cpp 2011-07-24 21:50:31 +0000
++++ mixxx-9999/src/engine/enginefilterbutterworth8.cpp 2012-03-21 20:41:47 +0000
+@@ -20,7 +20,6 @@
+ #include "engine/enginefilterbutterworth8.h"
+ #include "engine/enginefilter.h"
+ #include "engine/engineobject.h"
+-#include "../lib/fidlib-0.9.10/fidlib.h"
+
+ /* Local Prototypes */
+ inline double _processLowpass(double *coef, double *buf, register double val);
+
Modified: trunk/overlays/proaudio/media-sound/mixxx/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/metadata.xml 2012-03-14 03:34:39 UTC (rev 2101)
+++ trunk/overlays/proaudio/media-sound/mixxx/metadata.xml 2012-03-25 03:59:43 UTC (rev 2102)
@@ -10,6 +10,7 @@
<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="pulseaudio">Disables <pkg>media-sound/pulseaudio</pkg> support for mixxx with pasuspender</flag>
<flag name="shout">Enable shoutcast support</flag>
<flag name="tonal">Enable tonal analysis feature</flag>
<flag name="vinylcontrol">Enable vinylcontrol feature</flag>
Modified: trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2012-03-14 03:34:39 UTC (rev 2101)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2012-03-25 03:59:43 UTC (rev 2102)
@@ -1,94 +1,85 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=1
+EAPI=4
-inherit exteutils qt4 bzr toolchain-funcs
+inherit bzr eutils multilib scons-utils toolchain-funcs
-DESCRIPTION="Digital DJ tool using QT 4.x"
+DESCRIPTION="A Qt based Digital DJ tool"
HOMEPAGE="http://mixxx.sourceforge.net";
-
EBZR_REPO_URI="lp:mixxx"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
+IUSE="aac debug doc mp3 mp4 pulseaudio shout wavpack"
-RDEPEND=">=x11-libs/qt-core-4.3:4
- x11-libs/qt-gui:4
- x11-libs/qt-svg:4
- x11-libs/qt-opengl:4
- x11-libs/qt-qt3support:4
- media-libs/libmad
- media-libs/libvorbis
- media-libs/libsndfile
- media-libs/libid3tag
- >=media-libs/portaudio-19_pre
- virtual/glu
- 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="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.6:4
+ >=x11-libs/qt-opengl-4.6:4
+ >=x11-libs/qt-qt3support-4.6:4
+ >=x11-libs/qt-svg-4.6:4
+ >=x11-libs/qt-webkit-4.6:4
+ >=x11-libs/qt-xmlpatterns-4.6:4
+ aac? ( media-libs/faad2 )
+ mp3? ( media-libs/libmad )
+ mp4? ( media-libs/libmp4v2 )
+ pulseaudio? ( media-sound/pulseaudio )
+ shout? ( media-libs/libshout )
+ wavpack? ( media-sound/wavpack )"
DEPEND="${RDEPEND}
- sys-apps/sed
- dev-util/scons
- dev-lang/perl
dev-util/pkgconfig"
-IUSE="alsa jack ladspa djconsole hifieq shout tonal +vinylcontrol"
+S=${S}/${PN}
-S="${WORKDIR}/${P}/mixxx"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-cflags.patch
+ epatch "${FILESDIR}"/${P}-system-libs.patch
+ epatch "${FILESDIR}"/${P}-docs.patch
+ epatch "${FILESDIR}"/${P}-no-bzr.patch
-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
+ # 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_unpack() {
- 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} ')/" \
- "${S}/src/SConscript"
-}
-
src_compile() {
- myconf=""
- ! use ladspa; myconf="ladspa=$?"
- # disable ffmpeg for now
- #! 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"
+ 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 mp4 m4a) \
+ $(use_scons shout shoutcast) \
+ $(use_scons wavpack wv)
}
src_install() {
- mkdir -p "${D}/usr"
- scons ${myconf} install_root="${D}/usr" install || die
+ 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
}