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

[Lars Wendler]

commit:     34eef6a07922036e0df65186efbd86791967a99a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 02:52:27 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 02:58:45 2019 +0000
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 <polynomial-c <AT> 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 85000561ed8055e78342eeeea47064fdbac3a97d62fea26d10d7c8a19d762c73c2bdce0eea89ce2886d027cb64c127792c0848cf73ea427957cc4fd07d0f3842
 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 00000000000..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                                 *
+  *   forkotov02@××.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 @@
+ /***************************************************************************
+- *   Copyright (C) 2013 by Ilya Kotov                                      *
++ *   Copyright (C) 2013-2019 by Ilya Kotov                                 *
+  *   forkotov02@××.ru                                                      *
+  *                                                                         *
+  *   This program is free software; you can redistribute it and/or modify  *
+@@ -40,7 +40,11 @@
+     void selectPreset(int index);
+ 
+ private:
++#ifdef PROJECTM_31
++    void presetSwitchedEvent(bool isHardCut, size_t index) const override;
++#else
+     void presetSwitchedEvent(bool isHardCut, unsigned int index) const override;
++#endif
+ 
+ 
+ };
+Index: qmmp
+===================================================================
+--- qmmp	(revision 8708)
++++ qmmp	(revision 8709)
+
+Property changes on: qmmp
+___________________________________________________________________
+Modified: svn:mergeinfo
+## -0,0 +0,1 ##
+   Merged /trunk/qmmp:r8708

diff --git a/media-sound/qmmp/qmmp-1.3.0.ebuild b/media-sound/qmmp/qmmp-1.3.0.ebuild
new file mode 100644
index 00000000000..a895b3e7408
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.3.0.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.2"
+	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 libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+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
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( || (
+		media-libs/libmad
+		media-sound/mpg123
+	) )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		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? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-projectm-3.1.patch
+)
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}