public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: media-sound/TauonMusicBox/files/, media-sound/TauonMusicBox/
@ 2024-02-23  1:36 David Roman
  0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2024-02-23  1:36 UTC (permalink / raw
  To: gentoo-commits

commit:     dd358e90547f1809674369e2d55abb737b4c7c65
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Fri Feb 23 01:13:04 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri Feb 23 01:13:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dd358e90

media-sound/TauonMusicBox: new package, add 7.7.1, 9999

Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/guru/pull/132

 media-sound/TauonMusicBox/Manifest                 |   1 +
 .../TauonMusicBox/TauonMusicBox-7.7.1.ebuild       | 102 ++++++++++++++
 .../TauonMusicBox/TauonMusicBox-9999.ebuild        | 102 ++++++++++++++
 .../files/TauonMusicBox-fix-build-system.patch     | 156 +++++++++++++++++++++
 media-sound/TauonMusicBox/metadata.xml             |  11 ++
 5 files changed, 372 insertions(+)

diff --git a/media-sound/TauonMusicBox/Manifest b/media-sound/TauonMusicBox/Manifest
new file mode 100644
index 0000000000..c93e2ad79d
--- /dev/null
+++ b/media-sound/TauonMusicBox/Manifest
@@ -0,0 +1 @@
+DIST TauonMusicBox-7.7.1.tar.gz 1049204 BLAKE2B 0d1c4fbf7264bedbdb33fba00de141edffbd2290f3b39faf6e9b82a64f6a75ad30233f6e6071fa351bb9fba935e1d5323e550b25cc8fb4a9a35df34e38531774 SHA512 671d626f14358b6db96da24169ef428911a9e50501b2cc61e1bbc43f8fa7f6b76682e438f86fb94d1e4772085150d602a6a87d3e8bd74a5f77aba11efcda397f

diff --git a/media-sound/TauonMusicBox/TauonMusicBox-7.7.1.ebuild b/media-sound/TauonMusicBox/TauonMusicBox-7.7.1.ebuild
new file mode 100644
index 0000000000..4a820a6fb5
--- /dev/null
+++ b/media-sound/TauonMusicBox/TauonMusicBox-7.7.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="cs de es fr_FR hu id it ja_JP nb_NO pl pt pt_BR pt_PT ru sv tr zh_CN"
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit cmake desktop distutils-r1 plocale
+
+DESCRIPTION="The desktop music player of today!"
+HOMEPAGE="https://tauonmusicbox.rocks/"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_SUBMODULES=()
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Taiko2k/${PN}"
+else
+	SRC_URI="https://github.com/Taiko2k/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+PHAZOR_DEPS="
+	dev-libs/miniaudio
+	media-libs/flac
+	media-libs/libopenmpt
+	media-sound/mpg123
+	media-libs/opus
+	media-libs/opusfile
+	media-sound/wavpack
+	media-libs/libsamplerate
+	sci-libs/kissfft[-cpu_flags_x86_sse]
+"
+
+DEPEND="
+	dev-python/musicbrainzngs[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/PySDL2[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+
+	${PHAZOR_DEPS}
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	# Workaround. If PATCHES is used it would be applied to times and fail
+	eapply "${FILESDIR}/${PN}-fix-build-system.patch"
+
+	distutils-r1_src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+	distutils-r1_src_configure
+	cmake_src_configure
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	cmake_src_compile
+
+	build_locale() {
+		msgfmt -o "locale/${1}/LC_MESSAGES/tauon.mo" "locale/${1}/LC_MESSAGES/tauon.po" || die
+	}
+
+	plocale_for_each_locale build_locale
+}
+
+src_test() {
+	distutils-r1_src_test
+	cmake_src_test
+}
+
+python_install() {
+	dobin tauon.py
+	dolib.so  "${WORKDIR}/${P}_build/libphazor.so"
+
+	install_locale() {
+		insinto "/usr/share/locale/${1}/LC_MESSAGES"
+		doins "locale/${1}/LC_MESSAGES/tauon.mo"
+	}
+
+	plocale_for_each_locale install_locale
+
+	insinto "/usr/share/${PN}"
+	doins -r assets theme templates
+	doins input.txt
+	dosym "/usr/$(get_libdir)/libphazor.so" "/usr/share/${PN}/lib/libphazor.so"
+
+	sed -i 's/\/opt\/tauon-music-box\/tauonmb.sh/tauon.py/g' extra/tauonmb.desktop || die
+	domenu extra/tauonmb.desktop
+	doicon -s scalable extra/tauonmb.svg
+
+	distutils-r1_python_install
+}

diff --git a/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild b/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild
new file mode 100644
index 0000000000..4a820a6fb5
--- /dev/null
+++ b/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="cs de es fr_FR hu id it ja_JP nb_NO pl pt pt_BR pt_PT ru sv tr zh_CN"
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit cmake desktop distutils-r1 plocale
+
+DESCRIPTION="The desktop music player of today!"
+HOMEPAGE="https://tauonmusicbox.rocks/"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_SUBMODULES=()
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Taiko2k/${PN}"
+else
+	SRC_URI="https://github.com/Taiko2k/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+PHAZOR_DEPS="
+	dev-libs/miniaudio
+	media-libs/flac
+	media-libs/libopenmpt
+	media-sound/mpg123
+	media-libs/opus
+	media-libs/opusfile
+	media-sound/wavpack
+	media-libs/libsamplerate
+	sci-libs/kissfft[-cpu_flags_x86_sse]
+"
+
+DEPEND="
+	dev-python/musicbrainzngs[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/PySDL2[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+
+	${PHAZOR_DEPS}
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	# Workaround. If PATCHES is used it would be applied to times and fail
+	eapply "${FILESDIR}/${PN}-fix-build-system.patch"
+
+	distutils-r1_src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+	distutils-r1_src_configure
+	cmake_src_configure
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	cmake_src_compile
+
+	build_locale() {
+		msgfmt -o "locale/${1}/LC_MESSAGES/tauon.mo" "locale/${1}/LC_MESSAGES/tauon.po" || die
+	}
+
+	plocale_for_each_locale build_locale
+}
+
+src_test() {
+	distutils-r1_src_test
+	cmake_src_test
+}
+
+python_install() {
+	dobin tauon.py
+	dolib.so  "${WORKDIR}/${P}_build/libphazor.so"
+
+	install_locale() {
+		insinto "/usr/share/locale/${1}/LC_MESSAGES"
+		doins "locale/${1}/LC_MESSAGES/tauon.mo"
+	}
+
+	plocale_for_each_locale install_locale
+
+	insinto "/usr/share/${PN}"
+	doins -r assets theme templates
+	doins input.txt
+	dosym "/usr/$(get_libdir)/libphazor.so" "/usr/share/${PN}/lib/libphazor.so"
+
+	sed -i 's/\/opt\/tauon-music-box\/tauonmb.sh/tauon.py/g' extra/tauonmb.desktop || die
+	domenu extra/tauonmb.desktop
+	doicon -s scalable extra/tauonmb.svg
+
+	distutils-r1_python_install
+}

diff --git a/media-sound/TauonMusicBox/files/TauonMusicBox-fix-build-system.patch b/media-sound/TauonMusicBox/files/TauonMusicBox-fix-build-system.patch
new file mode 100644
index 0000000000..dad565e16c
--- /dev/null
+++ b/media-sound/TauonMusicBox/files/TauonMusicBox-fix-build-system.patch
@@ -0,0 +1,156 @@
+From fea857478425a10ee285818e1c987d1efdbb6a5c Mon Sep 17 00:00:00 2001
+From: David Roman <davidroman96@gmail.com>
+Date: Tue, 30 Jan 2024 23:34:48 +0100
+Subject: [PATCH 1/3] Add CmakeLists.txt file to compile phrazor
+
+Closes: #828
+---
+ CMakeLists.txt | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+ create mode 100644 CMakeLists.txt
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 000000000..cf79faf5b
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,19 @@
++cmake_minimum_required(VERSION 3.10)
++project(phazor)
++
++add_library(phazor SHARED src/phazor/phazor.c)
++
++find_package(PkgConfig REQUIRED)
++
++pkg_check_modules(phazor REQUIRED flac libopenmpt libmpg123 opus opusfile wavpack samplerate)
++
++find_package(kissfft CONFIG COMPONENTS float)
++if(NOT kissfft_FOUND)
++	add_subdirectory(src/phazor/kissfft)
++endif()
++
++target_include_directories(phazor PRIVATE ${phazor_INCLUDE_DIRS})
++target_link_libraries(phazor kissfft::kissfft ${phazor_LIBRARIES})
++
++
++install(TARGETS phazor DESTINATION ${CMAKE_SOURCE_DIR}/lib)
+
+From 44785f42480b7e53fda707b839153c3665ae4df0 Mon Sep 17 00:00:00 2001
+From: David Roman <davidroman96@gmail.com>
+Date: Thu, 1 Feb 2024 19:35:58 +0100
+Subject: [PATCH 2/3] Add setup.py and fix install_directory for Linux installs
+
+---
+ setup.py            | 16 ++++++++++++++++
+ t_modules/t_main.py |  4 ++++
+ tauon.py            | 15 +++++++++------
+ 3 files changed, 29 insertions(+), 6 deletions(-)
+ create mode 100644 setup.py
+
+diff --git a/setup.py b/setup.py
+new file mode 100644
+index 000000000..dbfa6257a
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,16 @@
++from setuptools import setup, find_packages, Extension
++
++with open('requirements.txt') as f:
++    required = f.read().splitlines()
++
++setup(
++    name = 'Tauon Music Box',
++    packages = find_packages(),
++    version = '7.7.2',
++    url = 'https://tauonmusicbox.rocks/',
++    license = 'GPL-3',
++    install_requires=required,
++	classifiers=[
++		'Programming Language :: Python :: 3'
++	],
++)
+diff --git a/t_modules/t_main.py b/t_modules/t_main.py
+index ebbd325b8..7cbb9782c 100644
+--- a/t_modules/t_main.py
++++ b/t_modules/t_main.py
+@@ -141,6 +141,10 @@
+ # if system == "windows" or msys:
+ #     os.environ["PYSDL2_DLL_PATH"] = install_directory + "\\lib"
+ 
++# Assume that it's a classic Linux install, use standard paths
++if install_directory.startswith("/usr/"):
++    install_directory = "/usr/share/TauonMusicBox"
++
+ # Set data folders (portable mode)
+ user_directory = install_directory
+ config_directory = user_directory
+diff --git a/tauon.py b/tauon.py
+index 6dec8f340..8c502a1a3 100755
+--- a/tauon.py
++++ b/tauon.py
+@@ -78,11 +78,6 @@ def transfer_args_and_exit():
+      os.environ["PATH"] += ":" + sys._MEIPASS
+      os.environ['SSL_CERT_FILE'] = os.path.join(install_directory, "certifi", "cacert.pem")
+ 
+-user_directory = os.path.join(install_directory, "user-data")
+-config_directory = user_directory
+-
+-asset_directory = os.path.join(install_directory, "assets")
+-
+ # If we're installed, use home data locations
+ install_mode = False
+ if install_directory.startswith("/opt/")\
+@@ -91,6 +86,14 @@ def transfer_args_and_exit():
+         or install_directory.startswith("/snap/") or sys.platform == "darwin" or sys.platform == 'win32':
+     install_mode = True
+ 
++# Assume that it's a classic Linux install, use standard paths
++if install_directory.startswith("/usr/"):
++    install_directory = "/usr/share/TauonMusicBox"
++
++user_directory = os.path.join(install_directory, "user-data")
++config_directory = user_directory
++asset_directory = os.path.join(install_directory, "assets")
++
+ if install_directory.startswith("/app/"):
+     # Its Flatpak
+     t_id = "com.github.taiko2k.tauonmb"
+@@ -345,7 +348,7 @@ def transfer_args_and_exit():
+ del flags
+ del img_path
+ 
+-if pyinstaller_mode or sys.platform == "darwin":
++if pyinstaller_mode or sys.platform == "darwin" or install_mode:
+     from t_modules import t_main
+ else:
+     # Using the above import method breaks previous pickles. Could be fixed
+
+From e5f16cfa1176421f4a3b7990a8d30158c9141ae6 Mon Sep 17 00:00:00 2001
+From: David Roman <davidroman96@gmail.com>
+Date: Fri, 2 Feb 2024 15:56:37 +0100
+Subject: [PATCH 3/3] Search phazor.so from standard LD_LIBRARY_PATH
+
+By removing the hardcoded path we allow LoadLibrary to search the
+library from LD_LIBRARY_PATH directories
+---
+ t_modules/t_phazor.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/t_modules/t_phazor.py b/t_modules/t_phazor.py
+index 2ec5724c9..0c629f62c 100644
+--- a/t_modules/t_phazor.py
++++ b/t_modules/t_phazor.py
+@@ -55,7 +55,12 @@ def player4(tauon):
+     loaded_track = None
+     fade_time = 400
+ 
+-    aud = ctypes.cdll.LoadLibrary(pctl.install_directory + "/lib/libphazor.so")
++    if os.path.isfile(pctl.install_directory + "/lib/libphazor.so"):
++        # XXX: May be unnecesary. It's only to ensure compatibility with WWindows
++        aud = ctypes.cdll.LoadLibrary(pctl.install_directory + "/lib/libphazor.so")
++    else:
++        aud = ctypes.cdll.LoadLibrary("libphazor.so")
++
+     aud.init()
+ 
+     aud.get_device.restype = ctypes.c_char_p

diff --git a/media-sound/TauonMusicBox/metadata.xml b/media-sound/TauonMusicBox/metadata.xml
new file mode 100644
index 0000000000..d30548692a
--- /dev/null
+++ b/media-sound/TauonMusicBox/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Taiko2k/TauronMusicBox</remote-id> 
+	</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-sound/TauonMusicBox/, media-sound/TauonMusicBox/files/
  2024-04-19 10:08 [gentoo-commits] repo/proj/guru:master commit in: media-sound/TauonMusicBox/files/, media-sound/TauonMusicBox/ David Roman
@ 2024-04-19  9:49 ` David Roman
  0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2024-04-19  9:49 UTC (permalink / raw
  To: gentoo-commits

commit:     7fa19192157da7ddfcd9d61706308e8fd654e076
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Fri Apr 19 09:49:14 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri Apr 19 09:49:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7fa19192

media-sound/TauonMusicBox: fix desktop file and icon cache

Closes: https://bugs.gentoo.org/930236
Closes: https://bugs.gentoo.org/930237
Closes: https://bugs.gentoo.org/925576
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>

 .../TauonMusicBox/TauonMusicBox-7.7.2-r2.ebuild    | 122 +++++++++++++++++++++
 .../files/TauonMusicBox-fix-desktop.patch          |  22 ++++
 2 files changed, 144 insertions(+)

diff --git a/media-sound/TauonMusicBox/TauonMusicBox-7.7.2-r2.ebuild b/media-sound/TauonMusicBox/TauonMusicBox-7.7.2-r2.ebuild
new file mode 100644
index 0000000000..ae30a05d6b
--- /dev/null
+++ b/media-sound/TauonMusicBox/TauonMusicBox-7.7.2-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="cs de es fr_FR hu id it ja_JP nb_NO pl pt pt_BR pt_PT ru sv tr zh_CN"
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit cmake desktop distutils-r1 optfeature plocale xdg
+
+DESCRIPTION="The desktop music player of today!"
+HOMEPAGE="https://tauonmusicbox.rocks/"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_SUBMODULES=()
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Taiko2k/${PN}"
+else
+	SRC_URI="https://github.com/Taiko2k/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+PHAZOR_DEPS="
+	dev-libs/miniaudio
+	media-libs/flac
+	media-libs/libopenmpt
+	media-libs/opus
+	media-libs/opusfile
+	media-libs/libsamplerate
+	media-libs/libvorbis
+	media-sound/mpg123
+	media-sound/wavpack
+	sci-libs/kissfft[-cpu_flags_x86_sse]
+"
+
+DEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/musicbrainzngs[${PYTHON_USEDEP}]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/PySDL2[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	media-video/ffmpeg
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-libs/sdl2-image
+
+	${PHAZOR_DEPS}
+"
+
+RDEPEND="
+	${DEPEND}
+
+	dev-libs/libappindicator
+	x11-libs/libnotify
+"
+
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	# Workaround. If PATCHES is used it would be applied to times and fail
+	eapply "${FILESDIR}/${PN}-fix-desktop.patch"
+
+	distutils-r1_src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+	distutils-r1_src_configure
+	cmake_src_configure
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	cmake_src_compile
+
+	build_locale() {
+		msgfmt -o "locale/${1}/LC_MESSAGES/tauon.mo" "locale/${1}/LC_MESSAGES/tauon.po" || die
+	}
+
+	plocale_for_each_locale build_locale
+}
+
+src_test() {
+	distutils-r1_src_test
+	cmake_src_test
+}
+
+python_install() {
+	newbin tauon.py tauon
+	dolib.so  "${WORKDIR}/${P}_build/libphazor.so"
+	dosym "/usr/$(get_libdir)/libphazor.so" "/usr/share/${PN}/lib/libphazor.so"
+
+	install_locale() {
+		insinto "/usr/share/locale/${1}/LC_MESSAGES"
+		doins "locale/${1}/LC_MESSAGES/tauon.mo"
+	}
+
+	plocale_for_each_locale install_locale
+
+	insinto "/usr/share/${PN}"
+	doins -r assets theme templates
+	doins input.txt
+
+	sed -i 's/\/opt\/tauon-music-box\/tauonmb.sh/tauon/g' extra/tauonmb.desktop || die
+	domenu extra/tauonmb.desktop
+	doicon -s scalable extra/tauonmb.svg
+
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "last fm support" dev-python/pylast
+	optfeature "PLEX support" dev-python/plexapi
+
+	xdg_pkg_postinst
+}

diff --git a/media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch b/media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch
new file mode 100644
index 0000000000..4de98dc146
--- /dev/null
+++ b/media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch
@@ -0,0 +1,22 @@
+From 203ed16eef31cc199853ecef9d947eb147ab4f16 Mon Sep 17 00:00:00 2001
+From: David Roman <davidroman96@gmail.com>
+Date: Fri, 19 Apr 2024 02:02:08 +0200
+Subject: [PATCH] tauonmb.desktop: add mising stop action (#1132)
+
+---
+ extra/tauonmb.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extra/tauonmb.desktop b/extra/tauonmb.desktop
+index 1a98fc4e2..5d049f084 100644
+--- a/extra/tauonmb.desktop
++++ b/extra/tauonmb.desktop
+@@ -21,7 +21,7 @@ StartupWMClass=Tauon Music Box
+ Terminal=false
+ Type=Application
+ Categories=AudioVideo;Player;Audio;
+-Actions=PlayPause;Previous;Next
++Actions=PlayPause;Previous;Next;Stop
+ 
+ [Desktop Action PlayPause]
+ Exec=/opt/tauon-music-box/tauonmb.sh --no-start --play-pause


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-sound/TauonMusicBox/files/, media-sound/TauonMusicBox/
@ 2024-04-19 10:08 David Roman
  2024-04-19  9:49 ` [gentoo-commits] repo/proj/guru:dev commit in: media-sound/TauonMusicBox/, media-sound/TauonMusicBox/files/ David Roman
  0 siblings, 1 reply; 4+ messages in thread
From: David Roman @ 2024-04-19 10:08 UTC (permalink / raw
  To: gentoo-commits

commit:     7fa19192157da7ddfcd9d61706308e8fd654e076
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Fri Apr 19 09:49:14 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri Apr 19 09:49:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7fa19192

media-sound/TauonMusicBox: fix desktop file and icon cache

Closes: https://bugs.gentoo.org/930236
Closes: https://bugs.gentoo.org/930237
Closes: https://bugs.gentoo.org/925576
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>

 .../TauonMusicBox/TauonMusicBox-7.7.2-r2.ebuild    | 122 +++++++++++++++++++++
 .../files/TauonMusicBox-fix-desktop.patch          |  22 ++++
 2 files changed, 144 insertions(+)

diff --git a/media-sound/TauonMusicBox/TauonMusicBox-7.7.2-r2.ebuild b/media-sound/TauonMusicBox/TauonMusicBox-7.7.2-r2.ebuild
new file mode 100644
index 0000000000..ae30a05d6b
--- /dev/null
+++ b/media-sound/TauonMusicBox/TauonMusicBox-7.7.2-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="cs de es fr_FR hu id it ja_JP nb_NO pl pt pt_BR pt_PT ru sv tr zh_CN"
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit cmake desktop distutils-r1 optfeature plocale xdg
+
+DESCRIPTION="The desktop music player of today!"
+HOMEPAGE="https://tauonmusicbox.rocks/"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_SUBMODULES=()
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Taiko2k/${PN}"
+else
+	SRC_URI="https://github.com/Taiko2k/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+PHAZOR_DEPS="
+	dev-libs/miniaudio
+	media-libs/flac
+	media-libs/libopenmpt
+	media-libs/opus
+	media-libs/opusfile
+	media-libs/libsamplerate
+	media-libs/libvorbis
+	media-sound/mpg123
+	media-sound/wavpack
+	sci-libs/kissfft[-cpu_flags_x86_sse]
+"
+
+DEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/musicbrainzngs[${PYTHON_USEDEP}]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/PySDL2[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	media-video/ffmpeg
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-libs/sdl2-image
+
+	${PHAZOR_DEPS}
+"
+
+RDEPEND="
+	${DEPEND}
+
+	dev-libs/libappindicator
+	x11-libs/libnotify
+"
+
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	# Workaround. If PATCHES is used it would be applied to times and fail
+	eapply "${FILESDIR}/${PN}-fix-desktop.patch"
+
+	distutils-r1_src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+	distutils-r1_src_configure
+	cmake_src_configure
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	cmake_src_compile
+
+	build_locale() {
+		msgfmt -o "locale/${1}/LC_MESSAGES/tauon.mo" "locale/${1}/LC_MESSAGES/tauon.po" || die
+	}
+
+	plocale_for_each_locale build_locale
+}
+
+src_test() {
+	distutils-r1_src_test
+	cmake_src_test
+}
+
+python_install() {
+	newbin tauon.py tauon
+	dolib.so  "${WORKDIR}/${P}_build/libphazor.so"
+	dosym "/usr/$(get_libdir)/libphazor.so" "/usr/share/${PN}/lib/libphazor.so"
+
+	install_locale() {
+		insinto "/usr/share/locale/${1}/LC_MESSAGES"
+		doins "locale/${1}/LC_MESSAGES/tauon.mo"
+	}
+
+	plocale_for_each_locale install_locale
+
+	insinto "/usr/share/${PN}"
+	doins -r assets theme templates
+	doins input.txt
+
+	sed -i 's/\/opt\/tauon-music-box\/tauonmb.sh/tauon/g' extra/tauonmb.desktop || die
+	domenu extra/tauonmb.desktop
+	doicon -s scalable extra/tauonmb.svg
+
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "last fm support" dev-python/pylast
+	optfeature "PLEX support" dev-python/plexapi
+
+	xdg_pkg_postinst
+}

diff --git a/media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch b/media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch
new file mode 100644
index 0000000000..4de98dc146
--- /dev/null
+++ b/media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch
@@ -0,0 +1,22 @@
+From 203ed16eef31cc199853ecef9d947eb147ab4f16 Mon Sep 17 00:00:00 2001
+From: David Roman <davidroman96@gmail.com>
+Date: Fri, 19 Apr 2024 02:02:08 +0200
+Subject: [PATCH] tauonmb.desktop: add mising stop action (#1132)
+
+---
+ extra/tauonmb.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extra/tauonmb.desktop b/extra/tauonmb.desktop
+index 1a98fc4e2..5d049f084 100644
+--- a/extra/tauonmb.desktop
++++ b/extra/tauonmb.desktop
+@@ -21,7 +21,7 @@ StartupWMClass=Tauon Music Box
+ Terminal=false
+ Type=Application
+ Categories=AudioVideo;Player;Audio;
+-Actions=PlayPause;Previous;Next
++Actions=PlayPause;Previous;Next;Stop
+ 
+ [Desktop Action PlayPause]
+ Exec=/opt/tauon-music-box/tauonmb.sh --no-start --play-pause


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-sound/TauonMusicBox/files/, media-sound/TauonMusicBox/
  2025-02-24  9:49 David Roman
@ 2025-02-24 10:34 ` David Roman
  0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2025-02-24 10:34 UTC (permalink / raw
  To: gentoo-commits

commit:     42031807c24b84648789d9cf91c76dd6b8feae73
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Mon Feb 24 09:46:53 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Feb 24 09:48:37 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=42031807

media-sound/TauonMusicBox: drop 7.8.0-r1, update 9999

Signed-off-by: David Roman <davidroman96 <AT> gmail.com>

 media-sound/TauonMusicBox/Manifest                 |   1 -
 .../TauonMusicBox/TauonMusicBox-9999.ebuild        |  35 ++-----
 .../TauonMusicBox-7.8.0-unidecode-compat.patch     | 102 ---------------------
 .../files/TauonMusicBox-fix-desktop.patch          |  22 -----
 4 files changed, 9 insertions(+), 151 deletions(-)

diff --git a/media-sound/TauonMusicBox/Manifest b/media-sound/TauonMusicBox/Manifest
index 29994b0f8..0246a82e0 100644
--- a/media-sound/TauonMusicBox/Manifest
+++ b/media-sound/TauonMusicBox/Manifest
@@ -1,3 +1,2 @@
-DIST TauonMusicBox-7.8.0.tar.gz 1080654 BLAKE2B 6c671efc10f0e7340bb2db0ebcc59f25784a665a9a2e85ab5132a10362d9d0f7041affedc763ed5acde19c529c742e127eb1493578f9f79ca7f3b1dfd4439784 SHA512 0896e185314037e23d76776ce96b227ede8a96651958df7ca0acc0d37c431169aeb72395116d8887d37c1360c15f436f7488c751866e60fa5ba3a5082b9acef8
 DIST TauonMusicBox-7.8.3.tar.gz 1085686 BLAKE2B 92014544bc45c92ca8170ae88c56eb2a767b0dff2dcd1086cb73d22a4287b6a82be7b3134a41329940ccc6080377d82b71c2d9ef891975d62756068c8a97f867 SHA512 f1679326a49c1d341ea773b5f402fa4ad00ac2c79549fc04b2959bdf2dfad045e6e88add5b9075e660016a4d94d15e43e5d5c93e6f413e727d30f5aaa8fbdc1d
 DIST TauonMusicBox-7.9.0.tar.gz 1354787 BLAKE2B 2116c84ec687ec337e712aefa5da54b08e572b917c3a41d94687a95bfefd8d7a3276422b4e68cda8ed5f27f92a32bf491d41f1f4476e193f19ce927d6f6d02b4 SHA512 17b26b296385f3c2b6006a6a33453e5a277c8bc901f717bac3751bddc1691116e0bf116db9457e425d61d300200b5ca487f5b4949ca2be2993657be4fa9d87cf

diff --git a/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild b/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild
index 3d53a8974..7c7e65a87 100644
--- a/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild
+++ b/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild
@@ -5,9 +5,10 @@ EAPI=8
 PLOCALES="cs de es fr_FR hu id it ja_JP nb_NO pl pt pt_BR pt_PT ru sv tr zh_CN"
 
 PYTHON_COMPAT=( python3_{11..12} )
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 
-inherit cmake desktop distutils-r1 optfeature plocale xdg
+inherit desktop distutils-r1 optfeature plocale xdg
 
 DESCRIPTION="The desktop music player of today!"
 HOMEPAGE="https://tauonmusicbox.rocks/"
@@ -21,12 +22,15 @@ else
 	KEYWORDS="~amd64"
 fi
 
+S="${WORKDIR}/Tauon-${PV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 
 PHAZOR_DEPS="
 	dev-libs/miniaudio
 	media-libs/flac
+	media-libs/game-music-emu
 	media-libs/libopenmpt
 	media-libs/opus
 	media-libs/opusfile
@@ -46,6 +50,7 @@ DEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/setproctitle[${PYTHON_USEDEP}]
 	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
 	media-video/ffmpeg
 	media-libs/mutagen[${PYTHON_USEDEP}]
 	media-libs/sdl2-image
@@ -57,27 +62,16 @@ RDEPEND="
 	${DEPEND}
 
 	dev-libs/libayatana-appindicator
+	media-sound/mpg123-base
 	x11-libs/libnotify
 "
 
 BDEPEND="sys-devel/gettext"
 
-src_prepare() {
-	# Workaround. If PATCHES is used it would be applied to times and fail
-	eapply "${FILESDIR}/${PN}-fix-desktop.patch"
-
-	distutils-r1_src_prepare
-	cmake_src_prepare
-}
-
-src_configure() {
-	distutils-r1_src_configure
-	cmake_src_configure
-}
+PATCHES=( "${FILESDIR}/${PN}-7.9.0-phazor-build.patch" )
 
 src_compile() {
 	distutils-r1_src_compile
-	cmake_src_compile
 
 	build_locale() {
 		msgfmt -o "locale/${1}/LC_MESSAGES/tauon.mo" "locale/${1}/LC_MESSAGES/tauon.po" || die
@@ -86,14 +80,8 @@ src_compile() {
 	plocale_for_each_locale build_locale
 }
 
-src_test() {
-	distutils-r1_src_test
-	cmake_src_test
-}
-
 python_install() {
-	newbin tauon.py tauon
-	dolib.so  "${WORKDIR}/${P}_build/libphazor.so"
+	distutils-r1_python_install
 
 	install_locale() {
 		insinto "/usr/share/locale/${1}/LC_MESSAGES"
@@ -102,15 +90,10 @@ python_install() {
 
 	plocale_for_each_locale install_locale
 
-	insinto "/usr/share/${PN}"
-	doins -r assets theme templates
-	doins input.txt
-
 	sed -i 's/\/opt\/tauon-music-box\/tauonmb.sh/tauon/g' extra/tauonmb.desktop || die
 	domenu extra/tauonmb.desktop
 	doicon -s scalable extra/tauonmb.svg
 
-	distutils-r1_python_install
 }
 
 pkg_postinst() {

diff --git a/media-sound/TauonMusicBox/files/TauonMusicBox-7.8.0-unidecode-compat.patch b/media-sound/TauonMusicBox/files/TauonMusicBox-7.8.0-unidecode-compat.patch
deleted file mode 100644
index be66f2391..000000000
--- a/media-sound/TauonMusicBox/files/TauonMusicBox-7.8.0-unidecode-compat.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-commit 6438345be829fa95bcaedf125cf4b29aa1d5064d
-Author: David Roman <davidroman96@gmail.com>
-Date:   Sun Jun 2 15:47:44 2024 +0200
-
-    replace isounidecode with unidecode
-
-diff --git a/extra/win-requirements.txt b/extra/win-requirements.txt
-index ef2dfd42..ccb54be7 100644
---- a/extra/win-requirements.txt
-+++ b/extra/win-requirements.txt
-@@ -8,7 +8,7 @@ requests
- beautifulsoup4
- PlexAPI
- musicbrainzngs
--isounidecode
-+unidecode
- infi.systray
- mutagen
- natsort
-diff --git a/requirements.txt b/requirements.txt
-index 3252278f..970d3a06 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -6,7 +6,7 @@ requests
- beautifulsoup4
- PlexAPI
- musicbrainzngs
--isounidecode
-+unidecode
- setproctitle
- mutagen
- natsort
-diff --git a/t_modules/t_lyrics.py b/t_modules/t_lyrics.py
-index 8e5d197a..19b91bd8 100644
---- a/t_modules/t_lyrics.py
-+++ b/t_modules/t_lyrics.py
-@@ -18,7 +18,7 @@
- #     along with Tauon Music Box.  If not, see <http://www.gnu.org/licenses/>.
- 
- 
--from isounidecode import unidecode
-+from unidecode import unidecode
- from bs4 import BeautifulSoup
- import urllib.parse
- import requests
-@@ -81,7 +81,7 @@ def genius(artist, title, return_url=False):
-     line = line.replace("/", "-")
-     line = line.replace("-&-", "-and-")
-     line = line.replace("&", "-and-")
--    line = unidecode(line).decode()
-+    line = unidecode(line)
-     line = urllib.parse.quote(line)
-     line = f"https://genius.com/{line}-lyrics"
- 
-diff --git a/t_modules/t_main.py b/t_modules/t_main.py
-index c2f2ebab..4848b7b2 100644
---- a/t_modules/t_main.py
-+++ b/t_modules/t_main.py
-@@ -591,7 +591,7 @@ from pathlib import Path
- from xml.sax.saxutils import escape, unescape
- from ctypes import *
- from send2trash import send2trash
--from isounidecode import unidecode
-+from unidecode import unidecode
- from collections import OrderedDict
- 
- musicbrainzngs.set_useragent("TauonMusicBox", n_version, "https://github.com/Taiko2k/Tauon")
-@@ -25663,14 +25663,14 @@ def worker2():
-                                         s_text = s_cn
- 
-                         if dia_mode:
--                            title = unidecode(title).decode()
-+                            title = unidecode(title)
- 
--                            artist = unidecode(artist).decode()
--                            album_artist = unidecode(album_artist).decode()
--                            composer = unidecode(composer).decode()
--                            album = unidecode(album).decode()
--                            filename = unidecode(filename).decode()
--                            sartist = unidecode(sartist).decode()
-+                            artist = unidecode(artist)
-+                            album_artist = unidecode(album_artist)
-+                            composer = unidecode(composer)
-+                            album = unidecode(album)
-+                            filename = unidecode(filename)
-+                            sartist = unidecode(sartist)
- 
-                             if cache_string is None:
-                                 search_dia_string_cache[
-@@ -30054,9 +30054,9 @@ class Over:
-                               click=self.click, replace="github")
- 
-             y += spacing
--            ddt.text((x, y), "isounidecode", colours.box_sub_text, font)
--            ddt.text((xx, y), "New BSD License", colours.box_text_label, font)
--            draw_linked_text2(xxx, y, "https://github.com/redvasily/isounidecode", colours.box_sub_text, font,
-+            ddt.text((x, y), "unidecode", colours.box_sub_text, font)
-+            ddt.text((xx, y), "GPL-2.0+", colours.box_text_label, font)
-+            draw_linked_text2(xxx, y, "https://github.com/avian2/unidecode", colours.box_sub_text, font,
-                               click=self.click, replace="github")
- 
-             y += spacing

diff --git a/media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch b/media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch
deleted file mode 100644
index 4de98dc14..000000000
--- a/media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 203ed16eef31cc199853ecef9d947eb147ab4f16 Mon Sep 17 00:00:00 2001
-From: David Roman <davidroman96@gmail.com>
-Date: Fri, 19 Apr 2024 02:02:08 +0200
-Subject: [PATCH] tauonmb.desktop: add mising stop action (#1132)
-
----
- extra/tauonmb.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/extra/tauonmb.desktop b/extra/tauonmb.desktop
-index 1a98fc4e2..5d049f084 100644
---- a/extra/tauonmb.desktop
-+++ b/extra/tauonmb.desktop
-@@ -21,7 +21,7 @@ StartupWMClass=Tauon Music Box
- Terminal=false
- Type=Application
- Categories=AudioVideo;Player;Audio;
--Actions=PlayPause;Previous;Next
-+Actions=PlayPause;Previous;Next;Stop
- 
- [Desktop Action PlayPause]
- Exec=/opt/tauon-music-box/tauonmb.sh --no-start --play-pause


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-24 10:34 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-19 10:08 [gentoo-commits] repo/proj/guru:master commit in: media-sound/TauonMusicBox/files/, media-sound/TauonMusicBox/ David Roman
2024-04-19  9:49 ` [gentoo-commits] repo/proj/guru:dev commit in: media-sound/TauonMusicBox/, media-sound/TauonMusicBox/files/ David Roman
  -- strict thread matches above, loose matches on Subject: below --
2025-02-24  9:49 David Roman
2025-02-24 10:34 ` [gentoo-commits] repo/proj/guru:master commit in: media-sound/TauonMusicBox/files/, media-sound/TauonMusicBox/ David Roman
2024-02-23  1:36 David Roman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox