diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile index ca96b2b4ca13..3412e0b140ce 100644 --- a/multimedia/audacious/Makefile +++ b/multimedia/audacious/Makefile @@ -1,93 +1,89 @@ PORTNAME= audacious -PORTVERSION= 4.3 +PORTVERSION= 4.3.1 CATEGORIES= multimedia audio MASTER_SITES= https://distfiles.audacious-media-player.org/ MAINTAINER= madpilot@FreeBSD.org COMMENT= Lightweight and versatile audio player WWW= https://audacious-media-player.org/ LICENSE= BSD2CLAUSE BSD3CLAUSE LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig FLAVORS= qt5 qt6 gtk2 gtk3 FLAVOR?= ${FLAVORS:[1]} USES= compiler:c++11-lib desktop-file-utils gettext-tools gmake \ gnome iconv localbase meson pkgconfig tar:bzip2 xorg USE_GNOME= glib20 USE_XORG= x11 sm USE_LDCONFIG= yes SUB_FILES= pkg-message CONFIGURE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" qt5_CONFLICTS_INSTALL= audacious-qt6 audacious-gtk2 audacious-gtk3 qt6_PKGNAMESUFFIX= -qt6 qt6_CONFLICTS_INSTALL= audacious audacious-gtk2 audacious-gtk3 gtk2_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz gtk2_PKGNAMESUFFIX= -gtk2 gtk2_CONFLICTS_INSTALL= audacious audacious-qt6 audacious-gtk3 gtk3_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz gtk3_PKGNAMESUFFIX= -gtk3 gtk3_CONFLICTS_INSTALL= audacious audacious-qt6 audacious-gtk2 .if ${FLAVOR} == qt5 MESON_ARGS+= -Dqt=true -Dqt6=false -Dgtk=false -Dgtk3=false USES+= qt:5 USE_QT= buildtools:build core gui widgets PLIST_SUB= QT="" GTK="@comment " .elif ${FLAVOR} == qt6 MESON_ARGS+= -Dqt=true -Dqt6=true -Dgtk=false -Dgtk3=false USES+= qt:6 USE_QT= base PLIST_SUB= QT="" GTK="@comment " .elif ${FLAVOR} == gtk2 MESON_ARGS+= -Dqt=false -Dqt6=false -Dgtk=true -Dgtk3=false USE_GNOME+= cairo gdkpixbuf2 gtk20 PLIST_SUB= QT="@comment " GTK="" .elif ${FLAVOR} == gtk3 MESON_ARGS+= -Dqt=false -Dqt6=false -Dgtk=true -Dgtk3=true USE_GNOME+= cairo gdkpixbuf2 gtk30 PLIST_SUB= QT="@comment " GTK="" .endif OPTIONS_DEFINE= NLS LIBARCHIVE EXECINFO OPTIONS_DEFAULT= EXECINFO OPTIONS_SUB= yes EXECINFO_DESC= Build with libexecinfo support LIBARCHIVE_DESC= Build with libarchive support LIBARCHIVE_MESON_TRUE= libarchive LIBARCHIVE_USES= libarchive NLS_USES= gettext-runtime -post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/src/libaudqt/meson.build - post-patch-NLS-off: @${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build post-patch-EXECINFO-on: @${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \ ${WRKSRC}/src/audacious/Makefile @${REINPLACE_CMD} 's|-laudcore|-laudcore -lexecinfo|' \ ${WRKSRC}/audacious.pc.in post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo ${INSTALL_DATA} ${WRKSRC}/contrib/audacious.appdata.xml \ ${STAGEDIR}${PREFIX}/share/metainfo/ .include diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo index 88c11a9e13c4..ea9883f0daa7 100644 --- a/multimedia/audacious/distinfo +++ b/multimedia/audacious/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678119453 -SHA256 (audacious-4.3.tar.bz2) = 27584dc845c7e70db8c9267990945f17322a1ecc80ff8b452e9ca916a0ce9091 -SIZE (audacious-4.3.tar.bz2) = 623855 +TIMESTAMP = 1682842590 +SHA256 (audacious-4.3.1.tar.bz2) = 85e9e26841505b51e342ee72a2d05f19bef894f567a029ebb3f3e0c1adb42042 +SIZE (audacious-4.3.1.tar.bz2) = 630820 diff --git a/multimedia/audacious/files/patch-meson.build b/multimedia/audacious/files/patch-meson.build deleted file mode 100644 index ae24ada8769e..000000000000 --- a/multimedia/audacious/files/patch-meson.build +++ /dev/null @@ -1,19 +0,0 @@ ---- meson.build.orig 2023-03-05 17:47:00 UTC -+++ meson.build -@@ -55,6 +55,7 @@ have_darwin = host_machine.system() == 'darwin' - - - have_darwin = host_machine.system() == 'darwin' -+have_freebsd = host_machine.system() == 'freebsd' - have_windows = host_machine.system() == 'windows' - - -@@ -120,7 +121,7 @@ if (cxx.has_header('libintl.h')) - if (cxx.has_header('libintl.h')) - add_project_arguments('-DHAVE_GETTEXT', language: ['c', 'cpp']) - -- if have_darwin or have_windows -+ if have_darwin or have_freebsd or have_windows - add_project_link_arguments('-lintl', language: ['c', 'cpp']) - endif - endif