Audacious: bump version

media-sound/audacious/audacious-4.0.2.recipe

@@ -9,11 +9,11 @@ with LADSPA effects. Enjoy the modern GTK-themed interface or change things \
 up with Winamp Classic skins. Use the plugins included with Audacious to \
 fetch lyrics for your music, to set an alarm in the morning, and more."
 HOMEPAGE="https://audacious-media-player.org/"
-COPYRIGHT="2010-2018 Błażej Szczygieł"
+COPYRIGHT="2010-2020 Błażej Szczygieł"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/audacious-media-player/audacious/archive/audacious-$portVersion.tar.gz"
-CHECKSUM_SHA256="c478939b4bcf6704c26eee87d48cab26547e92a83741f437711178c433373fa1"
+CHECKSUM_SHA256="92f30a78353c50f99b536061b9d94b6b9128760d546fddbf863e3591c4ac5a8d"
 SOURCE_DIR="audacious-audacious-$portVersion"
 PATCHES="audacious-$portVersion.patchset"
 ADDITIONAL_FILES="audacious.rdef.in"
@@ -24,8 +24,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	audacious$secondaryArchSuffix = $portVersion
 	app:Audacious$secondaryArchSuffix = $portVersion
-	lib:libaudcore$secondaryArchSuffix = 5.1.0 compat >= 5
+	lib:libaudcore$secondaryArchSuffix = 5.2.0 compat >= 5
-	lib:libaudqt$secondaryArchSuffix = 2.1.0 compat >= 2
+	lib:libaudqt$secondaryArchSuffix = 2.2.0 compat >= 2
 	lib:libaudtag$secondaryArchSuffix = 3.0.0 compat >= 3
 	"
 REQUIRES="
@@ -43,8 +43,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	audacious${secondaryArchSuffix}_devel = $portVersion
-	devel:libaudcore$secondaryArchSuffix = 5.1.0 compat >= 5
+	devel:libaudcore$secondaryArchSuffix = 5.2.0 compat >= 5
-	devel:libaudqt$secondaryArchSuffix = 2.1.0 compat >= 2
+	devel:libaudqt$secondaryArchSuffix = 2.2.0 compat >= 2
 	devel:libaudtag$secondaryArchSuffix = 3.0.0 compat >= 3
 	"
 REQUIRES_devel="
@@ -75,7 +75,11 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	./autogen.sh
-	runConfigure ./configure --disable-gtk --enable-qt --disable-dbus --enable-valgrind
+	runConfigure ./configure \
+		--disable-gtk \
+		--enable-qt \
+		--disable-dbus \
+		--enable-valgrind
 	make $jobArgs
 true
 }
@@ -90,7 +94,7 @@ INSTALL()
 	local APP_SIGNATURE="application/x-vnd.qt5-audacious"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="0"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
 	local LONG_INFO="$SUMMARY"
 	sed \
 		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \

media-sound/audacious/patches/audacious-3.10.1.patchset

@@ -1,74 +0,0 @@
-From f3901db657bbb399d660381d12ee112580884e8a Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sun, 26 Aug 2018 23:22:29 +1000
-Subject: Ugly hack
-
-
-diff --git a/src/audacious/main.cc b/src/audacious/main.cc
-index 52ad234..3178f44 100644
---- a/src/audacious/main.cc
-+++ b/src/audacious/main.cc
-@@ -25,6 +25,12 @@
- #include <windows.h>
- #endif
- 
-+#ifdef __HAIKU__
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <signal.h>
-+#endif
-+
- #define AUD_GLIB_INTEGRATION
- #include <libaudcore/audstrings.h>
- #include <libaudcore/drct.h>
-@@ -406,5 +412,9 @@ int main (int argc, char * * argv)
-     aud_cleanup ();
-     initted = false;
- 
-+#ifdef __HAIKU__
-+    kill (::getpid(), SIGKILL);
-+#endif
-+
-     return EXIT_SUCCESS;
- }
--- 
-2.21.0
-
-
-From 64223e5b135ddf5a1f0ab79968f2b9278edf7cd4 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Mon, 15 Apr 2019 22:16:23 +1000
-Subject: Fix settings dir
-
-
-diff --git a/src/libaudcore/runtime.cc b/src/libaudcore/runtime.cc
-index 382e773..03d33c7 100644
---- a/src/libaudcore/runtime.cc
-+++ b/src/libaudcore/runtime.cc
-@@ -34,6 +34,9 @@
- #ifdef __APPLE__
- #include <mach-o/dyld.h>
- #endif
-+#ifdef __HAIKU__
-+#include <FindDirectory.h>
-+#endif
- 
- #include <glib.h>
- #include <libintl.h>
-@@ -236,6 +239,13 @@ static void set_install_paths ()
- static void set_config_paths ()
- {
-     const char * xdg_config_home = g_get_user_config_dir ();
-+#ifdef __HAIKU__
-+	char audaciousSettings[PATH_MAX] = "";
-+	if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, audaciousSettings, sizeof(audaciousSettings)) == B_OK) {
-+		strcat(audaciousSettings, "/Audacious");
-+		xdg_config_home = audaciousSettings;
-+	}
-+#endif
-     StringBuf name = (instance_number == 1) ? str_copy ("audacious") :
-                      str_printf ("audacious-%d", instance_number);
- 
--- 
-2.21.0
-

media-sound/audacious/patches/audacious-4.0.2.patchset

@@ -0,0 +1,37 @@
+From 04d655bf968bdf7043d32b430e8226f9dffc35ba Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 19 Apr 2020 11:40:52 +1000
+Subject: Fix settings dir
+
+
+diff --git a/src/libaudcore/runtime.cc b/src/libaudcore/runtime.cc
+index 062cc59..3a9d918 100644
+--- a/src/libaudcore/runtime.cc
++++ b/src/libaudcore/runtime.cc
+@@ -34,6 +34,9 @@
+ #ifdef __APPLE__
+ #include <mach-o/dyld.h>
+ #endif
++#ifdef __HAIKU__
++#include <FindDirectory.h>
++#endif
+ 
+ #include <glib.h>
+ #include <libintl.h>
+@@ -232,6 +235,13 @@ static void set_install_paths()
+ static void set_config_paths()
+ {
+     const char * xdg_config_home = g_get_user_config_dir();
++#ifdef __HAIKU__
++	char audaciousSettings[PATH_MAX] = "";
++	if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, audaciousSettings, sizeof(audaciousSettings)) == B_OK) {
++		strcat(audaciousSettings, "/Audacious");
++		xdg_config_home = audaciousSettings;
++	}
++#endif
+     StringBuf name = (instance_number == 1)
+                          ? str_copy("audacious")
+                          : str_printf("audacious-%d", instance_number);
+-- 
+2.26.0
+