On Wed, 1 Jan 2025 09:28:29 -0500
Thomas Frohwein <tfrohw...@fastmail.com> wrote:
> On Wed, 25 Dec 2024 12:27:44 +0200
> Timo Myyrä <timo.my...@bittivirhe.fi> wrote:
>
> [...]
>
> > -GH_TAGNAME = 1.1.9
> > +GH_TAGNAME = 1.1.14
> >
> > -SHARED_LIBS += zmusic 1.0 # 1.1.0
> > -SHARED_LIBS += zmusiclite 1.0 # 1.1.0
> > +SHARED_LIBS += zmusic 1.1 # 1.1.14
> > +SHARED_LIBS += zmusiclite 1.1 # 1.1.14
>
> Running /usr/src/lib/check_sym on both shared libs, there are removed
> symbols and data object size changes, so to me it looks like this
> needs a major bump for both...
I missed to include the major bump, now included in the attached diff.
>
> [...]
>
> $ make port-lib-depends-check
>
> zmusic-1.1.14(audio/zmusic):
> Missing: glib-2.0.4201 from glib2-2.82.4
> (/usr/local/lib/libzmusiclite.so.1.1) Extra: fluidsynth.3 z.7
> WANTLIB += glib-2.0
>
> Per the logs, it builds the bundled fluidsynth (under thirdparty/). So
> I'm not sure the WANTLIB or LIB_DEPENDS are correct, unless some other
> work is done to use fluidsynth from our port...
>
> The CONFIGURE_ARGS for -DDYN_FLUIDSYNTH=NO doesn't seem to do anything
> - there is nothing in the source that matches this.
>
> And it probably uses thirdparty/miniz instead of system zlib...
>
> Here is a diff that cleans this up and make port-lib-depends-check is
> happy now. Can you check if it looks correct from your side?
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/zmusic/Makefile,v
diff -u -p -r1.3 Makefile
--- Makefile 13 Jul 2022 18:00:12 -0000 1.3
+++ Makefile 1 Jan 2025 14:42:43 -0000
@@ -4,10 +4,10 @@ PKGNAME = ${DISTNAME:L}
GH_ACCOUNT = coelckers
GH_PROJECT = ZMusic
-GH_TAGNAME = 1.1.9
+GH_TAGNAME = 1.1.14
-SHARED_LIBS += zmusic 1.0 # 1.1.0
-SHARED_LIBS += zmusiclite 1.0 # 1.1.0
+SHARED_LIBS += zmusic 2.0 # 1.1.14
+SHARED_LIBS += zmusiclite 2.0 # 1.1.14
CATEGORIES = audio
@@ -18,21 +18,20 @@ MAINTAINER = Timo Myyra <timo.myyra@bit
# GPL3+
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} fluidsynth m mpg123 sndfile z
+WANTLIB += ${COMPILER_LIBCXX} glib-2.0 m mpg123 sndfile
# C++11
COMPILER = base-clang ports-gcc
MODULES = devel/cmake
-CONFIGURE_ARGS += -DDYN_FLUIDSYNTH=NO \
- -DDYN_MPG123=NO \
+CONFIGURE_ARGS += -DDYN_MPG123=NO \
-DDYN_SNDFILE=NO \
-DCMAKE_INSTALL_PREFIX=${LOCALBASE}
-LIB_DEPENDS = audio/fluidsynth \
- audio/libsndfile \
- audio/mpg123
+LIB_DEPENDS = audio/libsndfile \
+ audio/mpg123 \
+ devel/glib2
NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/zmusic/distinfo,v
diff -u -p -r1.2 distinfo
--- distinfo 13 Jul 2022 18:00:12 -0000 1.2
+++ distinfo 1 Jan 2025 14:42:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (ZMusic-1.1.9.tar.gz) = S/OZFwKLvi84J0i0QAocuuuJdRV/5ATP9TQRKX1qxow=
-SIZE (ZMusic-1.1.9.tar.gz) = 1813045
+SHA256 (ZMusic-1.1.14.tar.gz) = 8EQQ/k6ggTbzdwPncVwn30yFMqzh5yHPQMbzA6k6zFQ=
+SIZE (ZMusic-1.1.14.tar.gz) = 2525238
