Revision: 2112
Author: keenblade
Date: 2012-05-05 21:15:28 +0200 (Sat, 05 May 2012)
Log Message:
-----------
mixxx ebuilds: new ebuild mixxx-1.10.9999. Also m4a and wavpack patch removed.
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/mixxx-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-cflags.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-docs.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-no-bzr.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-system-libs.patch
trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.9999.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-m4a.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-wavpack.patch
Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2012-04-27 16:23:51 UTC
(rev 2111)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2012-05-05 19:15:28 UTC
(rev 2112)
@@ -2,6 +2,16 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mixxx-1.10.9999 (05 May 2012)
+
+ 05 May 2012; Hakan Demiralp <[email protected]>
+ +mixxx-1.10.9999.ebuild, +files/mixxx-1.10.9999-cflags.patch,
+ +files/mixxx-1.10.9999-docs.patch, +files/mixxx-1.10.9999-no-bzr.patch,
+ +files/mixxx-1.10.9999-system-libs.patch, mixxx-9999.ebuild,
+ -files/mixxx-9999-m4a.patch, -files/mixxx-9999-wavpack.patch:
+ mixxx ebuilds: new ebuild mixxx-1.10.9999. Also m4a and wavpack patch
+ removed. Thanks to Alex Barker
+
27 Apr 2012; Hakan Demiralp <[email protected]>
files/mixxx-9999-docs.patch:
mixxx-9999.ebuild: docs.patch is updated. Thanks to Alex Barker
Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest 2012-04-27 16:23:51 UTC
(rev 2111)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest 2012-05-05 19:15:28 UTC
(rev 2112)
@@ -5,14 +5,17 @@
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-1.10.9999-cflags.patch 655 RMD160
e0a6792f5dd5634bae9f7ca3788935d29580b0b4 SHA1
ffa393ac5ab3609273ee9ddaf80386447fdbf19a SHA256
99804e3fa036a7bfdcafafbfc1451e370ea29a1c41448a8e35dee65499e77525
+AUX mixxx-1.10.9999-docs.patch 407 RMD160
d6339919d3634a700d21968c5e6ce0075ac210c9 SHA1
1e2a98febbb63375c10523512ff3c379b400f49b SHA256
b03ac370db5e59cf32801df17bdb5f605a5be2894f0ef06293d9dae4325dd650
+AUX mixxx-1.10.9999-no-bzr.patch 1667 RMD160
da949f6c6c2331997e3b899aa5eaa89d02f459b4 SHA1
a3967d286167a72a810f0328b32d304dc36cfcee SHA256
eb4e734e1c265833806f21b59abb35cc20379710bc7be353b701a4c1970112f2
+AUX mixxx-1.10.9999-system-libs.patch 7253 RMD160
279d4ea995ec4de3ba63365f6f249cd0f062ab1a SHA1
2344bb14544b41b14b2e5801c9279b809d96167b SHA256
f943697e197541ef18aa875f1a5a88a4be373a00f3bc16178854c5e286550af5
AUX mixxx-9999-cflags.patch 641 RMD160
53c31d4ef1ce971ca57a4fc08ab25c13b33f445c SHA1
7b49db41361db9dfaf462987a9aa1f87f8fea2a9 SHA256
5a4a4256cabc06bf10c532c82f055737748f79f066758ae20038815ca8342549
AUX mixxx-9999-docs.patch 438 RMD160 8ad7e74e3c56ffd5b22045d19fe09f6505d7ae28
SHA1 d49f5fc77b8bd5d4f9a2547af8cee319574cc04e SHA256
19377d095e34071010ddda59b03b86a63b82f2663dca32f8dc6771e6d217f1f7
-AUX mixxx-9999-m4a.patch 703 RMD160 2677c7ff74312ed1c2bc9c1e0286ca30ed08458b
SHA1 fd36cb69cb26ee95af3192ba6be5073041589144 SHA256
4d80a6dd4cfd64c1ebedd6a9514824329c5c8f8d7ad4e26bd44c9aeba12d11a0
AUX mixxx-9999-no-bzr.patch 1496 RMD160
2f10537abe9fe373d791e77984c3abc1b9f7f82c SHA1
245b85509d038ada45612c64781875e049331b61 SHA256
b50722573af57129892a92f9e7502ddc2d679f29435b27581352dc075d40c5c0
AUX mixxx-9999-system-libs.patch 6157 RMD160
944982b976ecd5d22f9f2caf53f24836c9240ac1 SHA1
3a25864da30e38410ac8ddb093f70aa479aa0e8e SHA256
a9b4737a03a1a4c6c32a1ebc2f501cf2fe74354b5ea09010b59cf9cc360a04fd
-AUX mixxx-9999-wavpack.patch 2020 RMD160
708427c50256f2fa9f0e9eaa2f5717cb46aacbb9 SHA1
707a120641681821f8f278bdd89171313feebd9f SHA256
5589578406062f11f426401262d6198777b68d52595618071a2fa7203ff3112b
DIST mixxx-1.10.0-src.tar.gz 15852338 RMD160
dde454d7ff6200e33c401e87313ad399ff751d53 SHA1
b01ab69c0eeca99fa6b1da472cfede01bda71328 SHA256
9135f814262bf42eb05bf5d56c760ab462329c06785271d570be6a9d14ab1e97
EBUILD mixxx-1.10.0.ebuild 2443 RMD160
21e6b1d930dae41451a639b9a40088ca90665ed6 SHA1
809bbd8067f5f6820f44e9bf4ced35bab4b32bfe SHA256
6f8ebe0b50eebffdce728c02f4501de4dc1c245775cf7e1e1bfb346950f46243
-EBUILD mixxx-9999.ebuild 2279 RMD160 a86db305e0a515ba3dcb284f52b1b2a058509304
SHA1 153a768cf9e9528beb5b1826de2a9d8fd62453bf SHA256
d06c6ca9e1dfc4e4a0c56733e2cc15a2e1c5f28429f3751f162cc2419d9b0f4a
-MISC ChangeLog 3704 RMD160 55c4aee6d66aa432291b92198e037cf683437d82 SHA1
c98cedf417e3b003cf86db532d04fb51fa6b1428 SHA256
308c819b6995698e4e0d389b22e505515c0c2204ad9fd9fe5f3de3d9e7625b7a
+EBUILD mixxx-1.10.9999.ebuild 2187 RMD160
37776ec0b566fdf1a3cfaf72a0af6c1c695d74d2 SHA1
12d726b8a3c7d0f953e9b88858333d8094b40acd SHA256
427d97dfca9155dbbe441dad177c34920db0e8988535147491d4e5d8c8f6c1dc
+EBUILD mixxx-9999.ebuild 2153 RMD160 442443d09404f3a8ac85eb01ba3991eae2c0497b
SHA1 63153e583cfe68b726678ec3076df0873c789a77 SHA256
959eeb5c3446c5fa23ce43808fbb834249624fb1204ed896b0c4c32a59f42673
+MISC ChangeLog 4163 RMD160 4698ee80041680683fba9176ddcbcc72b401f8a2 SHA1
411ce4ec7195c6db1987eb127572c6079f43516a SHA256
3deadd57df18cc6462e90dc4b9a405090c625c471e32686e3d1335caa8eda4ab
MISC metadata.xml 754 RMD160 3a4507c7280aeba4befbf07479cc3149526ec968 SHA1
07e5cb6c41989b25648616b5e0fc702addb8e312 SHA256
83057c5b52668f9b0a507bf324a031a7714f83390bd43752b94df888a1e85141
Added:
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-cflags.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-cflags.patch
(rev 0)
+++
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-cflags.patch
2012-05-05 19:15:28 UTC (rev 2112)
@@ -0,0 +1,15 @@
+=== modified file 'mixxx/build/depends.py'
+--- mixxx/build/depends.py 2011-12-23 22:09:30 +0000
++++ mixxx/build/depends.py 2012-05-05 00:03:59 +0000
+@@ -623,10 +623,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.9999-docs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-docs.patch
(rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-docs.patch
2012-05-05 19:15:28 UTC (rev 2112)
@@ -0,0 +1,12 @@
+=== modified file 'mixxx/src/SConscript'
+--- mixxx/src/SConscript 2012-01-23 11:25:21 +0000
++++ mixxx/src/SConscript 2012-05-05 00:05:56 +0000
+@@ -219,7 +219,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.9999-no-bzr.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-no-bzr.patch
(rev 0)
+++
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-no-bzr.patch
2012-05-05 19:15:28 UTC (rev 2112)
@@ -0,0 +1,41 @@
+=== modified file 'mixxx/src/SConscript'
+--- mixxx/src/SConscript 2012-01-23 11:25:21 +0000
++++ mixxx/src/SConscript 2012-05-05 00:08:40 +0000
+@@ -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 = []
+
+=== modified file 'mixxx/src/SConscript.env'
+--- mixxx/src/SConscript.env 2011-12-23 23:42:23 +0000
++++ mixxx/src/SConscript.env 2012-05-05 00:07:58 +0000
+@@ -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,
+
Added:
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-system-libs.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-system-libs.patch
(rev 0)
+++
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-system-libs.patch
2012-05-05 19:15:28 UTC (rev 2112)
@@ -0,0 +1,181 @@
+=== modified file 'mixxx/build/depends.py'
+--- mixxx/build/depends.py 2011-12-23 22:09:30 +0000
++++ mixxx/build/depends.py 2012-05-04 23:44:31 +0000
+@@ -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):
+
+=== modified file 'mixxx/build/features.py'
+--- mixxx/build/features.py 2011-11-19 20:27:07 +0000
++++ mixxx/build/features.py 2012-05-04 23:56:45 +0000
+@@ -665,25 +665,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):
+
+=== modified file 'mixxx/src/engine/enginefilter.h'
+--- mixxx/src/engine/enginefilter.h 2011-03-22 16:24:04 +0000
++++ mixxx/src/engine/enginefilter.h 2012-05-04 23:57:03 +0000
+@@ -20,13 +20,13 @@
+
+ #define MIXXX
+ #include "engine/engineobject.h"
+-#include "../lib/fidlib-0.9.9/fidlib.h"
++#include "fidlib.h"
+ #include "defs.h"
+
+-enum filterType{
+- FILTER_LOWPASS,
+- FILTER_BANDPASS,
+- FILTER_HIGHPASS
++enum filterType{
++ FILTER_LOWPASS,
++ FILTER_BANDPASS,
++ FILTER_HIGHPASS
+ };
+
+ #define PREDEF_HP 1
+
+=== modified file 'mixxx/src/engine/enginefilterbutterworth8.cpp'
+--- mixxx/src/engine/enginefilterbutterworth8.cpp 2011-03-22 16:24:04
+0000
++++ mixxx/src/engine/enginefilterbutterworth8.cpp 2012-05-04 23:57:29
+0000
+@@ -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);
+
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-m4a.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-m4a.patch
2012-04-27 16:23:51 UTC (rev 2111)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-m4a.patch
2012-05-05 19:15:28 UTC (rev 2112)
@@ -1,18 +0,0 @@
-=== modified file 'mixxx/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp'
---- mixxx/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp 2010-12-31 21:46:37
+0000
-+++ mixxx/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;
-
Deleted:
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-wavpack.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-wavpack.patch
2012-04-27 16:23:51 UTC (rev 2111)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-wavpack.patch
2012-05-05 19:15:28 UTC (rev 2112)
@@ -1,42 +0,0 @@
-=== 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);
- };
Added: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.9999.ebuild
(rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.9999.ebuild
2012-05-05 19:15:28 UTC (rev 2112)
@@ -0,0 +1,87 @@
+# 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.3
2012/05/01 16:32:12 radhermit Exp $
+
+EAPI=4
+
+inherit bzr eutils multilib scons-utils toolchain-funcs
+
+DESCRIPTION="A Qt based Digital DJ tool"
+HOMEPAGE="http://mixxx.sourceforge.net";
+EBZR_REPO_URI="lp:mixxx/1.10"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac debug doc mp3 mp4 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-svg:4
+ x11-libs/qt-webkit:4
+ x11-libs/qt-xmlpatterns:4
+ aac? (
+ media-libs/faad2
+ media-libs/libmp4v2
+ )
+ mp3? ( media-libs/libmad )
+ mp4? ( media-libs/libmp4v2 )
+ pulseaudio? ( media-sound/pulseaudio )
+ shout? ( media-libs/libshout )
+ wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+S=${S}/${PN}
+
+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 mp4 m4a) \
+ $(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
+}
Modified: trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2012-04-27
16:23:51 UTC (rev 2111)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2012-05-05
19:15:28 UTC (rev 2112)
@@ -52,12 +52,6 @@
epatch "${FILESDIR}"/${P}-docs.patch
epatch "${FILESDIR}"/${P}-no-bzr.patch
- # Fixed by Bug #976730
- epatch "${FILESDIR}"/${P}-m4a.patch
-
- # Fix by Bug #970339
- epatch "${FILESDIR}"/${P}-wavpack.patch
-
# use multilib compatible directory for plugins
sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript ||
die
