From e1151f1b10675496132b61a42f10bf1e9da75041 Mon Sep 17 00:00:00 2001 From: jolan Date: Sun, 3 Jul 2005 21:36:35 +0000 Subject: [PATCH] update to 1.2.6 --- devel/sdl-mixer/Makefile | 31 ++++++++++------------- devel/sdl-mixer/distinfo | 8 +++--- devel/sdl-mixer/patches/patch-Makefile_am | 15 ++++++----- devel/sdl-mixer/patches/patch-Makefile_in | 20 +++++++-------- devel/sdl-mixer/pkg/DESCR | 5 ++-- devel/sdl-mixer/pkg/PFRAG.shared | 4 +-- 6 files changed, 40 insertions(+), 43 deletions(-) diff --git a/devel/sdl-mixer/Makefile b/devel/sdl-mixer/Makefile index 1cf01f39761..42c7c9d332e 100644 --- a/devel/sdl-mixer/Makefile +++ b/devel/sdl-mixer/Makefile @@ -1,40 +1,35 @@ -# $OpenBSD: Makefile,v 1.21 2004/11/24 00:11:03 espie Exp $ +# $OpenBSD: Makefile,v 1.22 2005/07/03 21:36:35 jolan Exp $ COMMENT= "SDL multi-channel audio mixer library" - -DISTNAME= SDL_mixer-1.2.5 -PKGNAME= ${DISTNAME:L:S/_/-/}p2 +DISTNAME= SDL_mixer-1.2.6 +PKGNAME= ${DISTNAME:L:S/_/-/} CATEGORIES= devel audio - MASTER_SITES= ${HOMEPAGE}release/ HOMEPAGE= http://www.libsdl.org/projects/SDL_mixer/ -MAINTAINER= Jolan Luff - # LGPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xext c ogg pthread usbhid +USE_LIBTOOL= Yes USE_X11= Yes -LIB_DEPENDS= SDL::devel/sdl \ - smpeg.1::devel/smpeg \ - vorbis.0,vorbisfile.1::audio/libvorbis +LIB_DEPENDS= mikmod.2::audio/libmikmod \ + vorbis.0,vorbisfile.1::audio/libvorbis \ + SDL.4::devel/sdl \ + smpeg.1::devel/smpeg + +WANTLIB= X11 Xext c ogg pthread usbhid -SEPARATE_BUILD= concurrent CONFIGURE_STYLE=gnu -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ARGS+=${CONFIGURE_SHARED} - -PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \ - patch-* +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" post-install: - ${INSTALL_PROGRAM} ${WRKBUILD}/.libs/play{mus,wave} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKBUILD}/play{mus,wave} ${PREFIX}/bin .include diff --git a/devel/sdl-mixer/distinfo b/devel/sdl-mixer/distinfo index b291b3c3f7d..12e38f59c3c 100644 --- a/devel/sdl-mixer/distinfo +++ b/devel/sdl-mixer/distinfo @@ -1,4 +1,4 @@ -MD5 (SDL_mixer-1.2.5.tar.gz) = f26d4e4625f00517203e32bd06fbc5d8 -RMD160 (SDL_mixer-1.2.5.tar.gz) = e47e216fae13ce93179971de2937076acaa7f3a9 -SHA1 (SDL_mixer-1.2.5.tar.gz) = 48c7c7143f0a0a21e94e743ca0fafd7ae33f62dd -SIZE (SDL_mixer-1.2.5.tar.gz) = 936765 +MD5 (SDL_mixer-1.2.6.tar.gz) = 2b8beffad9179d80e598c22c80efb135 +RMD160 (SDL_mixer-1.2.6.tar.gz) = f20e3b7db266d9a0da75f2319dcc403d869907e6 +SHA1 (SDL_mixer-1.2.6.tar.gz) = d8e09d87a750c4bd989f0a3e4f1b6baff601b8f1 +SIZE (SDL_mixer-1.2.6.tar.gz) = 1147838 diff --git a/devel/sdl-mixer/patches/patch-Makefile_am b/devel/sdl-mixer/patches/patch-Makefile_am index fec9a928fb2..db5851edbc1 100644 --- a/devel/sdl-mixer/patches/patch-Makefile_am +++ b/devel/sdl-mixer/patches/patch-Makefile_am @@ -1,11 +1,12 @@ -$OpenBSD: patch-Makefile_am,v 1.4 2003/04/03 23:46:17 margarida Exp $ ---- Makefile.am.orig Sat Feb 8 18:14:39 2003 -+++ Makefile.am Mon Mar 10 04:55:03 2003 -@@ -60,7 +60,6 @@ EXTRA_DIST = \ +$OpenBSD: patch-Makefile_am,v 1.5 2005/07/03 21:36:35 jolan Exp $ +--- Makefile.am.orig Wed Dec 15 23:20:13 2004 ++++ Makefile.am Sun Jul 3 16:25:58 2005 +@@ -60,8 +60,6 @@ EXTRA_DIST = \ autogen.sh - libSDL_mixer_la_LDFLAGS = \ + libSDL_mixer_la_LDFLAGS = \ +- -no-undefined \ - -release $(LT_RELEASE) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -export-symbols-regex Mix_.* libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@ - diff --git a/devel/sdl-mixer/patches/patch-Makefile_in b/devel/sdl-mixer/patches/patch-Makefile_in index c480eb0ef9f..b3e997e4b33 100644 --- a/devel/sdl-mixer/patches/patch-Makefile_in +++ b/devel/sdl-mixer/patches/patch-Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-Makefile_in,v 1.4 2003/04/03 23:46:17 margarida Exp $ ---- Makefile.in.orig Fri Mar 7 00:29:16 2003 -+++ Makefile.in Mon Mar 10 04:55:03 2003 -@@ -116,7 +116,7 @@ libSDL_mixer_la_SOURCES = load_aiff.c - EXTRA_DIST = CHANGES VisualC.zip PBProjects.tar.gz MPWmake.sea.bin CWProjects.sea.bin SDL_mixer.spec SDL_mixer.spec.in autogen.sh +$OpenBSD: patch-Makefile_in,v 1.5 2005/07/03 21:36:35 jolan Exp $ +--- Makefile.in.orig Thu Dec 16 00:44:36 2004 ++++ Makefile.in Sun Jul 3 16:26:03 2005 +@@ -296,8 +296,6 @@ EXTRA_DIST = \ + autogen.sh - --libSDL_mixer_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+libSDL_mixer_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - - libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@ + libSDL_mixer_la_LDFLAGS = \ +- -no-undefined \ +- -release $(LT_RELEASE) \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -export-symbols-regex Mix_.* diff --git a/devel/sdl-mixer/pkg/DESCR b/devel/sdl-mixer/pkg/DESCR index e43a97886bf..a90697fb0e2 100644 --- a/devel/sdl-mixer/pkg/DESCR +++ b/devel/sdl-mixer/pkg/DESCR @@ -3,5 +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 outputs mp3 and libmikmod files - in the wrong byte order. This is being investigated. +NOTE: On big endian systems, SDL_mixer appears to output mp3 and + libmikmod files in the wrong byte order which results in scratchy + noise. diff --git a/devel/sdl-mixer/pkg/PFRAG.shared b/devel/sdl-mixer/pkg/PFRAG.shared index 1f45e308c6c..f690611ae13 100644 --- a/devel/sdl-mixer/pkg/PFRAG.shared +++ b/devel/sdl-mixer/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.5 2004/09/14 23:44:01 espie Exp $ -@lib lib/libSDL_mixer.so.2.3 +@comment $OpenBSD: PFRAG.shared,v 1.6 2005/07/03 21:36:35 jolan Exp $ +@lib lib/libSDL_mixer.so.2.4