diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
commit | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch) | |
tree | 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /media-sound/alsa-tools | |
parent | 957235cf19a691360c720f7913672adda4258ed0 (diff) |
gentoo resync : 22.10.2018
Diffstat (limited to 'media-sound/alsa-tools')
-rw-r--r-- | media-sound/alsa-tools/Manifest | 8 | ||||
-rw-r--r-- | media-sound/alsa-tools/alsa-tools-1.1.5.ebuild | 144 | ||||
-rw-r--r-- | media-sound/alsa-tools/alsa-tools-1.1.6.ebuild | 4 | ||||
-rw-r--r-- | media-sound/alsa-tools/alsa-tools-1.1.7.ebuild (renamed from media-sound/alsa-tools/alsa-tools-1.1.3.ebuild) | 90 |
4 files changed, 58 insertions, 188 deletions
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest index 102d134e56c3..15c315f41968 100644 --- a/media-sound/alsa-tools/Manifest +++ b/media-sound/alsa-tools/Manifest @@ -1,10 +1,8 @@ AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef DIST alsa-tools-1.1.0.tar.bz2 1715113 BLAKE2B 9b64f3a78e0cff212663c716c189591cd249e58992e5b403e8948b0fa81c4b3b86cc4872f4dcb7a0fadf9cb313043201549b10f3a36d546911bba18fe9fc3602 SHA512 caabbc9a8b494de6bba0dea6440b335b35e5c7dab4942ac36f127a75c2212ff98e7e38566444666edcf40c6c95e6d9797c421014fb5c5c292bb398780e6c9f87 -DIST alsa-tools-1.1.3.tar.bz2 1715759 BLAKE2B c267c746b1b6e986d65e4f69874eb8432e141e823112037ac21f6c794275c818d66dc8adb680c62eb72621d6d6b0974efaffadcf5b7dd7aea53c4c1528631c14 SHA512 b7c6c7639ea30fd8385c817fcd9dee4e5ed7c5766801d11a61d94f3211db4f99ecc0f00173573b69724ad9a06138605c353f4a40c8631eb4325b9718788bea50 -DIST alsa-tools-1.1.5.tar.bz2 1715977 BLAKE2B a8608d19794f7072959121a5f6ab8a7f676d600706bcf52d7e0ec770947fa85948927c1967d4ed35befd31f3bf1b66633ae107274b11490b4bb4558d434c4f80 SHA512 42463540def2260bda0fdb0b08a665ef336deb817920605ce8f77b4904595eadc7d4774d799385bb2271026e26976cc733a776b228814d2c7d7651c46a45098d DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75cb6838c407586b52144963350d51271fb500e627e152d05d1c586c337c70fc839072094e0492a0a1b160d6876ccedeb SHA512 33617ec6726ca11f66849c893a8dd9bf9faa8832374788819d9280159ac358c83443331faac24881df593cfd0b24b22769a41cbcb0af3c1fd781baab0c802d17 +DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c EBUILD alsa-tools-1.1.0.ebuild 3491 BLAKE2B 6c4c591a1025f18d1b8e7e2058fbb227f200ec5c50334ae400a9cff94d5630d05f5298faf91c2c76451b09ef9b90d1e3b1b04aad70871eb79d55a6f66b683f53 SHA512 704b16d093923c138ea05bfbeebd96be74987ea0ea076f40e2260e32765074bbde1bfe08f3b231fc6fb6b7b32a5eb2241c980f9d62294475df8e848e46393284 -EBUILD alsa-tools-1.1.3.ebuild 3497 BLAKE2B 247f1a79678b2a6f647da73c5e523a95d62565d66eebce000e5987adaa92995d5066e859c688ed7b7197939bf3e9ecb0b031e33d2c30dece41219d6eacf01459 SHA512 0c9bafd1470f61f189a19de82a7bbcafaeb9c195edb13632f63c846f5a248d755f668592025afd427719ea1d79223baafe994fac24b5b1a3fe6daffa5d81a60e -EBUILD alsa-tools-1.1.5.ebuild 3497 BLAKE2B 247f1a79678b2a6f647da73c5e523a95d62565d66eebce000e5987adaa92995d5066e859c688ed7b7197939bf3e9ecb0b031e33d2c30dece41219d6eacf01459 SHA512 0c9bafd1470f61f189a19de82a7bbcafaeb9c195edb13632f63c846f5a248d755f668592025afd427719ea1d79223baafe994fac24b5b1a3fe6daffa5d81a60e -EBUILD alsa-tools-1.1.6.ebuild 3547 BLAKE2B 6c8107c40bfc3927e2e5a4d6eedb4791882dcebb5d3033eec1f4d8d338e9bd01ff422eadca8b32dc569405e5624779d7529a848ab124f2e8103da4440d2b6e57 SHA512 26a4f2338d1714e1a9a0cebf8a731a3b19ee4513fc1738411bd7865e84630c7d83a7f1fefea09c10c1c9b831d9b2e5ac4f10f86a9f0441388eb06aafb54d0a6e +EBUILD alsa-tools-1.1.6.ebuild 3548 BLAKE2B b6a7fd71fdf79123aed542424f475b42d4d279daa2f33d586c499518aaf20aea4311b9e0d960f0e8d2e67bd77ddb1f0d1039a6c7a5af5be91d51eb5c097c7b84 SHA512 2535753579ebff3dd7fe0f4cca577a4873e2b71c902eae675d7d9cef97aab708cb46a0d02342e9dcebb1ccf8f09ac4f6c80c3965183c1e4a4c637b00d0bba882 +EBUILD alsa-tools-1.1.7.ebuild 3544 BLAKE2B b833cc72f9bd1d45a75f992cd9d0667ba23e94bcda8a22b2d39c2d72fa475bc78fc5e746061dd961fa7a7b83d74af3e7f910ba46ffd5fa8c67f21c5b8d5900ad SHA512 f2f7ed51b00cdd3ae72eae5d22f0185001bb0c96bbba656882c8f562ef962aa8b484b87db45aa2730ad2659c740e9c62621d8c2e4c069610cdda4c5f44055c81 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f diff --git a/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild deleted file mode 100644 index 972e14d4b033..000000000000 --- a/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils flag-o-matic - -DESCRIPTION="Advanced Linux Sound Architecture tools" -HOMEPAGE="https://alsa-project.org/" -SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0.9" -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86" - -IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart -alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe -alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 -alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr" - -COMMON_DEPEND=">=media-libs/alsa-lib-${PV} - >=dev-python/pyalsa-1.0.26 - fltk? ( >=x11-libs/fltk-1.3.0:1 ) - gtk? ( - >=dev-python/pygtk-2 - x11-libs/gtk+:2 - x11-libs/gtk+:3 - )" #468294 -RDEPEND="${COMMON_DEPEND} - gtk? ( media-fonts/font-misc-misc )" #456114 -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/envy24control-config-dir.patch -) - -pkg_setup() { - ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb" - - if use gtk; then - ALSA_TOOLS="${ALSA_TOOLS} hdajackretask" - use alsa_cards_ice1712 && \ - ALSA_TOOLS="${ALSA_TOOLS} envy24control" - use alsa_cards_rme32 && use alsa_cards_rme96 && \ - ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol" - fi - - if use alsa_cards_hdsp || use alsa_cards_hdspm; then - ALSA_TOOLS="${ALSA_TOOLS} hdsploader" - use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer" - fi - - use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader" - use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader" - use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader" - use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr" - use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl" - - { use alsa_cards_sb16 || use alsa_cards_sbawe; } && \ - ALSA_TOOLS="${ALSA_TOOLS} sb16_csp" - - if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then - ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1" - fi - - use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer" -} - -src_prepare() { - default - - # This block only deals with the tools that still use GTK and the - # AM_PATH_GTK macro. - for dir in echomixer envy24control rmedigicontrol; do - has "${dir}" "${ALSA_TOOLS}" || continue - pushd "${dir}" &> /dev/null - eautoreconf - popd &> /dev/null - done - - # This block deals with the tools that are being patched - for dir in hdspconf; do - has "${dir}" "${ALSA_TOOLS}" || continue - pushd "${dir}" &> /dev/null - eautoreconf - popd &> /dev/null - done - - elibtoolize -} - -src_configure() { - if use fltk; then - # hdspmixer requires fltk - append-ldflags "-L$(dirname $(fltk-config --libs))" - append-flags "-I$(fltk-config --includedir)" - fi - - local f - for f in ${ALSA_TOOLS} - do - cd "${S}/${f}" - case "${f}" in - echomixer,envy24control,rmedigicontrol ) - econf --with-gtk2 - ;; - * ) - econf - ;; - esac - done -} - -src_compile() { - local f - for f in ${ALSA_TOOLS} - do - cd "${S}/${f}" - emake - done -} - -src_install() { - local f - for f in ${ALSA_TOOLS} - do - # Install the main stuff - cd "${S}/${f}" - # hotplugdir is for usx2yloader/Makefile.am - emake DESTDIR="${D}" hotplugdir=/lib/firmware install - - # Install the text documentation - local doc - for doc in README TODO ChangeLog AUTHORS; do - if [[ -f "${doc}" ]]; then - mv "${doc}" "${doc}.$(basename ${f})" || die - dodoc "${doc}.$(basename ${f})" - fi - done - done - - # Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27) - prune_libtool_files -} diff --git a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild index 5f4c7573d32d..b0f1e28d9fa4 100644 --- a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0.9" -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="alpha amd64 ~mips ~ppc ~ppc64 ~sparc x86" IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe diff --git a/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild index 972e14d4b033..446f976a0369 100644 --- a/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils flag-o-matic +inherit autotools flag-o-matic gnome2-utils xdg-utils DESCRIPTION="Advanced Linux Sound Architecture tools" HOMEPAGE="https://alsa-project.org/" @@ -24,7 +24,7 @@ COMMON_DEPEND=">=media-libs/alsa-lib-${PV} >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 - )" #468294 + )" #468294 RDEPEND="${COMMON_DEPEND} gtk? ( media-fonts/font-misc-misc )" #456114 DEPEND="${COMMON_DEPEND} @@ -35,35 +35,44 @@ PATCHES=( ) pkg_setup() { - ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb" + ALSA_TOOLS=( + seq/sbiload + us428control + hwmixvolume + hda-verb + $(usex alsa_cards_mixart mixartloader '') + $(usex alsa_cards_vx222 vxloader '') + $(usex alsa_cards_usb-usx2y usx2yloader '') + $(usex alsa_cards_pcxhr pcxhr '') + $(usex alsa_cards_sscape sscape_ctl '') + ) if use gtk; then - ALSA_TOOLS="${ALSA_TOOLS} hdajackretask" - use alsa_cards_ice1712 && \ - ALSA_TOOLS="${ALSA_TOOLS} envy24control" - use alsa_cards_rme32 && use alsa_cards_rme96 && \ - ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol" + ALSA_TOOLS+=( + echomixer + hdajackretask + $(usex alsa_cards_ice1712 envy24control '') + ) + # Perhaps a typo the following && logic? + if use alsa_cards_rme32 && use alsa_cards_rme96 ; then + ALSA_TOOLS+=( rmedigicontrol ) + fi fi - if use alsa_cards_hdsp || use alsa_cards_hdspm; then - ALSA_TOOLS="${ALSA_TOOLS} hdsploader" - use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer" + if use alsa_cards_hdsp || use alsa_cards_hdspm ; then + ALSA_TOOLS+=( + hdsploader + $(usex fltk 'hdspconf hdspmixer' '') + ) fi - use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader" - use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader" - use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader" - use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr" - use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl" - - { use alsa_cards_sb16 || use alsa_cards_sbawe; } && \ - ALSA_TOOLS="${ALSA_TOOLS} sb16_csp" + if use alsa_cards_sb16 || use alsa_cards_sbawe ; then + ALSA_TOOLS+=( sb16_csp ) + fi if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then - ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1" + ALSA_TOOLS+=( as10k1 ld10k1 ) fi - - use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer" } src_prepare() { @@ -72,7 +81,7 @@ src_prepare() { # This block only deals with the tools that still use GTK and the # AM_PATH_GTK macro. for dir in echomixer envy24control rmedigicontrol; do - has "${dir}" "${ALSA_TOOLS}" || continue + has "${dir}" "${ALSA_TOOLS[*]}" || continue pushd "${dir}" &> /dev/null eautoreconf popd &> /dev/null @@ -80,7 +89,7 @@ src_prepare() { # This block deals with the tools that are being patched for dir in hdspconf; do - has "${dir}" "${ALSA_TOOLS}" || continue + has "${dir}" "${ALSA_TOOLS[*]}" || continue pushd "${dir}" &> /dev/null eautoreconf popd &> /dev/null @@ -97,35 +106,32 @@ src_configure() { fi local f - for f in ${ALSA_TOOLS} - do - cd "${S}/${f}" + for f in ${ALSA_TOOLS[@]} ; do + cd "${S}/${f}" || die case "${f}" in echomixer,envy24control,rmedigicontrol ) econf --with-gtk2 - ;; + ;; * ) econf - ;; + ;; esac done } src_compile() { local f - for f in ${ALSA_TOOLS} - do - cd "${S}/${f}" + for f in ${ALSA_TOOLS[@]} ; do + cd "${S}/${f}" || die emake done } src_install() { local f - for f in ${ALSA_TOOLS} - do + for f in ${ALSA_TOOLS[@]} ; do # Install the main stuff - cd "${S}/${f}" + cd "${S}/${f}" || die # hotplugdir is for usx2yloader/Makefile.am emake DESTDIR="${D}" hotplugdir=/lib/firmware install @@ -140,5 +146,15 @@ src_install() { done # Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27) - prune_libtool_files + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update } |