sdl2_mixer, fix recipe, add mod support and remove *.la file (#1467)

This commit is contained in:
Schrijvers Luc
2017-06-24 17:00:18 +02:00
committed by waddlesplash
parent 6a88763300
commit ad2b823335
2 changed files with 14 additions and 21 deletions

View File

@@ -1,13 +0,0 @@
diff --git a/configure.in b/configure.in
index f71c002..cd41fc0 100644
--- a/configure.in
+++ b/configure.in
@@ -493,7 +493,7 @@ if test x$enable_music_ogg = xyes; then
fi
else
AC_CHECK_HEADER([vorbis/vorbisfile.h], [have_ogg_hdr=yes])
- AC_CHECK_LIB([vorbisfile -lvorbis -logg -lm], [ov_open_callbacks], [have_ogg_lib=yes])
+ AC_CHECK_LIB([vorbisfile -lvorbis -logg], [ov_open_callbacks], [have_ogg_lib=yes])
if test x$have_ogg_hdr = xyes -a x$have_ogg_lib = xyes; then
case "$host" in
*-*-darwin*)

View File

@@ -7,11 +7,10 @@ Ogg Vorbis, and SMPEG MP3 libraries."
HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
COPYRIGHT="1997-2012 Sam Lantinga"
LICENSE="Zlib"
REVISION="2"
REVISION="3"
SOURCE_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-$portVersion.tar.gz"
CHECKSUM_SHA256="5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f"
SOURCE_DIR="SDL2_mixer-$portVersion"
PATCHES="sdl2_mixer-${portVersion}.patch"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -24,14 +23,14 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
lib:libgl$secondaryArchSuffix
lib:libsdl2_2.0$secondaryArchSuffix
lib:libsdl2$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
lib:libflac$secondaryArchSuffix
lib:libfluidsynth$secondaryArchSuffix
lib:libmad$secondaryArchSuffix
lib:libmodplug$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libmikmod$secondaryArchSuffix # requires libSDL
lib:libsmpeg$secondaryArchSuffix # requires libSDL
lib:libsmpeg2$secondaryArchSuffix
"
PROVIDES_devel="
@@ -50,8 +49,8 @@ BUILD_REQUIRES="
devel:libfluidsynth$secondaryArchSuffix
devel:libmad$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
devel:libmikmod$secondaryArchSuffix # requires libSDL
devel:libsmpeg$secondaryArchSuffix # requires libSDL
devel:libmodplug$secondaryArchSuffix
devel:libsmpeg2$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
@@ -60,7 +59,7 @@ BUILD_PREREQUIRES="
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:libtool$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
@@ -70,7 +69,11 @@ BUILD()
libtoolize -fci
aclocal --force --install -I acinclude
autoconf
if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
runConfigure ./configure --disable-music-wave
else
runConfigure ./configure
fi
make $jobArgs
}
@@ -78,6 +81,9 @@ INSTALL()
{
make install
#remove libtool file
rm $libDir/*.la
prepareInstalledDevelLibs libSDL2_mixer
prepareInstalledDevelLibs libSDL2_mixer-2.0
fixPkgconfig