Index | Thread | Search

From:
Omar Polo <op@omarpolo.com>
Subject:
update audio/amused to 0.16; split in subpackages
To:
ports@openbsd.org
Date:
Mon, 02 Sep 2024 00:32:04 +0200

Download raw body.

Thread
The changelog is:

- unbreak the build on various OSes
- add an oss audio backend
- plug a memory leak in amused-web
- add MPRIS2 support via a separate executable amused-mpris2
- amused-web now daemonizes by default; added -d to stay in the foreground
- fixed a bug in ao and oss backends that made amused advance at the wrong rate

I'd like to split the amused-mpris2 in a different subpackage because it:

- adds a dependency on glib
- makes sense mostly for people running a desktop environment, although
  there is playerctl(1) too.
- contains a tiny bit of GPLv2 stuff, making the whole program GPL2+
  AFAIK; mpris2/spec.h is the xml needed for dbus and it's GPL :/
- doesn't use pledge :)

are these enough to justify making a subpackage?

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/audio/amused/Makefile,v
diff -u -p -r1.15 Makefile
--- Makefile	26 May 2024 17:04:29 -0000	1.15
+++ Makefile	1 Sep 2024 22:16:01 -0000
@@ -1,6 +1,7 @@
-COMMENT =	minimalistic music player
+COMMENT-main =		minimalistic music player
+COMMENT-mpris2 =	DBus control interface for amused
 
-DISTNAME =	amused-0.15
+DISTNAME =	amused-0.16
 
 CATEGORIES =	audio
 
@@ -8,21 +9,29 @@ HOMEPAGE =	https://projects.omarpolo.com
 
 MAINTAINER =	Omar Polo <op@openbsd.org>
 
-# ISC, Public Domain
+# amused: ISC, Public Domain
+# amused-mpris2: ISC, Public Domain, GPLv2+
 PERMIT_PACKAGE = Yes
 
+MULTI_PACKAGES = -main -mpris2
+
 # uses pledge
-WANTLIB += FLAC c mpg123 opusfile sndio util vorbisfile
+WANTLIB-main += FLAC c mpg123 opusfile sndio util vorbisfile
+WANTLIB-mpris2 += c gio-2.0 glib-2.0 gobject-2.0 intl util
 
 SITES =		https://ftp.omarpolo.com/
 
-LIB_DEPENDS =	audio/flac \
-		audio/libvorbis \
-		audio/mpg123 \
-		audio/opusfile
+LIB_DEPENDS-main =	audio/flac \
+			audio/libvorbis \
+			audio/mpg123 \
+			audio/opusfile
+
+LIB_DEPENDS-mpris2 =	devel/glib2
+
+RUN_DEPENDS-mpris2 =	audio/amused,-main
 
 CONFIGURE_STYLE = simple
-CONFIGURE_ARGS = --backend=sndio
+CONFIGURE_ARGS = --backend=sndio --with-mpris2
 
 NO_TEST =	Yes
 
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/audio/amused/distinfo,v
diff -u -p -r1.14 distinfo
--- distinfo	26 May 2024 17:04:29 -0000	1.14
+++ distinfo	1 Sep 2024 22:04:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (amused-0.15.tar.gz) = b5d+o0kZj8KUEIDLNootMzjQtURAxiiAwaQzz+2RPf4=
-SIZE (amused-0.15.tar.gz) = 97223
+SHA256 (amused-0.16.tar.gz) = uftQ+rUJSDWURtj7QHVIOf3Y+usknLSNBkBMlirn7L4=
+SIZE (amused-0.16.tar.gz) = 111780
Index: pkg/DESCR
===================================================================
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- pkg/DESCR	9 Sep 2023 18:56:54 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-amused is a minimalistic music player that doesn't have many amazing
-features but instead aims to work well with other standard Unix tools.
-It supports flac, mp3, ogg vorbis and opus files.
-
-amused-web is a simple web interface to control amused remotely.
Index: pkg/DESCR-main
===================================================================
RCS file: pkg/DESCR-main
diff -N pkg/DESCR-main
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-main	9 Sep 2023 18:54:52 -0000
@@ -0,0 +1,5 @@
+amused is a minimalistic music player that doesn't have many amazing
+features but instead aims to work well with other standard Unix tools.
+It supports flac, mp3, ogg vorbis and opus files.
+
+amused-web is a simple web interface to control amused remotely.
Index: pkg/DESCR-mpris2
===================================================================
RCS file: pkg/DESCR-mpris2
diff -N pkg/DESCR-mpris2
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-mpris2	1 Sep 2024 22:12:01 -0000
@@ -0,0 +1,4 @@
+amused-mpris2 is a DBus interface to control the amused(1) music
+player.  It exposes the "standard" MPRIS2 (Media Player Remote
+Interfacing Specification) interface that DBus-capable program
+can use to query and control amused(1).
Index: pkg/PLIST
===================================================================
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- pkg/PLIST	9 Sep 2023 18:56:54 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-@bin bin/amused
-@bin bin/amused-web
-@man man/man1/amused-web.1
-@man man/man1/amused.1
Index: pkg/PLIST-main
===================================================================
RCS file: pkg/PLIST-main
diff -N pkg/PLIST-main
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-main	1 Sep 2024 22:26:29 -0000
@@ -0,0 +1,5 @@
+@pkgpath audio/amused
+@bin bin/amused
+@bin bin/amused-web
+@man man/man1/amused-web.1
+@man man/man1/amused.1
Index: pkg/PLIST-mpris2
===================================================================
RCS file: pkg/PLIST-mpris2
diff -N pkg/PLIST-mpris2
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-mpris2	1 Sep 2024 22:10:13 -0000
@@ -0,0 +1,2 @@
+@bin bin/amused-mpris2
+@man man/man1/amused-mpris2.1