aboutsummaryrefslogtreecommitdiff
path: root/audio/sdl_mixer/files
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2000-08-15 07:19:02 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2000-08-15 07:19:02 +0000
commitbcd4b24df9f3bc0b33ea32bd2c4c9fac3fe9704c (patch)
treef0aab0d029b9a2806b0b6f4a05ba552630a00ae5 /audio/sdl_mixer/files
parentce36c301fdc8937b75b9a87a2d4a701a80c80ac4 (diff)
Notes
Diffstat (limited to 'audio/sdl_mixer/files')
-rw-r--r--audio/sdl_mixer/files/patch-aa22
-rw-r--r--audio/sdl_mixer/files/patch-ab13
2 files changed, 22 insertions, 13 deletions
diff --git a/audio/sdl_mixer/files/patch-aa b/audio/sdl_mixer/files/patch-aa
index b103989b6794..488b363b4c31 100644
--- a/audio/sdl_mixer/files/patch-aa
+++ b/audio/sdl_mixer/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig Sat Mar 4 06:54:37 2000
-+++ Makefile.in Mon Apr 24 12:39:34 2000
-@@ -91,15 +91,15 @@
+--- Makefile.in.orig Mon Jul 3 07:38:36 2000
++++ Makefile.in Tue Aug 15 10:02:41 2000
+@@ -90,15 +90,15 @@
lib_LTLIBRARIES = libSDL_mixer.la
SUBDIRS = @MUSIC_SUBDIRS@
@@ -12,15 +12,15 @@
libSDL_mixerinclude_HEADERS = SDL_mixer.h
- libSDL_mixer_la_SOURCES = mixer.c music.c music_cmd.c music_cmd.h wave.h wavestream.c wavestream.h
+ libSDL_mixer_la_SOURCES = mixer.c music.c music_cmd.c music_cmd.h music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h
-@USE_MIKMOD_TRUE@MIKMOD_LIB = mikmod/libmikmod.la
+@USE_MIKMOD_TRUE@MIKMOD_LIB = -lmikmod
@USE_MIKMOD_FALSE@MIKMOD_LIB =
@USE_TIMIDITY_TRUE@TIMIDITY_LIB = timidity/libtimidity.la
@USE_TIMIDITY_FALSE@TIMIDITY_LIB =
-@@ -107,7 +107,7 @@
- EXTRA_DIST = CHANGES VisualC.zip MPWmake.sea.hqx autogen.sh
+@@ -106,7 +106,7 @@
+ EXTRA_DIST = CHANGES VisualC.zip MPWmake.sea.hqx CWprojects.sea.hqx autogen.sh
-libSDL_mixer_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -28,7 +28,7 @@
libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
-@@ -127,12 +127,10 @@
+@@ -126,12 +126,11 @@
LIBS = @LIBS@
@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libSDL_mixer_la_DEPENDENCIES =
@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES = \
@@ -36,9 +36,9 @@
@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@timidity/libtimidity.la
@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libSDL_mixer_la_DEPENDENCIES = \
@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@timidity/libtimidity.la
--@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES = \
+ @USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES = \
-@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la
-+@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES =
- libSDL_mixer_la_OBJECTS = mixer.lo music.lo music_cmd.lo wavestream.lo
++
+ libSDL_mixer_la_OBJECTS = mixer.lo music.lo music_cmd.lo music_ogg.lo \
+ wavestream.lo
PROGRAMS = $(bin_PROGRAMS)
-
diff --git a/audio/sdl_mixer/files/patch-ab b/audio/sdl_mixer/files/patch-ab
index b294897e5ba4..a2124f79ba9c 100644
--- a/audio/sdl_mixer/files/patch-ab
+++ b/audio/sdl_mixer/files/patch-ab
@@ -1,5 +1,14 @@
---- configure.orig Mon Apr 24 12:40:12 2000
-+++ configure Mon Apr 24 12:43:53 2000
+--- configure.orig Sat Mar 4 05:36:35 2000
++++ configure Sat Aug 12 16:43:06 2000
+@@ -1849,7 +1849,7 @@
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
++$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
+ # Reload cache, that may have been modified by ltconfig
@@ -2232,8 +2232,8 @@
fi