From 5a1e5a6812ca9c9555657cce48fe09d2ffa44401 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Dec 2022 08:55:38 +0000 Subject: gentoo auto-resync : 02:12:2022 - 08:55:37 --- media-sound/Manifest.gz | Bin 56885 -> 56890 bytes media-sound/cava/Manifest | 2 - media-sound/cava/cava-0.8.2-r1.ebuild | 64 ------------ media-sound/jack-example-tools/Manifest | 2 +- .../jack-example-tools/jack-example-tools-3.ebuild | 2 +- media-sound/jack2/Manifest | 6 +- media-sound/jack2/jack2-1.9.19.ebuild | 97 ------------------ media-sound/jack2/jack2-1.9.21-r1.ebuild | 113 +++++++++++++++++++++ media-sound/jack2/jack2-1.9.21.ebuild | 109 -------------------- media-sound/jack2/jack2-9999.ebuild | 8 +- media-sound/schismtracker/Manifest | 3 + .../files/schismtracker-20221201-bashism.patch | 29 ++++++ .../schismtracker/schismtracker-20221201.ebuild | 54 ++++++++++ 13 files changed, 209 insertions(+), 280 deletions(-) delete mode 100644 media-sound/cava/cava-0.8.2-r1.ebuild delete mode 100644 media-sound/jack2/jack2-1.9.19.ebuild create mode 100644 media-sound/jack2/jack2-1.9.21-r1.ebuild delete mode 100644 media-sound/jack2/jack2-1.9.21.ebuild create mode 100644 media-sound/schismtracker/files/schismtracker-20221201-bashism.patch create mode 100644 media-sound/schismtracker/schismtracker-20221201.ebuild (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 2eb478150ac7..ce1d4b7b61b2 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/cava/Manifest b/media-sound/cava/Manifest index 8e6903252fb1..174509e3570d 100644 --- a/media-sound/cava/Manifest +++ b/media-sound/cava/Manifest @@ -1,6 +1,4 @@ AUX cava-0.8.0-gentoo-iniparser4.patch 702 BLAKE2B 9ea8f952f0a9673d7348b4abeb46e480022205b3bf6a296b5f742e0dee15c81181c876829177159570b239c6c46c4b1177523eb60d3abf6e89640239e5192ba6 SHA512 ed474fc10475731ef733e77469782308c693d4b7214e911257e69499ab5cc598a13e0293644698f98d749e71c3002cbab857f8fda6e36a050bc8ff6be50af881 -DIST cava-0.8.2.tar.gz 103930 BLAKE2B feeb8313bd9b74029d101acaecfeed02e449cc29dceb2c119d7deef65befae418526274e6bad14dc0df7eaed90850ecae4a4064a414d94950ab3c24943281017 SHA512 8ab146987324fad97dea5e9fd893de6c12b00cbb074d835c1e334d75c0d32cb4cbbc13cf72f7899191ebd5d346505b2639dcad5312e5ab00975b29a006ba41b3 DIST cava-0.8.3.tar.gz 104797 BLAKE2B 0617273669fbd8d1c122e6b19975d54d42b5779339de89613b4fe5d6087bcf0ff93afe6234af238e489d6b72c3eca481140105000951ef007cc864b77ef49b65 SHA512 cd176428ff293572325d21769fd4fdb666b6301e0fe5c7a2c53af2399a26b3fd10e83647f9c9cc318f4c69cc28835323fb949cd76340c14670df8b544bffa0f0 -EBUILD cava-0.8.2-r1.ebuild 1519 BLAKE2B 9397e6cf0e4a52e09ad740c8c3865c3740ce6222dcaccbf798e525ecfb8aeff62c3b8280949901a6b15961d1bda03bf1110857c43795beb55a47da9db11aee64 SHA512 767224bf295a4df9e40ba3c0f88651693b73560a1ef0cfc16cf85264cb16ed2dc2fae3d0039944f3ab2f6b10eb88663bb08aed8276a9173045333b70223b8212 EBUILD cava-0.8.3.ebuild 1429 BLAKE2B d68709ff51c6bd35aa418dad1a4682ad7e594f7a70cac02603e8f30b314406ddac11aee0f0343799265eba00cad2dacb51ca9d0ad47867c95f0354b4a31ae315 SHA512 7d3355742b32c92e3035eb1890e0dc9664fe650bc2fa0890b2be23664eb0209130a36aad88db5f1822b84d364343325b3e36e4d9d89a54683d4431b55b80acdc MISC metadata.xml 427 BLAKE2B 94797ecc93cc139cde50a9c04e5d413d9356083740a2a3130894f7bd2fe30e8caf007712566a53cf2a28ad81be79d46aba6c57355491b75f9f3501dd0523ee10 SHA512 21289938ed3ecdfc6d15e3df7577c0a560b403b27d6b6b944cf007af9abaab6a96045d2cc35cb44a869e321a678bc85e9f02d285729ebaffb09797d8726001c6 diff --git a/media-sound/cava/cava-0.8.2-r1.ebuild b/media-sound/cava/cava-0.8.2-r1.ebuild deleted file mode 100644 index e24cc76b4c0b..000000000000 --- a/media-sound/cava/cava-0.8.2-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Console-based Audio Visualizer for Alsa" -HOMEPAGE="https://github.com/karlstav/cava/" -SRC_URI="https://github.com/karlstav/cava/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="alsa +ncurses portaudio pulseaudio sdl sndio" - -RDEPEND=" - dev-libs/iniparser:4 - sci-libs/fftw:3.0= - alsa? ( media-libs/alsa-lib ) - ncurses? ( sys-libs/ncurses:= ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-libs/libpulse ) - sdl? ( media-libs/libsdl2[opengl,video] ) - sndio? ( media-sound/sndio:= )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.0-gentoo-iniparser4.patch -) - -src_prepare() { - default - - # https://github.com/karlstav/cava/issues/450 - sed -i 's/-Werror //' Makefile.am || die - - echo ${PV} > version || die - eautoreconf -} - -src_configure() { - local econfargs=( - $(use_enable alsa input-alsa) - $(use_enable portaudio input-portaudio) - $(use_enable pulseaudio input-pulse) - $(use_enable sndio input-sndio) - - $(use_enable ncurses output-ncurses) - $(use_enable sdl output-sdl) - - GENTOO_SYSROOT="${ESYSROOT}" # see iniparser4.patch - ) - - econf "${econfargs[@]}" -} - -pkg_postinst() { - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog "A default ~/.config/cava/config will be created after initial" - elog "use of ${PN}, see it and ${EROOT}/usr/share/doc/${PF}/README*" - elog "for configuring audio input and more." - fi -} diff --git a/media-sound/jack-example-tools/Manifest b/media-sound/jack-example-tools/Manifest index 227d9bbceb71..e1593797f5eb 100644 --- a/media-sound/jack-example-tools/Manifest +++ b/media-sound/jack-example-tools/Manifest @@ -1,3 +1,3 @@ DIST jack-example-tools-3.tar.gz 125686 BLAKE2B b0fbb68f2a21711113516a6754e13230b009f21d73a4fa8b94f2e8e81b71f6d95c246eae88d479daf3f4f6e0ccf3eb8295ff1b1b76603676c6d8b09d0594f9db SHA512 2fe33c4fc294a4e4e2c0c271d5e2f28bac162939c25536902c772fcc919d2a0923fcefd27305f3fce283edfe043d2da7773b66988a1f14f8670d5cac90c8d7e9 -EBUILD jack-example-tools-3.ebuild 1440 BLAKE2B 6e8f5f5092747838a334bb59f88944f481978f3bb6e6ac131c8470b31ee4c74c6480cacd2813574d7f46f8a9401462a2629cce2a1a8f3796c6abad24817173aa SHA512 e1dd7436626ca6b55c7eca1b895335467e73335e5b5334d79691b85afc4e796cf05362bdc3d8b0ee599861a0706057a4da9341d296d316bef9e31fa3cccf6d97 +EBUILD jack-example-tools-3.ebuild 1434 BLAKE2B d558b1cef6a14fd314b01f46e38d33478e77019a2b6696240bfd3e221a5c6ff261e2f10fa1dbf3eb8ca61c8006b4acf9e14f413a3ae14d929ea6a0febb778a9b SHA512 a53ee68ec3ca7f029e19e46e69bc32ac943c3a71b4baffc1b99472050e8882efafbdb775f957b254ca63bdeb74110a8ac3d04975796846fd9df56cfb7e816d9d MISC metadata.xml 731 BLAKE2B 7c83aa6f9f1e4c7c43d6104cd089a69755c72577e728592ccedb8153687257c267609636832797d7dbfdac7f73bf55a3f0a195baaac442bf919f783589fb98b2 SHA512 1db07c3ba14f3a096c333630690e2b6bb1fd060fafe9aa132d7e455a5f89351b3074112eaac24bddf0e8697c0a8008ca4de192c78947cacea43a3aa2b71ef492 diff --git a/media-sound/jack-example-tools/jack-example-tools-3.ebuild b/media-sound/jack-example-tools/jack-example-tools-3.ebuild index cfd43a654532..29d01081d9c3 100644 --- a/media-sound/jack-example-tools/jack-example-tools-3.ebuild +++ b/media-sound/jack-example-tools/jack-example-tools-3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/jackaudio/jack-example-tools/archive/refs/tags/${PV} LICENSE="GPL-2+ zalsa? ( GPL-3+ )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" IUSE="alsa jack-net jack-netsource opus +readline sndfile zalsa" RDEPEND=" diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest index 936da1c1e878..3b433010d7a2 100644 --- a/media-sound/jack2/Manifest +++ b/media-sound/jack2/Manifest @@ -1,7 +1,5 @@ AUX jack2-1.9.21-python3.11.patch 635 BLAKE2B 8e9168c2d44e087c20f0b6b1ac7a08bf957a5427f3c396e88ba3d0918e636500265e8182a39a8831b9cd37f9db3e86ff3ff6222e191d18f110b964a36c446982 SHA512 be0bb5fb4d65f99dc8355393a02c79ac36f64f7bb0e36a0e6c08ca99cc5c5340a5457fa13e7937d70349a4e0b86074c69232f69cab26779a7e53de5710b4b7fe -DIST jack2-1.9.19.tar.gz 988780 BLAKE2B 37536e23f97ea8a3bf62fe77e35a4a40c5d88cea1197a2f72c4ab31cbbc689fcf99a1d51bb0ee96122c618464eefe1ca8479dc53ab7de9e6570cb4009cf2a7a1 SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d DIST jack2-1.9.21.tar.gz 1006157 BLAKE2B 052486300bd17860964115427d4b5755ce7a4e4607bf9eb4e2b94d5b0cc61cf6a6b56d3a3eae9e91a1195a3316dd1f1ec1357275803805957e4b6f7a76424e24 SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557 -EBUILD jack2-1.9.19.ebuild 2406 BLAKE2B 43cef82b53dc0f37ca9114e90a1419031ba5bf7fa7fd02f8f5a5c9e87c3b030b97b16c063f20f593740c88ec077f4690d493059cd827e3e86ee63e155ff2e8fa SHA512 1e6ae9ceb32b43b2008d9f2687a8e8dbc42f6a099d36c096b5a30aa6c9b4e1cf9e494b343724454e0fc2f764fea195aec6a7466ecbdba953e2d024c1a51a21dd -EBUILD jack2-1.9.21.ebuild 2624 BLAKE2B 79c29ce393f8a368862bb941656b38389b6f1a965f7bc30ae79e46264f48ae478c3d97b16c14a988fd6d15386ebfc27b81a2d3d032c5e0bd6cb66a017a690a79 SHA512 3289575be2e7184454bd90b1ff0059b275aff0d5580a148cc8b7da1d22b79a4479ae35c23eb21ea71bc5a8e85d59d6339ceece61b857b0665ac76f2da44aea74 -EBUILD jack2-9999.ebuild 2447 BLAKE2B 7d8a8a69e3bc2e15e355ee9a6ea43cb5673024d1e540bda2e5b447ba1dd3e4c09de9190cd346f302c7ff0c9acfc275fee5b861218a5a43ac22717acc4167c614 SHA512 4c7523fcc1e0116aadce1f92b9441f0bff768483942513bfd043223ee5b78e09f138db60be9599ec624321632278dcdf5fd65d2825dafbc89d12b4d5fd0e5167 +EBUILD jack2-1.9.21-r1.ebuild 2804 BLAKE2B 63c416828e84f56a4cc2efe265807301b1c0066b0a668cb2061aa2541f1c5892b305384b1a1da7479217a74a0a33f69f7f0c8e47df73d8fb9c915f95dab90cc1 SHA512 867504bc14598120dc85e39c497ba1757b76788645ab586e66c22fefaf3cbe56f3125b93f6bb34d9f1bd65f4859d16ad82a68d732151516980bf85cb2b919eb2 +EBUILD jack2-9999.ebuild 2633 BLAKE2B df913b0507bfe8471ab04532c47a4ae6393ede6bbf3c3dc018407043ed1dd93e2bb9782d4f61f7ced9221b4555d7b923a5ec2d84e7274e5e3260c390cc1c8064 SHA512 d97ad73ac25140a5e22604e52cf047d751d7b3ca196e40c5c56ffa2bb62737bb89ee7150a3527cf851f4fe58945b90e1c9888b6b7a72390db833e08128ef518b MISC metadata.xml 780 BLAKE2B 2cbd15be73cfc17162ab0cd6d5311bb4ab48f19dae7224df11712a9ab91fbbbba383e80fe3c99f3a1bb0ee91015144799f58652c782bce1405d5b7a4f8e203ee SHA512 ac8d68929de1d11a39d89ca0ccc0e330790596af7f58fe5305c328dddc74438ec465beca11cce7244e8f2421a446aab900b90b018dd73d688dae7062d26d0e16 diff --git a/media-sound/jack2/jack2-1.9.19.ebuild b/media-sound/jack2/jack2-1.9.19.ebuild deleted file mode 100644 index 8b2b7719b6e4..000000000000 --- a/media-sound/jack2/jack2-1.9.19.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,10} ) -PYTHON_REQ_USE="threads(+)" -inherit python-single-r1 waf-utils multilib-minimal - -DESCRIPTION="Jackdmp jack implemention for multi-processor machine" -HOMEPAGE="https://jackaudio.org/" - -if [[ "${PV}" = "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git" -else - MY_PV="${PV/_rc/-RC}" - MY_P="${PN}-${MY_PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -fi - -LICENSE="GPL-2" -SLOT="2" -IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( classic dbus )" - -BDEPEND=" - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" -DEPEND="${PYTHON_DEPS} - media-libs/libsamplerate - media-libs/libsndfile - sys-libs/readline:0= - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - dbus? ( - dev-libs/expat[${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] - ) - ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] ) - metadata? ( sys-libs/db:* ) - opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - dbus? ( - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - ') - ) - pam? ( sys-auth/realtime-base ) - !media-sound/jack-audio-connection-kit:0" - -DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 ) - -src_prepare() { - default - python_fix_shebang waf - multilib_copy_sources -} - -multilib_src_configure() { - local mywafconfargs=( - --htmldir=/usr/share/doc/${PF}/html - $(usex dbus --dbus "") - $(usex classic --classic "") - --alsa=$(usex alsa yes no) - --celt=no - --db=$(usex metadata yes no) - --doxygen=$(multilib_native_usex doc yes no) - --firewire=$(usex ieee1394 yes no) - --iio=no - --opus=$(usex opus yes no) - --portaudio=no - --readline=$(multilib_native_usex readline yes no) - --samplerate=$(multilib_native_usex libsamplerate yes no) - --sndfile=$(multilib_native_usex sndfile yes no) - --winmme=no - ) - - waf-utils_src_configure ${mywafconfargs[@]} -} - -multilib_src_compile() { - WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile -} - -multilib_src_install() { - WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install -} - -multilib_src_install_all() { - python_fix_shebang "${ED}" -} diff --git a/media-sound/jack2/jack2-1.9.21-r1.ebuild b/media-sound/jack2/jack2-1.9.21-r1.ebuild new file mode 100644 index 000000000000..356cbe29a718 --- /dev/null +++ b/media-sound/jack2/jack2-1.9.21-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_REQ_USE="threads(+)" +inherit flag-o-matic python-single-r1 waf-utils multilib-minimal + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git" +else + SRC_URI="https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" +fi + +DESCRIPTION="Jackdmp jack implemention for multi-processor machine" +HOMEPAGE="https://jackaudio.org/" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="2" +IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + || ( classic dbus )" + +DEPEND=" + alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) + dbus? ( + dev-libs/expat[${MULTILIB_USEDEP}] + sys-apps/dbus[${MULTILIB_USEDEP}] + ) + libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) + ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] ) + metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] ) + opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] ) + systemd? ( classic? ( sys-apps/systemd:= ) )" +RDEPEND=" + ${DEPEND} + dbus? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + ') + ) + pam? ( sys-auth/realtime-base ) + !media-sound/jack-audio-connection-kit + !media-video/pipewire[jack-sdk(-)]" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + doc? ( app-doc/doxygen )" +# tools were formerly provided here, pull to maintain expectations +PDEPEND="tools? ( media-sound/jack-example-tools )" + +DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.21-python3.11.patch +) + +src_prepare() { + default + + python_fix_shebang waf + multilib_copy_sources +} + +multilib_src_configure() { + # clients crash if built with lto + # https://github.com/jackaudio/jack2/issues/485 + filter-lto + + local wafargs=( + --mandir="${EPREFIX}"/usr/share/man/man1 # override eclass' for man1 + + --alsa=$(usex alsa) + --celt=no + $(usev classic --classic) + --db=$(usex metadata) + $(usev dbus --dbus) + --doxygen=$(multilib_native_usex doc) + --firewire=$(usex ieee1394) + --iio=no + --opus=$(usex opus) + --portaudio=no + --samplerate=$(usex libsamplerate) + --systemd=$(multilib_native_usex systemd $(usex classic)) + --winmme=no + + # obsolete options, migrated to media-sound/jack-example-tools + # and will be removed entirely next version + --example-tools=no + --readline=no + --sndfile=no + --zalsa=no + ) + + waf-utils_src_configure "${wafargs[@]}" +} + +multilib_src_compile() { + waf-utils_src_compile +} + +multilib_src_install() { + waf-utils_src_install +} + +multilib_src_install_all() { + use dbus && python_fix_shebang "${ED}"/usr/bin/jack_control +} diff --git a/media-sound/jack2/jack2-1.9.21.ebuild b/media-sound/jack2/jack2-1.9.21.ebuild deleted file mode 100644 index 4ed7d3847d9c..000000000000 --- a/media-sound/jack2/jack2-1.9.21.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -PYTHON_REQ_USE="threads(+)" -inherit flag-o-matic python-single-r1 waf-utils multilib-minimal - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git" -else - SRC_URI="https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="Jackdmp jack implemention for multi-processor machine" -HOMEPAGE="https://jackaudio.org/" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="2" -IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( classic dbus )" - -DEPEND=" - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - dbus? ( - dev-libs/expat[${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] - ) - libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) - ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] ) - metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] ) - opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )" -RDEPEND=" - ${DEPEND} - dbus? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - ') - ) - pam? ( sys-auth/realtime-base ) - !media-sound/jack-audio-connection-kit - !media-video/pipewire[jack-sdk(-)]" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( app-doc/doxygen )" -# tools were formerly provided here, pull to maintain expectations -PDEPEND="tools? ( media-sound/jack-example-tools )" - -DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.21-python3.11.patch -) - -src_prepare() { - default - - python_fix_shebang waf - multilib_copy_sources -} - -multilib_src_configure() { - # clients crash if built with lto - # https://github.com/jackaudio/jack2/issues/485 - filter-lto - - local wafargs=( - --alsa=$(usex alsa) - --celt=no - $(usev classic --classic) - --db=$(usex metadata) - $(usev dbus --dbus) - --doxygen=$(multilib_native_usex doc) - --firewire=$(usex ieee1394) - --iio=no - --opus=$(usex opus) - --portaudio=no - --samplerate=$(usex libsamplerate) - --winmme=no - - # obsolete options, migrated to media-sound/jack-example-tools - # and will be removed entirely next version - --example-tools=no - --readline=no - --sndfile=no - --zalsa=no - ) - - waf-utils_src_configure "${wafargs[@]}" -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install -} - -multilib_src_install_all() { - use dbus && python_fix_shebang "${ED}"/usr/bin/jack_control -} diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild index 49be304b89f7..52a3a799904b 100644 --- a/media-sound/jack2/jack2-9999.ebuild +++ b/media-sound/jack2/jack2-9999.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="https://jackaudio.org/" LICENSE="GPL-2+ LGPL-2.1+" SLOT="2" -IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools" +IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} || ( classic dbus )" @@ -34,7 +34,8 @@ DEPEND=" libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] ) metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] ) - opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )" + opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] ) + systemd? ( classic? ( sys-apps/systemd:= ) )" RDEPEND=" ${DEPEND} dbus? ( @@ -72,6 +73,8 @@ multilib_src_configure() { filter-lto local wafargs=( + --mandir="${EPREFIX}"/usr/share/man/man1 # override eclass' for man1 + --alsa=$(usex alsa) --celt=no $(usev classic --classic) @@ -83,6 +86,7 @@ multilib_src_configure() { --opus=$(usex opus) --portaudio=no --samplerate=$(usex libsamplerate) + --systemd=$(multilib_native_usex systemd $(usex classic)) --winmme=no ) diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest index 4cd1f1be4e77..2bbf789753c7 100644 --- a/media-sound/schismtracker/Manifest +++ b/media-sound/schismtracker/Manifest @@ -1,5 +1,8 @@ +AUX schismtracker-20221201-bashism.patch 1102 BLAKE2B 69d03032f77f6c60076f35ba3632c642f5bf5ab717adf08cb8039bcab6edcb5c38360a7874e92f1161df67f4f599e6adffc68e30a57b623f11418425c9b7ad5b SHA512 67e267856f0f11db23a3ef291ec8e6630047958d3dfce1034ecbb72fe21c6ac27802398acc4c863bacd16097624ea8883a98bfb17eb6a3d57167a7eb054843f4 DIST schismtracker-20220905.tar.gz 1278816 BLAKE2B 6f461732c99a01c8f4a17afbac61b9b52686cd6c0e58c99f75337b4e33e187b5465f9adf5422ec3a455e9448f1beac845080816001af02cf2afa5740b9f384a7 SHA512 2429e6a3ed6004a0d327ddb8ae7c379fbed4e4d2e2fe87be225fb85c990327fa3008115f9dbdcf08b3691c50411bf5aad04e97264a2f9ef6c05c7cfdc6231bda DIST schismtracker-20221020.tar.gz 1276386 BLAKE2B d498eba07d05729640eb78de3253a47aad9f09594ea4b45195a4f829b581ca293cef5f12ddcb8bdf7c9b2f01ff9b3e00c5e7c54a23a179d3af23567c233a96f5 SHA512 1653800b0967926c8edab96636fcad547d94f20b6bc06f27780c75d48d7944983ba36013c62bfc9c0f6fcf33e3e8f9fb4c70fff19fd2a56c672ecfc1ba2f2cd7 +DIST schismtracker-20221201.source.tar.gz 1633099 BLAKE2B 6f376323002f85031140be7d54b1ab8bd830f8654e90c07596c9a45ce2ce76dfda51f124ff01247c1a371269b2924470faab06d7692a76ced694fdf05937f384 SHA512 062dc54b541709be0a5c8b0c5edadc9710106154c15b2a40847998db33aaba7d07740cdd32da94f56725e66834221bc5470f9a111eb41a06fbfbd70fdc920113 EBUILD schismtracker-20220905.ebuild 1305 BLAKE2B defbd3cca41714e6a2f75392a07c0ef44765ae146e28887f628dd7ab3caebb4b21a502eb8693ddadcfa7904f6b60b695a6bb766b2aaaa281050d0b2b649fdda1 SHA512 b37529e6702b49fd6a4ea7a1332ff4fc898ccf71c4ff1b33e7c2b1153409c8da91bde1489b82fad2d873a9454041ef2c7cd09ce44a69deff5704c3016d1d145a EBUILD schismtracker-20221020.ebuild 1305 BLAKE2B defbd3cca41714e6a2f75392a07c0ef44765ae146e28887f628dd7ab3caebb4b21a502eb8693ddadcfa7904f6b60b695a6bb766b2aaaa281050d0b2b649fdda1 SHA512 b37529e6702b49fd6a4ea7a1332ff4fc898ccf71c4ff1b33e7c2b1153409c8da91bde1489b82fad2d873a9454041ef2c7cd09ce44a69deff5704c3016d1d145a +EBUILD schismtracker-20221201.ebuild 1458 BLAKE2B 7bf2e8f990816b4f5d68c79c3eafba00802f5689f0385591c545bd8058f1d9e3e031b0b4bf1a072da43381021c2350ca80dece6289cebd9fd724ecf85dcb58bb SHA512 3455d5adafc1c318e0a4ba4a427200b61236735b4b2725c9ce76dec67fe212ee512729242aa18301cd86b2b645d79949f11e2aeef46de61d0a9ca62f33ee7299 MISC metadata.xml 356 BLAKE2B d0dafca63357e3b8b2fd8658b79f4f3e62202273f63dd59fbe1cdd7255a66ac2199854ee1adc870cb5b82ae18c294e65a5504163347920480e851a914dcc1fb6 SHA512 5c0f821a6f33b5a06ea18319e989c38714d2cc06bd2049b4e52fef62fdfe93b2e1a2e2c97c4776ebcd9cc10ecd3039b1f805faf5acc63cd20d60d3b4d05d4e3d diff --git a/media-sound/schismtracker/files/schismtracker-20221201-bashism.patch b/media-sound/schismtracker/files/schismtracker-20221201-bashism.patch new file mode 100644 index 000000000000..64cad709efe0 --- /dev/null +++ b/media-sound/schismtracker/files/schismtracker-20221201-bashism.patch @@ -0,0 +1,29 @@ +https://github.com/schismtracker/schismtracker/pull/340 + +From 5f2f594b6a4055318fa31d3c0cd6ecc8dc3666f7 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 2 Dec 2022 01:39:06 +0000 +Subject: [PATCH] Fix bashism in configure.ac sdl2-config check +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +configure scripts need to be runnable with a POSIX-compliant /bin/sh. + +On many (but not all!) systems, /bin/sh is provided by Bash, so errors +like this aren't spotted. Notably Debian defaults to /bin/sh provided +by dash which doesn't tolerate such bashisms as '=='. + +This retains compatibility with bash. +--- a/configure.ac ++++ b/configure.ac +@@ -63,7 +63,7 @@ AC_C_BIGENDIAN + dnl Check for SDL libs + AC_CHECK_TOOL([SDL_CONFIG], [sdl2-config]) + AC_SUBST(SDL_CONFIG) +-if test "x$SDL_CONFIG" == "x"; then ++if test "x$SDL_CONFIG" = "x"; then + AC_MSG_ERROR([*** sdl2-config not found.]) + fi + AS_VERSION_COMPARE([$($SDL_CONFIG --version)], [2.0.5], [AC_MSG_ERROR([*** SDL version >= 2.0.5 not found.])]) + diff --git a/media-sound/schismtracker/schismtracker-20221201.ebuild b/media-sound/schismtracker/schismtracker-20221201.ebuild new file mode 100644 index 000000000000..980ebc3426fa --- /dev/null +++ b/media-sound/schismtracker/schismtracker-20221201.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop xdg + +DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music" +HOMEPAGE="http://schismtracker.org/" +SRC_URI="https://github.com/schismtracker/schismtracker/releases/download/${PV}/${P}.source.tar.gz" +S="${WORKDIR}" + +LICENSE="GPL-2 LGPL-2 public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=media-libs/libsdl2-2.0.5[X] + x11-libs/libX11 + x11-libs/libXv +" +DEPEND="${RDEPEND} + virtual/os-headers + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}"/${PN}-20221201-bashism.patch +) + +src_prepare() { + default + + # Can drop this once bashism patch unnecessary + eautoreconf + + # workaround for temporary files (missing directory). Fixes: + # sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c + # /bin/sh: auto/default-font.c: No such file or directory + mkdir auto || die + + # sys-devel/binutils[multitarget] provides ${CHOST}-windres + # wine provides /usr/bin/windres + # and schismtracker fails to use it properly: + # sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory + [[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES= +} + +src_install() { + default + + domenu sys/fd.org/*.desktop + doicon icons/schism{,-itf}-icon-128.png +} -- cgit v1.2.3