diff options
Diffstat (limited to 'media-sound/pamix')
| -rw-r--r-- | media-sound/pamix/Manifest | 9 | ||||
| -rw-r--r-- | media-sound/pamix/files/pamix-1.6-ncurses_pkgconfig.patch | 34 | ||||
| -rw-r--r-- | media-sound/pamix/pamix-1.5.ebuild | 4 | ||||
| -rw-r--r-- | media-sound/pamix/pamix-1.6.ebuild (renamed from media-sound/pamix/pamix-1.4.1.ebuild) | 18 | ||||
| -rw-r--r-- | media-sound/pamix/pamix-9999.ebuild | 10 |
5 files changed, 52 insertions, 23 deletions
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest index 77b446b09f8b..6d4ea6a86270 100644 --- a/media-sound/pamix/Manifest +++ b/media-sound/pamix/Manifest @@ -1,6 +1,7 @@ -DIST pamix-1.4.1.tar.gz 15900 BLAKE2B 127467ae6cf2d380f78ab2ccd0e990a11ad1747adfe82411f05ba08403ebfc3d91ab10f931dfe46451755a350a830643abbf0165744eefa57ee4e3ed25f8f426 SHA512 2b33f384760f7706a10879ba51f027fd47e46f53c7a784feae0adf18f0badd7826a19a6ed75886a0c78afa115ca0725ddf7e319e55565f5b05081578310512d2 +AUX pamix-1.6-ncurses_pkgconfig.patch 1022 BLAKE2B f5ffa8a58e49fb8bf7c14c1764ddd2509fc9236cfdc898084434c378c3b1b78db941f05e9634de3ab585322371af89c3d47f98942f8cab1a4f8a462a544ad0e3 SHA512 b910fb3cd2f5c82f50dedd06f076d93b78fc9008b884434bda6854e3340ac357144bd75207f5ba490d1752d5dd013a413d3510570e47f60fd667ff6a1bda4bb0 DIST pamix-1.5.tar.gz 16902 BLAKE2B 4f7612cb870f84110b8cc31a061afecb7c2aeb8d073887cde671bbaf8702db83b8cfe4e7b06e9260c6925c4334c1cb46175612f87d4ed625181179f615b6e954 SHA512 51516664c5f5d8d0c70565c5cdd7a91e7d40c83a49d75ca76c38286d937a737da28f9070e9d0185545d8e74999894e3afa9f1d2f8c22658f83af5c1c161f7938 -EBUILD pamix-1.4.1.ebuild 776 BLAKE2B 8a1be6f76c7b186c6cc51dd7545fd86e8c47af2f465d21a8cbcec5a8216401397ee083dfe445f2eb25aaff85820cb7677f3b9cf90fa4d3eb497dc6f30dcfd438 SHA512 b2c5f9027d1e691b6a3a2f90645666f7df5e7bfaef4f0b8817d603d35c16f1a36e6743c3fc6bdf8d6aac5a7c205b91895e495a37d0daf64e91dd71e4f8a07b72 -EBUILD pamix-1.5.ebuild 775 BLAKE2B 1189c963951039c25bce9b1cebfe01cbefa0f18fc683276be48c5c2cbaf17fd3b709c4a011ecf68434d317896e05b65f0a80eef8182e16dcba48b4799366abb9 SHA512 a550d7a541050ee64b1b391d5b5eda0ec3eab2b780b86066e22696599ea490ba561415915c403e66ec79284eed3133470f7b2aaf70d63d2aac703b136df26976 -EBUILD pamix-9999.ebuild 953 BLAKE2B 6abf863b3890234bd02acaef9df44655225fc586ccfa3dec890651a1ad16322ae1dcec7ea03242f69b181dae85bd6e64fb306e0d57b0169728d6790af6d9b75a SHA512 83498e726fa224d15c66a82f8fc36dc19274621565a89774dd714778f4d55ad8dd3e44db9e67914c390cac29ab5aeae3ec4f31093c6cd1da98211a69bd746661 +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.ebuild 850 BLAKE2B 845af8b7c774e977b9bebb96d83dd6dda7463c5a1f388bdb22283d8ed4a7a35e2da62a0eca3f1fe539158a9e8f54cafc13754e39a1a48490a5de1f05f2e1770a SHA512 ab2020f427bb9175b282ed59611de4b291372617afdc6d4c5b4106a593ee123d2673aba34e16e42aebce9da25be8b4adcc0f26842309474a5f36471e4220544c +EBUILD pamix-9999.ebuild 794 BLAKE2B d0bbf1bb4375d6bbd7d50fcd344dd9175a3ea4519f85a328cfdfa4a233aee5c83723b7584b7ff8263f88f59370d7a2c2d30748123fc1d54e94c6efab98cb7dcd SHA512 c098a7473d9f3852a66a04d395cea32ac9a528ae6031e503f53db4487c952157fb26f17a4623c5cc0280d43ceea8d0a8ed9031600e1c41f05eed85f1fde7d212 MISC metadata.xml 341 BLAKE2B 370b3031b7775e1c96f7d275f0e662594ff091d5d621dd51548af9153ec7a40eb821055573d6b53a742b1ee777b72067c49d900a6dec47b8f7bce09457e89f3b SHA512 8ca39f3e12bac0db8cd11f2ef8707d06fe1008f265bc99b0757650e98d4c2e36c4693cc46c7e657b26f7737e29479ac64a22e305171072bbbc74ab48ea67b5cf diff --git a/media-sound/pamix/files/pamix-1.6-ncurses_pkgconfig.patch b/media-sound/pamix/files/pamix-1.6-ncurses_pkgconfig.patch new file mode 100644 index 000000000000..c05977166797 --- /dev/null +++ b/media-sound/pamix/files/pamix-1.6-ncurses_pkgconfig.patch @@ -0,0 +1,34 @@ +From 90bd2ead3d88b5b24093cb76f9500b69bb0221dd Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Tue, 2 Jan 2018 21:24:05 +0100 +Subject: [PATCH] Use pkg-config to reliably find ncurses lib. + +Otherwise linking might fail when ncurses was built with separate tinfo lib. +--- + CMakeLists.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 38605f2..c7da94e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,11 +17,14 @@ file(GLOB_RECURSE pamix_SRC + include_directories("include") + link_libraries("pulse" "pthread") + ++find_package(PkgConfig REQUIRED QUIET) + IF (WITH_UNICODE) +- link_libraries("ncursesw") ++ pkg_search_module(NCURSESW REQUIRED ncursesw) ++ link_libraries(${NCURSESW_LDFLAGS}) + add_definitions(-DFEAT_UNICODE) + ELSE () +- link_libraries("ncurses") ++ pkg_search_module(NCURSES REQUIRED ncurses) ++ link_libraries(${NCURSES_LDFLAGS}) + ENDIF () + + add_executable(pamix ${pamix_SRC}) +-- +2.16.0.rc0 + diff --git a/media-sound/pamix/pamix-1.5.ebuild b/media-sound/pamix/pamix-1.5.ebuild index 1efd5b465935..261d33492f6d 100644 --- a/media-sound/pamix/pamix-1.5.ebuild +++ b/media-sound/pamix/pamix-1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ 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" + KEYWORDS="amd64 x86" S="${WORKDIR}/PAmix-${PV}" fi diff --git a/media-sound/pamix/pamix-1.4.1.ebuild b/media-sound/pamix/pamix-1.6.ebuild index 05816380caad..dbeb0e57cc75 100644 --- a/media-sound/pamix/pamix-1.4.1.ebuild +++ b/media-sound/pamix/pamix-1.6.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# 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} +inherit cmake-utils ${SCM} unset SCM DESCRIPTION="A PulseAudio NCurses mixer" @@ -17,7 +17,7 @@ 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" + SRC_URI="https://github.com/patroclos/PAmix/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" S="${WORKDIR}/PAmix-${PV}" fi @@ -28,11 +28,13 @@ DEPEND="sys-devel/autoconf-archive virtual/pkgconfig ${RDEPEND}" -src_prepare() { - default - eautoreconf -} +PATCHES=( + "${FILESDIR}/${P}-ncurses_pkgconfig.patch" +) src_configure() { - econf $(use_enable unicode) + local mycmakeargs=( + -DWITH_UNICODE="$(usex unicode)" + ) + cmake-utils_src_configure } diff --git a/media-sound/pamix/pamix-9999.ebuild b/media-sound/pamix/pamix-9999.ebuild index acdf22771d05..a3da8fcc45fe 100644 --- a/media-sound/pamix/pamix-9999.ebuild +++ b/media-sound/pamix/pamix-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,14 +28,6 @@ DEPEND="sys-devel/autoconf-archive virtual/pkgconfig ${RDEPEND}" -src_prepare() { - default - - # ugly hackaround for split tinfo ncurses libs - sed '/link_libraries.*ncurses/s@\(")\)@" "tinfo\1@' \ - -i CMakeLists.txt || die -} - src_configure() { local mycmakeargs=( -DWITH_UNICODE="$(usex unicode)" |