From 6fc0e9875d82ba7c4cca32dda516d47c754ec00b Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 11 Aug 2023 11:42:27 +0000 Subject: [PATCH] libxmp, bump version, switch to cmake build (#9173) --- ...ibxmp-4.4.1.recipe => libxmp-4.6.0.recipe} | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) rename media-libs/libxmp/{libxmp-4.4.1.recipe => libxmp-4.6.0.recipe} (69%) diff --git a/media-libs/libxmp/libxmp-4.4.1.recipe b/media-libs/libxmp/libxmp-4.6.0.recipe similarity index 69% rename from media-libs/libxmp/libxmp-4.4.1.recipe rename to media-libs/libxmp/libxmp-4.6.0.recipe index 8bec4272e..fcb20fada 100644 --- a/media-libs/libxmp/libxmp-4.4.1.recipe +++ b/media-libs/libxmp/libxmp-4.6.0.recipe @@ -8,15 +8,15 @@ and Amiga file packers including gzip, bzip2, SQSH, Powerpack, etc." HOMEPAGE="http://xmp.sourceforge.net/" COPYRIGHT="1996-2016 Claudio Matsuoka and Hipolito Carraro Jr" LICENSE="GNU LGPL v2.1" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/cmatsuoka/libxmp/archive/libxmp-$portVersion.tar.gz" -CHECKSUM_SHA256="b7257c0b430daa07f3dfbca0480a09c09412eb2e202ec5370ead03cb674ad3cc" +CHECKSUM_SHA256="032ed31e9a334078e59dc5e2ca7a14b950712fef8e838328b727570ddbd3dc12" SOURCE_DIR="libxmp-libxmp-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="4.4.1" +libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -38,28 +38,44 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel +# devel:libSDL2_2.0$secondaryArchSuffix # for the sample player " BUILD_PREREQUIRES=" - cmd:autoconf + cmd:cmake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:libtool + cmd:libtool$secondaryArchSuffix cmd:make + cmd:rst2html + cmd:rst2man " BUILD() { - autoconf - runConfigure ./configure - make + cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DBUILD_STATIC=OFF \ + -DWITH_UNIT_TESTS=ON +# -DXMP_DEMO_WITH_SDL2=ON + make -C build $jobArgs } INSTALL() { - make install + make -C build install + + mkdir -p $docDir + cp build/docs/libxmp.html $docDir prepareInstalledDevelLib libxmp fixPkgconfig - packageEntries devel $developDir + packageEntries devel $developDir \ + $documentationDir \ + $libDir/cmake +} + +TEST() +{ + make -C build test }