Hi,
* Stuart Henderson wrote:
>
> Don't hand-generate the patch files, use "make update-patches", but...
>
> > +@@ -101,7 +101,7 @@
> > + # has a number of important bugfixes.
> > + if (NOT DEFINED ENABLE_BUNDLED_TAGLIB)
> > + message(STATUS "[build] ENABLE_BUNDLED_TAGLIB not defined, setting to
> > 'true'")
> > +- set(ENABLE_BUNDLED_TAGLIB "true")
> > ++ set(ENABLE_BUNDLED_TAGLIB "false")
>
> ...no need to patch for this any more. They have added the "if (NOT
> DEFINED..."
> above so you can set -DENABLE_BUNDLED_TAGLIB=false in CONFIGURE_ARGS.
[x] done. Recompiled and it still works as expected. New diff
attached:
diff -urN musikcube.orig/Makefile musikcube/Makefile
--- musikcube.orig/Makefile Thu Dec 30 14:14:03 2021
+++ musikcube/Makefile Thu Dec 30 15:51:37 2021
@@ -4,7 +4,7 @@
GH_ACCOUNT = clangen
GH_PROJECT = musikcube
-GH_TAGNAME = 0.96.5
+GH_TAGNAME = 0.96.10
CATEGORIES = audio
@@ -24,6 +24,8 @@
COMPILER = base-clang ports-gcc
MODULES = devel/cmake
+
+CONFIGURE_ARGS += -DENABLE_BUNDLED_TAGLIB=false
LIB_DEPENDS = audio/libopenmpt \
audio/taglib \
diff -urN musikcube.orig/distinfo musikcube/distinfo
--- musikcube.orig/distinfo Thu Dec 30 14:14:03 2021
+++ musikcube/distinfo Thu Dec 30 14:15:51 2021
@@ -1,2 +1,2 @@
-SHA256 (musikcube-0.96.5.tar.gz) = 7gBmfqFypVfADeSF+7qj/ePrXsGGfJS18XBcG3KAdJA=
-SIZE (musikcube-0.96.5.tar.gz) = 9474635
+SHA256 (musikcube-0.96.10.tar.gz) =
kf2YTmi272bxvh7N8MhGB0U+xuyAYy7OaIrHRcdxnqU=
+SIZE (musikcube-0.96.10.tar.gz) = 9509759
diff -urN musikcube.orig/patches/patch-CMakeLists_txt
musikcube/patches/patch-CMakeLists_txt
--- musikcube.orig/patches/patch-CMakeLists_txt Thu Dec 30 14:14:03 2021
+++ musikcube/patches/patch-CMakeLists_txt Thu Jan 1 01:00:00 1970
@@ -1,14 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2021/08/29 13:04:47 solene Exp $
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -98,7 +98,7 @@ endif()
- # we use a bundled version of taglib because the latest release is from 2016,
- # and the upstream git repo is hundreds of commits ahead and has a number of
- # important bugfixes.
--set(USE_BUNDLED_TAGLIB "true")
-+set(USE_BUNDLED_TAGLIB "false")
-
- add_subdirectory(src/musikcore)
- add_subdirectory(src/core_c_demo)
