| [proaudio] [2108] mixxx-1.10.0.ebuild: ebuild updated and added new patches |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2108
Author: keenblade
Date: 2012-04-21 02:59:19 +0200 (Sat, 21 Apr 2012)
Log Message:
-----------
mixxx-1.10.0.ebuild: ebuild updated and added new patches
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
trunk/overlays/proaudio/media-sound/mixxx/Manifest
trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.0.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-m4a.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-wavpack.patch
Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2012-04-21 00:49:14 UTC (rev 2107)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2012-04-21 00:59:19 UTC (rev 2108)
@@ -2,6 +2,13 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 21 Apr 2012; Hakan Demiralp <keenblade@xxxxxxxxxxxxx> mixxx-1.10.0.ebuild,
+ +files/mixxx-1.10.0-cflags.patch, +files/mixxx-1.10.0-docs.patch,
+ +files/mixxx-1.10.0-libmp4v2_r479_compat.patch,
+ +files/mixxx-1.10.0-m4a.patch, +files/mixxx-1.10.0-no-bzr.patch,
+ +files/mixxx-1.10.0-system-libs.patch, +files/mixxx-1.10.0-wavpack.patch:
+ mixxx-1.10.0.ebuild: ebuild updated and added new patches
+
21 Apr 2012; Hakan Demiralp <keenblade@xxxxxxxxxxxxx> -mixxx-1.7.0.ebuild:
mixxx: update v1.10.0 and remove v1.7.0 wrt #125 by kwhat
Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest 2012-04-21 00:49:14 UTC (rev 2107)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest 2012-04-21 00:59:19 UTC (rev 2108)
@@ -1,3 +1,10 @@
+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-libmp4v2_r479_compat.patch 934 RMD160 766ad0f3124a3713711a67c357536c93f27b010a SHA1 17f24f924082cfc59c5b8309228b3107416259a6 SHA256 42ac5344d5544bbb42bbb6bc67ace8e61a409ebad8a5c17adc30ae140308124d
+AUX mixxx-1.10.0-m4a.patch 698 RMD160 31bdef217bac38c48e89a5b6aecbfc657b55deb6 SHA1 1f2b4b3230b4d6ecdff78ad6eca2565a18443471 SHA256 0acb50575bfd2c6682b4d28ad3df42357561e62412b93d065e66011d4268dcf1
+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
+AUX mixxx-1.10.0-wavpack.patch 2020 RMD160 708427c50256f2fa9f0e9eaa2f5717cb46aacbb9 SHA1 707a120641681821f8f278bdd89171313feebd9f SHA256 5589578406062f11f426401262d6198777b68d52595618071a2fa7203ff3112b
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
@@ -3,6 +10,6 @@
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
-EBUILD mixxx-1.10.0.ebuild 2242 RMD160 d2e17182bfe222a927aa461ac853c2b025a1bdb5 SHA1 080d5798c04126e4d01498a33ceec7bb5f7c5360 SHA256 85743d3544c974f0aaed24a35638f8346a13e272be67045a96584dfb0f0d5885
+EBUILD mixxx-1.10.0.ebuild 2443 RMD160 21e6b1d930dae41451a639b9a40088ca90665ed6 SHA1 809bbd8067f5f6820f44e9bf4ced35bab4b32bfe SHA256 6f8ebe0b50eebffdce728c02f4501de4dc1c245775cf7e1e1bfb346950f46243
EBUILD mixxx-9999.ebuild 2106 RMD160 eda613761c05db5c12ec9082f8a49f6903e0f69d SHA1 612c55fdc3319ce782209ba54e0b26f2667d68ee SHA256 b12ceeb8e2fbd930ff2c52ffb064408c919812a6a66d937a734598ddb433f4e1
-MISC ChangeLog 2768 RMD160 b97fa428ab642fc3a5dcb09470f79c06c67662d4 SHA1 a035a1a9e173c8b9fd05128f285ca837fc55f690 SHA256 472bcb09eebbd90fb43a57b6a2bb747a3c8896361943b4a8f8d48c259f1cfd8f
+MISC ChangeLog 3167 RMD160 7454b72f9054a310c1e46189a18ac18e436ace8a SHA1 7b394c5d6ad90e077652dac5d2b0ba061a3912c2 SHA256 7df8cb1905134a941280cf8b98de921616c5867730f790697322d22e2a5a38d9
MISC metadata.xml 754 RMD160 3a4507c7280aeba4befbf07479cc3149526ec968 SHA1 07e5cb6c41989b25648616b5e0fc702addb8e312 SHA256 83057c5b52668f9b0a507bf324a031a7714f83390bd43752b94df888a1e85141
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch 2012-04-21 00:59:19 UTC (rev 2108)
@@ -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
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-docs.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-docs.patch 2012-04-21 00:59:19 UTC (rev 2108)
@@ -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)
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch 2012-04-21 00:59:19 UTC (rev 2108)
@@ -0,0 +1,28 @@
+--- mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4.c
++++ mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4.c
+@@ -114,7 +114,11 @@
+ faacDecSetConfiguration(priv->decoder, neaac_cfg);
+
+ /* open mpeg-4 file */
++#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
++ priv->mp4.handle = MP4Read(ip_data->filename);
++#else
+ priv->mp4.handle = MP4Read(ip_data->filename, 0);
++#endif
+ if (!priv->mp4.handle) {
+ d_print("MP4Read failed\n");
+ goto out;
+--- mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp
++++ mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp
+@@ -164,7 +164,11 @@
+ faacDecSetConfiguration(priv->decoder, neaac_cfg);
+
+ /* open mpeg-4 file */
++#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
++ priv->mp4.handle = MP4Read(ip_data->filename);
++#else
+ priv->mp4.handle = MP4Read(ip_data->filename, 0);
++#endif
+ if (!priv->mp4.handle) {
+ qDebug() << "MP4Read failed";
+ goto out;
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-m4a.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-m4a.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-m4a.patch 2012-04-21 00:59:19 UTC (rev 2108)
@@ -0,0 +1,18 @@
+=== modified file 'mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp'
+--- plugins/soundsourcem4a/m4a/mp4-mixxx.cpp 2010-12-31 21:46:37 +0000
++++ plugins/soundsourcem4a/m4a/mp4-mixxx.cpp 2012-04-08 18:12:25 +0000
+@@ -163,8 +163,12 @@
+ // << neaac_cfg->dontUpSampleImplicitSBR;
+ faacDecSetConfiguration(priv->decoder, neaac_cfg);
+
+- /* open mpeg-4 file */
++ /* open mpeg-4 file, check for >= ver 1.9.1 */
++ #if MP4V2_PROJECT_version_hex <= 0x00010901
+ priv->mp4.handle = MP4Read(ip_data->filename, 0);
++ #else
++ priv->mp4.handle = MP4Read(ip_data->filename);
++ #endif
+ if (!priv->mp4.handle) {
+ qDebug() << "MP4Read failed";
+ goto out;
+
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch 2012-04-21 00:59:19 UTC (rev 2108)
@@ -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 = []
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch 2012-04-21 00:59:19 UTC (rev 2108)
@@ -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{
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-wavpack.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-wavpack.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-wavpack.patch 2012-04-21 00:59:19 UTC (rev 2108)
@@ -0,0 +1,42 @@
+=== modified file 'mixxx/plugins/soundsourcewv/soundsourcewv.cpp'
+--- mixxx/plugins/soundsourcewv/soundsourcewv.cpp 2011-12-18 20:40:43 +0000
++++ mixxx/plugins/soundsourcewv/soundsourcewv.cpp 2012-03-31 19:59:55 +0000
+@@ -9,8 +9,6 @@
+
+ #include "soundsourcewv.h"
+
+-void format_samples(int bps, char *dst, int32_t *src, uint32_t count);
+-
+ namespace Mixxx {
+
+ SoundSourceWV::SoundSourceWV(QString qFilename) : SoundSource(qFilename)
+@@ -91,7 +89,8 @@
+ tsdone=WavpackUnpackSamples(filewvc, tempbuffer, timesamps); //fill temp buffer with timesamps*4bytes*channels
+ //data is right justified, format_samples() fixes that.
+
+- format_samples(Bps, (char *) (dest + (sampsread>>1)*m_iChannels), tempbuffer, tsdone*m_iChannels); //this will unpack the 4byte/sample
++ SoundSourceWV::format_samples(Bps, (char *) (dest + (sampsread>>1)*m_iChannels), tempbuffer, tsdone*m_iChannels);
++ //this will unpack the 4byte/sample
+ //output of wUnpackSamples(), sign-extending or truncating to output 16bit / sample.
+ //specifying dest+sampsread should resume the conversion where it was left if size requested
+ //required multiple reads (size req. > fixed buffer size)
+@@ -152,7 +151,7 @@
+ return ERR;
+ }
+
+-void format_samples(int Bps, char *dst, int32_t *src, uint32_t count)
++void SoundSourceWV::format_samples(int Bps, char *dst, int32_t *src, uint32_t count)
+ {
+ //this handles converting the fixed 32bit per sample produced by UnpackSamples
+ //to 16 bps, by truncating (24/32) or sign-extending (8)
+
+=== modified file 'mixxx/plugins/soundsourcewv/soundsourcewv.h'
+--- mixxx/plugins/soundsourcewv/soundsourcewv.h 2011-10-09 19:05:15 +0000
++++ mixxx/plugins/soundsourcewv/soundsourcewv.h 2012-03-31 19:26:26 +0000
+@@ -37,7 +37,7 @@
+ unsigned long filelength;
+ WavpackContext * filewvc; //works as a file handle to access the wv file.
+ int32_t tempbuffer[WV_BUF_LENGTH]; //hax ! legacy from cmus. this is 64k*4bytes.
+-
++ void format_samples(int, char *, int32_t *, uint32_t);
+ };
Modified: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.0.ebuild 2012-04-21 00:49:14 UTC (rev 2107)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.0.ebuild 2012-04-21 00:59:19 UTC (rev 2108)
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -9,87 +9,84 @@
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"
+IUSE="aac debug doc mp3 mp4 pulseaudio shout wavpack"
-RDEPEND="media-libs/libmad
+RDEPEND="media-libs/flac
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/libvorbis
>=media-libs/portaudio-19_pre
- virtual/opengl
+ media-libs/portmidi
+ media-libs/taglib
virtual/glu
+ virtual/opengl
x11-libs/qt-gui:4
- x11-libs/qt-svg: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 )
+ mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2 )
- pulseaudio? ( media-sound/pulseaudio )"
+ pulseaudio? ( media-sound/pulseaudio )
+ shout? ( media-libs/libshout )
+ wavpack? ( media-sound/wavpack )"
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() {
+ epatch "${FILESDIR}"/${P}-system-libs.patch
+ epatch "${FILESDIR}"/${P}-cflags.patch
+ epatch "${FILESDIR}"/${P}-docs.patch
+ epatch "${FILESDIR}"/${P}-no-bzr.patch
+ epatch "${FILESDIR}"/${P}-libmp4v2_r479_compat.patch
+ epatch "${FILESDIR}"/${P}-wavpack.patch
+ # patch external libsoundtouch
+# epatch "${FILESDIR}"/${P}-libsoundtouch.patch
+
# patch bzr revisoon issue.
- sed -i -e 's:return os.popen("bzr revno").readline().strip():return "gentoo":' \
- src/SConscript.env || die "sed revno failed"
+# 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"
+ # use multilib compatible directory for plugins
+ sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
- # 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)"
+ # alter startup command when pulseaudio support is disabled
+ if ! use pulseaudio ; then
+ sed -i -e 's:pasuspender ::' src/mixxx.desktop || die
+ fi
}
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
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+ LIBPATH="/usr/$(get_libdir)" escons \
+ prefix=/usr \
+ qtdir=/usr/$(get_libdir)/qt4 \
+ $(use_scons aac faad) \
+ $(use_scons debug qdebug) \
+ $(use_scons mp3 mad) \
+ $(use_scons mp4 m4a) \
+ $(use_scons shout shoutcast) \
+ $(use_scons wavpack wv) \
+ hifieq=1 \
+ vinylcontrol=1 \
+ tuned=1 \
+ optimize=0 \
+ || die
}
src_install() {
-
- scons ${MAKEOPTS} ${mysconsargs} install || die
-
- dodoc README*
-
- insinto /usr/share/doc/${PF}/pdf
- doins Mixxx-Manual.pdf
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+ LIBPATH="/usr/$(get_libdir)" escons install \
+ prefix=/usr \
+ install_root="${D}"/usr || die
+ dodoc README Mixxx-Manual.pdf
}