From e8387b7edf7b07a246b34433f10367381f932ac4 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 4 Jan 2019 17:08:07 +1000 Subject: [PATCH] audacious_plugins: bump version --- ...recipe => audacious_plugins-3.10.1.recipe} | 6 +- ...hset => audacious_plugins-3.10.1.patchset} | 108 ++++++++---------- 2 files changed, 52 insertions(+), 62 deletions(-) rename media-plugins/audacious-plugins/{audacious_plugins-3.10.recipe => audacious_plugins-3.10.1.recipe} (96%) rename media-plugins/audacious-plugins/patches/{audacious_plugins-3.10.patchset => audacious_plugins-3.10.1.patchset} (96%) diff --git a/media-plugins/audacious-plugins/audacious_plugins-3.10.recipe b/media-plugins/audacious-plugins/audacious_plugins-3.10.1.recipe similarity index 96% rename from media-plugins/audacious-plugins/audacious_plugins-3.10.recipe rename to media-plugins/audacious-plugins/audacious_plugins-3.10.1.recipe index d9ac9f8f0..575a80bdb 100644 --- a/media-plugins/audacious-plugins/audacious_plugins-3.10.recipe +++ b/media-plugins/audacious-plugins/audacious_plugins-3.10.1.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-2017 Błażej Szczygieł" +COPYRIGHT="2010-2018 Błażej Szczygieł" LICENSE="GNU GPL v3" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/audacious-media-player/audacious-plugins/archive/audacious-plugins-$portVersion.tar.gz" -CHECKSUM_SHA256="3a354c5045eb5d12101c398962b801703c9d3e9180356eb514e3956c5b711781" +CHECKSUM_SHA256="548fd3dd56da5e2f719844fb3dc5c53925a8f0fff21646fc8f88ff41880586e0" SOURCE_DIR="audacious-plugins-audacious-plugins-$portVersion" PATCHES="audacious_plugins-$portVersion.patchset" diff --git a/media-plugins/audacious-plugins/patches/audacious_plugins-3.10.patchset b/media-plugins/audacious-plugins/patches/audacious_plugins-3.10.1.patchset similarity index 96% rename from media-plugins/audacious-plugins/patches/audacious_plugins-3.10.patchset rename to media-plugins/audacious-plugins/patches/audacious_plugins-3.10.1.patchset index 2bcac9856..f2f9d600e 100644 --- a/media-plugins/audacious-plugins/patches/audacious_plugins-3.10.patchset +++ b/media-plugins/audacious-plugins/patches/audacious_plugins-3.10.1.patchset @@ -1,9 +1,52 @@ -From 5cfec2ef5e60d771ba53eaef3f15855653e34e1b Mon Sep 17 00:00:00 2001 +From 53427322102071f8e1b9e60618b1a2fb1a546571 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 13 Aug 2018 17:01:48 +1000 +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 +--- a/configure.ac ++++ b/configure.ac +@@ -603,6 +603,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 +@@ -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/mediakit/Makefile b/src/mediakit/Makefile new file mode 100644 index 0000000..5d59cc1 @@ -537,64 +580,11 @@ index 0000000..bd042c3 +}; + +#endif --- -2.16.4 - - -From f1c76f52e7a6e0fcea7acb138c579cdf606db692 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 13 Aug 2018 17:02:17 +1000 -Subject: Fix build for Haiku - - -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 - -+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 -@@ -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 c8a062d..549491d 100644 +index da5bdc1..17a46b1 100644 --- a/src/statusicon-qt/statusicon.cc +++ b/src/statusicon-qt/statusicon.cc -@@ -206,8 +206,11 @@ bool StatusIcon::init () +@@ -182,8 +182,11 @@ bool StatusIcon::init () aud_config_set_defaults ("statusicon", defaults); audqt::init (); @@ -606,7 +596,7 @@ index c8a062d..549491d 100644 +#endif QObject::connect (tray, & QSystemTrayIcon::activated, activate); menu = audqt::menu_build (items); - QObject::connect (menu, & QMenu::aboutToShow, tray, & SystemTrayIcon::hide_popup); + tray->setContextMenu (menu); -- -2.16.4 +2.19.1