diff --git a/audio/audacious/Makefile.inc b/audio/audacious/Makefile.inc index cb5bb379df6..e4b5393f869 100644 --- a/audio/audacious/Makefile.inc +++ b/audio/audacious/Makefile.inc @@ -1,5 +1,5 @@ # Do not forget to sync meta/audacious -VERSION = 4.5.1 +VERSION = 4.6 CATEGORIES = audio multimedia @@ -12,16 +12,15 @@ EXTRACT_SUFX = .tar.bz2 COMPILER = base-clang ports-gcc -FIX_EXTRACT_PERMISSIONS = Yes - BUILD_DEPENDS += devel/gettext,-tools -MODULES += x11/qt5 -CONFIGURE_ARGS += --disable-gtk \ - --enable-qt5 +MODULES += devel/meson \ + x11/qt5 -USE_GMAKE = Yes +CONFIGURE_ARGS += -Dgtk=false \ + -Dqt5=true -CONFIGURE_STYLE = gnu +CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" NO_TEST = Yes diff --git a/audio/audacious/player/Makefile b/audio/audacious/player/Makefile index 79bc651b73d..f525e7c0048 100644 --- a/audio/audacious/player/Makefile +++ b/audio/audacious/player/Makefile @@ -3,9 +3,9 @@ COMMENT = graphical audio player which supports lots of formats DISTNAME = audacious-${VERSION} PKGNAME = audacious-player-${VERSION} -SHARED_LIBS += audcore 5.3 +SHARED_LIBS += audcore 6.0 SHARED_LIBS += audtag 3.0 -SHARED_LIBS += audqt 1.0 +SHARED_LIBS += audqt 2.0 # BSD PERMIT_PACKAGE = Yes @@ -20,8 +20,4 @@ LIB_DEPENDS = x11/qt5/qtsvg RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+4,-guic -MAKE_ENV = LIBaudcore_VERSION=${LIBaudcore_VERSION} \ - LIBaudtag_VERSION=${LIBaudtag_VERSION} \ - LIBaudqt_VERSION=${LIBaudqt_VERSION} - .include diff --git a/audio/audacious/player/distinfo b/audio/audacious/player/distinfo index fa6a3b3d032..30a552a5f47 100644 --- a/audio/audacious/player/distinfo +++ b/audio/audacious/player/distinfo @@ -1,2 +1,2 @@ -SHA256 (audacious-4.5.1.tar.bz2) = cZR0OgpBsdj1gsBxSIt397kXvkfKXhQt12r12B02+c0= -SIZE (audacious-4.5.1.tar.bz2) = 642359 +SHA256 (audacious-4.6.tar.bz2) = A5iKahFORvkdq81NDa4p/K0Z9gKePChzeTjRvVJZed0= +SIZE (audacious-4.6.tar.bz2) = 520091 diff --git a/audio/audacious/player/patches/patch-src_libaudcore_Makefile b/audio/audacious/player/patches/patch-src_libaudcore_Makefile deleted file mode 100644 index 7641e0b4c37..00000000000 --- a/audio/audacious/player/patches/patch-src_libaudcore_Makefile +++ /dev/null @@ -1,9 +0,0 @@ -Index: src/libaudcore/Makefile ---- src/libaudcore/Makefile.orig -+++ src/libaudcore/Makefile -@@ -1,4 +1,4 @@ --SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX} -+SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION} - LIB_MAJOR = 5 - LIB_MINOR = 5 - LIB_PATCH = 0 diff --git a/audio/audacious/player/patches/patch-src_libaudqt_Makefile b/audio/audacious/player/patches/patch-src_libaudqt_Makefile deleted file mode 100644 index dd4390faf6e..00000000000 --- a/audio/audacious/player/patches/patch-src_libaudqt_Makefile +++ /dev/null @@ -1,10 +0,0 @@ -Index: src/libaudqt/Makefile ---- src/libaudqt/Makefile.orig -+++ src/libaudqt/Makefile -@@ -1,4 +1,5 @@ --SHARED_LIB = ${LIB_PREFIX}audqt${LIB_SUFFIX} -+SHARED_LIB = ${LIB_PREFIX}audqt.so.${LIBaudqt_VERSION} -+ - LIB_MAJOR = 3 - LIB_MINOR = 0 - LIB_PATCH = 0 diff --git a/audio/audacious/player/patches/patch-src_libaudtag_Makefile b/audio/audacious/player/patches/patch-src_libaudtag_Makefile deleted file mode 100644 index cda9311e1c6..00000000000 --- a/audio/audacious/player/patches/patch-src_libaudtag_Makefile +++ /dev/null @@ -1,9 +0,0 @@ -Index: src/libaudtag/Makefile ---- src/libaudtag/Makefile.orig -+++ src/libaudtag/Makefile -@@ -1,4 +1,4 @@ --SHARED_LIB = ${LIB_PREFIX}audtag${LIB_SUFFIX} -+SHARED_LIB = ${LIB_PREFIX}audtag.so.${LIBaudtag_VERSION} - LIB_MAJOR = 3 - LIB_MINOR = 0 - LIB_PATCH = 0 diff --git a/audio/audacious/player/pkg/PLIST b/audio/audacious/player/pkg/PLIST index 7bded0ddb55..4550d0a4482 100644 --- a/audio/audacious/player/pkg/PLIST +++ b/audio/audacious/player/pkg/PLIST @@ -29,7 +29,6 @@ include/libaudcore/ringbuf.h include/libaudcore/runtime.h include/libaudcore/templates.h include/libaudcore/threads.h -include/libaudcore/tinylock.h include/libaudcore/tuple.h include/libaudcore/vfs.h include/libaudcore/vfs_async.h @@ -121,3 +120,5 @@ share/locale/zh_CN/LC_MESSAGES/audacious.mo share/locale/zh_TW/LC_MESSAGES/audacious.mo @tag update-desktop-database @tag gtk-update-icon-cache %D/share/icons/hicolor +share/metainfo/ +share/metainfo/audacious.metainfo.xml diff --git a/audio/audacious/plugins/Makefile b/audio/audacious/plugins/Makefile index 3839a7bde7b..19b7c896c0c 100644 --- a/audio/audacious/plugins/Makefile +++ b/audio/audacious/plugins/Makefile @@ -1,21 +1,21 @@ COMMENT = input and output plugins for Audacious DISTNAME = audacious-plugins-${VERSION} -REVISION = 0 # BSD / GPL PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} FLAC GL Qt5Core Qt5Gui Qt5OpenGL -WANTLIB += Qt5Svg Qt5Widgets Qt5X11Extras X11 adplug audcore audqt -WANTLIB += audtag avcodec avformat avutil binio cddb cdio cdio_cdda -WANTLIB += cue curl faad gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 -WANTLIB += iconv intl m mms modplug mp3lame mpg123 neon notify -WANTLIB += ogg opusfile samplerate sndfile sndio soxr vorbis vorbisenc -WANTLIB += vorbisfile wavpack xml2 z +WANTLIB += ${COMPILER_LIBCXX} FLAC Qt5Core Qt5Gui Qt5Widgets Qt5X11Extras +WANTLIB += X11 adplug audcore audqt audtag avcodec avformat avutil +WANTLIB += binio cddb cdio cdio_cdda cue curl faad gdk_pixbuf-2.0 +WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m mms modplug mp3lame +WANTLIB += mpg123 neon notify ogg opusfile samplerate sndfile +WANTLIB += sndio soxr vorbis vorbisenc vorbisfile wavpack xml2 +WANTLIB += z # needed for the gio plugin RUN_DEPENDS = x11/gnome/gvfs + LIB_DEPENDS = audio/adplug \ audio/audacious/player>=${VERSION} \ audio/faad>=2.7 \ @@ -40,18 +40,16 @@ LIB_DEPENDS = audio/adplug \ textproc/libxml \ x11/qt5/qtx11extras -CONFIGURE_ARGS = --disable-alsa \ - --disable-amidiplug \ - --disable-bs2b \ - --disable-jack \ - --disable-lirc \ - --disable-openmpt \ - --disable-pipewire \ - --disable-pulse \ - --disable-qtaudio \ - --disable-sdlout \ - --disable-sid -CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ARGS = -Dalsa=false \ + -Damidiplug=false \ + -Dbs2b=false \ + -Djack=false \ + -Dlirc=false \ + -Dopenmpt=false \ + -Dpipewire=false \ + -Dpulse=false \ + -Dqtaudio=false \ + -Dsdlout=false \ + -Dsid=false .include diff --git a/audio/audacious/plugins/distinfo b/audio/audacious/plugins/distinfo index 951c115edd7..4b7326cbec4 100644 --- a/audio/audacious/plugins/distinfo +++ b/audio/audacious/plugins/distinfo @@ -1,2 +1,2 @@ -SHA256 (audacious-plugins-4.5.1.tar.bz2) = 9P7twyd2rPqdJHAdO3lPyXgi922mmR6R5ifnDlYf3Ts= -SIZE (audacious-plugins-4.5.1.tar.bz2) = 1907432 +SHA256 (audacious-plugins-4.6.tar.bz2) = znCLygGU06GyuKiaKJLhx3mPN0WTVj+yHExkskq42Do= +SIZE (audacious-plugins-4.6.tar.bz2) = 1787724 diff --git a/audio/audacious/plugins/patches/patch-configure b/audio/audacious/plugins/patches/patch-configure deleted file mode 100644 index 5d2181f2618..00000000000 --- a/audio/audacious/plugins/patches/patch-configure +++ /dev/null @@ -1,25 +0,0 @@ -Set AUDACIOUS_{CFLAGS,LIBS} only after the end of all plugin checks. -This fixes some of the autoconf checks as the LIBS variable is being -polluted very early on, breaking most of the checks using AC_CHECK_LIB. - -Index: configure ---- configure.orig -+++ configure -@@ -12041,8 +12041,6 @@ printf "%s\n" "yes" >&6; } - - fi - --CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS" --LIBS="$LIBS $AUDACIOUS_LIBS" - - - if test $HAVE_DARWIN = yes ; then -@@ -17844,6 +17842,8 @@ then : - - fi - -+CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS" -+LIBS="$LIBS $AUDACIOUS_LIBS" - - : "${CONFIG_STATUS=./config.status}" - ac_write_fail=0 diff --git a/audio/audacious/plugins/pkg/PLIST b/audio/audacious/plugins/pkg/PLIST index 4572f32e195..7b30a5327f6 100644 --- a/audio/audacious/plugins/pkg/PLIST +++ b/audio/audacious/plugins/pkg/PLIST @@ -28,6 +28,7 @@ lib/audacious/General/ @so lib/audacious/General/albumart-qt.so @so lib/audacious/General/cd-menu-items.so @so lib/audacious/General/delete-files.so +@so lib/audacious/General/filebrowser-qt.so @so lib/audacious/General/lyrics-qt.so @so lib/audacious/General/mpris2.so @so lib/audacious/General/notify.so @@ -122,6 +123,7 @@ share/audacious/Skins/Default/pledit.png share/audacious/Skins/Default/pledit.txt share/audacious/Skins/Default/posbar.png share/audacious/Skins/Default/shufrep.png +share/audacious/Skins/Default/skin-classic.hints share/audacious/Skins/Default/skin.hints share/audacious/Skins/Default/text.png share/audacious/Skins/Default/titlebar.png diff --git a/meta/audacious/Makefile b/meta/audacious/Makefile index b496afe1006..ef5581ddaf6 100644 --- a/meta/audacious/Makefile +++ b/meta/audacious/Makefile @@ -1,6 +1,6 @@ COMMENT = audacious meta-package -VERSION = 4.5.1 +VERSION = 4.6 PKGNAME = audacious-${VERSION} MAINTAINER = Bjorn Ketelaars