diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-11-26 23:03:24 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-11-26 23:03:24 +0000 |
| commit | a778b60eed33e8a695af36d25c109fd8011ea6bb (patch) | |
| tree | fbd4e8763e1d6730fb0cde8f48346b5e17097849 /media-sound/musepack-tools/files | |
| parent | gnome-extra/gnome-swallow-1.2 stable for x86... (Manifest recommit) (diff) | |
| download | gentoo-2-a778b60eed33e8a695af36d25c109fd8011ea6bb.tar.gz gentoo-2-a778b60eed33e8a695af36d25c109fd8011ea6bb.tar.bz2 gentoo-2-a778b60eed33e8a695af36d25c109fd8011ea6bb.zip | |
Version bump closes bug #72486.
Diffstat (limited to 'media-sound/musepack-tools/files')
| -rw-r--r-- | media-sound/musepack-tools/files/digest-musepack-tools-1.15s | 1 | ||||
| -rw-r--r-- | media-sound/musepack-tools/files/musepack-tools-1.15s-Makefile.patch (renamed from media-sound/musepack-tools/files/musepack-tools-1.15r-Makefile.patch) | 60 |
2 files changed, 21 insertions, 40 deletions
diff --git a/media-sound/musepack-tools/files/digest-musepack-tools-1.15s b/media-sound/musepack-tools/files/digest-musepack-tools-1.15s new file mode 100644 index 000000000000..8fd08627a75f --- /dev/null +++ b/media-sound/musepack-tools/files/digest-musepack-tools-1.15s @@ -0,0 +1 @@ +MD5 7b2aa799490a306efbd6642c2623a793 mpcsv7-src-1.15s.tar.gz 501116 diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15r-Makefile.patch b/media-sound/musepack-tools/files/musepack-tools-1.15s-Makefile.patch index eebd5b596cbd..76799512c368 100644 --- a/media-sound/musepack-tools/files/musepack-tools-1.15r-Makefile.patch +++ b/media-sound/musepack-tools/files/musepack-tools-1.15s-Makefile.patch @@ -1,15 +1,5 @@ -diff -ru sv7/Makefile sv7_nu/Makefile ---- sv7/Makefile 2004-03-18 00:17:54.000000000 +0200 -+++ sv7_nu/Makefile 2004-04-16 20:41:00.842641680 +0300 -@@ -12,7 +12,7 @@ - - # Select the compiler. Normally gcc is used. - --CC = cc -pipe -L/lib -+CC = gcc -pipe -L/lib - CC3 = gcc3 -pipe -L/lib - - +--- Makefile.orig 2004-06-18 23:27:10.227221536 +0300 ++++ Makefile 2004-06-18 23:29:28.279234440 +0300 @@ -20,8 +20,7 @@ # If unset Intel 386 with optimization for Pentium is selected. @@ -38,24 +28,6 @@ diff -ru sv7/Makefile sv7_nu/Makefile -Wall \ -pedantic \ -W \ -@@ -143,7 +142,7 @@ - -fstrength-reduce \ - -fexpensive-optimizations \ - -funroll-all-loops -fmove-all-movables -fstrength-reduce \ -- -mpreferred-stack-boundary=2 -malign-jumps=5 -malign-loops=0 -malign-functions=5 -+ -mpreferred-stack-boundary=2 -falign-jumps=5 -falign-loops=0 -falign-functions=5 - - # -fcse-follow-jumps \ - -@@ -156,7 +155,7 @@ - -frerun-loop-opt \ - -fstrength-reduce \ - -fmove-all-movables -fstrength-reduce -fcse-follow-jumps \ -- -mpreferred-stack-boundary=2 -malign-jumps=5 -malign-loops=0 -malign-functions=5 -+ -mpreferred-stack-boundary=2 -falign-jumps=5 -falign-loops=0 -falign-functions=5 - - # Options to generate Assembly code for inspecting - @@ -189,7 +188,7 @@ # Merge all options together for CFLAGS and CFLAG_SIZE @@ -71,12 +43,13 @@ diff -ru sv7/Makefile sv7_nu/Makefile $(MPPDEC_TARGET): $(MPPDEC_OBJ) +ifndef BLDSTATIC $(CC) $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET) $(LDADD) - -$(STRIP) $(STRIPOPT) $(MPPDEC_TARGET) +- -$(STRIP) $(STRIPOPT) $(MPPDEC_TARGET) - $(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)-static $(LDADD) - -$(STRIP) $(STRIPOPT) $(MPPDEC_TARGET)-static ++# -$(STRIP) $(STRIPOPT) $(MPPDEC_TARGET) +else + $(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET) $(LDADD) -+ -$(STRIP) $(STRIPOPT) $(MPPDEC_TARGET) ++# -$(STRIP) $(STRIPOPT) $(MPPDEC_TARGET) +endif @@ -87,22 +60,29 @@ diff -ru sv7/Makefile sv7_nu/Makefile $(MPPENC_TARGET): $(MPPENC_OBJ) +ifndef BLDSTATIC $(CC) $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET) $(LDADD) - -$(STRIP) $(STRIPOPT) $(MPPENC_TARGET) +- -$(STRIP) $(STRIPOPT) $(MPPENC_TARGET) - $(CC) -static $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET)-static $(LDADD) - -$(STRIP) $(STRIPOPT) $(MPPENC_TARGET)-static ++# -$(STRIP) $(STRIPOPT) $(MPPENC_TARGET) +else + $(CC) -static $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET) $(LDADD) -+ -$(STRIP) $(STRIPOPT) $(MPPENC_TARGET) ++# -$(STRIP) $(STRIPOPT) $(MPPENC_TARGET) +endif $(MPPDEC_TARGET)-profiling: $(MPPDEC_OBJ) -@@ -344,7 +349,7 @@ - -$(STRIP) $(STRIPOPT) $(TAGGER_TARGET) +@@ -336,12 +341,12 @@ + + $(REPLAY_TARGET): $(REPLAY_OBJ) mpp.h config.c + $(CC) $(CFLAGS) $(REPLAY_OBJ) -o $(REPLAY_TARGET) $(LDADD) +- -$(STRIP) $(STRIPOPT) $(REPLAY_TARGET) ++# -$(STRIP) $(STRIPOPT) $(REPLAY_TARGET) + + $(TAGGER_TARGET): + $(CC) -DMPP_DECODER $(CFLAGS) -o $(TAGGER_TARGET) $(TAGGER_TARGET).c +- -$(STRIP) $(STRIPOPT) $(TAGGER_TARGET) ++# -$(STRIP) $(STRIPOPT) $(TAGGER_TARGET) --$(CLIPSTAT_TARGET): -+$(CLIPSTAT_TARGET): $(CLIPSTAT_OBJ) - $(CC) $(CFLAGS) $(CLIPSTAT_OBJ) -o $(CLIPSTAT_TARGET) $(LDADD) - -$(STRIP) $(STRIPOPT) $(CLIPSTAT_TARGET) + $(CLIPSTAT_TARGET): |