diff options
| -rw-r--r-- | audio/sdl_mixer/Makefile | 10 | ||||
| -rw-r--r-- | audio/sdl_mixer/distinfo | 2 | ||||
| -rw-r--r-- | audio/sdl_mixer/files/patch-aa | 37 | ||||
| -rw-r--r-- | audio/sdl_mixer/files/patch-ab | 31 |
4 files changed, 35 insertions, 45 deletions
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile index 4e7e249b31fa..ebf4fe7fa928 100644 --- a/audio/sdl_mixer/Makefile +++ b/audio/sdl_mixer/Makefile @@ -6,16 +6,16 @@ # PORTNAME= sdl_mixer -PORTVERSION= 1.0.6 +PORTVERSION= 1.1.0 CATEGORIES= audio -MASTER_SITES= http://www.devolution.com/~slouken/SDL/projects/SDL_mixer/src/ +MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/src/ DISTNAME= SDL_mixer-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org LIB_DEPENDS= SDL-1.1.2:${PORTSDIR}/devel/sdl-devel \ smpeg.1:${PORTSDIR}/graphics/smpeg \ - mikmod.2:${PORTSDIR}/audio/libmikmod + vorbis.0:${PORTSDIR}/audio/libvorbis SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config @@ -25,4 +25,8 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ CPPFLAGS="-I${X11BASE}/include" +post-configure: + @${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ + ${WRKSRC}/libtool + .include <bsd.port.mk> diff --git a/audio/sdl_mixer/distinfo b/audio/sdl_mixer/distinfo index 6033d6a784f5..fef8048c0d92 100644 --- a/audio/sdl_mixer/distinfo +++ b/audio/sdl_mixer/distinfo @@ -1 +1 @@ -MD5 (SDL_mixer-1.0.6.tar.gz) = 62b25bdf4ddb97d3c435b5412940ebc4 +MD5 (SDL_mixer-1.1.0.tar.gz) = aefc9ddc344a7888ab97bd9ccc5ad56d diff --git a/audio/sdl_mixer/files/patch-aa b/audio/sdl_mixer/files/patch-aa index 488b363b4c31..07abb9fab55e 100644 --- a/audio/sdl_mixer/files/patch-aa +++ b/audio/sdl_mixer/files/patch-aa @@ -1,25 +1,18 @@ ---- 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 - + +$FreeBSD$ + +--- Makefile.in.orig Thu Nov 30 06:50:20 2000 ++++ Makefile.in Mon Jan 29 20:20:33 2001 +@@ -91,7 +91,7 @@ SUBDIRS = @MUSIC_SUBDIRS@ --DIST_SUBIDRS = mikmod timidity -+DIST_SUBIDRS = timidity + DIST_SUBIDRS = mikmod timidity -libSDL_mixerincludedir = $(includedir)/SDL +libSDL_mixerincludedir = $(includedir)/SDL11 libSDL_mixerinclude_HEADERS = SDL_mixer.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 = -@@ -106,7 +106,7 @@ +@@ -105,7 +105,7 @@ EXTRA_DIST = CHANGES VisualC.zip MPWmake.sea.hqx CWprojects.sea.hqx autogen.sh @@ -28,17 +21,3 @@ libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) -@@ -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 = \ --@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la \ - @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@mikmod/libmikmod.la -+ - 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 70ebf4d1cde0..d26414b04a3b 100644 --- a/audio/sdl_mixer/files/patch-ab +++ b/audio/sdl_mixer/files/patch-ab @@ -1,13 +1,20 @@ ---- configure.orig Sat Mar 4 05:36:35 2000 -+++ configure Sat Aug 12 16:43:06 2000 -@@ -2232,8 +2232,8 @@ - fi + +$FreeBSD$ + +--- configure 2001/01/29 18:39:52 1.1 ++++ configure 2001/01/29 18:40:15 +@@ -560,10 +560,10 @@ + # set BINARY_AGE and INTERFACE_AGE to 0. + + MAJOR_VERSION=1 +-MINOR_VERSION=1 +-MICRO_VERSION=0 +-INTERFACE_AGE=0 +-BINARY_AGE=0 ++MINOR_VERSION=0 ++MICRO_VERSION=6 ++INTERFACE_AGE=4 ++BINARY_AGE=6 + VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION + - if test x$enable_music_mod = xyes; then -- CFLAGS="$CFLAGS -DMOD_MUSIC -I\$(top_srcdir)/mikmod" -- MUSIC_SUBDIRS="$MUSIC_SUBDIRS mikmod" -+ CFLAGS="$CFLAGS -DMOD_MUSIC" -+# MUSIC_SUBDIRS="$MUSIC_SUBDIRS mikmod" - fi - # Check whether --enable-music-midi or --disable-music-midi was given. - if test "${enable_music_midi+set}" = set; then |