haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

sdl_sound, fix non provided lib:libsdl_sound, add tools package and conflict (#8989)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-07-06 16:20:18 +02:00
committed by GitHub
parent d9ab345b89
commit 68ea17133b
2 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-libs/sdl2_sound/sdl2_sound-2.0.1~06112022.recipe
View File

@@ -14,7 +14,7 @@ HOMEPAGE="http://www.icculus.org/SDL_sound
https://github.com/icculus/SDL_sound"
COPYRIGHT="2022 Ryan C. Gordon"
LICENSE="Zlib"
REVISION="1"
REVISION="2"
srcGitRev="6cb07c21fab468be5f6a8b4c00c1b29697a9cc7a"
SOURCE_URI="https://github.com/icculus/SDL_sound/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="7cc58b9088023726d0b6adefc8de1775bf22b8f1e6dea788770f3a5519f49804"
@@ -60,7 +60,7 @@ REQUIRES_tools="
lib:libSDL2_2.0$secondaryArchSuffix
"
CONFLICTS_tools="
sdl_sound$secondaryArchSuffix
sdl_sound${secondaryArchSuffix}_tools
"
BUILD_REQUIRES="

37
media-libs/sdl_sound/sdl_sound-1.0.3.recipe
View File

@@ -15,15 +15,11 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
sdl_sound$secondaryArchSuffix = $portVersion
cmd:playsound$secondaryArchSuffix = $portVersion compat >= 1
cmd:playsound_simple$secondaryArchSuffix = $portVersion compat >= 1
lib:libSDL_sound$secondaryArchSuffix = 1.0.2 compat >= 1
lib:libSDL_sound_1.0$secondaryArchSuffix = 1.0.2 compat >= 1
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libflac$secondaryArchSuffix
# lib:libGL$secondaryArchSuffix
lib:libFLAC$secondaryArchSuffix
lib:libmikmod$secondaryArchSuffix
lib:libmodplug$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
@@ -32,7 +28,6 @@ REQUIRES="
lib:libspeex$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libvorbisfile$secondaryArchSuffix
# lib:physfs$secondaryArchSuffix
"
PROVIDES_devel="
@@ -44,9 +39,28 @@ REQUIRES_devel="
sdl_sound$secondaryArchSuffix == $portVersion base
"
PROVIDES_tools="
sdl_sound${secondaryArchSuffix}_tools = $portVersion
cmd:playsound$secondaryArchSuffix = $portVersion compat >= 1
cmd:playsound_simple$secondaryArchSuffix = $portVersion compat >= 1
"
REQUIRES_tools="
sdl_sound$secondaryArchSuffix == $portVersion base
haiku$secondaryArchSuffix
lib:libFLAC$secondaryArchSuffix
lib:libmikmod$secondaryArchSuffix
lib:libmodplug$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
lib:libSDL_1.2$secondaryArchSuffix
lib:libsmpeg_0.4$secondaryArchSuffix
lib:libspeex$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libvorbisfile$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libflac$secondaryArchSuffix
devel:libFLAC$secondaryArchSuffix
devel:libmikmod$secondaryArchSuffix
devel:libmodplug$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
@@ -54,7 +68,6 @@ BUILD_REQUIRES="
devel:libsmpeg_0.4$secondaryArchSuffix
devel:libspeex$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
# devel:physfs$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
@@ -74,7 +87,7 @@ BUILD()
touch NEWS AUTHORS ChangeLog
autoreconf -fi
CPPFLAGS="$CPPFLAGS `smpeg-config${secondaryArchSuffix/_/-} --cflags`" \
runConfigure ./configure
runConfigure ./configure --disable-static
make
}
@@ -83,7 +96,7 @@ INSTALL()
make install
# remove libtool library file
rm $libDir/libSDL_sound.{a,la}
rm $libDir/libSDL_sound.la
prepareInstalledDevelLibs libSDL_sound \
libSDL_sound-1.0
@@ -91,4 +104,8 @@ INSTALL()
packageEntries devel \
$developDir
packageEntries tools \
$binDir
}