Update to sdl-mixer-1.2.12.

from Brad
This commit is contained in:
ajacoutot 2012-04-05 11:41:32 +00:00
parent 8a0c9e0366
commit e1a57d4328
7 changed files with 40 additions and 45 deletions

View File

@ -1,18 +1,17 @@
# $OpenBSD: Makefile,v 1.40 2010/11/15 19:46:09 espie Exp $
# $OpenBSD: Makefile,v 1.41 2012/04/05 11:41:32 ajacoutot Exp $
COMMENT= SDL multi-channel audio mixer library
DISTNAME= SDL_mixer-1.2.11
DISTNAME= SDL_mixer-1.2.12
PKGNAME= ${DISTNAME:L:S/_/-/}
REVISION= 0
CATEGORIES= devel audio
MASTER_SITES= ${HOMEPAGE}release/
SHARED_LIBS= SDL_mixer 4.0
SHARED_LIBS= SDL_mixer 5.0
HOMEPAGE= http://www.libsdl.org/projects/SDL_mixer/
# LGPLv2.1+
# Zlib
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -24,6 +23,7 @@ WANTLIB= FLAC SDL c m mikmod ogg pthread smpeg>=1 sndio \
MODULES= converters/libiconv
LIB_DEPENDS= audio/flac \
audio/libmikmod \
audio/libogg \
audio/libvorbis \
devel/sdl \
devel/smpeg
@ -33,14 +33,17 @@ USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-music-flac-shared \
--disable-music-fluidsynth-midi \
--disable-music-mod-shared \
--disable-music-mp3-shared \
--disable-music-ogg-shared
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
NO_REGRESS= Yes
pre-build:
${SUBST_CMD} ${WRKSRC}/timidity/config.h
@${SUBST_CMD} ${WRKSRC}/timidity/config.h
post-install:
${INSTALL_PROGRAM} ${WRKBUILD}/build/.libs/play{mus,wave} ${PREFIX}/bin

View File

