summaryrefslogtreecommitdiff
path: root/media-sound/pamix
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/pamix')
-rw-r--r--media-sound/pamix/Manifest8
-rw-r--r--media-sound/pamix/files/pamix-1.6-fix-ncurses-freezing.patch23
-rw-r--r--media-sound/pamix/files/pamix-1.6-fix-output-scrolling.patch23
-rw-r--r--media-sound/pamix/files/pamix-1.6-xdgconfigdir.patch45
-rw-r--r--media-sound/pamix/pamix-1.5.ebuild38
-rw-r--r--media-sound/pamix/pamix-1.6-r1.ebuild53
-rw-r--r--media-sound/pamix/pamix-9999.ebuild32
7 files changed, 169 insertions, 53 deletions
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
index 19139b79cef1..22ac70d55a95 100644
--- a/media-sound/pamix/Manifest
+++ b/media-sound/pamix/Manifest
@@ -1,7 +1,9 @@
+AUX pamix-1.6-fix-ncurses-freezing.patch 628 BLAKE2B a1265bd6d77771d00700812c9da0b50a46705a735bc0bcf7be92b9082b4bbe7737347645691d6d707d74c7806a346505d2702755ca2c3a8bda5dd5ba1f4f6d3d SHA512 23a91d5161103facf023eddc072295dfa9aa268b3961cbc5daaa072176007af7eab2c000e69e5866dd7e69352f09927f639c8df1e546b39f88803cb19aac0f7b
+AUX pamix-1.6-fix-output-scrolling.patch 742 BLAKE2B 23d14840500c9f535a68e5f439165a75fcecd455c4a419297ca982ebeac8f97047dc4548f3838db188b14cac8bfccb9fc6e6d59d597aa30b6a9ae69ab01d746a SHA512 a89269b18d42257c4a5d2ee8cfbb56cf49191348c64d1d27f9d009af0d0b1ed41282171de759cca26ad122d7aa6ee466ab97ff71f3299c3de12560e20fef4b13
AUX pamix-1.6-ncurses_pkgconfig.patch 1022 BLAKE2B f5ffa8a58e49fb8bf7c14c1764ddd2509fc9236cfdc898084434c378c3b1b78db941f05e9634de3ab585322371af89c3d47f98942f8cab1a4f8a462a544ad0e3 SHA512 b910fb3cd2f5c82f50dedd06f076d93b78fc9008b884434bda6854e3340ac357144bd75207f5ba490d1752d5dd013a413d3510570e47f60fd667ff6a1bda4bb0
-DIST pamix-1.5.tar.gz 16902 BLAKE2B 4f7612cb870f84110b8cc31a061afecb7c2aeb8d073887cde671bbaf8702db83b8cfe4e7b06e9260c6925c4334c1cb46175612f87d4ed625181179f615b6e954 SHA512 51516664c5f5d8d0c70565c5cdd7a91e7d40c83a49d75ca76c38286d937a737da28f9070e9d0185545d8e74999894e3afa9f1d2f8c22658f83af5c1c161f7938
+AUX pamix-1.6-xdgconfigdir.patch 1390 BLAKE2B f64950f335b03aaeed20298ee66bc769d575cbe1fd4b17682742d6d87cf8f5ad06432dd23147ebdd3f0c35d815a296f9cbbc1ddac7a33a8706cb0074b8aea0ec SHA512 e90c2ea1b02b4b74fe231740d09a266c4e91128b67353ffbc92e66897c8b08a8b131d43e01b1462542f289b0f1e2633851681d6a5ec514f29e266d8868849281
DIST pamix-1.6.tar.gz 18552 BLAKE2B 35cc2844cf0d5824c961a226f1b857b3ac070dc5c4fc802a9aa21a3317f9afdc42fb87e18d9e9a61276ace66a93d42c256e7811e946e3f9fba19f645ab8f07ef SHA512 53f3a892b41418cdbfff28d29636997e777ab9e1042f002e1df47735941e5a34f0391866939c539594d22f0b3f0cbd1ad5342dc5663d816e12354ae9e744d5f8
-EBUILD pamix-1.5.ebuild 773 BLAKE2B 57ab9145fcb6998a9c03ae50109cb9a65dbdae0e2a7578dfdf8f3287deea336948774c37059bf4f6ae39cee5e71d66c1827eb0c09b6adf0c1377a9915be79865 SHA512 4041efab6a1ee3d34d39a8dfd2f4353516eec4dcb937d334c6e7113700a9ceb3cb82b8f29a834093732c9b97f37f92509313eefd38ecbe0cfbd779f9e90a963d
+EBUILD pamix-1.6-r1.ebuild 1117 BLAKE2B 7b6a3c08fc6ceee40ef1c30cb91764baba293724115aeeebf45be272b57962cc727b522f6fa684bf6e3547bff0f07394fdc55ec03124da2a8b8e08094922e4b3 SHA512 90e206ee4b2d5de6d908952d95a819b57d2cdb624fc35b0470807d1c33ce4416c98af42e1ef871920c3aec3345d4e49be232f39f4d798cab759ff58810476947
EBUILD pamix-1.6.ebuild 845 BLAKE2B 177ff961b13d3008f5a45ad81aac87ed31e256e4114a07a3402e88034424c8c72295a41422ef8fd9d956a6f652a8466a785b4bed54dfec9dc6b1e6f442bbad42 SHA512 e063b58c9bd13b3640cd29aa2d5f3d9eed262a031aaf791b96aac88d9847836ad42509043fdf1489d9ae1348a98bd07ef06181d324636724e3bfa237bc5671b2
-EBUILD pamix-9999.ebuild 753 BLAKE2B f0a0fd50d60ae57dff4e7ef22a739ee62694dfb5e207c7af97c50e2a6b8ffcff837c7308b1084a5c26e406a4acb4577f13f7d63c07585eb58834d00fe815aa13 SHA512 655e7c7ff7131255837c6c5bdb6a4e2613d46a2c5038d2dede0af0d64bff3f0d6e589c707bd1285120f9033fece73c59f4a0452aa19a7ac9b0638105c6e94fee
+EBUILD pamix-9999.ebuild 927 BLAKE2B d8d49375ae2f78a08d47bb82656da43d2d7922bb3aaed738871142d26a15dee6149be0d1b21bb45c4bba145e38573ca0f9bd9cd765dfdb3372a811a119b2b1cf SHA512 f083f2a75297e6b9e7f344404f2d8b1d7233fe029dd89066568593343d5c73e403af732c03141ed1dea7c8ff952f47fbe44064c4723e3ccba48810e2bed939c5
MISC metadata.xml 341 BLAKE2B 370b3031b7775e1c96f7d275f0e662594ff091d5d621dd51548af9153ec7a40eb821055573d6b53a742b1ee777b72067c49d900a6dec47b8f7bce09457e89f3b SHA512 8ca39f3e12bac0db8cd11f2ef8707d06fe1008f265bc99b0757650e98d4c2e36c4693cc46c7e657b26f7737e29479ac64a22e305171072bbbc74ab48ea67b5cf
diff --git a/media-sound/pamix/files/pamix-1.6-fix-ncurses-freezing.patch b/media-sound/pamix/files/pamix-1.6-fix-ncurses-freezing.patch
new file mode 100644
index 000000000000..61c34f0a4202
--- /dev/null
+++ b/media-sound/pamix/files/pamix-1.6-fix-ncurses-freezing.patch
@@ -0,0 +1,23 @@
+From 1e45f226ef35b649cb2889e23ad90ad39d0db947 Mon Sep 17 00:00:00 2001
+From: Joshua Jensch <jenschjoshua@gmail.com>
+Date: Sat, 14 Mar 2020 03:11:58 +0100
+Subject: [PATCH] Use 25ms as escdelay
+
+By default ncurses will use 1000ms, which will cause freezing.
+Fixes #44
+---
+ src/pamix.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pamix.cpp b/src/pamix.cpp
+index d5f7ead..368639d 100644
+--- a/src/pamix.cpp
++++ b/src/pamix.cpp
+@@ -206,6 +206,7 @@ int main(int argc, char **argv) {
+ initscr();
+ init_colors();
+ nodelay(stdscr, true);
++ set_escdelay(25);
+ curs_set(0);
+ keypad(stdscr, true);
+ meta(stdscr, true);
diff --git a/media-sound/pamix/files/pamix-1.6-fix-output-scrolling.patch b/media-sound/pamix/files/pamix-1.6-fix-output-scrolling.patch
new file mode 100644
index 000000000000..6e4b94d05669
--- /dev/null
+++ b/media-sound/pamix/files/pamix-1.6-fix-output-scrolling.patch
@@ -0,0 +1,23 @@
+From c15831c99bbef1a25710e5a34208809dc9160e86 Mon Sep 17 00:00:00 2001
+From: Joshua Jensch <jenschjoshua@gmail.com>
+Date: Sun, 1 Dec 2019 16:23:12 +0100
+Subject: [PATCH] fix bug preventing entries from being scrolled.
+
+resolves #41
+---
+ src/pamix_ui.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pamix_ui.cpp b/src/pamix_ui.cpp
+index 16a2e34..c1acb2b 100644
+--- a/src/pamix_ui.cpp
++++ b/src/pamix_ui.cpp
+@@ -265,7 +265,7 @@ pamix_entry_iter_t pamix_ui::getSelectedEntryIterator() {
+ }
+
+ void pamix_ui::adjustDisplayedEntries() {
+- if (!m_Entries->empty())
++ if (m_Entries->empty())
+ return;
+ if (m_SelectedEntry >= m_NumSkippedEntries && m_SelectedEntry < m_NumSkippedEntries + m_NumDrawnEntries)
+ return;
diff --git a/media-sound/pamix/files/pamix-1.6-xdgconfigdir.patch b/media-sound/pamix/files/pamix-1.6-xdgconfigdir.patch
new file mode 100644
index 000000000000..7de00460316d
--- /dev/null
+++ b/media-sound/pamix/files/pamix-1.6-xdgconfigdir.patch
@@ -0,0 +1,45 @@
+From 72d8189b942f6e95d8c946fea2faaee9a74f4b35 Mon Sep 17 00:00:00 2001
+From: nilninull <nilninull@gmail.com>
+Date: Wed, 3 Jan 2018 16:32:27 +0900
+Subject: [PATCH] FIX: default XDG_CONFIG_DIRS directory
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 38605f2..7677e43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@ ELSE ()
+ ENDIF ()
+
+ add_executable(pamix ${pamix_SRC})
+-install(FILES pamix.conf DESTINATION /etc)
++install(FILES pamix.conf DESTINATION /etc/xdg)
+ install(TARGETS pamix DESTINATION bin)
+ install(FILES man/pamix.1 DESTINATION share/man/man1)
+
+From e3bf53d9a841c3559880863c8c29c2919ab5b425 Mon Sep 17 00:00:00 2001
+From: Joshua Jensch <jenschjoshua@gmail.com>
+Date: Sat, 6 Jan 2018 07:05:23 +0100
+Subject: [PATCH] change default XDG_CONFIG_DIRS value when searching config
+ file
+
+---
+ src/pamix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pamix.cpp b/src/pamix.cpp
+index 3ea2730..d5f7ead 100644
+--- a/src/pamix.cpp
++++ b/src/pamix.cpp
+@@ -130,7 +130,7 @@ void loadConfiguration() {
+
+ char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
+
+- path = xdg_config_dirs ? xdg_config_dirs : "/etc";
++ path = xdg_config_dirs ? xdg_config_dirs : "/etc/xdg";
+ path += "/pamix.conf";
+ size_t cpos = path.find(':');
+ while (cpos != std::string::npos) {
diff --git a/media-sound/pamix/pamix-1.5.ebuild b/media-sound/pamix/pamix-1.5.ebuild
deleted file mode 100644
index 261d33492f6d..000000000000
--- a/media-sound/pamix/pamix-1.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-[[ "${PV}" == 9999 ]] && SCM="git-r3"
-inherit autotools ${SCM}
-unset SCM
-
-DESCRIPTION="A PulseAudio NCurses mixer"
-HOMEPAGE="https://github.com/patroclos/PAmix"
-LICENSE="MIT"
-SLOT="0"
-IUSE="+unicode"
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
-else
- SRC_URI="https://github.com/patroclos/PAmix/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
- S="${WORKDIR}/PAmix-${PV}"
-fi
-
-RDEPEND="media-sound/pulseaudio
- sys-libs/ncurses:0=[unicode?]"
-DEPEND="sys-devel/autoconf-archive
- virtual/pkgconfig
- ${RDEPEND}"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable unicode)
-}
diff --git a/media-sound/pamix/pamix-1.6-r1.ebuild b/media-sound/pamix/pamix-1.6-r1.ebuild
new file mode 100644
index 000000000000..e3fa9ceb8f79
--- /dev/null
+++ b/media-sound/pamix/pamix-1.6-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/PAmix-${PV}"
+fi
+
+DESCRIPTION="A PulseAudio NCurses mixer"
+HOMEPAGE="https://github.com/patroclos/PAmix"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+unicode"
+
+RDEPEND="
+ media-sound/pulseaudio
+ sys-libs/ncurses:0=[unicode?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-ncurses_pkgconfig.patch"
+ "${FILESDIR}/${P}-xdgconfigdir.patch"
+ "${FILESDIR}/${P}-fix-output-scrolling.patch"
+ "${FILESDIR}/${P}-fix-ncurses-freezing.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+ if [[ ${PV} != 9999 ]] ; then
+ sed -e "/^include(CMakeGitDefines.cmake)/d" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_UNICODE="$(usex unicode)"
+ )
+ [[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_VERSION=${PV} )
+ cmake_src_configure
+}
diff --git a/media-sound/pamix/pamix-9999.ebuild b/media-sound/pamix/pamix-9999.ebuild
index 1e8fad344924..aac3dbb67cf9 100644
--- a/media-sound/pamix/pamix-9999.ebuild
+++ b/media-sound/pamix/pamix-9999.ebuild
@@ -1,38 +1,46 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
-if [[ "${PV}" == 9999 ]] ; then
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
inherit git-r3
+else
+ SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/PAmix-${PV}"
fi
DESCRIPTION="A PulseAudio NCurses mixer"
HOMEPAGE="https://github.com/patroclos/PAmix"
+
LICENSE="MIT"
SLOT="0"
IUSE="+unicode"
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
-else
- SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/PAmix-${PV}"
-fi
-
-RDEPEND="media-sound/pulseaudio
- sys-libs/ncurses:0=[unicode?]"
+RDEPEND="
+ media-sound/pulseaudio
+ sys-libs/ncurses:0=[unicode?]
+"
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
"
+src_prepare() {
+ cmake_src_prepare
+ if [[ ${PV} != 9999 ]] ; then
+ sed -e "/^include(CMakeGitDefines.cmake)/d" -i CMakeLists.txt || die
+ fi
+}
+
src_configure() {
local mycmakeargs=(
-DWITH_UNICODE="$(usex unicode)"
)
+ [[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_VERSION=${PV} )
cmake_src_configure
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 15:25:35 +0000