| [proaudio] [2914] media-sound/mixxx: update system-libs patch, remove cflags patch, depend on newer version of fidlib |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2914
Author: lilrc
Date: 2014-12-20 21:42:33 +0100 (Sat, 20 Dec 2014)
Log Message:
-----------
media-sound/mixxx: update system-libs patch, remove cflags patch, depend on newer version of fidlib
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
trunk/overlays/proaudio/media-sound/mixxx/Manifest
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch
trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-cflags.patch
Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2014-12-20 20:09:02 UTC (rev 2913)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2014-12-20 20:42:33 UTC (rev 2914)
@@ -1,7 +1,14 @@
# ChangeLog for media-sound/mixxx
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Dec 2014; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ mixxx-9999.ebuild, -files/mixxx-9999-cflags.patch,
+ files/mixxx-9999-system-libs.patch:
+ update system-libs patch
+ remove cflags patch
+ depend on newer version of fidlib
+
02 Mar 2014; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
mixxx-9999-system-libs.patch: updated for new offsets.
Thanks to Alex Barker for the updated patch.
Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest 2014-12-20 20:09:02 UTC (rev 2913)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest 2014-12-20 20:42:33 UTC (rev 2914)
@@ -6,12 +6,11 @@
AUX mixxx-1.11.9999-docs.patch 438 SHA256 19377d095e34071010ddda59b03b86a63b82f2663dca32f8dc6771e6d217f1f7 SHA512 c2ebe6043bea9bc793e92d98237ea8369169bc874354f58a88388a59f0d98630e97e44aea169418824b740cd0108689d7b8d4e619b7ce5788c9c72f5ce844846 WHIRLPOOL 31dea2227c3353ade49d7683b32a0c0b9db54870551d30b9d33b69a01762d3dc9a6e452059ee690762632732968043d0c57139fefcd66461c7723f38d66677bf
AUX mixxx-1.11.9999-no-bzr.patch 1468 SHA256 6075410573cd0911623dd0a160cdefe6a48c3f335eeef682d80eebf52b75446e SHA512 d5aa2071a836cad7c995f1e83af3ee06687a4444845583013df2023bc11f58a626c1f887fe49385b562d26d70a156383ba47d4dd6ae61b194790b1ac498e8f7c WHIRLPOOL ff247e659c62bbbe3f0989c78a284c9ea6815e162e185b6fa8844775521d268fbfbed59197b27d2949376f7db070b8aa9a4f4bf5ce9d674c8d763df9908cc0fe
AUX mixxx-1.11.9999-system-libs.patch 8072 SHA256 996c6a170e06a5b4b0250f6fcefd80be8cb6d51325ee19c231360f1892567cb1 SHA512 d8d6ab9162b365288e224bfe2611c3322d539e35284c26ede0c829a29508a1047ad8e28c08bc769a0c72bfc70e69ebca71ac8e0217fb78c5904582153c1ae267 WHIRLPOOL 0fffac4355f882e01fefaaca19cdbf9cc048d1ef6892f2451c7e7163ad19fa17e41685980acb8cd62d4530010f3ec88db8962827d35fb9f9ec5ff564adaafa89
-AUX mixxx-9999-cflags.patch 565 SHA256 a0e19566dad57446c7991efb3bbb6201b57a7608cbf23dccfc90fd7f36f38a02 SHA512 31ab088e9c7f55f1cd0ee277aa43ee1ca0ac514dd78a280121e84e0c875a9ecf4200a94e55b6fe73e7b56f1a40123b7232937ebf7d22458fb5b29fd90cd0038e WHIRLPOOL c6ff82134c0e9f7714cb7e1e60d9314018da4c4f48db80e9e60e08390b1a5af5eaa53bbb64e774446876093fdeb17445b7328ee8735da55398cf3ac089edb0a5
AUX mixxx-9999-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
-AUX mixxx-9999-system-libs.patch 7712 SHA256 c80714c187041d700b35cc254a002eabdb5859b095ea309ccb7a0deb9fdeddcd SHA512 269deff691a434e5426a51323df4ff5a54f48008f6d85f545e78170e5b30ba6e77cd0ed24feb64fdf0c8581314d895d1e9a955543e2d16619a579d691a4743e1 WHIRLPOOL 1ef1fd773ed4f80a8e49fb3a5b5fce34f672c7469efdb0eef1d6bc608fbc9110410b918d0dcb8ea9ff529168d7c3a2b18648fd5710179a3e962e11de08155c8c
+AUX mixxx-9999-system-libs.patch 7177 SHA256 9d93444cb21ccbf99b80b755a080b3c36d63050f1eb8d7c729b8298f8d0bc500 SHA512 9ef3beac445358843c24d4aac5eeb9ffd99642fa1e6449bebd8ca4659f381225d60f5ea46751c9317fa5831940a697a43875dcb5dfc999bf298436ef010beb20 WHIRLPOOL 8bfb34fe2957350d22a677fa074267b1c60a766f89792d4755831d44e69700a4d62dfb4cc22faa0004841c96ad4a1b043cf1e47e47dab840b493ad52c2b7e263
DIST mixxx-1.11.0-src.tar.gz 24473835 SHA256 00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331 SHA512 a42c2e3a648986e401f9812315942b5c68e0bc4f47ce867eb043d64f9d7836860e414b04b5e5da52b0541da5069d231774f30e965bcf3bd0db09f6bca74876c2 WHIRLPOOL 9ab4de6bfa5840500f04a4e7d523b6546e0ef08ade017f14b73425e205f039a6da11604f2b0e902085ff3062fff451385f984735029592d4b10ac3d4e0c985b1
EBUILD mixxx-1.11.0.ebuild 2268 SHA256 3073dae0132a766076bef6ea221a524ebc0e3a31f2c1d60cab1fad902bb4b4b3 SHA512 441141d4c366cff455998cbd42daed61e745b91940b39dccc5f4a3cce268dcd16d1ae7b1e55033bf53f68a7c65aa486f9f91b571c5888d02d8d1b7f43934168d WHIRLPOOL 895a2e2288c6e46298c4bd31dff4ca1fb900b1c324906b27c0e1efbedc5499c0a727afc8bd8cd168f3af944c9e3e00e382271dfa9ee88111889a203d9c078658
EBUILD mixxx-1.11.9999.ebuild 2263 SHA256 3d0226957b626e92f6ba2f9d6a7b2d764f6282f940ef77bd534b11fb609b1fc8 SHA512 b94e1a928cbb6f12abb19e0080bb098c58f4458010b866feb6358f745d72208524369e55d3ed8e06c24ef315426a85e9d14263faf52e54e14fdbb9846bb30ccf WHIRLPOOL 2117ce352078cd1e2ca9e8c7abd7d91e61d13b9a18ab3ec880b462c332e8a413b130bc1af150136a0beab41ccbb81bdc229c4bb29f14c673c8a3a24ffd3136c3
-EBUILD mixxx-9999.ebuild 2315 SHA256 bb5715e98a5d5f135d834414e655953485acb7d527ce300f151900e2a7c8e311 SHA512 13b4dd4371fabe3e7024d7e8c07d35b3058cb4ff280185d8b5397cd68de370e82b9434ac29d9d3ca8ff4da629ddfce10c5f7eedd806ab10679159fdc1d7a1fe1 WHIRLPOOL 5cd8dfa5079aa381e44fbd5e09dd9e7d4255e774bb59fe7d8ec682c7c0642091b3db45bca7b1242cfee59f63463353438720100434062b60a69c6d01b5cb0ac7
-MISC ChangeLog 7611 SHA256 4a53aa596425fde7bc5a16fd37690261c3d0ec0b214954e28c561e5390479078 SHA512 0b3c0603e6df7c8f41f761866306a5a3bf4db7bbaf50013a2e0124d2c8fd0794f75b173c5b7793132c3856efd6b3225610e2265247168c493649d8d9cf72ef39 WHIRLPOOL f0ddb5fb421682a0eb58204d888eb4978766f5b9ae63645bcfcbb8c20de2f587d02700568ecc11a30171dedc30f50b72ff6ba8a932eb25ec719a04c4e3d37143
+EBUILD mixxx-9999.ebuild 2274 SHA256 aecdf1ee0d06e3dcaf6bd4a13f5b75abaf7c38b710f943d21bf284d7abb1aece SHA512 480a0f083db88c011b6e9bbf7b313c07d3a43d043d262feccfaac826ade7086a94f13353ba80aec4fb7d858419b44395b7f29b790fb174f6b9ad2372c69b19fe WHIRLPOOL 446aec1c8820aa1b11a716f795d920ca801eefb9cb21f7d7462de89e5cc37942154af5dc2b06570ca6b6fcfc81e874689e8d6aca4afd97489009f8920e9e3106
+MISC ChangeLog 7853 SHA256 aae49fa4008b5a1c51ac67bc8f8417b957a9cf78cfb61b28587c5612af2423da SHA512 ac90613974fee38c857c0769e680dd343869e6d5caecfe1f51608c4e29cea70686ac97de63e183032b45689f2522a37ae1fbbe3360855b35a4c42ba9bbd79239 WHIRLPOOL 549f652d0058489695b9d779eb4deade4b828aa48bab6baf45d0dd409e7e12e8cc16f0bc45eae1a6c22a2389e9cab2e1be10238345be72864ccbeed69413ef51
MISC metadata.xml 485 SHA256 2d28e5b3222a404cd0ae26b12d70640ed15c665204a43496862b77f0396f2038 SHA512 cf3578bae5e75f6b5db4ca71cd00a9389878d87d0983b0c5e0b2858336bd30186df13c58b03b9f1f2e698b651d360058ed0ff63771be6ba98128ae30b886d7f7 WHIRLPOOL 275c04e470f80968e15e0c3ef77cfa4f6fe89917b01ce1d94ea7bebdfd30ee54baae32678d79e7d28dde24bd0f4ad1f8756f185638e77421ab22ebca8e42c555
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-cflags.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-cflags.patch 2014-12-20 20:09:02 UTC (rev 2913)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-cflags.patch 2014-12-20 20:42:33 UTC (rev 2914)
@@ -1,13 +0,0 @@
---- mixxx-9999/build/depends.py
-+++ mixxx-9999/build/depends.py
-@@ -862,10 +862,8 @@ class MixxxCore(Feature):
- 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)
- # returns a non zeros return code if g++ is found
Modified: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch 2014-12-20 20:09:02 UTC (rev 2913)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch 2014-12-20 20:42:33 UTC (rev 2914)
@@ -1,6 +1,8 @@
---- mixxx-9999/build/depends.py
-+++ mixxx-9999/build/depends.py
-@@ -377,25 +377,10 @@ class TestHeaders(Dependence):
+diff --git a/build/depends.py b/build/depends.py
+index ad71733..a33d68e 100644
+--- a/build/depends.py
++++ b/build/depends.py
+@@ -347,25 +347,10 @@ class TestHeaders(Dependence):
class FidLib(Dependence):
@@ -25,38 +27,39 @@
- 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'])
++ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
class ReplayGain(Dependence):
-@@ -408,7 +393,6 @@ class ReplayGain(Dependence):
+@@ -378,7 +363,6 @@ class ReplayGain(Dependence):
class SoundTouch(Dependence):
-- SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
+- SOUNDTOUCH_PATH = 'soundtouch-1.8.0'
def sse_enabled(self, build):
optimize = int(util.get_flags(build.env, 'optimize', 1))
-@@ -417,30 +401,7 @@ class SoundTouch(Dependence):
+@@ -387,41 +371,15 @@ class SoundTouch(Dependence):
(build.toolchain_is_gnu and optimize > 1))
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/BPMDetect.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
+- '#lib/%s/InterpolateCubic.cpp' % self.SOUNDTOUCH_PATH,
+- '#lib/%s/InterpolateLinear.cpp' % self.SOUNDTOUCH_PATH,
+- '#lib/%s/InterpolateShannon.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
+- '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
+- '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
+- '#lib/%s/TDStretch.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)
+- sources.append('#lib/%s/cpu_detect_x86.cpp' % self.SOUNDTOUCH_PATH)
-
- # Check if the compiler has SSE extention enabled
- # Allways the case on x64 (core instructions)
@@ -69,16 +72,13 @@
def configure(self, build, conf, env=None):
if env is None:
-@@ -448,12 +409,11 @@ class SoundTouch(Dependence):
- if build.platform_is_windows:
- # Regardless of the bitwidth, ST checks for WIN32
- env.Append(CPPDEFINES='WIN32')
+ env = build.env
- env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
-
-- # Check if the compiler has SSE extention enabled
-- # Allways the case on x64 (core instructions)
-- if self.sse_enabled(build):
-- env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
+-
+- # If we do not want SSE optimizations (either the architecture does not
+- # support it or we are running a non-optimized build) then disable them.
+- if not self.sse_enabled(build):
+- env.Append(CPPDEFINES='SOUNDTOUCH_DISABLE_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'])
@@ -86,11 +86,11 @@
class RubberBand(Dependence):
-
-
---- mixxx-9999/build/features.py
-+++ mixxx-9999/build/features.py
-@@ -54,7 +54,6 @@ class HSS1394(Feature):
+diff --git a/build/features.py b/build/features.py
+index b61de86..639e143 100644
+--- a/build/features.py
++++ b/build/features.py
+@@ -45,7 +45,6 @@ class HSS1394(Feature):
class HID(Feature):
@@ -98,7 +98,7 @@
def description(self):
return "HID controller support"
-@@ -71,10 +70,6 @@ class HID(Feature):
+@@ -62,10 +61,6 @@ class HID(Feature):
def configure(self, build, conf):
if not self.enabled(build):
return
@@ -109,15 +109,16 @@
if build.platform_is_linux:
build.env.ParseConfig(
-@@ -95,22 +90,16 @@ class HID(Feature):
+@@ -89,23 +84,17 @@ class HID(Feature):
+ build.env.AppendUnique(FRAMEWORKS=['IOKit', 'CoreFoundation'])
build.env.Append(CPPDEFINES='__HID__')
-
++
+ if not conf.CheckLib('hidapi-libusb'):
+ raise Exception('Did not find HID API library, exiting!')
+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi'])
+ build.env.Append(LIBS='hidapi-libusb')
-+
+
def sources(self, build):
sources = ['controllers/hid/hidcontroller.cpp',
'controllers/hid/hidenumerator.cpp',
@@ -137,7 +138,7 @@
return sources
-@@ -798,24 +787,15 @@ class TestSuite(Feature):
+@@ -717,24 +706,15 @@ class TestSuite(Feature):
test_env.Append(CCFLAGS='-pthread')
test_env.Append(LINKFLAGS='-pthread')
@@ -170,29 +171,4 @@
+ test_env.Append(LIBS='gmock')
return []
-
-
---- mixxx-9999/src/engine/enginefilter.h
-+++ mixxx-9999/src/engine/enginefilter.h
-@@ -20,7 +20,7 @@
- #define MIXXX
- #include "engine/engineobject.h"
--#include "../lib/fidlib-0.9.10/fidlib.h"
-+#include <fidlib.h>
- #include "defs.h"
-
- #define PREDEF_HP 1
-
-
---- mixxx-9999/src/engine/enginefilterbutterworth8.cpp
-+++ mixxx-9999/src/engine/enginefilterbutterworth8.cpp
-@@ -18,7 +18,7 @@
- #include "engine/enginefilterbutterworth8.h"
- #include "engine/enginefilter.h"
- #include "engine/engineobject.h"
--#include "../lib/fidlib-0.9.10/fidlib.h"
-+#include <fidlib.h>
-
- inline CSAMPLE _processLowpass(CSAMPLE *coef, CSAMPLE *buf, register CSAMPLE val);
- inline CSAMPLE _processBandpass(CSAMPLE *coef, CSAMPLE *buf, register CSAMPLE val);
Modified: trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2014-12-20 20:09:02 UTC (rev 2913)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2014-12-20 20:42:33 UTC (rev 2914)
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -18,7 +18,7 @@
RDEPEND="dev-libs/protobuf
media-libs/chromaprint
- >=media-libs/fidlib-0.9.10-r1
+ >media-libs/fidlib-0.9.10-r1
media-libs/flac
media-libs/libid3tag
media-libs/libogg
@@ -56,7 +56,6 @@
S=${S}/${PN}
src_prepare() {
- epatch "${FILESDIR}"/${P}-cflags.patch
epatch "${FILESDIR}"/${P}-system-libs.patch
epatch "${FILESDIR}"/${P}-docs.patch