diff --git a/media-libs/taglib/patches/taglib-2.0.2.patchset b/media-libs/taglib/patches/taglib-2.1.1.patchset similarity index 79% rename from media-libs/taglib/patches/taglib-2.0.2.patchset rename to media-libs/taglib/patches/taglib-2.1.1.patchset index 98d7396c9..cdbfa367e 100644 --- a/media-libs/taglib/patches/taglib-2.0.2.patchset +++ b/media-libs/taglib/patches/taglib-2.1.1.patchset @@ -1,11 +1,11 @@ -From 64b3e7661dc2a7053e4c87b8e00cacc0c8f27035 Mon Sep 17 00:00:00 2001 +From 5589802e8f8e44a8900e70308c423a30f68db9ae Mon Sep 17 00:00:00 2001 From: Begasus Date: Mon, 29 Jan 2024 15:39:05 +0100 Subject: Fix for fcntl.h diff --git a/tests/utils.h b/tests/utils.h -index ee2ec03..c33bde8 100644 +index ba4c721..8c4568a 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -32,7 +32,11 @@ @@ -21,5 +21,5 @@ index ee2ec03..c33bde8 100644 #endif #include -- -2.48.1 +2.51.0 diff --git a/media-libs/taglib/taglib2.0-2.0.2.recipe b/media-libs/taglib/taglib2-2.1.1.recipe similarity index 85% rename from media-libs/taglib/taglib2.0-2.0.2.recipe rename to media-libs/taglib/taglib2-2.1.1.recipe index 4869a4a49..17b501b7d 100644 --- a/media-libs/taglib/taglib2.0-2.0.2.recipe +++ b/media-libs/taglib/taglib2-2.1.1.recipe @@ -10,7 +10,7 @@ LICENSE="GNU LGPL v2.1 MPL v1.1" REVISION="1" SOURCE_URI="https://taglib.github.io/releases/taglib-$portVersion.tar.gz" -CHECKSUM_SHA256="0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737" +CHECKSUM_SHA256="3716d31f7c83cbf17b67c8cf44dd82b2a2f17e6780472287a16823e70305ddba" SOURCE_DIR="taglib-$portVersion" PATCHES="taglib-$portVersion.patchset" @@ -21,7 +21,7 @@ libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - taglib2.0$secondaryArchSuffix = $portVersion + taglib2$secondaryArchSuffix = $portVersion lib:libtag$secondaryArchSuffix = $libVersionCompat lib:libtag_c$secondaryArchSuffix = $libVersionCompat " @@ -29,15 +29,18 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " +REPLACES=" + taglib2.0$secondaryArchSuffix + " PROVIDES_devel=" - taglib2.0${secondaryArchSuffix}_devel = $portVersion + taglib2${secondaryArchSuffix}_devel = $portVersion cmd:taglib_config$secondaryArchSuffix devel:libtag$secondaryArchSuffix = $libVersionCompat devel:libtag_c$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - taglib2.0$secondaryArchSuffix == $portVersion base + taglib2$secondaryArchSuffix == $portVersion base " CONFLICTS_devel=" taglib${secondaryArchSuffix}_devel @@ -59,9 +62,10 @@ BUILD_PREREQUIRES=" BUILD() { - cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DBUILD_SHARED_LIBS=TRUE + make -C build $jobArgs } @@ -91,5 +95,5 @@ INSTALL() TEST() { - make -Cbuild test + ctest --test-dir build --output-on-failure }