cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.0.3; from brad

Browse Source
This commit is contained in:
jolan 2010-07-25 02:11:14 +00:00
parent 2dd8f6d986
commit 38b6438f69
8 changed files with 51 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
devel/sdl-sound/Makefile
View File

@ -1,36 +1,39 @@
# $OpenBSD: Makefile,v 1.15 2009/08/10 06:31:08 kili Exp $
# $OpenBSD: Makefile,v 1.16 2010/07/25 02:11:14 jolan Exp $
COMMENT= library that handles the decoding of sound file formats
DISTNAME= SDL_sound-1.0.1
PKGNAME= ${DISTNAME:L:S/_/-/}p8
SHARED_LIBS= SDL_sound 2.0
DISTNAME= SDL_sound-1.0.3
PKGNAME= ${DISTNAME:L:S/_/-/}
CATEGORIES= devel audio
MASTER_SITES= http://offload1.icculus.org/SDL_sound/downloads/
SHARED_LIBS= SDL_sound 2.0
HOMEPAGE= http://icculus.org/SDL_sound/
MAINTAINER= Jolan Luff <jolan@openbsd.org>
# LGPL
# LGPLv2.1+
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB= X11 Xau Xdmcp Xext Xrandr Xrender c iconv m ogg \
pthread pthread-stubs sndio usbhid xcb z
WANTLIB= c m ogg pthread sndio usbhid z
MODULES= converters/libiconv
LIB_DEPENDS+= physfs::devel/physfs \
SDL.>=2.0::devel/sdl \
smpeg.>=1.3::devel/smpeg \
mikmod.>=2.4::audio/libmikmod \
vorbis.>=2.0,vorbisenc.>=2.0,vorbisfile.>=3.0::audio/libvorbis \
vorbis.>=2.0,vorbisfile.>=3.0::audio/libvorbis \
FLAC.>=8::audio/flac \
speex.>=2.2::audio/speex
USE_X11= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+=--disable-modplug
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/smpeg -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>

10
devel/sdl-sound/distinfo
View File

@ -1,5 +1,5 @@
MD5 (SDL_sound-1.0.1.tar.gz) = SeGX73yKtiPQZA3HS+QxYA==
RMD160 (SDL_sound-1.0.1.tar.gz) = KNk01gTl25s7C2gXhUBlhzI+p2U=
SHA1 (SDL_sound-1.0.1.tar.gz) = nLhVD6z2T5QRebpXZ/dj0dUt3Ws=
SHA256 (SDL_sound-1.0.1.tar.gz) = gom0g9mUKD1ZloZkPUAtBzyN1sBnqcWyMqfj4D7KQIk=
SIZE (SDL_sound-1.0.1.tar.gz) = 1019056
MD5 (SDL_sound-1.0.3.tar.gz) = qgnNUt+F0pvuh6ZkQkyUtQ==
RMD160 (SDL_sound-1.0.3.tar.gz) = jlbapx+Cekoi5wcaTk83wh3ZYQU=
SHA1 (SDL_sound-1.0.3.tar.gz) = GYS8ILLHVtxxEHpaCozr/gfljLE=
SHA256 (SDL_sound-1.0.3.tar.gz) = OZn9C7tIUomlK+FLL2i1ccuE44DMQzh+rfd49kx55t8=
SIZE (SDL_sound-1.0.3.tar.gz) = 1127100

10
devel/sdl-sound/patches/patch-Makefile_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile_in,v 1.1 2006/01/06 08:36:18 steven Exp $
--- Makefile.in.orig Fri Jan 6 09:24:05 2006
+++ Makefile.in Fri Jan 6 09:24:54 2006
@@ -127,7 +127,6 @@ libSDL_sound_la_SOURCES = \
$OpenBSD: patch-Makefile_in,v 1.2 2010/07/25 02:11:14 jolan Exp $
--- Makefile.in.orig Sun Apr 20 16:33:52 2008
+++ Makefile.in Fri Jul 9 18:19:28 2010
@@ -251,7 +251,6 @@ libSDL_sound_la_SOURCES = \
@USE_MPGLIB_FALSE@MPGLIB_LIB =
@USE_MPGLIB_TRUE@MPGLIB_LIB = decoders/mpglib/libmpglib.la
libSDL_sound_la_LDFLAGS = \
- -release $(LT_RELEASE) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

