haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

audacious_plugins: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2018-08-26 23:37:30 +10:00
parent 5a34703686
commit 086ace1fa5
2 changed files with 54 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-plugins/audacious-plugins/audacious_plugins-3.9.recipe → media-plugins/audacious-plugins/audacious_plugins-3.10.recipe
View File

@@ -11,9 +11,9 @@ fetch lyrics for your music, to set an alarm in the morning, and more."
HOMEPAGE="http://audacious-media-player.org/"
COPYRIGHT="2010-2017 Błażej Szczygieł"
LICENSE="GNU GPL v3"
REVISION="7"
REVISION="1"
SOURCE_URI="https://github.com/audacious-media-player/audacious-plugins/archive/audacious-plugins-$portVersion.tar.gz"
CHECKSUM_SHA256="1d6ec9da502d79735afa5d5377c74c69863348fc8173edc5b4d6c2158b94418c"
CHECKSUM_SHA256="3a354c5045eb5d12101c398962b801703c9d3e9180356eb514e3956c5b711781"
SOURCE_DIR="audacious-plugins-audacious-plugins-$portVersion"
PATCHES="audacious_plugins-$portVersion.patchset"

205
media-plugins/audacious-plugins/patches/audacious_plugins-3.9.patchset → media-plugins/audacious-plugins/patches/audacious_plugins-3.10.patchset
View File

