From b906991c7713f181c70d87fdc8242db91b62f66b Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 27 Dec 2025 14:10:04 +0100 Subject: [PATCH] dumb, rename recipes, drop _devel package for 0.9.3 (#13491) --- ...1219.recipe => dumb-2.0.3~20181219.recipe} | 32 +++++++++++-------- ...dumb-0.9.3.recipe => dumb0.9-0.9.3.recipe} | 23 +++---------- 2 files changed, 23 insertions(+), 32 deletions(-) rename media-libs/dumb/{dumb2-2.0.3~20181219.recipe => dumb-2.0.3~20181219.recipe} (75%) rename media-libs/dumb/{dumb-0.9.3.recipe => dumb0.9-0.9.3.recipe} (72%) diff --git a/media-libs/dumb/dumb2-2.0.3~20181219.recipe b/media-libs/dumb/dumb-2.0.3~20181219.recipe similarity index 75% rename from media-libs/dumb/dumb2-2.0.3~20181219.recipe rename to media-libs/dumb/dumb-2.0.3~20181219.recipe index 27876af4e..e4fc69954 100644 --- a/media-libs/dumb/dumb2-2.0.3~20181219.recipe +++ b/media-libs/dumb/dumb-2.0.3~20181219.recipe @@ -15,7 +15,7 @@ ARCHITECTURES="all !x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - dumb2$secondaryArchSuffix = $portVersion + dumb$secondaryArchSuffix = $portVersion lib:libaldmb$secondaryArchSuffix = 2.0 compat >= 2 lib:libdumb$secondaryArchSuffix = 2.0 compat >= 2 " @@ -23,23 +23,26 @@ REQUIRES=" haiku$secondaryArchSuffix lib:liballeg$secondaryArchSuffix " +REPLACES=" + dumb2$secondaryArchSuffix + " PROVIDES_devel=" - dumb2${secondaryArchSuffix}_devel = $portVersion + dumb${secondaryArchSuffix}_devel = $portVersion devel:libaldmb$secondaryArchSuffix = 2.0 compat >= 2 devel:libdumb$secondaryArchSuffix = 2.0 compat >= 2 " REQUIRES_devel=" - dumb2$secondaryArchSuffix == $portVersion base + dumb$secondaryArchSuffix == $portVersion base " PROVIDES_tools=" - dumb2${secondaryArchSuffix}_tools = $portVersion + dumb${secondaryArchSuffix}_tools = $portVersion cmd:dumbout$secondaryArchSuffix = $portVersion cmd:dumbplay$secondaryArchSuffix = $portVersion " REQUIRES_tools=" - dumb2$secondaryArchSuffix == $portVersion base + dumb$secondaryArchSuffix == $portVersion base haiku$secondaryArchSuffix lib:libargtable2$secondaryArchSuffix lib:libSDL2_2.0$secondaryArchSuffix @@ -59,25 +62,28 @@ BUILD_PREREQUIRES=" BUILD() { - mkdir -p build && cd build + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DBUILD_SHARED_LIBS=ON - cmake .. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS:BOOL=ON - make $jobArgs + make -C build $jobArgs } INSTALL() { - cd build - make install + make -C build install - prepareInstalledDevelLibs libdumb libaldmb + prepareInstalledDevelLibs \ + libdumb\ + libaldmb fixPkgconfig # devel package packageEntries devel \ $developDir + + # tools package packageEntries tools \ $binDir } diff --git a/media-libs/dumb/dumb-0.9.3.recipe b/media-libs/dumb/dumb0.9-0.9.3.recipe similarity index 72% rename from media-libs/dumb/dumb-0.9.3.recipe rename to media-libs/dumb/dumb0.9-0.9.3.recipe index 2dd253d35..d7b4ea7d5 100644 --- a/media-libs/dumb/dumb-0.9.3.recipe +++ b/media-libs/dumb/dumb0.9-0.9.3.recipe @@ -3,20 +3,18 @@ DESCRIPTION="DUMB is an IT, XM, S3M and MOD player library" HOMEPAGE="http://dumb.sourceforge.net/" COPYRIGHT="2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere" LICENSE="DUMB-0.9.3" -REVISION="4" +REVISION="1" SOURCE_URI="http://downloads.sourceforge.net/project/dumb/dumb/$portVersion/dumb-$portVersion.tar.gz" CHECKSUM_SHA256="8d44fbc9e57f3bac9f761c3b12ce102d47d717f0dd846657fb988e0bb5d1ea33" SOURCE_URI_2="http://prdownloads.sourceforge.net/dumb/dumb-$portVersion-autotools.tar.gz" CHECKSUM_SHA256_2="9e3fa1e0932e00e31f2314cefb3ea0343ee4f850b6a8e6a6a9627a35b2dc0dbd" +SOURCE_DIR="dumb-$portVersion" ARCHITECTURES="all" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - dumb$secondaryArchSuffix = $portVersion - cmd:dumb2wav$secondaryArchSuffix = $portVersion - cmd:dumbout$secondaryArchSuffix = $portVersion - cmd:dumbplay$secondaryArchSuffix = $portVersion + dumb0.9$secondaryArchSuffix = $portVersion lib:libaldmb_0.9.3$secondaryArchSuffix = $portVersion compat >= 0.9 lib:libdumb_0.9.3$secondaryArchSuffix = $portVersion compat >= 0.9 " @@ -25,17 +23,6 @@ REQUIRES=" lib:liballeg$secondaryArchSuffix " -PROVIDES_devel=" - dumb${secondaryArchSuffix}_devel = $portVersion - devel:libaldmb$secondaryArchSuffix = $portVersion - devel:libaldmb_0.9.3$secondaryArchSuffix = 0.9.3 compat >= 0.9 - devel:libdumb$secondaryArchSuffix = $portVersion - devel:libdumb_0.9.3$secondaryArchSuffix = 0.9.3 compat >= 0.9 - " -REQUIRES_devel=" - dumb$secondaryArchSuffix == $portVersion base - " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:liballeg$secondaryArchSuffix @@ -73,8 +60,6 @@ INSTALL() prepareInstalledDevelLibs libdumb libaldmb libdumb-0.9.3 libaldmb-0.9.3 - # devel package - packageEntries devel \ - $developDir + rm -rf $developDir $binDir }