mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
Audacious_plugin: bumped to 4.4.2 (#12339)
This commit is contained in:
kenmays
GitHub
@@ -4,11 +4,11 @@ Included are various skins, visualizations, support for more in/output \
|
||||
formats, effects, and services like fetching lyrics for your music or setting \
|
||||
an alarm in the morning, and more."
|
||||
HOMEPAGE="https://audacious-media-player.org/"
|
||||
COPYRIGHT="2001-2021 Audacious developers and others"
|
||||
COPYRIGHT="2001-present Audacious developers and others"
|
||||
LICENSE="BSD (2-clause)"
|
||||
REVISION="4"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/audacious-media-player/audacious-plugins/archive/audacious-plugins-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="94c732488ac836c0c9f37c5634bdb41d222e956b18cb66499ab8c870361768e8"
|
||||
CHECKSUM_SHA256="0825b1e3ac1465c7a012bcb4c629a3390c8c22ebf3d207c6e8db056429e4ffa4"
|
||||
SOURCE_DIR="audacious-plugins-audacious-plugins-$portVersion"
|
||||
PATCHES="audacious_plugins-$portVersion.patchset"
|
||||
|
||||
@@ -27,6 +27,8 @@ REQUIRES="
|
||||
lib:libavformat$secondaryArchSuffix
|
||||
lib:libavutil$secondaryArchSuffix
|
||||
lib:libbs2b$secondaryArchSuffix
|
||||
lib:libcddb$secondaryArchSuffix
|
||||
lib:libcdio_cdda$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libfaad$secondaryArchSuffix
|
||||
lib:libFLAC$secondaryArchSuffix
|
||||
@@ -41,15 +43,20 @@ REQUIRES="
|
||||
lib:libmp3lame$secondaryArchSuffix
|
||||
lib:libmpg123$secondaryArchSuffix
|
||||
lib:libneon$secondaryArchSuffix
|
||||
lib:libnotify$secondaryArchSuffix
|
||||
lib:libogg$secondaryArchSuffix
|
||||
lib:libopenmpt$secondaryArchSuffix
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
lib:libQt5Gui$secondaryArchSuffix
|
||||
lib:libQt5Multimedia$secondaryArchSuffix
|
||||
lib:libQt5Network$secondaryArchSuffix
|
||||
lib:libQt5OpenGL$secondaryArchSuffix
|
||||
lib:libQt5Widgets$secondaryArchSuffix
|
||||
lib:libopus$secondaryArchSuffix
|
||||
lib:libopusfile$secondaryArchSuffix
|
||||
lib:libQt6Core$secondaryArchSuffix
|
||||
lib:libQt6Gui$secondaryArchSuffix
|
||||
lib:libQt6Multimedia$secondaryArchSuffix
|
||||
lib:libQt6Network$secondaryArchSuffix
|
||||
lib:libQt6OpenGL$secondaryArchSuffix
|
||||
lib:libQt6Svg$secondaryArchSuffix
|
||||
lib:libQt6Widgets$secondaryArchSuffix
|
||||
lib:libsamplerate$secondaryArchSuffix
|
||||
lib:libsdl2_2.0$secondaryArchSuffix
|
||||
lib:libsidplayfp$secondaryArchSuffix
|
||||
lib:libsndfile$secondaryArchSuffix
|
||||
lib:libsoxr$secondaryArchSuffix
|
||||
@@ -64,12 +71,11 @@ SUPPLEMENTS="audacious$secondaryArchSuffix"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
ffmpeg${secondaryArchSuffix}_devel
|
||||
ffmpeg6${secondaryArchSuffix}_devel
|
||||
devel:libaudcore$secondaryArchSuffix
|
||||
# devel:libavcodec$secondaryArchSuffix
|
||||
devel:libbs2b$secondaryArchSuffix
|
||||
devel:libcddb$secondaryArchSuffix
|
||||
devel:libcdio$secondaryArchSuffix
|
||||
devel:libcdio_cdda$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libfaad$secondaryArchSuffix
|
||||
devel:libflac$secondaryArchSuffix
|
||||
@@ -83,12 +89,19 @@ BUILD_REQUIRES="
|
||||
devel:libmp3lame$secondaryArchSuffix
|
||||
devel:libmpg123$secondaryArchSuffix
|
||||
devel:libneon$secondaryArchSuffix
|
||||
devel:libnotify$secondaryArchSuffix
|
||||
devel:libopenmpt$secondaryArchSuffix
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
devel:libQt5DBus$secondaryArchSuffix
|
||||
devel:libQt5Gui$secondaryArchSuffix
|
||||
devel:libQt5Widgets$secondaryArchSuffix
|
||||
devel:libopus$secondaryArchSuffix
|
||||
devel:libopusfile$secondaryArchSuffix
|
||||
devel:libQt6Core$secondaryArchSuffix
|
||||
devel:libQt6Gui$secondaryArchSuffix
|
||||
devel:libQt6Multimedia$secondaryArchSuffix
|
||||
devel:libQt6Network$secondaryArchSuffix
|
||||
devel:libQt6OpenGL$secondaryArchSuffix
|
||||
devel:libQt6Svg$secondaryArchSuffix
|
||||
devel:libQt6Widgets$secondaryArchSuffix
|
||||
devel:libsamplerate$secondaryArchSuffix
|
||||
devel:libsdl2$secondaryArchSuffix
|
||||
devel:libsidplayfp$secondaryArchSuffix
|
||||
devel:libsndfile$secondaryArchSuffix
|
||||
devel:libsoxr$secondaryArchSuffix
|
||||
@@ -107,7 +120,6 @@ BUILD_PREREQUIRES="
|
||||
cmd:awk
|
||||
cmd:find
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:lrelease$secondaryArchSuffix >= 5
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:python3
|
||||
@@ -1,14 +1,14 @@
|
||||
From 355096acdce158cb68126ccadf12a767736a9029 Mon Sep 17 00:00:00 2001
|
||||
From 9687c0ad1ce61a776cb314ddf3fe063acc69c839 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 4 Jan 2019 16:58:00 +1000
|
||||
Subject: Add Haiku support
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9a0f5df..a4d8d0a 100644
|
||||
index 89ed071..969bd29 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -603,6 +603,21 @@ if test "x$enable_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; th
|
||||
@@ -680,6 +680,21 @@ if test "x$enable_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; th
|
||||
)
|
||||
fi
|
||||
|
||||
@@ -30,7 +30,7 @@ index 9a0f5df..a4d8d0a 100644
|
||||
dnl Vorbis and FLAC support support reuse input plugin checks.
|
||||
|
||||
if test "x$enable_filewriter" = "xyes" -a "x$have_vorbis" = "xyes"; then
|
||||
@@ -633,7 +648,7 @@ fi
|
||||
@@ -710,7 +725,7 @@ fi
|
||||
|
||||
dnl *** End of all plugin checks ***
|
||||
|
||||
@@ -39,14 +39,58 @@ index 9a0f5df..a4d8d0a 100644
|
||||
AC_SUBST(plugindir)
|
||||
|
||||
dnl XXX
|
||||
@@ -745,6 +760,7 @@ echo " Jack Audio Connection Kit: $have_jack"
|
||||
echo " Open Sound System: $have_oss4"
|
||||
@@ -827,6 +842,7 @@ echo " Open Sound System: $have_oss4"
|
||||
echo " PipeWire: $have_pipewire"
|
||||
echo " PulseAudio: $have_pulse"
|
||||
echo " Simple DirectMedia Layer: $have_sdlout"
|
||||
+echo " MediaKit: $have_mediakit"
|
||||
echo " Sndio: $have_sndio"
|
||||
echo " Win32 waveOut: $HAVE_MSWINDOWS"
|
||||
echo " FileWriter: $enable_filewriter"
|
||||
From 42ee265e732dc1d50de476865a36cd8e2f85ec94 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 14 Apr 2019 17:58:31 +1000
|
||||
Subject: Use system soundfont
|
||||
|
||||
diff --git a/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc b/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc
|
||||
index 6375ceb..7d450c2 100644
|
||||
--- a/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc
|
||||
+++ b/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc
|
||||
@@ -32,6 +32,10 @@
|
||||
#include "../i_configure.h"
|
||||
#include "../i_midievent.h"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <FindDirectory.h>
|
||||
+#endif
|
||||
+
|
||||
typedef struct
|
||||
{
|
||||
fluid_settings_t * settings;
|
||||
@@ -204,6 +208,23 @@ static void i_soundfont_load ()
|
||||
{
|
||||
String soundfont_file = aud_get_str ("amidiplug", "fsyn_soundfont_file");
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ char midiSettings[PATH_MAX] = "";
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, midiSettings, sizeof(midiSettings)) == B_OK) {
|
||||
+ strcat(midiSettings, "/Media/midi_settings");
|
||||
+ if( access( midiSettings, F_OK ) != -1 ) {
|
||||
+ FILE *inFile = fopen(midiSettings, "rt");
|
||||
+ if (inFile) {
|
||||
+ char sf2file[PATH_MAX];
|
||||
+ if (fscanf(inFile, "# Midi\n\tsoundfont \"%[^\"]\"", sf2file)) {
|
||||
+ soundfont_file = String(sf2file);
|
||||
+ }
|
||||
+ fclose(inFile);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
if (soundfont_file[0])
|
||||
{
|
||||
Index<String> sffiles = str_list_to_index (soundfont_file, ";");
|
||||
diff --git a/src/mediakit/Makefile b/src/mediakit/Makefile
|
||||
new file mode 100644
|
||||
index 0000000..5d59cc1
|
||||
@@ -581,10 +625,10 @@ index 0000000..bd042c3
|
||||
+
|
||||
+#endif
|
||||
diff --git a/src/statusicon-qt/statusicon.cc b/src/statusicon-qt/statusicon.cc
|
||||
index da5bdc1..17a46b1 100644
|
||||
index cd4ca56..567908a 100644
|
||||
--- a/src/statusicon-qt/statusicon.cc
|
||||
+++ b/src/statusicon-qt/statusicon.cc
|
||||
@@ -182,8 +182,11 @@ bool StatusIcon::init ()
|
||||
@@ -187,8 +187,11 @@ bool StatusIcon::init ()
|
||||
aud_config_set_defaults ("statusicon", defaults);
|
||||
|
||||
audqt::init ();
|
||||
@@ -598,54 +642,5 @@ index da5bdc1..17a46b1 100644
|
||||
menu = audqt::menu_build (items);
|
||||
tray->setContextMenu (menu);
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From 42ee265e732dc1d50de476865a36cd8e2f85ec94 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 14 Apr 2019 17:58:31 +1000
|
||||
Subject: Use system soundfont
|
||||
|
||||
|
||||
diff --git a/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc b/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc
|
||||
index 09d8c24..0d90608 100644
|
||||
--- a/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc
|
||||
+++ b/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc
|
||||
@@ -32,6 +32,10 @@
|
||||
#include "../i_configure.h"
|
||||
#include "../i_midievent.h"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <FindDirectory.h>
|
||||
+#endif
|
||||
+
|
||||
typedef struct
|
||||
{
|
||||
fluid_settings_t * settings;
|
||||
@@ -208,6 +212,23 @@ static void i_soundfont_load ()
|
||||
{
|
||||
String soundfont_file = aud_get_str ("amidiplug", "fsyn_soundfont_file");
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ char midiSettings[PATH_MAX] = "";
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, midiSettings, sizeof(midiSettings)) == B_OK) {
|
||||
+ strcat(midiSettings, "/Media/midi_settings");
|
||||
+ if( access( midiSettings, F_OK ) != -1 ) {
|
||||
+ FILE *inFile = fopen(midiSettings, "rt");
|
||||
+ if (inFile) {
|
||||
+ char sf2file[PATH_MAX];
|
||||
+ if (fscanf(inFile, "# Midi\n\tsoundfont \"%[^\"]\"", sf2file)) {
|
||||
+ soundfont_file = String(sf2file);
|
||||
+ }
|
||||
+ fclose(inFile);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
if (soundfont_file[0])
|
||||
{
|
||||
Index<String> sffiles = str_list_to_index (soundfont_file, ";");
|
||||
--
|
||||
2.21.0
|
||||
2.48.1
|
||||
|
||||
Reference in New Issue
Block a user