[gentoo-commits] repo/gentoo:master commit in: media-sound/qmmp/files/, media-sound/qmmp/

2022-05-22 Thread Lars Wendler
commit: e4376591bd636479d2781feffbf52943b4275e8a
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun May 22 07:54:48 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun May 22 07:59:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4376591

media-sound/qmmp: Bump to version 1.6.0

Closes: https://bugs.gentoo.org/846890
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/qmmp/Manifest  |   1 +
 .../qmmp/files/qmmp-1.6.0-udisks_plugin.patch  |  11 ++
 media-sound/qmmp/qmmp-1.6.0.ebuild | 163 +
 3 files changed, 175 insertions(+)

diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index c1fd61a98ce8..9b6246e96ef6 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1 +1,2 @@
 DIST qmmp-1.5.4.tar.bz2 1388941 BLAKE2B 
e1a205b6315cd841c7d7a94ed85dca7fcbc74416dcc09458637ccadab96c3a2614039007cdbab404098d2818f4b5cdb7a0bc5cf27e1bfdd0f146d73e2834f230
 SHA512 
5dcc543f75f3baa6115c7c692acaca00b1ad6b62c773ac18ad97447fc17978f067d85b132d1fdb65467474417b7d7e8d8b43e0284196978ca63dd5d431a23bf5
+DIST qmmp-1.6.0.tar.bz2 1364512 BLAKE2B 
3af905fa8af1a23f04d3df30856f881184a5150de571ffb82efc98179c2fe67a232207ad1233c57fde9000facc1df07317b10658e5f462f79083e99deeb7bb9f
 SHA512 
a96242b4eb46fce84f7eefb1dd90cf4c51809c7f8471a405462d95cb3ba5c373e217c50ed48b4ad6b94e1a7e0948839433d4085c41a35991bffd08699a4826f1

diff --git a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch 
b/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
new file mode 100644
index ..45512099ffeb
--- /dev/null
+++ b/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
@@ -0,0 +1,11 @@
+--- qmmp-1.6.0/src/plugins/General/CMakeLists.txt
 qmmp-1.6.0/src/plugins/General/CMakeLists.txt
+@@ -51,7 +51,7 @@
+ ENDIF(USE_HAL AND Qt5DBus_FOUND)
+ 
+ IF(USE_UDISKS2 AND Qt5DBus_FOUND)
+-add_subdirectory(udisks2)
++add_subdirectory(udisks)
+ ENDIF(USE_UDISKS2 AND Qt5DBus_FOUND)
+ 
+ IF(USE_HOTKEY AND Qt5X11Extras_FOUND)

