| [proaudio] [2109] mixxx-9999.ebuild: ebuild updated and new patches. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2109
Author: keenblade
Date: 2012-04-21 03:07:00 +0200 (Sat, 21 Apr 2012)
Log Message:
-----------
mixxx-9999.ebuild: ebuild updated and new patches. 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-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-21 00:59:19 UTC (rev 2108)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2012-04-21 01:07:00 UTC (rev 2109)
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 21 Apr 2012; Hakan Demiralp <keenblade@xxxxxxxxxxxxx> mixxx-9999.ebuild,
+ +files/mixxx-9999-m4a.patch, +files/mixxx-9999-wavpack.patch:
+ mixxx-9999.ebuild: ebuild updated and new patches. Thanks to Alex Barker
+
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,
Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest 2012-04-21 00:59:19 UTC (rev 2108)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest 2012-04-21 01:07:00 UTC (rev 2109)
@@ -7,10 +7,12 @@
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-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 5878 RMD160 3349088b72e854bf06a1e22cfda3bbbb8f292e4a SHA1 4538ec5d125da83fb173980a912a8998c80e1793 SHA256 35f4a30e2aa6a6c66f175d2223e74fcb49407339cea60040da753199c9070b93
+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 2106 RMD160 eda613761c05db5c12ec9082f8a49f6903e0f69d SHA1 612c55fdc3319ce782209ba54e0b26f2667d68ee SHA256 b12ceeb8e2fbd930ff2c52ffb064408c919812a6a66d937a734598ddb433f4e1
-MISC ChangeLog 3167 RMD160 7454b72f9054a310c1e46189a18ac18e436ace8a SHA1 7b394c5d6ad90e077652dac5d2b0ba061a3912c2 SHA256 7df8cb1905134a941280cf8b98de921616c5867730f790697322d22e2a5a38d9
+EBUILD mixxx-9999.ebuild 2279 RMD160 a86db305e0a515ba3dcb284f52b1b2a058509304 SHA1 153a768cf9e9528beb5b1826de2a9d8fd62453bf SHA256 d06c6ca9e1dfc4e4a0c56733e2cc15a2e1c5f28429f3751f162cc2419d9b0f4a
+MISC ChangeLog 3382 RMD160 430e11960635d3f4d484f82ce36fbde53c6813f5 SHA1 2657f83a5541a4e76afc7fe25f0f82ab34a82c51 SHA256 1881e820a312d4699ccddbbdae74bdfb137fd6df478fe5e35b19da68dbdb848a
MISC metadata.xml 754 RMD160 3a4507c7280aeba4befbf07479cc3149526ec968 SHA1 07e5cb6c41989b25648616b5e0fc702addb8e312 SHA256 83057c5b52668f9b0a507bf324a031a7714f83390bd43752b94df888a1e85141
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-m4a.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-m4a.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-m4a.patch 2012-04-21 01:07:00 UTC (rev 2109)
@@ -0,0 +1,18 @@
+=== 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;
+
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-wavpack.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-wavpack.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-wavpack.patch 2012-04-21 01:07:00 UTC (rev 2109)
@@ -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-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2012-04-21 00:59:19 UTC (rev 2108)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2012-04-21 01:07:00 UTC (rev 2109)
@@ -15,7 +15,8 @@
KEYWORDS=""
IUSE="aac debug doc mp3 mp4 pulseaudio shout wavpack"
-RDEPEND="media-libs/fidlib
+RDEPEND="dev-libs/protobuf
+ media-libs/fidlib
media-libs/flac
media-libs/libid3tag
media-libs/libogg
@@ -25,6 +26,7 @@
>=media-libs/portaudio-19_pre
media-libs/portmidi
media-libs/taglib
+ media-libs/vamp-plugin-sdk
virtual/glu
virtual/opengl
>=x11-libs/qt-gui-4.6:4
@@ -50,6 +52,12 @@
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