From 338bca76946bbfe12b84a541d6c37c9a5cd791b2 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 5 Dec 2013 08:38:15 +0000 Subject: [PATCH] Added patch for sdl_mixer-1.2.12 so that it skips building playwave and playmus --- .../sdl_mixer/patches/sdl_mixer-1.2.12.patch | 50 +++++++++++++++++++ media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 3 ++ 2 files changed, 53 insertions(+) create mode 100644 media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch diff --git a/media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch b/media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch new file mode 100644 index 000000000..0640f3a47 --- /dev/null +++ b/media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch @@ -0,0 +1,50 @@ +diff --git a/Makefile.in b/Makefile.in +index 1468e92..367fd69 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -39,7 +39,7 @@ VERSION_OBJECTS = @VERSION_OBJECTS@ + PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@ + PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@ + +-DIST = Android.mk CHANGES COPYING CWProjects.sea.bin MPWmake.sea.bin Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC Watcom-OS2.zip Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi playmus.c timidity wavestream.c wavestream.h version.rc ++DIST = Android.mk CHANGES COPYING CWProjects.sea.bin MPWmake.sea.bin Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC Watcom-OS2.zip Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi timidity wavestream.c wavestream.h version.rc + + LT_AGE = @LT_AGE@ + LT_CURRENT = @LT_CURRENT@ +@@ -47,7 +47,7 @@ LT_RELEASE = @LT_RELEASE@ + LT_REVISION = @LT_REVISION@ + LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +-all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playmus$(EXE) ++all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) + + $(srcdir)/configure: $(srcdir)/configure.in + @echo "Warning, configure.in is out of date" +@@ -65,9 +65,6 @@ $(objects): + $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + +-$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) +- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) +- + install: all install-hdrs install-lib #install-bin + install-hdrs: + $(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL +@@ -82,7 +79,6 @@ install-lib: $(objects) $(objects)/$(TARGET) + $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET) + install-bin: + $(SHELL) $(auxdir)/mkinstalldirs $(bindir) +- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE) + + uninstall: uninstall-hdrs uninstall-lib uninstall-bin + uninstall-hdrs: +@@ -96,7 +92,8 @@ uninstall-hdrs: + uninstall-lib: + $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET) + uninstall-bin: +- rm -f $(bindir)/playmus$(EXE) ++ touch playmus ++ rm -f playmus + + clean: + rm -rf $(objects) diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe index 1f50a77f2..e91763b9c 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -44,6 +44,7 @@ BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf + cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtool @@ -56,6 +57,8 @@ BUILD_PREREQUIRES=" SOURCE_DIR="SDL_mixer-$portVersion" +PATCHES="sdl_mixer-1.2.12.patch" + BUILD() { libtoolize --force --copy --install