@@ -1,127 +1,9 @@
From 61246ec7cd6becd381623194f4fd7ac6606261fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 2 Sep 2017 12:11:30 +0200
Subject: Install path fix
diff --git a/configure.ac b/configure.ac
index 990d93c..068bea4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -626,7 +626,7 @@ fi
dnl *** End of all plugin checks ***
-plugindir=`pkg-config audacious --variable=plugin_dir`
+plugindir="$libdir/audacious"
AC_SUBST(plugindir)
dnl XXX
--
2.16.4
From 0219a34df2b134098a8b40ca5909db35422891a0 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sat, 2 Sep 2017 17:24:06 +0300
Subject: enable icons in qtgui
diff --git a/src/qtui/Makefile b/src/qtui/Makefile
index 6576ef7..b6dae72 100644
--- a/src/qtui/Makefile
+++ b/src/qtui/Makefile
@@ -22,7 +22,7 @@ include ../../extra.mk
# These overrides variables in buildsys.mk and so must come after it.
PACKAGE_NAME = audacious
-CUSTOM_ICONS=no
+CUSTOM_ICONS=yes
ifeq ($(HAVE_MSWINDOWS),yes)
CUSTOM_ICONS=yes
endif
diff --git a/src/qtui/main_window.cc b/src/qtui/main_window.cc
index 4a16a65..593b19b 100644
--- a/src/qtui/main_window.cc
+++ b/src/qtui/main_window.cc
@@ -95,7 +95,7 @@ MainWindow::MainWindow () :
m_search_tool (aud_plugin_lookup_basename ("search-tool-qt")),
m_playlist_manager (aud_plugin_lookup_basename ("playlist-manager-qt"))
{
-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) || defined(Q_OS_HAIKU)
QIcon::setThemeName ("QtUi");
QStringList paths = QIcon::themeSearchPaths ();
--
2.16.4
From b16e3219d22d441405f16f2b4c32463174cf3d16 Mon Sep 17 00:00:00 2001
From 5cfec2ef5e60d771ba53eaef3f15855653e34e1b Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 17 Jun 2018 11:10:49 +1000
Subject: Fix build for Qt 5.11
Date: Mon, 13 Aug 2018 17:01:48 +1000
Subject: Add Haiku support
diff --git a/src/qtui/info_bar.cc b/src/qtui/info_bar.cc
index c764c2a..5179e96 100644
--- a/src/qtui/info_bar.cc
+++ b/src/qtui/info_bar.cc
@@ -255,8 +255,8 @@ void InfoBar::paintEvent (QPaintEvent *)
if (d.title.text ().isNull () && ! d.orig_title.isNull ())
{
QFontMetrics metrics = p.fontMetrics ();
- d.title = metrics.elidedText (d.orig_title, Qt::ElideRight,
- width () - ps.VisWidth - ps.Height - ps.Spacing);
+ d.title = QStaticText(metrics.elidedText (d.orig_title, Qt::ElideRight,
+ width () - ps.VisWidth - ps.Height - ps.Spacing));
}
p.setPen (QColor (255, 255, 255));
--
2.16.4
From 0c9540d6fe0ba087817d5784e6153ef7578d3c66 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 17 Jun 2018 15:17:02 +1000
Subject: Add MediaKit output plugin
diff --git a/configure.ac b/configure.ac
index 068bea4..5ac84d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -596,6 +596,21 @@ if test "x$enable_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; th
)
fi
+dnl MediaKit
+dnl ==========
+
+AC_ARG_ENABLE(filewriter,
+ [AS_HELP_STRING([--disable-mediakit], [disable MediaKit output plugin (default=enabled)])],
+ [enable_mediakit=$enableval],
+ [enable_mediakit=yes]
+)
+
+have_mediakit=yes
+
+if test "x$enable_mediakit" != "xno"; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS mediakit"
+fi
+
dnl Vorbis and FLAC support support reuse input plugin checks.
if test "x$enable_filewriter" = "xyes" -a "x$have_vorbis" = "xyes"; then
@@ -738,6 +753,7 @@ echo " Jack Audio Connection Kit: $have_jack"
echo " Open Sound System: $have_oss4"
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"
diff --git a/src/mediakit/Makefile b/src/mediakit/Makefile
new file mode 100644
index 0000000..5d59cc1
@@ -659,55 +541,72 @@ index 0000000..bd042c3
2.16.4
From 8bc03f0bced99d911bee3c6bb4c176e29b7db5d1 Mon Sep 17 00:00:00 2001
From f1c76f52e7a6e0fcea7acb138c579cdf606db692 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 17 Jun 2018 20:49:42 +1000
Subject: Use system icon theme
Date: Mon, 13 Aug 2018 17:02:17 +1000
Subject: Fix build for Haiku
diff --git a/src/qtui/main_window.cc b/src/qtui/main_window.cc
index 593b19b..4a16a65 100644
--- a/src/qtui/main_window.cc
+++ b/src/qtui/main_window.cc
@@ -95,7 +95,7 @@ MainWindow::MainWindow () :
m_search_tool (aud_plugin_lookup_basename ("search-tool-qt")),
m_playlist_manager (aud_plugin_lookup_basename ("playlist-manager-qt"))
{
-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) || defined(Q_OS_HAIKU)
+#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
QIcon::setThemeName ("QtUi");
diff --git a/configure.ac b/configure.ac
index edc19b3..511499e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -603,6 +603,21 @@ if test "x$enable_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; th
)
fi
QStringList paths = QIcon::themeSearchPaths ();
diff --git a/src/qtui/tool_bar.cc b/src/qtui/tool_bar.cc
index 348bbbd..81d4c31 100644
--- a/src/qtui/tool_bar.cc
+++ b/src/qtui/tool_bar.cc
@@ -32,7 +32,7 @@ ToolBar::ToolBar (QWidget * parent, ArrayRef<ToolBarItem> items)
setMovable (false);
setObjectName ("MainToolBar");
+dnl MediaKit
+dnl ==========
+
+AC_ARG_ENABLE(filewriter,
+ [AS_HELP_STRING([--disable-mediakit], [disable MediaKit output plugin (default=enabled)])],
+ [enable_mediakit=$enableval],
+ [enable_mediakit=yes]
+)
+
+have_mediakit=yes
+
+if test "x$enable_mediakit" != "xno"; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS mediakit"
+fi
+
dnl Vorbis and FLAC support support reuse input plugin checks.
-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) || defined(Q_OS_HAIKU)
setIconSize (QSize (22, 22));
#endif
if test "x$enable_filewriter" = "xyes" -a "x$have_vorbis" = "xyes"; then
@@ -633,7 +648,7 @@ fi
dnl *** End of all plugin checks ***
-plugindir=`pkg-config audacious --variable=plugin_dir`
+plugindir="$libdir/audacious"
AC_SUBST(plugindir)
dnl XXX
@@ -745,6 +760,7 @@ echo " Jack Audio Connection Kit: $have_jack"
echo " Open Sound System: $have_oss4"
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"
diff --git a/src/statusicon-qt/statusicon.cc b/src/statusicon-qt/statusicon.cc
index 2643c4e..f5dbb6e 100644
index c8a062d..549491d 100644
--- a/src/statusicon-qt/statusicon.cc
+++ b/src/statusicon-qt/statusicon.cc
@@ -100,8 +100,11 @@ bool StatusIcon::init ()
aud_config_set_defaults ("statusicon-qt", defaults);
@@ -206,8 +206,11 @@ bool StatusIcon::init ()
aud_config_set_defaults ("statusicon", defaults);
audqt::init ();
-
+#ifndef Q_OS_HAIKU
tray = new QSystemTrayIcon (qApp->windowIcon ());
tray = new SystemTrayIcon (qApp->windowIcon ());
+#else
+ tray = new QSystemTrayIcon (QIcon::fromTheme ("music-note-16th"));
+ tray = new SystemTrayIcon (QIcon::fromTheme ("music-note-16th"));
+#endif
QObject::connect (tray, & QSystemTrayIcon::activated, activate);
menu = audqt::menu_build (items);
tray->setContextMenu (menu);
QObject::connect (menu, & QMenu::aboutToShow, tray, & SystemTrayIcon::hide_popup);
--
2.16.4