diff --git a/media-sound/qmmp/qmmp-1.6.0.ebuild 
b/media-sound/qmmp/qmmp-1.6.0.ebuild
new file mode 100644
index ..973fbd88a571
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.6.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com;
+if [[ ${PV} !=  ]]; then
+   SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+   mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+   KEYWORDS="~amd64 ~x86"
+else
+   inherit subversion
+   QMMP_DEV_BRANCH="1.3"
+   
ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack xmp"
+
+REQUIRED_USE="
+   gnome? ( dbus )
+   shout? ( soxr vorbis )
+   udisks? ( dbus )
+"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   media-libs/taglib
+   x11-libs/libX11
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   archive? ( app-arch/libarchive )
+   bs2b? ( media-libs/libbs2b )
+   cdda? (
+   dev-libs/libcdio:=
+   dev-libs/libcdio-paranoia
+   )
+   curl? ( net-misc/curl )
+   dbus? ( dev-qt/qtdbus:5 )
+   enca? ( app-i18n/enca )
+   ffmpeg? ( media-video/ffmpeg:= )
+   flac? ( media-libs/flac )
+   game? ( media-libs/game-music-emu )
+   jack? (
+   media-libs/libsamplerate
+   virtual/jack
+   )
+   ladspa? ( media-plugins/cmt-plugins )
+   mad? (
+   media-libs/libmad:=
+   media-sound/mpg123:=
+   )
+   midi? ( media-sound/wildmidi )
+   mms? ( media-libs/libmms )
+   mplayer? ( media-video/mplayer )
+   musepack? ( >=media-sound/musepack-tools-444 )
+   opus? ( media-libs/opusfile )
+   pipewire? ( media-video/pipewire )
+   projectm? (
+   dev-qt/qtgui:5[-gles2-only]
+   dev-qt/qtopengl:5
+   media-libs/libprojectm:=
+   )
+   pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+   qtmedia? ( dev-qt/qtmultimedia:5 )
+   scrobbler? ( net-misc/curl )
+   shout? ( media-libs/libshout )
+   sid? ( >=media-libs/libsidplayfp-1.1.0 )
+   sndfile? ( media-libs/libsndfile )
+   soxr? ( media-libs/soxr )
+   udisks? ( sys-fs/udisks:2 )
+   vorbis? (
+  

[gentoo-commits] repo/gentoo:master commit in: media-sound/qmmp/files/, media-sound/qmmp/

2019-02-13 Thread Lars Wendler
commit: 34eef6a07922036e0df65186efbd86791967a99a
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Feb 14 02:52:27 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Feb 14 02:58:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34eef6a0

media-sound/qmmp: Bump to version 1.3.0

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/qmmp/Manifest  |   1 +
 .../qmmp/files/qmmp-1.3.0-projectm-3.1.patch   |  91 +++
 media-sound/qmmp/qmmp-1.3.0.ebuild | 172 +
 3 files changed, 264 insertions(+)

diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 102c1ab39fb..a9a80162321 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,3 +1,4 @@
 DIST qmmp-1.2.3.tar.bz2 1187718 BLAKE2B 
f57eae68d25d709413a9cd33c48d82488be4e357eb472b19169f821ab96eba6babd75cf6d4492bade95ee590c17cb3dc789018782b136ee0829d337fb391008c
 SHA512 
8daeae416b7c985450c7876145a896b88163608afd971f05eca9e4cbdea65039f21833836fe88cf1ceff253434370e3880c3ee7f30fe3ee7207fa8656a473d1e
 DIST qmmp-1.2.5.tar.bz2 1181154 BLAKE2B 
12a0b3d47a2c844dfecf4c4236147bb3b53b18a37442b61502bc7c8388e7ca180fe744211100314fb9f2abda30174b4cf47810a3e9435262fa977faa3b246ddc
 SHA512 
85000561ed8055e78342a47064fdbac3a97d62fea26d10d7c8a19d762c73c2bdce0eea89ce2886d027cb64c127792c0848cf73ea427957cc4fd07d0f3842
 DIST qmmp-1.2.6.tar.bz2 1181291 BLAKE2B 
fb039d8abcc0e2c6e2e1aa64c603f1f8b81858c48332eaa480d9d71e77958af52352772394fe5c22be653fcb01bc2acc44011e5cf30ab38863f2a2deca6c0ef2
 SHA512 
c816f530a7b4dabfbe327f4c726c3412c8c22bc9713a288df0f0b405d9831f4958be01b3f9abd35818e54f03e5568eb79cec85bf154ac9ed8075c0bf3fd5a442
+DIST qmmp-1.3.0.tar.bz2 1220426 BLAKE2B 
0a64b36876ed672c380c097897aa69f6d44f9d5fc7fdc2006ece63c91438fc72f3df67cf4c63d17dab526d8e67c45593b035df0e1ccfc1c179824807637aa812
 SHA512 
e91dc40ca8e96c1a5527ca73443e192bb8f2198a449f46911894b0e2779011766b2c6fd3b1786d2fbe3d87ccc7ee6b987ece0a3260144981bb74b96b3b7c3bb3

diff --git a/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch 
b/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch
new file mode 100644
index 000..0db7359bff4
--- /dev/null
+++ b/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch
@@ -0,0 +1,91 @@
+Index: qmmp/src/plugins/Visual/projectm/CMakeLists.txt
+===
+--- qmmp/src/plugins/Visual/projectm/CMakeLists.txt(revision 8708)
 qmmp/src/plugins/Visual/projectm/CMakeLists.txt(revision 8709)
+@@ -15,6 +15,12 @@
+   MESSAGE(WARNING "Unsuppoted OpenGL implementation, projectM disabled")
+ ENDIF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
+ 
++pkg_search_module(PROJECTM_31 libprojectM>=3.1.0)
++
++IF(PROJECTM_31_FOUND)
++ADD_DEFINITIONS(-DPROJECTM_31)
++ENDIF(PROJECTM_31_FOUND)
++
+ find_file(PROJECTM_CONFIG config.inp
+   PATHS "/usr/share/projectM/" "/usr/local/share/projectM/")
+ 
+Index: qmmp/src/plugins/Visual/projectm/projectm.pro
+===
+--- qmmp/src/plugins/Visual/projectm/projectm.pro  (revision 8708)
 qmmp/src/plugins/Visual/projectm/projectm.pro  (revision 8709)
+@@ -13,6 +13,8 @@
+ 
+ RESOURCES = translations/translations.qrc
+ 
++#DEFINES += PROJECTM_31
++
+ unix {
+ PKGCONFIG += libprojectM
+ target.path = $$PLUGIN_DIR/Visual
+Index: qmmp/src/plugins/Visual/projectm/projectmwrapper.cpp
+===
+--- qmmp/src/plugins/Visual/projectm/projectmwrapper.cpp   (revision 8708)
 qmmp/src/plugins/Visual/projectm/projectmwrapper.cpp   (revision 8709)
+@@ -1,5 +1,5 @@
+ /***
+- *   Copyright (C) 2013 by Ilya Kotov  *
++ *   Copyright (C) 2013-2019 by Ilya Kotov *
+  *   forkoto...@ya.ru  *
+  * *
+  *   This program is free software; you can redistribute it and/or modify  *
+@@ -40,8 +40,16 @@
+ projectM::selectPreset(index);
+ }
+ 
++#ifdef PROJECTM_31
++void ProjectMWrapper::presetSwitchedEvent(bool isHardCut, size_t index) const
++{
++Q_UNUSED(isHardCut);
++emit currentPresetChanged(index);
++}
++#else
+ void ProjectMWrapper::presetSwitchedEvent(bool isHardCut, unsigned int index) 
const
+ {
+ Q_UNUSED(isHardCut);
+ emit currentPresetChanged(index);
+ }
++#endif
+Index: qmmp/src/plugins/Visual/projectm/projectmwrapper.h
+===
+--- qmmp/src/plugins/Visual/projectm/projectmwrapper.h (revision 8708)
 qmmp/src/plugins/Visual/projectm/projectmwrapper.h (revision 8709)
+@@ -1,5 +1,5 @@
+