summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2008-12-10 13:25:04 -0800
committerEric Sandall2008-12-10 13:25:04 -0800
commitced3ececbb9c3217bd29181251b1c25b535a6538 (patch)
treedb5d4c69bff044aa69a6f45cb8940cda17cd992a
parente750bc3ef8718097e7b329093948d12ce61e5d64 (diff)
musepack-tools: unbork #14907
(cherry-picked from commit 3a82a7f2f97daa28428e906a64ee553d68c0cb55)
-rwxr-xr-xaudio-soft/musepack-tools/BUILD1
-rw-r--r--audio-soft/musepack-tools/HISTORY4
-rw-r--r--audio-soft/musepack-tools/Makefile.patch23
-rwxr-xr-xaudio-soft/musepack-tools/PRE_BUILD3
4 files changed, 30 insertions, 1 deletions
diff --git a/audio-soft/musepack-tools/BUILD b/audio-soft/musepack-tools/BUILD
index 0c99eaf7e6..d6662350e3 100755
--- a/audio-soft/musepack-tools/BUILD
+++ b/audio-soft/musepack-tools/BUILD
@@ -1 +1,2 @@
+CFLAGS="" make &&
make mppenc mppdec replaygain
diff --git a/audio-soft/musepack-tools/HISTORY b/audio-soft/musepack-tools/HISTORY
index 8f62ce9c98..be990fc174 100644
--- a/audio-soft/musepack-tools/HISTORY
+++ b/audio-soft/musepack-tools/HISTORY
@@ -1,3 +1,7 @@
+2008-12-04 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+ * BUILD, PRE_BUILD: changed for castability #14907
+ * Makefile.patch: added for castability
+
2007-06-13 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DEPENDS: added nasm #12111
diff --git a/audio-soft/musepack-tools/Makefile.patch b/audio-soft/musepack-tools/Makefile.patch
new file mode 100644
index 0000000000..b6e1d16c52
--- /dev/null
+++ b/audio-soft/musepack-tools/Makefile.patch
@@ -0,0 +1,23 @@
+--- Makefile.orig 2005-02-07 15:56:48.000000000 +0100
++++ Makefile 2005-02-07 23:23:20.422596896 +0100
+@@ -36,7 +36,7 @@
+ # If unset Intel 386 with optimization for Pentium is selected.
+
+ ifndef ARCH
+-ARCH = -march=i586 -m$(TUNE)=i686
++ARCH = #-march=i586 -m$(TUNE)=i686
+ endif
+
+ ifdef MINGW
+@@ -176,9 +176,9 @@
+ -fno-finite-math-only -fno-unsafe-math-optimizations
+ endif
+
+-OPTIM_SPEED = -O2 $(FLAGS) $(UNBREAK)
++OPTIM_SPEED = $(UNBREAK)
+
+-OPTIM_SIZE = -Os $(FLAGS) $(UNBREAK)
++OPTIM_SIZE = $(UNBREAK)
+
+ # Options to generate Assembly code for inspecting
+
diff --git a/audio-soft/musepack-tools/PRE_BUILD b/audio-soft/musepack-tools/PRE_BUILD
index ff351bf9e6..9bd273e10b 100755
--- a/audio-soft/musepack-tools/PRE_BUILD
+++ b/audio-soft/musepack-tools/PRE_BUILD
@@ -9,4 +9,5 @@ if [ $MPC_USE_ESD == "y" ]; then
LDADD\ \ \ +=\ -lesd' Makefile
else
sed -i 's/#define USE_ESD_AUDIO/#undef\ USE_ESD_AUDIO/' mpp.h
-fi
+fi &&
+patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/Makefile.patch