78
devel/sdl-sound/patches/patch-configure
View File

@ -1,78 +0,0 @@
$OpenBSD: patch-configure,v 1.3 2007/09/18 18:29:14 naddy Exp $
--- configure.orig Sun Oct 12 20:54:57 2003
+++ configure Sat Sep 15 20:53:00 2007
@@ -7089,7 +7089,7 @@ EOF
fi
-x="C__seekable_stream_decoder_process_single"
+x="C__stream_decoder_process_single"
flcsym="FLA$x"
# Check whether --enable-flac or --disable-flac was given.
if test "${enable_flac+set}" = set; then
@@ -7147,7 +7147,7 @@ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lFLAC $LIBS"
+LIBS="-lFLAC -logg $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 7152 "configure"
#include "confdefs.h"
@@ -7195,7 +7195,7 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
fi
if test x$have_flac_hdr = xyes -a x$have_flac_lib = xyes; then
- LIBS="$LIBS -lFLAC"
+ LIBS="$LIBS -lFLAC -logg"
cat >>confdefs.h <<\EOF
#define SOUND_SUPPORTS_FLAC 1
EOF
@@ -7363,16 +7363,11 @@ int main (int argc, char *argv[])
}
else
{
- printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the
-minimum version\n", $smpeg_major_version, $smpeg_minor_version,
-$smpeg_micro_version);
- printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is
-correct, then it is\n", major, minor, micro);
+ printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the minimum version\n", $smpeg_major_version, $smpeg_minor_version, $smpeg_micro_version);
+ printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is correct, then it is\n", major, minor, micro);
printf("*** best to upgrade to the required version.\n");
- printf("*** If smpeg-config was wrong, set the environment variable
-SMPEG_CONFIG\n");
- printf("*** to point to the correct copy of smpeg-config, and remove
-the file\n");
+ printf("*** If smpeg-config was wrong, set the environment variable SMPEG_CONFIG\n");
+ printf("*** to point to the correct copy of smpeg-config, and remove the file\n");
printf("*** config.cache before re-running configure\n");
return 1;
}
@@ -7995,7 +7990,7 @@ fi;
VORBIS_LIBDIR="-L$vorbis_prefix/lib"
fi
- VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm"
+ VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm -logg"
VORBISFILE_LIBS="-lvorbisfile"
VORBISENC_LIBS="-lvorbisenc"
@@ -8241,7 +8236,7 @@ else
cat >conftest.$ac_ext <<_ACEOF
#line 8242 "configure"
#include "confdefs.h"
-#include <speex.h>
+#include <speex/speex.h>
_ACEOF
if { (eval echo "$as_me:8246: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -8328,7 +8323,7 @@ if test $ac_cv_lib_speex_speex_bits_init = yes; then
fi
if test "x$have_ogg_hdr" = "xyes" -a "x$have_ogg_lib" = "xyes" -a "x$have_speex_hdr" = "xyes" -a "x$have_speex_lib" = "xyes"; then
- LIBS="$LIBS -logg -lspeex"
+ LIBS="$LIBS -lspeex -logg"
cat >>confdefs.h <<\EOF
#define SOUND_SUPPORTS_SPEEX 1
EOF

24
devel/sdl-sound/patches/patch-configure_in Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-configure_in,v 1.1 2010/07/25 02:11:14 jolan Exp $
--- configure.in.orig Sun Apr 20 16:33:43 2008
+++ configure.in Fri Jul 9 18:55:19 2010
@@ -222,9 +222,9 @@ AC_ARG_ENABLE(ogg,
, enable_ogg=yes)
if test x$enable_ogg = xyes; then
AC_CHECK_HEADER(vorbis/codec.h, have_vorbis_hdr=yes)
- AC_CHECK_LIB(vorbis, vorbis_info_init, have_vorbis_lib=yes)
+ AC_CHECK_LIB(vorbis, vorbis_info_init, have_vorbis_lib=yes,,[-logg])
AC_CHECK_HEADER(vorbis/vorbisfile.h, have_vorbisfile_hdr=yes)
- AC_CHECK_LIB(vorbisfile, ov_open_callbacks, have_vorbisfile_lib=yes)
+ AC_CHECK_LIB(vorbisfile, ov_open_callbacks, have_vorbisfile_lib=yes,,[-lvorbis -logg])
have_vorbis=no
if test x$have_ogg = xyes; then
if test x$have_vorbis_hdr = xyes -a x$have_vorbis_lib = xyes; then
@@ -259,7 +259,7 @@ AC_ARG_ENABLE(flac,
, enable_flac=yes)
if test x$enable_flac = xyes; then
AC_CHECK_HEADER(FLAC/stream_decoder.h, have_flac_hdr=yes)
- AC_CHECK_LIB(FLAC, $flcsym, have_flac_lib=yes)
+ AC_CHECK_LIB(FLAC, $flcsym, have_flac_lib=yes,,[-logg])
if test x$have_ogg = xyes; then
if test x$have_flac_hdr = xyes -a x$have_flac_lib = xyes; then
LIBS="$LIBS -lFLAC -logg"

96
devel/sdl-sound/patches/patch-decoders_flac_c
View File

@ -1,96 +0,0 @@
$OpenBSD: patch-decoders_flac_c,v 1.1 2007/09/18 18:29:14 naddy Exp $
--- decoders/flac.c.orig Mon Mar 10 23:44:14 2003
+++ decoders/flac.c Sat Sep 15 21:50:42 2007
@@ -44,42 +44,33 @@
#define __SDL_SOUND_INTERNAL__
#include "SDL_sound_internal.h"
-#include <FLAC/seekable_stream_decoder.h>
+#include <FLAC/stream_decoder.h>
-#define D_END_OF_STREAM FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM
+#define D_END_OF_STREAM FLAC__STREAM_DECODER_END_OF_STREAM
-#define d_new() FLAC__seekable_stream_decoder_new()
-#define d_init(x) FLAC__seekable_stream_decoder_init(x)
-#define d_process_metadata(x) FLAC__seekable_stream_decoder_process_until_end_of_metadata(x)
-#define d_process_one_frame(x) FLAC__seekable_stream_decoder_process_single(x)
-#define d_get_state(x) FLAC__seekable_stream_decoder_get_state(x)
-#define d_finish(x) FLAC__seekable_stream_decoder_finish(x)
-#define d_delete(x) FLAC__seekable_stream_decoder_delete(x)
-#define d_set_read_callback(x, y) FLAC__seekable_stream_decoder_set_read_callback(x, y)
-#define d_set_write_callback(x, y) FLAC__seekable_stream_decoder_set_write_callback(x, y)
-#define d_set_metadata_callback(x, y) FLAC__seekable_stream_decoder_set_metadata_callback(x, y)
-#define d_set_error_callback(x, y) FLAC__seekable_stream_decoder_set_error_callback(x, y)
-#define d_set_client_data(x, y) FLAC__seekable_stream_decoder_set_client_data(x, y)
+#define d_new() FLAC__stream_decoder_new()
+#define d_init(a,b,c,d,e,f,g,h,i,j) FLAC__stream_decoder_init_stream(a,b,c,d,e,f,g,h,i,j)
+#define d_process_metadata(x) FLAC__stream_decoder_process_until_end_of_metadata(x)
+#define d_process_one_frame(x) FLAC__stream_decoder_process_single(x)
+#define d_get_state(x) FLAC__stream_decoder_get_state(x)
+#define d_finish(x) FLAC__stream_decoder_finish(x)
+#define d_delete(x) FLAC__stream_decoder_delete(x)
-typedef FLAC__SeekableStreamDecoder decoder_t;
-typedef FLAC__SeekableStreamDecoderReadStatus d_read_status_t;
+typedef FLAC__StreamDecoder decoder_t;
+typedef FLAC__StreamDecoderReadStatus d_read_status_t;
-#define D_SEEK_STATUS_OK FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK
-#define D_SEEK_STATUS_ERROR FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR
-#define D_TELL_STATUS_OK FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK
-#define D_TELL_STATUS_ERROR FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR
-#define D_LENGTH_STATUS_OK FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK
-#define D_LENGTH_STATUS_ERROR FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR
+#define D_SEEK_STATUS_OK FLAC__STREAM_DECODER_SEEK_STATUS_OK
+#define D_SEEK_STATUS_ERROR FLAC__STREAM_DECODER_SEEK_STATUS_ERROR
+#define D_TELL_STATUS_OK FLAC__STREAM_DECODER_TELL_STATUS_OK
+#define D_TELL_STATUS_ERROR FLAC__STREAM_DECODER_TELL_STATUS_ERROR
+#define D_LENGTH_STATUS_OK FLAC__STREAM_DECODER_LENGTH_STATUS_OK
+#define D_LENGTH_STATUS_ERROR FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR
-#define d_set_seek_callback(x, y) FLAC__seekable_stream_decoder_set_seek_callback(x, y)
-#define d_set_tell_callback(x, y) FLAC__seekable_stream_decoder_set_tell_callback(x, y)
-#define d_set_length_callback(x, y) FLAC__seekable_stream_decoder_set_length_callback(x, y)
-#define d_set_eof_callback(x, y) FLAC__seekable_stream_decoder_set_eof_callback(x, y)
-#define d_seek_absolute(x, y) FLAC__seekable_stream_decoder_seek_absolute(x, y)
+#define d_seek_absolute(x, y) FLAC__stream_decoder_seek_absolute(x, y)
-typedef FLAC__SeekableStreamDecoderSeekStatus d_seek_status_t;
-typedef FLAC__SeekableStreamDecoderTellStatus d_tell_status_t;
-typedef FLAC__SeekableStreamDecoderLengthStatus d_length_status_t;
+typedef FLAC__StreamDecoderSeekStatus d_seek_status_t;
+typedef FLAC__StreamDecoderTellStatus d_tell_status_t;
+typedef FLAC__StreamDecoderLengthStatus d_length_status_t;
#define D_WRITE_CONTINUE FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE
#define D_READ_END_OF_STREAM FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM
@@ -400,17 +391,6 @@ static int FLAC_open(Sound_Sample *sample, const char
BAIL_MACRO(ERR_OUT_OF_MEMORY, 0);
} /* if */
- d_set_read_callback(decoder, read_callback);
- d_set_write_callback(decoder, write_callback);
- d_set_metadata_callback(decoder, metadata_callback);
- d_set_error_callback(decoder, error_callback);
- d_set_seek_callback(decoder, seek_callback);
- d_set_tell_callback(decoder, tell_callback);
- d_set_length_callback(decoder, length_callback);
- d_set_eof_callback(decoder, eof_callback);
-
- d_set_client_data(decoder, f);
-
f->rw = internal->rw;
f->sample = sample;
f->decoder = decoder;
@@ -418,7 +398,9 @@ static int FLAC_open(Sound_Sample *sample, const char
f->is_flac = 0 /* !!! FIXME: should be "has_extension", not "0". */;
internal->decoder_private = f;
- d_init(decoder);
+ d_init(decoder, read_callback, seek_callback, tell_callback,
+ length_callback, eof_callback, write_callback, metadata_callback,
+ error_callback, f);
sample->flags = SOUND_SAMPLEFLAG_NONE;

14
devel/sdl-sound/patches/patch-decoders_speex_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-decoders_speex_c,v 1.1 2007/05/02 19:01:07 naddy Exp $
--- decoders/speex.c.orig Wed May 2 19:00:16 2007
+++ decoders/speex.c Wed May 2 19:00:27 2007
@@ -51,8 +51,8 @@
#include <assert.h>
#include <ogg/ogg.h>
-#include <speex.h>
-#include <speex_header.h>
+#include <speex/speex.h>
+#include <speex/speex_header.h>
#include "SDL_sound.h"

5
devel/sdl-sound/pkg/PLIST
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/14 23:44:01 espie Exp $
bin/playsound
@comment $OpenBSD: PLIST,v 1.3 2010/07/25 02:11:14 jolan Exp $
@bin bin/playsound
@bin bin/playsound_simple
include/SDL/
include/SDL/SDL_sound.h
lib/libSDL_sound.a