From d37a25d0d8d3f0615b19dfb20f859e2a8c859da4 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 13 Jun 2024 20:40:13 -0400 Subject: [PATCH] audacious: update to 4.4. --- common/shlibs | 4 ++-- srcpkgs/audacious-base/template | 25 ++++++++++++------------- srcpkgs/audacious-plugins/template | 25 ++++++++++++------------- srcpkgs/audacious/template | 4 ++-- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/common/shlibs b/common/shlibs index a33bb85772e392..588a9baabe0e45 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1111,9 +1111,9 @@ libmowgli-2.so.0 libmowgli-2.1.3_8 libgts-0.7.so.5 gts-0.7.6_1 libguess.so.1 libguess-1.1_1 libaudcore.so.5 audacious-base-4.3.1_1 -libaudgui.so.5 audacious-base-4.3.1_1 +libaudgui.so.6 audacious-base-4.3.1_1 libaudtag.so.3 audacious-base-4.3.1_1 -libaudqt.so.2 audacious-base-4.3.1_1 +libaudqt.so.3 audacious-base-4.3.1_1 libgstreamer-1.0.so.0 gstreamer1-1.0.0_1 libgstbase-1.0.so.0 gstreamer1-1.0.0_1 libgstcontroller-1.0.so.0 gstreamer1-1.0.0_1 diff --git a/srcpkgs/audacious-base/template b/srcpkgs/audacious-base/template index 5f61312488ac75..7da28f92af5ba9 100644 --- a/srcpkgs/audacious-base/template +++ b/srcpkgs/audacious-base/template @@ -1,31 +1,30 @@ # Template file for 'audacious-base' # Keep in sync with audacious and audacious-plugins pkgname=audacious-base -version=4.3.1 +version=4.4 revision=1 build_style=meson -configure_args="-Dlibarchive=true $(vopt_bool gtk3 gtk) $(vopt_bool gtk3) - $(vopt_bool qt) $(vopt_bool qt qt6) -Dbuildstamp=xbps" +configure_args="-Dlibarchive=true $(vopt_bool gtk) $(vopt_bool qt) -Dbuildstamp=xbps" hostmakedepends="pkg-config gettext glib-devel $(vopt_if qt 'qt6-base qt6-tools')" makedepends="libSM-devel dbus-glib-devel libguess-devel libarchive-devel - $(vopt_if gtk3 gtk+3-devel) $(vopt_if qt qt6-base-devel)" + $(vopt_if gtk gtk+3-devel) $(vopt_if qt 'qt6-base-devel qt6-svg-devel')" depends="desktop-file-utils hicolor-icon-theme $(vopt_if qt qt6-svg)" short_desc="Lightweight, advanced audio player focused on audio quality" maintainer="classabbyamp " license="BSD-2-Clause" homepage="https://audacious-media-player.org/" -distfiles="https://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2" -checksum=85e9e26841505b51e342ee72a2d05f19bef894f567a029ebb3f3e0c1adb42042 +distfiles="https://github.com/audacious-media-player/audacious/archive/refs/tags/audacious-${version}.tar.gz" +checksum=b240567c9b4452339fbee63503284d9c7f443f4f08c3ec0221d9e8738337a55e -build_options="gtk3 qt" +build_options="gtk qt" build_options_default="qt" -vopt_conflict gtk3 qt +vopt_conflict gtk qt -pre_configure() { - # Meson uses paths from pkg-config which is /usr/lib32/qt6 when cross compiling 32-bit - # Work around this for now - export PATH="/usr/lib/qt6/libexec/:$PATH" -} +# pre_configure() { +# # Meson uses paths from pkg-config which is /usr/lib32/qt6 when cross compiling 32-bit +# # Work around this for now +# export PATH="/usr/lib/qt6/libexec/:$PATH" +# } post_install() { vlicense COPYING diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index e19792d71bb7b8..e81686c2f2f6e4 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -1,33 +1,32 @@ # Template file for 'audacious-plugins' # Keep in sync with audacious and audacious-base pkgname=audacious-plugins -version=4.3.1 -revision=4 +version=4.4 +revision=1 build_style=meson -configure_args="$(vopt_bool gtk3 gtk) $(vopt_bool gtk3) - $(vopt_bool qt) $(vopt_bool qt qt6)" +configure_args="$(vopt_bool gtk gtk) $(vopt_bool qt)" hostmakedepends="gettext pkg-config glib-devel $(vopt_if qt qt6-tools)" makedepends="audacious-base-devel alsa-lib-devel pulseaudio-devel jack-devel lame-devel libvorbis-devel libflac-devel mpg123-devel faad2-devel ffmpeg-devel libmodplug-devel fluidsynth-devel libcdio-paranoia-devel wavpack-devel libnotify-devel libcurl-devel libmtp-devel neon-devel libmms-devel libxml2-devel opus-devel opusfile-devel libbs2b-devel libsoxr-devel libsidplayfp-devel libcue-devel libopenmpt-devel pipewire-devel - $(vopt_if gtk3 gtk+3-devel) $(vopt_if qt 'qt6-base-devel qt6-multimedia-devel')" + $(vopt_if gtk gtk+3-devel) $(vopt_if qt 'qt6-base-devel qt6-multimedia-devel')" short_desc="Plugins for the Audacious media player" maintainer="classabbyamp " license="BSD-2-Clause" homepage="https://audacious-media-player.org/" -distfiles="https://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2" -checksum=2dea26e3af583a2d684df240b27b2b2932bcd653df4db500a85f4fe5d5fdc8a6 +distfiles="https://github.com/audacious-media-player/audacious-plugins/archive/refs/tags/audacious-plugins-${version}.tar.gz" +checksum=97e70fea48a9f6c3dbf47e47c8ce9bfd423d73f32142851ccfac86d23354d2cc -build_options="gtk3 qt" +build_options="gtk qt" build_options_default="qt" -vopt_conflict gtk3 qt +vopt_conflict gtk qt -if [ -n "$CROSS_BUILD" ]; then - # fails to configure: FileNotFoundError: [Errno 2] No such file or directory: '/usr/include/qt6' - configure_args+=" -Dhotkey=false" -fi +# if [ -n "$CROSS_BUILD" ]; then +# # fails to configure: FileNotFoundError: [Errno 2] No such file or directory: '/usr/include/qt6' +# configure_args+=" -Dhotkey=false" +# fi post_install() { vlicense COPYING diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template index ed8b88f4173f29..b97877168a23bd 100644 --- a/srcpkgs/audacious/template +++ b/srcpkgs/audacious/template @@ -1,8 +1,8 @@ # Template file for 'audacious' # Keep in sync with audacious-base and audacious-plugins pkgname=audacious -version=4.3.1 -revision=2 +version=4.4 +revision=1 build_style=meta depends="audacious-base>=${version}_1 audacious-plugins>=${version}_1" short_desc="Lightweight, advanced audio player focused on audio quality"