@ -1,5 +1,5 @@
MD5 (SDL_mixer-1.2.11.tar.gz) = Za2j2Zf+hRCRkaX7CD8kjA==
RMD160 (SDL_mixer-1.2.11.tar.gz) = VZNVEWocOA7fcYedoNvPU1nwVHY=
SHA1 (SDL_mixer-1.2.11.tar.gz) = 711FFgur61Hq+n5AGc7DgyTuGl0=
SHA256 (SDL_mixer-1.2.11.tar.gz) = hhRaw5ysbSxhacIm+TdkjcpeidzYKHUXY90XT6mvnPk=
SIZE (SDL_mixer-1.2.11.tar.gz) = 2690654
MD5 (SDL_mixer-1.2.12.tar.gz) = 4D/3PXelXjVyrQIXEx3EoQ==
RMD160 (SDL_mixer-1.2.12.tar.gz) = mQiXJYJAlTmL+zT9nMt8FmdBktg=
SHA1 (SDL_mixer-1.2.12.tar.gz) = og+pZHCtnhBS8ZV7d/+mj7CQs4Q=
SHA256 (SDL_mixer-1.2.12.tar.gz) = FkQwgnmpdXmQSeSCavLPx4fK0quxGqFFYuQCUh+GmSo=
SIZE (SDL_mixer-1.2.12.tar.gz) = 3707781

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.6 2010/07/30 20:00:26 jolan Exp $
--- Makefile.in.orig Mon Oct 12 19:06:53 2009
+++ Makefile.in Fri Jul 9 20:06:52 2010
@@ -44,7 +44,7 @@ LT_AGE = @LT_AGE@
$OpenBSD: patch-Makefile_in,v 1.7 2012/04/05 11:41:32 ajacoutot Exp $
--- Makefile.in.orig Sun Jan 15 17:01:04 2012
+++ Makefile.in Sat Mar 17 12:20:57 2012
@@ -45,7 +45,7 @@ LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-configure,v 1.1 2010/07/30 20:00:26 jolan Exp $
--- configure.orig Thu Jul 29 19:35:07 2010
+++ configure Thu Jul 29 19:36:21 2010
@@ -13275,7 +13275,7 @@ if test "${ac_cv_lib_vorbisfile_ov_open_callbacks+set}
$as_echo_n "(cached) " >&6
$OpenBSD: patch-configure,v 1.2 2012/04/05 11:41:32 ajacoutot Exp $
--- configure.orig Sun Jan 15 17:01:05 2012
+++ configure Sat Mar 17 12:24:59 2012
@@ -13576,7 +13576,7 @@ if test "${ac_cv_lib_vorbisfile_ov_open_callbacks+set}
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lvorbisfile $LIBS"
@ -10,17 +10,17 @@ $OpenBSD: patch-configure,v 1.1 2010/07/30 20:00:26 jolan Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -13520,7 +13520,7 @@ fi
@@ -13815,7 +13815,7 @@ fi
if test x$have_flac_export = xyes; then
LIBS_SAVED="$LIBS"
- LIBS="-lFLAC"
+ LIBS="-lFLAC -logg $LIBM"
{ $as_echo "$as_me:$LINENO: checking for libflac so-name version >= $libflac_ver" >&5
$as_echo_n "checking for libflac so-name version >= $libflac_ver... " >&6; }
if test "$cross_compiling" = yes; then
@@ -13730,7 +13730,7 @@ if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set
$as_echo_n "(cached) " >&6
{ echo "$as_me:$LINENO: checking for libflac so-name version >= $libflac_ver" >&5
echo $ECHO_N "checking for libflac so-name version >= $libflac_ver... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
@@ -14009,7 +14009,7 @@ if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lFLAC $LIBS"
@ -28,12 +28,3 @@ $OpenBSD: patch-configure,v 1.1 2010/07/30 20:00:26 jolan Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -13814,7 +13814,7 @@ fi
echo "-- dynamic libFLAC -> $flac_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_DYNAMIC=\\\"$flac_lib\\\""
else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lFLAC"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lFLAC -logg $LIBM"
fi
fi
else

View File

@ -1,13 +1,14 @@
$OpenBSD: patch-timidity_config_h,v 1.2 2010/07/30 20:00:26 jolan Exp $
--- timidity/config.h.orig Mon Oct 12 19:06:52 2009
+++ timidity/config.h Thu Jul 29 19:27:12 2010
@@ -177,9 +177,7 @@ typedef char int8;
$OpenBSD: patch-timidity_config_h,v 1.3 2012/04/05 11:41:32 ajacoutot Exp $
--- timidity/config.h.orig Sun Jan 15 17:01:05 2012
+++ timidity/config.h Sat Mar 17 12:22:06 2012
@@ -166,10 +166,7 @@ typedef char int8;
#if defined(__WIN32__) || defined(__OS2__)
#define DEFAULT_PATH "C:\\TIMIDITY"
#else
-#define DEFAULT_PATH "/etc/timidity"
-#define DEFAULT_PATH1 "/usr/share/timidity"
-#define DEFAULT_PATH2 "/usr/local/lib/timidity"
-#define DEFAULT_PATH2 "/usr/local/share/timidity"
-#define DEFAULT_PATH3 "/usr/local/lib/timidity"
+#define DEFAULT_PATH "${SYSCONFDIR}"
#endif

View File

@ -3,6 +3,6 @@ any number of simultaneously playing channels of 16 bit stereo audio,
plus a single channel of music, mixed by the popular MikMod MOD, Ogg
Vorbis, Timidity MIDI, and SMPEG MP3 libraries.
NOTE: On big endian systems, SDL_mixer appears to output mp3 and
libmikmod files in the wrong byte order which results in scratchy
noise.
NOTE: On big endian systems, SDL_mixer appears to output MP3 and
libmikmod files in the wrong byte order which results in
scratchy noise.

View File

@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST,v 1.6 2010/07/30 20:00:26 jolan Exp $
@comment $OpenBSD: PLIST,v 1.7 2012/04/05 11:41:32 ajacoutot Exp $
%%SHARED%%
@bin bin/playmus
@bin bin/playwave
include/SDL/
include/SDL/SDL_mixer.h
lib/libSDL_mixer.a
lib/libSDL_mixer.la
%%SHARED%%
lib/pkgconfig/
lib/pkgconfig/SDL_mixer.pc