diff --git a/media-libs/libopenmpt/libopenmpt-0.4.4.recipe b/media-libs/libopenmpt/libopenmpt-0.4.4.recipe index c42a32970..905366ace 100644 --- a/media-libs/libopenmpt/libopenmpt-0.4.4.recipe +++ b/media-libs/libopenmpt/libopenmpt-0.4.4.recipe @@ -6,7 +6,7 @@ HOMEPAGE="https://openmpt.org/" COPYRIGHT="2004-2019 OpenMPT contributors 1997-2003 Olivier Lapicque" LICENSE="BSD (3-clause)" -REVISION="2" +REVISION="3" SOURCE_URI="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-$portVersion+release.autotools.tar.gz" CHECKSUM_SHA256="57834bd4e67485019584e19a1080615269c1e92551230a7c96e79c4fc97b0f75" SOURCE_DIR="libopenmpt-$portVersion+release.autotools" @@ -14,16 +14,13 @@ SOURCE_DIR="libopenmpt-$portVersion+release.autotools" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="?x86_gcc2 x86" -libmodplugVersion=1.0.0 libopenmpt_modplugVersion=1.0.0 libopenmptVersion=0.1.1 -libmodplugVersionCompat="$libmodplugVersion compat >= ${libmodplugVersion%%.*}" libopenmpt_modplugVersionCompat="$libopenmpt_modplugVersion compat >= ${libopenmpt_modplugVersion%%.*}" libopenmptVersionCompat="$libopenmptVersion compat >= ${libopenmptVersion%%.*}" PROVIDES=" libopenmpt$secondaryArchSuffix = $portVersion - lib:libmodplug$secondaryArchSuffix = $libmodplugVersionCompat lib:libopenmpt_modplug$secondaryArchSuffix = $libopenmpt_modplugVersionCompat lib:libopenmpt$secondaryArchSuffix = $libopenmptVersionCompat " @@ -31,18 +28,14 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " -CONFLICTS=" - libmodplug$secondaryArchSuffix - " PROVIDES_devel=" libopenmpt${secondaryArchSuffix}_devel = $portVersion - devel:libmodplug$secondaryArchSuffix = $libmodplugVersionCompat devel:libopenmpt_modplug$secondaryArchSuffix = $libopenmpt_modplugVersionCompat devel:libopenmpt$secondaryArchSuffix = $libopenmptVersionCompat " REQUIRES_devel=" - libopenmpt$secondaryArchSuffix == $portVersion + libopenmpt$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" @@ -59,7 +52,6 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage libopenmpt$secondaryArchSuffix \ - $libDir/libmodplug.so.$libmodplugVersion \ $libDir/libopenmpt_modplug.so.$libopenmpt_modplugVersion \ $libDir/libopenmpt.so.$libopenmptVersion @@ -70,7 +62,7 @@ BUILD() --disable-openmpt123 \ --disable-examples \ --enable-libopenmpt_modplug \ - --enable-libmodplug \ + --disable-libmodplug \ --without-mpg123 \ --without-ogg \ --without-vorbis \ @@ -78,7 +70,8 @@ BUILD() --without-portaudio \ --without-portaudiocpp \ --without-sndfile \ - --without-flac + --without-flac \ + --disable-static make $jobArgs } @@ -86,13 +79,13 @@ BUILD() INSTALL() { make install - prepareInstalledDevelLibs libmodplug libopenmpt_modplug libopenmpt + prepareInstalledDevelLibs libopenmpt_modplug libopenmpt rm $developLibDir/*.la fixPkgconfig # devel package packageEntries devel \ - $developDir + $developDir $docDir } TEST()