* [gentoo-commits] repo/gentoo:master commit in: media-sound/qmmp/, media-sound/qmmp/files/
@ 2025-01-06 22:58 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-01-06 22:58 UTC (permalink / raw
To: gentoo-commits
commit: 0c1e80b46afe750dafbdbb0d423a8f76070ce4f5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 6 22:32:39 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 6 22:55:05 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c1e80b4
media-sound/qmmp: Sync live ebuild
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qmmp/files/qmmp-1.6.0-udisks_plugin.patch | 11 -----------
media-sound/qmmp/qmmp-9999.ebuild | 20 +++++---------------
2 files changed, 5 insertions(+), 26 deletions(-)
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
deleted file mode 100644
index 45512099ffeb..000000000000
--- a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index a8f1b4fc79ad..4628e3c5aa07 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -32,12 +32,7 @@ REQUIRED_USE="
"
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
+ dev-qt/qtbase:6[X,dbus,gui,network,sqlite,widgets]
media-libs/taglib:=
x11-libs/libX11
aac? ( media-libs/faad2 )
@@ -49,7 +44,7 @@ RDEPEND="
dev-libs/libcdio-paranoia
)
curl? ( net-misc/curl )
- dbus? ( dev-qt/qtdbus:5 )
+ dbus? ( dev-qt/qtbase:6[dbus] )
enca? ( app-i18n/enca )
ffmpeg? ( media-video/ffmpeg:= )
flac? ( media-libs/flac:= )
@@ -71,12 +66,11 @@ RDEPEND="
opus? ( media-libs/opusfile )
pipewire? ( media-video/pipewire )
projectm? (
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qtopengl:5
+ dev-qt/qtbase:6[-gles2-only,opengl]
media-libs/libprojectm:=
)
pulseaudio? ( media-libs/libpulse )
- qtmedia? ( dev-qt/qtmultimedia:5 )
+ qtmedia? ( dev-qt/qtmultimedia:6 )
scrobbler? ( net-misc/curl )
shout? ( media-libs/libshout )
sid? ( >=media-libs/libsidplayfp-1.1.0 )
@@ -90,14 +84,10 @@ RDEPEND="
wavpack? ( media-sound/wavpack )
"
DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
+BDEPEND="dev-qt/qttools:6[linguist]"
DOCS=( AUTHORS ChangeLog README )
-PATCHES=(
- "${FILESDIR}/${PN}-1.6.0-udisks_plugin.patch"
-)
-
src_prepare() {
if has_version dev-libs/libcdio-paranoia ; then
sed -i \
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/qmmp/, media-sound/qmmp/files/
@ 2025-04-26 2:42 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-04-26 2:42 UTC (permalink / raw
To: gentoo-commits
commit: a8c2a9ebf06daf1393064ec798119ef6dac5023f
Author: Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Tue Jan 14 19:28:09 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 26 02:40:26 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8c2a9eb
media-sound/qmmp: add 2.2.3 with MANY improvements
- added:
- USE flags:
- X
- cddb
- doc
- mpg123 (kills automagic)
- libxcb if USE=X
- liibglvnd if USE=projectm
- patch to build with projectm:4
- implied Gentoo's configure defaults
- subslot operator where needed
- explicitly disabled windows specific configure options
- qtbase[sql] due to required qtbase[sqlite]
- require soxr if USE=jack
- updated:
- branch for live ebuild
- LICENSE
- changed:
- avoid sourceforge redirection
- dbus? () in favor of [dbus?]
- whitespace & some formatting
- merge USE=notifier to USE=X
- removed:
- ineffective src_prepare
- drop subslot operator for libmad & mpg123
- libsamplerate dependency, not needed since 1.1.0
- USE flags:
- analyzer
- cover
- crossfade
- cue
- lyrics
- oss
- qtsui
- scrobbler
- stereo
- tray
Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
Part-of: https://github.com/gentoo/gentoo/pull/39955
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/qmmp/Manifest | 1 +
.../files/qmmp-2.2.3_build-with-projectm4.patch | 17 +++
media-sound/qmmp/metadata.xml | 1 +
media-sound/qmmp/qmmp-2.2.3.ebuild | 167 +++++++++++++++++++++
4 files changed, 186 insertions(+)
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 7a706054408c..701a8181cb23 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1 +1,2 @@
DIST qmmp-2.1.9.tar.bz2 1373111 BLAKE2B a7420c50b4a3e9d41d6e483dce3a0446a202823f673aab2def308b5473563d5ea77730aec771a96a63ef860284bdcaa378dafe9d03c20919cba70b046681bc4c SHA512 87370dfdb856953ff9f89c1308c21133eaef880c3ace1e57ea1e0fde6deea4988c491836139a8d89c41670730838c0b8786fd4208429c709bab3b976efac53a8
+DIST qmmp-2.2.3.tar.bz2 1420014 BLAKE2B 88d77cf5e17e6a4033aab5e5b6eb6c8f6e2ec47d41e6839cc526910c069ed35ab06d72562118c6311479ac1655302fd84513ac8eec44b75dac57ed6b53ffdc1c SHA512 91637a3293030c21c1d0de689bb5e2227e6ea2bf122e9eeeadc303465bc045c6a3621d74af9971ae2f436f3167026eee67e1bcb005f54e71081961d058523770
diff --git a/media-sound/qmmp/files/qmmp-2.2.3_build-with-projectm4.patch b/media-sound/qmmp/files/qmmp-2.2.3_build-with-projectm4.patch
new file mode 100644
index 000000000000..a46f3951f170
--- /dev/null
+++ b/media-sound/qmmp/files/qmmp-2.2.3_build-with-projectm4.patch
@@ -0,0 +1,17 @@
+Source: https://sourceforge.net/p/qmmp-dev/code/12150/
+--- a/src/plugins/Visual/projectm/projectmplugin.cpp
++++ b/src/plugins/Visual/projectm/projectmplugin.cpp
+@@ -59,8 +59,13 @@
+ layout->setContentsMargins(0,0,0,0);
+ setLayout(layout);
+ addActions(m_projectMWidget->actions());
++#ifdef PROJECTM_4
++ connect(m_projectMWidget, &ProjectM4Widget::showMenuToggled, listWidget, &QListWidget::setVisible);
++ connect(m_projectMWidget, &ProjectM4Widget::fullscreenToggled, this, &ProjectMPlugin::setFullScreen);
++#else
+ connect(m_projectMWidget, &ProjectMWidget::showMenuToggled, listWidget, &QListWidget::setVisible);
+ connect(m_projectMWidget, &ProjectMWidget::fullscreenToggled, this, &ProjectMPlugin::setFullScreen);
++#endif
+ listWidget->hide();
+ resize(600,400);
+ QSettings settings;
\ No newline at end of file
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index d25b6f756000..fc9e356154d4 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -19,6 +19,7 @@
<flag name="libxmp">Enable module files renderer (modplug replacement) via <pkg>media-libs/libxmp</pkg></flag>
<flag name="lyrics">Fetch track lyrics from the web</flag>
<flag name="midi">Enable midi support using wildmidi library</flag>
+ <flag name="mpg123">Enable support for MPEG audio playback via <pkg>media-sound/mpg123</pkg></flag>
<flag name="notifier">Enable qmmps' notifier system</flag>
<flag name="pipewire">Enable PipeWire output plugin</flag>
<flag name="projectm">Enable projectm music visualization plugin</flag>
diff --git a/media-sound/qmmp/qmmp-2.2.3.ebuild b/media-sound/qmmp/qmmp-2.2.3.ebuild
new file mode 100644
index 000000000000..b76445ff19f6
--- /dev/null
+++ b/media-sound/qmmp/qmmp-2.2.3.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Qt-based audio player with winamp/xmms skins support"
+HOMEPAGE="https://qmmp.ylsoftware.com"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="
+ https://qmmp.ylsoftware.com/files/qmmp/$(ver_cut 1-2)/${P}.tar.bz2
+ https://downloads.sourceforge.net/project/qmmp-dev/qmmp/$(ver_cut 1-2)/${P}.tar.bz2
+ "
+ KEYWORDS="~amd64 ~x86"
+else
+ inherit subversion
+ QMMP_DEV_BRANCH="2.2"
+ ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="CC-BY-SA-4.0 GPL-2+" # default skin & source code
+SLOT="0"
+# KEYWORDS further up
+IUSE="X aac +alsa archive bs2b cdda cddb curl +dbus doc enca
+ffmpeg flac game gnome jack ladspa libxmp +mad midi mms mpg123
+mplayer musepack opus pipewire projectm pulseaudio qtmedia
+shout sid sndfile soxr udisks +vorbis wavpack
+"
+REQUIRED_USE="
+ cddb? ( cdda )
+ gnome? ( dbus )
+ jack? ( soxr )
+ shout? ( soxr vorbis )
+ udisks? ( dbus )
+"
+# qtbase[sql] to help autounmask of sqlite
+RDEPEND="
+ dev-qt/qtbase:6[X?,dbus?,gui,network,sql,sqlite,widgets]
+ media-libs/taglib:=
+ X? (
+ x11-libs/libX11
+ x11-libs/libxcb:=
+ )
+ 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:=
+ )
+ cddb? ( media-libs/libcddb )
+ curl? ( net-misc/curl )
+ enca? ( app-i18n/enca )
+ ffmpeg? ( media-video/ffmpeg:= )
+ flac? ( media-libs/flac:= )
+ game? ( media-libs/game-music-emu )
+ jack? ( virtual/jack )
+ ladspa? ( media-plugins/cmt-plugins )
+ libxmp? ( media-libs/libxmp )
+ mad? ( media-libs/libmad )
+ midi? ( media-sound/wildmidi )
+ mms? ( media-libs/libmms )
+ mpg123? ( media-sound/mpg123 )
+ mplayer? ( media-video/mplayer )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ opus? ( media-libs/opusfile )
+ pipewire? ( media-video/pipewire:= )
+ projectm? (
+ dev-qt/qtbase:6[-gles2-only,opengl]
+ media-libs/libglvnd
+ media-libs/libprojectm:=
+ )
+ pulseaudio? ( media-libs/libpulse )
+ qtmedia? ( dev-qt/qtmultimedia:6 )
+ 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}
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+ dev-qt/qttools:6[linguist]
+ doc? ( app-text/doxygen )
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+PATCHES=( "${FILESDIR}"/${P}_build-with-projectm4.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ # our defaults
+ -DUSE_CONVERTER=ON # because taglib
+ -DUSE_RGSCAN=ON # because taglib
+ -DUSE_LIBRARY=ON # because qtbase[sqlite]
+
+ # depless non-default options
+ -DUSE_OSS=ON
+
+ # turn off windows specific stuff
+ -DUSE_DSOUND=OFF
+ -DUSE_TASKBAR=OFF
+ -DUSE_RDETECT=OFF
+ -DUSE_WASAPI=OFF
+ -DUSE_WAVEOUT=OFF
+ # set USE flags
+ -DUSE_AAC="$(usex aac)"
+ -DUSE_ALSA="$(usex alsa)"
+ -DUSE_ARCHIVE="$(usex archive)"
+ -DUSE_BS2B="$(usex bs2b)"
+ -DUSE_CDA="$(usex cdda)"
+ -DUSE_LIBCDDB="$(usex cddb)"
+ -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_HOTKEY="$(usex X)"
+ -DUSE_JACK="$(usex jack)"
+ -DUSE_LADSPA="$(usex ladspa)"
+ -DUSE_MAD="$(usex mad)"
+ -DUSE_MIDI="$(usex midi)"
+ -DUSE_MMS="$(usex mms)"
+ -DUSE_MPG123="$(usex mpg123)"
+ -DUSE_MPLAYER="$(usex mplayer)"
+ -DUSE_MPC="$(usex musepack)"
+ -DUSE_NOTIFIER="$(usex X)"
+ -DUSE_OPUS="$(usex opus)"
+ -DUSE_PIPEWIRE="$(usex pipewire)"
+ -DUSE_PROJECTM="$(usex projectm)"
+ -DUSE_PULSE="$(usex pulseaudio)"
+ -DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+ -DUSE_SHOUT="$(usex shout)"
+ -DUSE_SID="$(usex sid)"
+ -DUSE_SKINNED="$(usex X)"
+ -DUSE_SNDFILE="$(usex sndfile)"
+ -DUSE_SOXR="$(usex soxr)"
+ -DUSE_UDISKS="$(usex udisks)"
+ -DUSE_VORBIS="$(usex vorbis)"
+ -DUSE_WAVPACK="$(usex wavpack)"
+ -DUSE_XMP="$(usex libxmp)"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && {
+ cmake_build docs
+ HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ }
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/qmmp/, media-sound/qmmp/files/
@ 2019-06-04 19:49 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-06-04 19:49 UTC (permalink / raw
To: gentoo-commits
commit: 8c91853e176a75b036099d06b0c2b35ec0715f9f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 4 19:18:53 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 4 19:49:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c91853e
media-sound/qmmp: Drop old
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/qmmp/Manifest | 3 -
.../qmmp/files/qmmp-1.3.0-projectm-3.1.patch | 91 -----------
media-sound/qmmp/qmmp-1.2.6.ebuild | 164 --------------------
media-sound/qmmp/qmmp-1.3.0.ebuild | 172 ---------------------
media-sound/qmmp/qmmp-1.3.1.ebuild | 168 --------------------
5 files changed, 598 deletions(-)
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index cb91ce18e3e..778391cc4b5 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,4 +1 @@
-DIST qmmp-1.2.6.tar.bz2 1181291 BLAKE2B fb039d8abcc0e2c6e2e1aa64c603f1f8b81858c48332eaa480d9d71e77958af52352772394fe5c22be653fcb01bc2acc44011e5cf30ab38863f2a2deca6c0ef2 SHA512 c816f530a7b4dabfbe327f4c726c3412c8c22bc9713a288df0f0b405d9831f4958be01b3f9abd35818e54f03e5568eb79cec85bf154ac9ed8075c0bf3fd5a442
-DIST qmmp-1.3.0.tar.bz2 1220426 BLAKE2B 0a64b36876ed672c380c097897aa69f6d44f9d5fc7fdc2006ece63c91438fc72f3df67cf4c63d17dab526d8e67c45593b035df0e1ccfc1c179824807637aa812 SHA512 e91dc40ca8e96c1a5527ca73443e192bb8f2198a449f46911894b0e2779011766b2c6fd3b1786d2fbe3d87ccc7ee6b987ece0a3260144981bb74b96b3b7c3bb3
-DIST qmmp-1.3.1.tar.bz2 1221322 BLAKE2B ab0a4ecf5746926f2778a99d076f2756883621a4962f8f78a57d5eacb9977def9e8c3d186576715735763d991e6ee88d1ecd6f02e601a4b302ccd7ddf4176866 SHA512 936928bbe058253dc8cf95fb17b5ba840b3b51240d68ed9fefe4f09fd918d0908d1fc7ec816b7b08386c3da72fe78da73316e36b1b52018017d2a23fd8275556
DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
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
deleted file mode 100644
index 0db7359bff4..00000000000
--- a/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-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@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 @@
- /***************************************************************************
-- * Copyright (C) 2013 by Ilya Kotov *
-+ * Copyright (C) 2013-2019 by Ilya Kotov *
- * forkotov02@ya.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.2.6.ebuild b/media-sound/qmmp/qmmp-1.2.6.ebuild
deleted file mode 100644
index 81b05993cbe..00000000000
--- a/media-sound/qmmp/qmmp-1.2.6.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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/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 )
- 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 )
-
-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
-}
diff --git a/media-sound/qmmp/qmmp-1.3.0.ebuild b/media-sound/qmmp/qmmp-1.3.0.ebuild
deleted file mode 100644
index a895b3e7408..00000000000
--- a/media-sound/qmmp/qmmp-1.3.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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
-}
diff --git a/media-sound/qmmp/qmmp-1.3.1.ebuild b/media-sound/qmmp/qmmp-1.3.1.ebuild
deleted file mode 100644
index 611727b19b0..00000000000
--- a/media-sound/qmmp/qmmp-1.3.1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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 )
-
-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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-04-26 2:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-06 22:58 [gentoo-commits] repo/gentoo:master commit in: media-sound/qmmp/, media-sound/qmmp/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-04-26 2:42 Sam James
2019-06-04 19:49 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox