On Mon 06/03/2023 22:07, Edd Barrett wrote: > On Mon, Mar 06, 2023 at 07:55:51PM +0100, Bjorn Ketelaars wrote: > > Comments/OK? > > Seems to work for me. > > When I run `make plist` in the plugins/ package, it removes some directory > entries. Should they be removed?
Yes, they should be removed. I double checked by building in a clean chroot, and running 'make update-plist'. New diff enclosed below. While here remove unneeded patch, and remove --disable-oss4 from plugins/Makefile as the plugins will no longer utilize OSS on OpenBSD (thanks to Brad Smith, [0]). [0] https://github.com/audacious-media-player/audacious-plugins/commit/a7ed79da3dd3c9114e3e850535f588698d319e81 Comments / OK? diff --git audio/audacious/Makefile.inc audio/audacious/Makefile.inc index 2434ee8e8cb..8df2e0114f5 100644 --- audio/audacious/Makefile.inc +++ audio/audacious/Makefile.inc @@ -1,5 +1,5 @@ # Do not forget to sync meta/audacious -VERSION = 4.2 +VERSION = 4.3 CATEGORIES = audio multimedia diff --git audio/audacious/player/distinfo audio/audacious/player/distinfo index e92bca49cb1..dff637055db 100644 --- audio/audacious/player/distinfo +++ audio/audacious/player/distinfo @@ -1,2 +1,2 @@ -SHA256 (audacious-4.2.tar.bz2) = /rME5HCkgf4rPEyhycs7I+wmJUDBLQ0ebCKl62JeBLM= -SIZE (audacious-4.2.tar.bz2) = 612155 +SHA256 (audacious-4.3.tar.bz2) = J1hNyEXH5w24ySZ5kJRfFzIqHsyA/4tFLpypFqDOkJE= +SIZE (audacious-4.3.tar.bz2) = 623855 diff --git audio/audacious/player/patches/patch-buildsys_mk_in audio/audacious/player/patches/patch-buildsys_mk_in index 8cac2a6f988..b5370c4f27c 100644 --- audio/audacious/player/patches/patch-buildsys_mk_in +++ audio/audacious/player/patches/patch-buildsys_mk_in @@ -3,7 +3,7 @@ Show compiler invocations. Index: buildsys.mk.in --- buildsys.mk.in.orig +++ buildsys.mk.in -@@ -122,18 +122,18 @@ DEPS = ${OBJS:.o=.dep} \ +@@ -123,18 +123,18 @@ DEPS = ${OBJS:.o=.dep} \ MO_FILES = ${LOCALES:.po=.mo} @@ -29,7 +29,7 @@ Index: buildsys.mk.in pre-all post-all: -@@ -143,7 +143,7 @@ subdirs-after: ${SUBDIRS_AFTER} +@@ -144,7 +144,7 @@ subdirs-after: ${SUBDIRS_AFTER} ${SUBDIRS} ${SUBDIRS_AFTER}: for i in $@; do \ ${DIR_ENTER}; \ @@ -38,7 +38,7 @@ Index: buildsys.mk.in ${DIR_LEAVE}; \ done -@@ -192,7 +192,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_ +@@ -194,7 +194,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_ ${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${LINK_STATUS} out="$@"; \ @@ -47,7 +47,7 @@ Index: buildsys.mk.in ${LINK_OK}; \ else \ rm -fr $$out; false; \ -@@ -203,7 +203,7 @@ copy-headers-into-framework: +@@ -205,7 +205,7 @@ copy-headers-into-framework: for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ test x"$$i" = x"" && continue; \ cd $$i || exit 1; \ @@ -56,7 +56,7 @@ Index: buildsys.mk.in cd .. || exit 1; \ done -@@ -652,7 +652,7 @@ install: install-extra +@@ -654,7 +654,7 @@ install: install-extra for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ test x"$$i" = x"" && continue; \ ${DIR_ENTER}; \ @@ -65,7 +65,7 @@ Index: buildsys.mk.in ${DIR_LEAVE}; \ done -@@ -765,7 +765,7 @@ uninstall: uninstall-extra +@@ -767,7 +767,7 @@ uninstall: uninstall-extra for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ test x"$$i" = x"" && continue; \ ${DIR_ENTER}; \ @@ -74,7 +74,7 @@ Index: buildsys.mk.in ${DIR_LEAVE}; \ done -@@ -880,7 +880,7 @@ clean: +@@ -882,7 +882,7 @@ clean: for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ test x"$$i" = x"" && continue; \ ${DIR_ENTER}; \ @@ -83,7 +83,7 @@ Index: buildsys.mk.in ${DIR_LEAVE}; \ done -@@ -901,7 +901,7 @@ distclean: clean +@@ -903,7 +903,7 @@ distclean: clean for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ test x"$$i" = x"" && continue; \ ${DIR_ENTER}; \ @@ -92,7 +92,7 @@ Index: buildsys.mk.in ${DIR_LEAVE}; \ done -@@ -921,7 +921,7 @@ print-hierarchy: +@@ -923,7 +923,7 @@ print-hierarchy: test x"$$i" = x"" && continue; \ echo ${PRINT_HIERARCHY_PREFIX}$$i; \ cd $$i || exit $$?; \ diff --git audio/audacious/player/patches/patch-src_libaudcore_Makefile audio/audacious/player/patches/patch-src_libaudcore_Makefile index 932822edb6e..3be6a06faed 100644 --- audio/audacious/player/patches/patch-src_libaudcore_Makefile +++ audio/audacious/player/patches/patch-src_libaudcore_Makefile @@ -5,5 +5,5 @@ Index: src/libaudcore/Makefile -SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX} +SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION} LIB_MAJOR = 5 - LIB_MINOR = 3 + LIB_MINOR = 4 diff --git audio/audacious/player/patches/patch-src_libaudgui_Makefile audio/audacious/player/patches/patch-src_libaudgui_Makefile deleted file mode 100644 index 90c66dc09d3..00000000000 --- audio/audacious/player/patches/patch-src_libaudgui_Makefile +++ /dev/null @@ -1,9 +0,0 @@ -Index: src/libaudgui/Makefile ---- src/libaudgui/Makefile.orig -+++ src/libaudgui/Makefile -@@ -1,4 +1,4 @@ --SHARED_LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX} -+SHARED_LIB = ${LIB_PREFIX}audgui.so.${LIBaudgui_VERSION} - LIB_MAJOR = 5 - LIB_MINOR = 1 - diff --git audio/audacious/player/pkg/PLIST audio/audacious/player/pkg/PLIST index 8d37aa94d81..7bded0ddb55 100644 --- audio/audacious/player/pkg/PLIST +++ audio/audacious/player/pkg/PLIST @@ -102,6 +102,7 @@ share/locale/pt_BR/LC_MESSAGES/audacious.mo share/locale/pt_PT/ share/locale/pt_PT/LC_MESSAGES/ share/locale/pt_PT/LC_MESSAGES/audacious.mo +share/locale/ro/LC_MESSAGES/audacious.mo share/locale/ru/LC_MESSAGES/audacious.mo share/locale/si/LC_MESSAGES/audacious.mo share/locale/sk/LC_MESSAGES/audacious.mo diff --git audio/audacious/plugins/Makefile audio/audacious/plugins/Makefile index 6e4874bc49c..136eb707e01 100644 --- audio/audacious/plugins/Makefile +++ audio/audacious/plugins/Makefile @@ -9,8 +9,9 @@ WANTLIB += ${COMPILER_LIBCXX} FLAC GL Qt5Core Qt5Gui Qt5OpenGL WANTLIB += Qt5Widgets Qt5X11Extras X11 audcore audqt audtag avcodec WANTLIB += avformat avutil cddb cdio cdio_cdda cue curl faad gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gobject-2.0 iconv intl m mms modplug -WANTLIB += mp3lame mpg123 neon notify ogg samplerate sndfile sndio -WANTLIB += soxr vorbis vorbisenc vorbisfile wavpack xml2 z +WANTLIB += mp3lame mpg123 neon notify ogg opus opusfile samplerate +WANTLIB += sndfile sndio soxr vorbis vorbisenc vorbisfile wavpack +WANTLIB += xml2 z # needed for the gio plugin RUN_DEPENDS = x11/gnome/gvfs @@ -27,6 +28,8 @@ LIB_DEPENDS = audio/audacious/player>=${VERSION} \ audio/libsoxr \ audio/libvorbis \ audio/mpg123 \ + audio/opus \ + audio/opusfile \ audio/wavpack \ devel/libnotify>=0.7.2 \ graphics/ffmpeg \ @@ -41,7 +44,6 @@ CONFIGURE_ARGS = --disable-alsa \ --disable-bs2b \ --disable-jack \ --disable-lirc \ - --disable-oss4 \ --disable-pulse \ --disable-qtaudio \ --disable-sdlout \ diff --git audio/audacious/plugins/distinfo audio/audacious/plugins/distinfo index fafccdebf3e..0062c8b0a20 100644 --- audio/audacious/plugins/distinfo +++ audio/audacious/plugins/distinfo @@ -1,2 +1,2 @@ -SHA256 (audacious-plugins-4.2.tar.bz2) = b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8= -SIZE (audacious-plugins-4.2.tar.bz2) = 1947472 +SHA256 (audacious-plugins-4.3.tar.bz2) = Zi72yMS9cNDzX9HF8IuRVJuUNmOLZfihozlWsJ34n8Y= +SIZE (audacious-plugins-4.3.tar.bz2) = 1932184 diff --git audio/audacious/plugins/patches/patch-buildsys_mk_in audio/audacious/plugins/patches/patch-buildsys_mk_in index 8cac2a6f988..b5370c4f27c 100644 --- audio/audacious/plugins/patches/patch-buildsys_mk_in +++ audio/audacious/plugins/patches/patch-buildsys_mk_in @@ -3,7 +3,7 @@ Show compiler invocations. Index: buildsys.mk.in --- buildsys.mk.in.orig +++ buildsys.mk.in -@@ -122,18 +122,18 @@ DEPS = ${OBJS:.o=.dep} \ +@@ -123,18 +123,18 @@ DEPS = ${OBJS:.o=.dep} \ MO_FILES = ${LOCALES:.po=.mo} @@ -29,7 +29,7 @@ Index: buildsys.mk.in pre-all post-all: -@@ -143,7 +143,7 @@ subdirs-after: ${SUBDIRS_AFTER} +@@ -144,7 +144,7 @@ subdirs-after: ${SUBDIRS_AFTER} ${SUBDIRS} ${SUBDIRS_AFTER}: for i in $@; do \ ${DIR_ENTER}; \ @@ -38,7 +38,7 @@ Index: buildsys.mk.in ${DIR_LEAVE}; \ done -@@ -192,7 +192,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_ +@@ -194,7 +194,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_ ${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${LINK_STATUS} out="$@"; \ @@ -47,7 +47,7 @@ Index: buildsys.mk.in ${LINK_OK}; \ else \ rm -fr $$out; false; \ -@@ -203,7 +203,7 @@ copy-headers-into-framework: +@@ -205,7 +205,7 @@ copy-headers-into-framework: for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ test x"$$i" = x"" && continue; \ cd $$i || exit 1; \ @@ -56,7 +56,7 @@ Index: buildsys.mk.in cd .. || exit 1; \ done -@@ -652,7 +652,7 @@ install: install-extra +@@ -654,7 +654,7 @@ install: install-extra for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ test x"$$i" = x"" && continue; \ ${DIR_ENTER}; \ @@ -65,7 +65,7 @@ Index: buildsys.mk.in ${DIR_LEAVE}; \ done -@@ -765,7 +765,7 @@ uninstall: uninstall-extra +@@ -767,7 +767,7 @@ uninstall: uninstall-extra for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ test x"$$i" = x"" && continue; \ ${DIR_ENTER}; \ @@ -74,7 +74,7 @@ Index: buildsys.mk.in ${DIR_LEAVE}; \ done -@@ -880,7 +880,7 @@ clean: +@@ -882,7 +882,7 @@ clean: for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ test x"$$i" = x"" && continue; \ ${DIR_ENTER}; \ @@ -83,7 +83,7 @@ Index: buildsys.mk.in ${DIR_LEAVE}; \ done -@@ -901,7 +901,7 @@ distclean: clean +@@ -903,7 +903,7 @@ distclean: clean for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ test x"$$i" = x"" && continue; \ ${DIR_ENTER}; \ @@ -92,7 +92,7 @@ Index: buildsys.mk.in ${DIR_LEAVE}; \ done -@@ -921,7 +921,7 @@ print-hierarchy: +@@ -923,7 +923,7 @@ print-hierarchy: test x"$$i" = x"" && continue; \ echo ${PRINT_HIERARCHY_PREFIX}$$i; \ cd $$i || exit $$?; \ diff --git audio/audacious/plugins/patches/patch-configure audio/audacious/plugins/patches/patch-configure index ef7aacd8fc3..bc73a8f82aa 100644 --- audio/audacious/plugins/patches/patch-configure +++ audio/audacious/plugins/patches/patch-configure @@ -5,7 +5,7 @@ polluted very early on, breaking most of the checks using AC_CHECK_LIB. Index: configure --- configure.orig +++ configure -@@ -11411,8 +11411,6 @@ printf "%s\n" "yes" >&6; } +@@ -11758,8 +11758,6 @@ printf "%s\n" "yes" >&6; } fi @@ -14,7 +14,7 @@ Index: configure if test $HAVE_DARWIN = yes ; then -@@ -16600,6 +16598,8 @@ then : +@@ -17192,6 +17190,8 @@ then : fi diff --git audio/audacious/plugins/pkg/PLIST audio/audacious/plugins/pkg/PLIST index c7bd024c243..ea8331d3630 100644 --- audio/audacious/plugins/pkg/PLIST +++ audio/audacious/plugins/pkg/PLIST @@ -48,6 +48,7 @@ lib/audacious/Input/ @so lib/audacious/Input/madplug.so @so lib/audacious/Input/metronom.so @so lib/audacious/Input/modplug.so +@so lib/audacious/Input/opus.so @so lib/audacious/Input/psf2.so @so lib/audacious/Input/sndfile.so @so lib/audacious/Input/tonegen.so @@ -227,6 +228,7 @@ share/locale/nl/LC_MESSAGES/audacious-plugins.mo share/locale/pl/LC_MESSAGES/audacious-plugins.mo share/locale/pt_BR/LC_MESSAGES/audacious-plugins.mo share/locale/pt_PT/LC_MESSAGES/audacious-plugins.mo +share/locale/ro/LC_MESSAGES/audacious-plugins.mo share/locale/ru/LC_MESSAGES/audacious-plugins.mo share/locale/si/LC_MESSAGES/audacious-plugins.mo share/locale/sk/LC_MESSAGES/audacious-plugins.mo diff --git meta/audacious/Makefile meta/audacious/Makefile index 81224d5c6fe..c9ff0e71204 100644 --- meta/audacious/Makefile +++ meta/audacious/Makefile @@ -1,6 +1,6 @@ COMMENT = audacious meta-package -VERSION = 4.2 +VERSION = 4.3 PKGNAME = audacious-${VERSION} MAINTAINER = Bjorn Ketelaars <b...@openbsd.org>
