diff --git a/media-plugins/audacious-plugins/audacious_plugins-3.9.recipe b/media-plugins/audacious-plugins/audacious_plugins-3.9.recipe index 40461e214..d717d119f 100644 --- a/media-plugins/audacious-plugins/audacious_plugins-3.9.recipe +++ b/media-plugins/audacious-plugins/audacious_plugins-3.9.recipe @@ -11,7 +11,7 @@ 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="4" +REVISION="5" SOURCE_URI="https://github.com/audacious-media-player/audacious-plugins/archive/audacious-plugins-$portVersion.tar.gz" CHECKSUM_SHA256="1d6ec9da502d79735afa5d5377c74c69863348fc8173edc5b4d6c2158b94418c" SOURCE_DIR="audacious-plugins-audacious-plugins-$portVersion" @@ -51,6 +51,7 @@ REQUIRES=" lib:libQt5Network$secondaryArchSuffix lib:libQt5OpenGL$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix + lib:libsamplerate$secondaryArchSuffix lib:libsndfile$secondaryArchSuffix lib:libsoxr$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix @@ -66,10 +67,8 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libaudcore$secondaryArchSuffix devel:libavcodec$secondaryArchSuffix -# devel:libbs2b$secondaryArchSuffix # no recipe yet devel:libcddb$secondaryArchSuffix - devel:libcdio$secondaryArchSuffix # isn't detected -# devel:libcue$secondaryArchSuffix # no recipe yet + devel:libcdio$secondaryArchSuffix devel:libcurl$secondaryArchSuffix devel:libfaad$secondaryArchSuffix devel:libflac$secondaryArchSuffix @@ -86,7 +85,7 @@ BUILD_REQUIRES=" devel:libQt5DBus$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix -# devel:libsidplay2$secondaryArchSuffix # no recipe yet + devel:libsamplerate$secondaryArchSuffix devel:libsndfile$secondaryArchSuffix devel:libsoxr$secondaryArchSuffix devel:libswresample$secondaryArchSuffix @@ -94,6 +93,7 @@ BUILD_REQUIRES=" devel:libvorbisenc$secondaryArchSuffix devel:libwavpack$secondaryArchSuffix devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/media-plugins/audacious-plugins/patches/audacious_plugins-3.9.patchset b/media-plugins/audacious-plugins/patches/audacious_plugins-3.9.patchset index 74a5dee62..633061cf7 100644 --- a/media-plugins/audacious-plugins/patches/audacious_plugins-3.9.patchset +++ b/media-plugins/audacious-plugins/patches/audacious_plugins-3.9.patchset @@ -1,4 +1,4 @@ -From 72cac1dfbba173b58516dd6df998e3ef255ee3eb Mon Sep 17 00:00:00 2001 +From 61246ec7cd6becd381623194f4fd7ac6606261fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sat, 2 Sep 2017 12:11:30 +0200 Subject: Install path fix @@ -21,7 +21,7 @@ index 990d93c..068bea4 100644 2.16.4 -From d4111b6912ac637b4c2988fa8890a8784b0e75e6 Mon Sep 17 00:00:00 2001 +From 0219a34df2b134098a8b40ca5909db35422891a0 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 2 Sep 2017 17:24:06 +0300 Subject: enable icons in qtgui @@ -57,7 +57,7 @@ index 4a16a65..593b19b 100644 2.16.4 -From 0f6cf0a923a97bfe268093a800bc4547c7255d9d Mon Sep 17 00:00:00 2001 +From b16e3219d22d441405f16f2b4c32463174cf3d16 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 @@ -82,7 +82,7 @@ index c764c2a..5179e96 100644 2.16.4 -From 856efd83cd27bfb51da80b239c7251c86fc02112 Mon Sep 17 00:00:00 2001 +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 @@ -658,3 +658,56 @@ index 0000000..bd042c3 -- 2.16.4 + +From 8bc03f0bced99d911bee3c6bb4c176e29b7db5d1 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 + + +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"); + + 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 items) + setMovable (false); + setObjectName ("MainToolBar"); + +-#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 + +diff --git a/src/statusicon-qt/statusicon.cc b/src/statusicon-qt/statusicon.cc +index 2643c4e..f5dbb6e 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); + + audqt::init (); +- ++#ifndef Q_OS_HAIKU + tray = new QSystemTrayIcon (qApp->windowIcon ()); ++#else ++ tray = new QSystemTrayIcon (QIcon::fromTheme ("music-note-16th")); ++#endif + QObject::connect (tray, & QSystemTrayIcon::activated, activate); + menu = audqt::menu_build (items); + tray->setContextMenu (menu); +-- +2.16.4 +