From ec9f79e1d3358df31a704f16a76a269ccceae2b2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Dec 2022 20:03:07 +0000 Subject: gentoo auto-resync : 24:12:2022 - 20:03:07 --- media-sound/Manifest.gz | Bin 56409 -> 56413 bytes media-sound/alsa-utils/Manifest | 2 +- media-sound/alsa-utils/alsa-utils-1.2.8-r1.ebuild | 92 ------------------ media-sound/alsa-utils/alsa-utils-1.2.8-r2.ebuild | 91 ++++++++++++++++++ media-sound/gbsplay/Manifest | 11 ++- .../files/gbsplay-0.0.94-fix-buildsys-1.patch | 71 ++++++++++++++ .../files/gbsplay-0.0.94-fix-buildsys-2.patch | 107 +++++++++++++++++++++ .../files/gbsplay-0.0.94-fix-off-by-one-err.patch | 24 +++++ .../files/gbsplay-0.0.94-fix-sharedlib-build.patch | 36 +++++++ .../gbsplay-0.0.94-no-install-desktop-mime.patch | 14 +++ media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild | 56 ----------- media-sound/gbsplay/gbsplay-0.0.94.ebuild | 68 +++++++++++++ media-sound/gbsplay/metadata.xml | 3 + 13 files changed, 423 insertions(+), 152 deletions(-) delete mode 100644 media-sound/alsa-utils/alsa-utils-1.2.8-r1.ebuild create mode 100644 media-sound/alsa-utils/alsa-utils-1.2.8-r2.ebuild create mode 100644 media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-1.patch create mode 100644 media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-2.patch create mode 100644 media-sound/gbsplay/files/gbsplay-0.0.94-fix-off-by-one-err.patch create mode 100644 media-sound/gbsplay/files/gbsplay-0.0.94-fix-sharedlib-build.patch create mode 100644 media-sound/gbsplay/files/gbsplay-0.0.94-no-install-desktop-mime.patch delete mode 100644 media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild create mode 100644 media-sound/gbsplay/gbsplay-0.0.94.ebuild (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index fbdf4c31ff72..792096c83f6b 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest index d47709dec168..fc6b726b4629 100644 --- a/media-sound/alsa-utils/Manifest +++ b/media-sound/alsa-utils/Manifest @@ -5,6 +5,6 @@ AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b76 DIST alsa-utils-1.2.7.tar.bz2 1562595 BLAKE2B dd8821c510a98d76e2986d59c01516013f01c632fb6311e6ffd2b10eabbdd68312537d977b1bf2ab48e0f181751ecf58ec1c1da3f8d4f7ee84d8f2623893a091 SHA512 1be8f617315193e6033653ac96a14bd1c3272cd9d8f3776cdb1357f35f5353652acd5975cfc5bd16278cd496f5bf409bb60432818a526282edad9a4c718a97c9 DIST alsa-utils-1.2.8.tar.bz2 1560162 BLAKE2B 4b9676957e775be51076b4798dfd384db4eea440c682899024034d3dd593ba24f1d42b8d742c312e041a37f0dbbc12b16635d79f6e6633a3459cc21f80739b5e SHA512 882e6f67467596ed273bf554fcce87d8ef287806bbdabd6c103de4980981f9e2102fb3800c6e8628ee8e86ffb165c1c92f9370c8145f28a6cb7cca563942330b EBUILD alsa-utils-1.2.7-r1.ebuild 2513 BLAKE2B 1b6bcd11aa55710907940a1f28713bfe8ee2a871ead905858d1fae1069bbca4893a9bdcfaceddb1915fb8d80cf127eb45f02d9a55b25a9c7dfcb9b7b63105f36 SHA512 1fe83211234f6bbab673150b19775b9aa9d0fd2303b32240c698bdfbb9b8a6a0db8637093e2e29f302985326f147601b4b20406613cd4ffd3c4e655b8bbdc208 -EBUILD alsa-utils-1.2.8-r1.ebuild 2508 BLAKE2B 8133bcdb855be091b167125d55c350996fe2d07a3d3cf503da6005abe5ecc20de7b1d94017b4db8d97f7c24c6e0be671731f5c583328894b655d7e67e0cd8c41 SHA512 8c28e46fb314798294235817746d213f7c4323ceb4f3619d8b5c459819c81782c00001e439f56b5d2d395aa2c935415c576ea5323b56abb8aa52ad28a3a358c4 +EBUILD alsa-utils-1.2.8-r2.ebuild 2504 BLAKE2B 8bfb25c167466296d26319949e69c4ccd9441e53ec50d7f21ffce9d3a0c1a4cb987378e2ef2a00d8305f924851de6b8a63aa231c6b0ba529810292b3581ad2e3 SHA512 7045ba80ef35b6de3bd13558687f0027dfb5034c83b51452523b05d7bfdf338740882fd4027edde12004db016de9c13728bceb3d587665c75368d7eee04dd061 EBUILD alsa-utils-1.2.8.ebuild 2508 BLAKE2B 8133bcdb855be091b167125d55c350996fe2d07a3d3cf503da6005abe5ecc20de7b1d94017b4db8d97f7c24c6e0be671731f5c583328894b655d7e67e0cd8c41 SHA512 8c28e46fb314798294235817746d213f7c4323ceb4f3619d8b5c459819c81782c00001e439f56b5d2d395aa2c935415c576ea5323b56abb8aa52ad28a3a358c4 MISC metadata.xml 630 BLAKE2B 297896d48e1b947e3d8fdb0e8508846ac5f11740101a80d1d492e8fdd6bb042d629c654583d3262c00a0e33d31ecf3b6f4b3c07c73ede339b4ed168d4c5deae0 SHA512 1e26d146329b58c509ee8a9e6683bd0bc15651d942a7d400383106d3e61df0d3148322bedf0d10e445db74109ee1ee759310eb72c5e3fb1ae4ec258892d378b2 diff --git a/media-sound/alsa-utils/alsa-utils-1.2.8-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.8-r1.ebuild deleted file mode 100644 index 99651ae43b13..000000000000 --- a/media-sound/alsa-utils/alsa-utils-1.2.8-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd udev - -DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" -HOMEPAGE="https://alsa-project.org/wiki/Main_Page" -SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0.9" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux" - -DEPEND=" - >=media-libs/alsa-lib-${PV} - libsamplerate? ( media-libs/libsamplerate ) - ieee1394? ( media-libs/libffado ) - ncurses? ( >=sys-libs/ncurses-5.7-r7:= ) - bat? ( sci-libs/fftw:= ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-alsa ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/xmlto ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.8-missing_header.patch -) - -src_configure() { - export ac_cv_lib_ffado_ffado_streaming_init=$(usex ieee1394) - - local myeconfargs=( - # --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214 - --disable-alsaconf - --disable-maintainer-mode - --with-asound-state-dir="${EPREFIX}"/var/lib/alsa - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d - $(use_enable bat) - $(use_enable libsamplerate alsaloop) - $(use_enable ncurses alsamixer) - $(use_enable nls) - $(usex doc '' --disable-xmlto) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - dodoc seq/*/README.* - - newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound - newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound - - insinto /etc/modprobe.d - newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf - - keepdir /var/lib/alsa - - # ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not - # scan directory /usr/share/alsa/ucm: No such file or directory - # alsaucm: unable to obtain card list: No such file or directory - keepdir /usr/share/alsa/ucm -} - -pkg_postinst() { - udev_reload - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - elog "To take advantage of the init script, and automate the process of" - elog "saving and restoring sound-card mixer levels you should" - elog "add alsasound to the boot runlevel. You can do this as" - elog "root like so:" - elog "# rc-update add alsasound boot" - ewarn - ewarn "The ALSA core should be built into the kernel or loaded through other" - ewarn "means. There is no longer any modular auto(un)loading in alsa-utils." - fi -} - -pkg_postrm() { - udev_reload -} diff --git a/media-sound/alsa-utils/alsa-utils-1.2.8-r2.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.8-r2.ebuild new file mode 100644 index 000000000000..4405067a27fa --- /dev/null +++ b/media-sound/alsa-utils/alsa-utils-1.2.8-r2.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd udev + +DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" +HOMEPAGE="https://alsa-project.org/wiki/Main_Page" +SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0.9" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux" + +DEPEND=" + >=media-libs/alsa-lib-${PV} + libsamplerate? ( media-libs/libsamplerate ) + ieee1394? ( media-libs/libffado ) + ncurses? ( >=sys-libs/ncurses-5.7-r7:= ) + bat? ( sci-libs/fftw:= ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-alsa ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/xmlto ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.8-missing_header.patch +) + +src_configure() { + export ac_cv_lib_ffado_ffado_streaming_init=$(usex ieee1394) + + local myeconfargs=( + # --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214 + --disable-alsaconf + --disable-maintainer-mode + --with-asound-state-dir="${EPREFIX}"/var/lib/alsa + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d + $(use_enable bat) + $(use_enable libsamplerate alsaloop) + $(use_enable ncurses alsamixer) + $(use_enable nls) + $(usex doc '' --disable-xmlto) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + dodoc seq/*/README.* + + newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound + newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound + + keepdir /var/lib/alsa + + # ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not + # scan directory /usr/share/alsa/ucm: No such file or directory + # alsaucm: unable to obtain card list: No such file or directory + keepdir /usr/share/alsa/ucm + + find "${ED}" -type f -name '*.la' -delete || die +} + +pkg_postinst() { + udev_reload + + if [[ -z ${REPLACING_VERSIONS} ]] && ! systemd_is_booted ; then + elog + elog "To take advantage of the init script, and automate the process of" + elog "saving and restoring sound-card mixer levels you should" + elog "add alsasound to the boot runlevel. You can do this as" + elog "root like so:" + elog "# rc-update add alsasound boot" + ewarn + ewarn "The ALSA core should be built into the kernel or loaded through other" + ewarn "means. There is no longer any modular auto(un)loading in alsa-utils." + fi +} + +pkg_postrm() { + udev_reload +} diff --git a/media-sound/gbsplay/Manifest b/media-sound/gbsplay/Manifest index fd7e4b1b446f..2959b4494597 100644 --- a/media-sound/gbsplay/Manifest +++ b/media-sound/gbsplay/Manifest @@ -1,4 +1,9 @@ AUX gbsplay-0.0.91-fix-buildsystem.patch 824 BLAKE2B b51c452cdc889ff43c240e2ebe1aca371c01d4f2ba89cf248ed2e54d05c8207de6caa84553e4fb050afdf04d577609f951d418927e9e79e9a416712250ae3259 SHA512 f794afcfa72c53382f48c7418d939f999f553f4db8a5eb2b90ccbeaaf261681bd9f016aeeae5e1245f4c4e3817bd9badaafbdaaa614042c3353f7d643d44331e -DIST gbsplay-0.0.91.tar.gz 61071 BLAKE2B b1c5c0f7f852961a082a686eb992caa835480fc0a6c15f509ec637c016a64b830f7d6aaa337f204c78213ea5c95bac0e12649023780f38a84dddab97f5efe448 SHA512 94a5acd892740f2443fbc5455a190cba2aefddf3608a6f59213175bb8985d21d4f2cb4011e332756ae2bf977432e03be53014f203d7b9edc572048e2a6124f08 -EBUILD gbsplay-0.0.91-r2.ebuild 1145 BLAKE2B abdc408ce0bd462d01b775248cee737527549e98a9ec8d0d747e7564c19e12901bd6337d6b5fc6383c93bda24831b3cbb5319a3be104b35ec250e8f5ba373401 SHA512 bd60cbf9c61d1415d6fa62a3bc55824aa196ce0fd8b56b46995eb0b39cd13a7addae6fe1e8608faf7d4e601375549f796540ceb1e252383b1c7c627f484c04f8 -MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b +AUX gbsplay-0.0.94-fix-buildsys-1.patch 1838 BLAKE2B 249b77c0af40b5a60ff49bf55460d6af2238addc721033487a8c64e707f49fd0948ece400624df8564db29b6b42879198f767cf0cb19edffd15fef5f7fcae145 SHA512 fd96a460229b8fca5fdf91202bde9f72dc97e4d73416e06b4db2d1b9e28a2b2e2ad6f5325bf0d492be915a9fa8c71446f71b01273e383178441c1a8d04374b90 +AUX gbsplay-0.0.94-fix-buildsys-2.patch 2937 BLAKE2B 80121bfea6bc92e8565ebc9dfa8db8df51c4b47bee3c3ea038ce61d2f695629338ed22dc21fbf75433aa6de69f899d5fb32aae5935c71a6378ca119c49250cba SHA512 b16f5e19282424b3aa01c086b169706546e7e1dbd993ddf5058af30890f861e7f69bb981a4876ae77bba54bf594300af974b70d7d5a6da41e59131a89981774e +AUX gbsplay-0.0.94-fix-off-by-one-err.patch 775 BLAKE2B e3dad6716d4941618055eb8c86b3f24e5a360ebcd0d3d509890599ccaf6e14128bf74d84de5b2002176ce2adec481ee8c4942781dfcf991a543cf6015e0d8afb SHA512 f02c2f6eae8b584c022f361e22ff9ca009cae709116946f5ccdc29333da7bbfce771d7388e49a8a1d01fe8613af2135e44a183d590882846cc83517ec63b8fc2 +AUX gbsplay-0.0.94-fix-sharedlib-build.patch 1235 BLAKE2B 54ec7672bfcab2775a01748165cb735f7ce24d2ec022c92da6d100b9c27806fec635b42ca58c4f1b4b9c7951511f957228085367ddb3961f7dd53503fad83d8d SHA512 9289c5ec58ecb9766e64769cd6b8eb48832822e9d2ebe1a8fdfd6fbf43db6cd96d4d20a86994e8a8237e610f07f23c302e74535b650e4fcbadeb11c69114874b +AUX gbsplay-0.0.94-no-install-desktop-mime.patch 509 BLAKE2B 2b85c7e7c129d17847f792db80843d2bb0df34a9880e475319da9a7fff962fcba34453242038d87a07fd3d153a09db1db8bf213ca34955aa55915a21a644776d SHA512 a6c0d41571443a562a2f2eb3b666692575d48ee4600beda941ab49cce02ee1d39d5d4553d9efc51dcbaacf534edac123237a262f11323fa08308b70bd82943f7 +DIST gbsplay-0.0.94.tar.gz 136589 BLAKE2B 688fefc51fe693ab1da41f258bd6d7daccedadac31ecd80ba25488c11c6cfa6e823aeef5f97c1c9210b32aa02382845d312d077117df5781f5c2e2d165a352cc SHA512 36d545d658b57a86f31477911b29c0a9150e67a75b18a0b3897f47f58bec25588cda34c235ff10393f1767e3321bb9bd63debf0c30d3031e192b4df759053c1a +EBUILD gbsplay-0.0.94.ebuild 1534 BLAKE2B 2b8cc8e0ad0df5057ee3bc05f8253f7d29b4ee73c0b77d8eb5b05deaf07e2997454110e9d681f65b4369479af7bd047044cab2c1be89e0789145fd4d5aed8b4f SHA512 8ff1afbda8b66ff9246c6790808a41e286cb954f0b90014ecac9e295e2d8b2a9b0416abf0cef36af59e637bded66ee2914597d28caa19f4e6712c2e778424466 +MISC metadata.xml 333 BLAKE2B 8a589e2047914bbafbd8107ecc9ef46b34658bf102ff9944ee30af442f9ebec44c9b2728f8f6fc0211782fc729a053a8f78baa191ffa599daede468443013669 SHA512 97b4924f8f451b773ae40d658a7da02c0e6be5098261e3e2a5fe4c49e6ecf77c3bb0c4b976da26d0caaf86b1eea94642ff2e2be870c8448197bc31a3d9bf59a4 diff --git a/media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-1.patch b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-1.patch new file mode 100644 index 000000000000..87c9a660792d --- /dev/null +++ b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-1.patch @@ -0,0 +1,71 @@ +From 89134a5847bc143ce0c7acf1ca860861b4639a6b Mon Sep 17 00:00:00 2001 +From: ranma +Date: Wed, 4 Nov 2020 10:20:08 +0100 +Subject: [PATCH] Avoid running depend.sh before config.mk is included + +Should fix "./depend.sh: line 27: exec: : not found" +--- + Makefile | 9 ++++++++- + configure | 1 + + depend.sh | 2 +- + 3 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 26aa20b..de4e761 100644 +--- a/Makefile ++++ b/Makefile +@@ -50,6 +50,7 @@ SPLINTFLAGS := \ + -shiftnegative \ + -shiftimplementation + ++configured := no + ifneq ($(noincludes),yes) + -include config.mk + endif +@@ -247,15 +248,21 @@ endif + # include the rules for each subdir + include $(shell find . -type f -name "subdir.mk") + ++ifeq ($(configured),yes) + default: config.mk $(objs) $(dsts) $(mans) $(EXTRA_ALL) $(TEST_TARGETS) ++else ++default: config.mk ++endif + + # include the dependency files + + ifneq ($(noincludes),yes) ++ifeq ($(configured),yes) + deps := $(patsubst %.o,%.d,$(filter %.o,$(objs))) + deps += $(patsubst %.lo,%.d,$(filter %.lo,$(objs))) + -include $(deps) + endif ++endif + + distclean: clean + find . -regex ".*\.d" -exec rm -f "{}" \; +diff --git a/configure b/configure +index 455e5a0..e5882dc 100755 +--- a/configure ++++ b/configure +@@ -1046,6 +1046,7 @@ __EOF__ + echo plugout_nas := $use_nas + echo plugout_pulse := $use_pulse + echo plugout_stdout := $use_stdout ++ echo configured := yes + ) > config.mk + + ( +diff --git a/depend.sh b/depend.sh +index 09a2cb7..29ac15b 100755 +--- a/depend.sh ++++ b/depend.sh +@@ -24,7 +24,7 @@ if [ -f "${DIR}subdir.mk" ]; then + SUBMK=" ${DIR}subdir.mk" + fi + +-exec "$CC" -M $GBSCFLAGS "$FILE" | ++exec "$BUILDCC" -M $GBSCFLAGS "$FILE" | + sed -n -e " + s@^\\(.*\\)\\.o:@$DIR\\1.d $DIR\\1.o $DIR\\1.lo: depend.sh Makefile$SUBMK$EXTRADEP@ + s@/usr/[^ ]*@@g diff --git a/media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-2.patch b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-2.patch new file mode 100644 index 000000000000..a55e665f5090 --- /dev/null +++ b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-buildsys-2.patch @@ -0,0 +1,107 @@ +From a4290411d7f7c1482b3073a4ef9e7e2d0ccdd019 Mon Sep 17 00:00:00 2001 +From: ranma +Date: Wed, 4 Nov 2020 22:18:12 +0100 +Subject: [PATCH] Avoid running depend.sh before config.mk is included + +Should fix: + "./depend.sh: line 27: exec: : not found" +and also avoid the + "fatal error: impulse.h: No such file or directory" +warning. +--- + Makefile | 33 ++++++++++++++++++++------------- + depend.sh | 2 +- + 2 files changed, 21 insertions(+), 14 deletions(-) + +diff --git a/Makefile b/Makefile +index de4e761..8c2d70f 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,6 +16,7 @@ all: default + + noincludes := $(patsubst distclean,yes,$(MAKECMDGOALS)) + ++# Defaults, overridden by config.mk below once configure has run + prefix := /usr/local + exec_prefix := $(prefix) + +@@ -55,9 +56,19 @@ ifneq ($(noincludes),yes) + -include config.mk + endif + ++generatedeps := no ++ifneq ($(noincludes),yes) ++ifeq ($(configured),yes) ++ifeq ($(wildcard impulse.h),impulse.h) ++generatedeps := yes ++endif ++endif ++endif ++ + XMMSPREFIX := + DESTDIR := + ++# Update paths with user-provided DESTDIR + prefix := $(DESTDIR)$(prefix) + exec_prefix := $(DESTDIR)$(exec_prefix) + bindir := $(DESTDIR)$(bindir) +@@ -248,20 +259,17 @@ endif + # include the rules for each subdir + include $(shell find . -type f -name "subdir.mk") + +-ifeq ($(configured),yes) +-default: config.mk $(objs) $(dsts) $(mans) $(EXTRA_ALL) $(TEST_TARGETS) +-else +-default: config.mk +-endif +- +-# include the dependency files ++ifeq ($(generatedeps),yes) ++# Ready to build deps and everything else ++default: config.mk impulse.h $(objs) $(dsts) $(mans) $(EXTRA_ALL) $(TEST_TARGETS) + +-ifneq ($(noincludes),yes) +-ifeq ($(configured),yes) ++# Generate & include the dependency files + deps := $(patsubst %.o,%.d,$(filter %.o,$(objs))) + deps += $(patsubst %.lo,%.d,$(filter %.lo,$(objs))) + -include $(deps) +-endif ++else ++# Configure still needs to be run and/or impulse.h is not generated yet ++default: config.mk impulse.h + endif + + distclean: clean +@@ -400,8 +408,7 @@ $(gen_impulse_h_bin): $(objs_gen_impulse_h) + $(HOSTCC) -o $(gen_impulse_h_bin) $(objs_gen_impulse_h) -lm + impulse.h: $(gen_impulse_h_bin) + $(Q)./$(gen_impulse_h_bin) > $@ +-gbhw.o: impulse.h +-gbhw.lo: impulse.h ++ $(Q)$(MAKE) + + libgbspic.a: $(objs_libgbspic) + $(AR) r $@ $+ +@@ -450,7 +457,7 @@ config.mk: configure + + %.d: %.c config.mk + @echo DEP $< -o $@ +- $(Q)./depend.sh $< config.mk > $@ || rm -f $@ ++ $(Q)CC=$(BUILDCC) ./depend.sh $< config.mk > $@ || rm -f $@ + + %.1: %.in.1 config.sed + sed -f config.sed $< > $@ +diff --git a/depend.sh b/depend.sh +index 29ac15b..09a2cb7 100755 +--- a/depend.sh ++++ b/depend.sh +@@ -24,7 +24,7 @@ if [ -f "${DIR}subdir.mk" ]; then + SUBMK=" ${DIR}subdir.mk" + fi + +-exec "$BUILDCC" -M $GBSCFLAGS "$FILE" | ++exec "$CC" -M $GBSCFLAGS "$FILE" | + sed -n -e " + s@^\\(.*\\)\\.o:@$DIR\\1.d $DIR\\1.o $DIR\\1.lo: depend.sh Makefile$SUBMK$EXTRADEP@ + s@/usr/[^ ]*@@g diff --git a/media-sound/gbsplay/files/gbsplay-0.0.94-fix-off-by-one-err.patch b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-off-by-one-err.patch new file mode 100644 index 000000000000..5b9b076ed2cd --- /dev/null +++ b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-off-by-one-err.patch @@ -0,0 +1,24 @@ +From e9ef7a872ac7f7201b195c961b64f6ce33a5b110 Mon Sep 17 00:00:00 2001 +From: Sanqui +Date: Thu, 23 Jul 2020 21:41:16 +0300 +Subject: [PATCH] Fix off-by-one error in gbhw_io_peek + +This bug made e.g. WAVE display when verbose incorrect, as the +last byte of the waveform would always be given as FF. +--- + gbhw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gbhw.c b/gbhw.c +index 931c79d..dd60066 100644 +--- a/gbhw.c ++++ b/gbhw.c +@@ -1000,7 +1000,7 @@ regparm void gbhw_io_put(uint16_t addr, uint8_t val) { + /* unmasked peek used by gbsplay.c to print regs */ + regparm uint8_t gbhw_io_peek(uint16_t addr) + { +- if (addr >= 0xff10 && addr <= 0xff3e) { ++ if (addr >= 0xff10 && addr <= 0xff3f) { + return ioregs[addr & 0x7f]; + } + return 0xff; diff --git a/media-sound/gbsplay/files/gbsplay-0.0.94-fix-sharedlib-build.patch b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-sharedlib-build.patch new file mode 100644 index 000000000000..31f001596161 --- /dev/null +++ b/media-sound/gbsplay/files/gbsplay-0.0.94-fix-sharedlib-build.patch @@ -0,0 +1,36 @@ +From 1b14c65c60da03c3a51fd62aa6dcbf9847453834 Mon Sep 17 00:00:00 2001 +From: Tobias Diedrich +Date: Sat, 27 Jun 2020 21:49:03 +0200 +Subject: [PATCH] Fix broken compilation with shared libgbs + +From 8bf4d3b484bc39986a7db7dd759ebda8602048e9 Mon Sep 17 00:00:00 2001 +From: Tobias Diedrich +Date: Sat, 27 Jun 2020 21:51:49 +0200 +Subject: [PATCH] Fix broken compilation with shared libgbs try 2 + +--- + Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index f629d37..5535c8e 100644 +--- a/Makefile ++++ b/Makefile +@@ -77,6 +77,8 @@ DISTDIR := gbsplay-$(VERSION) + + GBSCFLAGS := $(EXTRA_CFLAGS) + GBSLDFLAGS := $(EXTRA_LDFLAGS) ++comma := , ++GBSLIBLDFLAGS := -lm $(subst -pie,,$(subst -Wl$(comma)-pie,,$(EXTRA_LDFLAGS))) + # Additional ldflags for the gbsplay executable + GBSPLAYLDFLAGS := + +@@ -207,7 +209,7 @@ uninstall-libgbs.so.1: + + + libgbs.so.1: $(objs_libgbspic) libgbs.so.1.ver +- $(BUILDCC) -fpic -shared -Wl,-soname=$@ -Wl,--version-script,$@.ver -o $@ $(objs_libgbspic) -lm ++ $(BUILDCC) -fpic -shared -Wl,-soname=$@ -Wl,--version-script,$@.ver -o $@ $(objs_libgbspic) $(GBSLIBLDFLAGS) + ln -fs $@ libgbs.so + + libgbs: libgbs.so.1 diff --git a/media-sound/gbsplay/files/gbsplay-0.0.94-no-install-desktop-mime.patch b/media-sound/gbsplay/files/gbsplay-0.0.94-no-install-desktop-mime.patch new file mode 100644 index 000000000000..39d156cd0a21 --- /dev/null +++ b/media-sound/gbsplay/files/gbsplay-0.0.94-no-install-desktop-mime.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 28f2c55..8753496 100644 +--- a/Makefile ++++ b/Makefile +@@ -282,9 +282,5 @@ install-default: + install -m 644 man/gbsplay.1 man/gbsinfo.1 $(man1dir) + install -m 644 man/gbsplayrc.5 $(man5dir) +- install -m 644 mime/gbsplay.xml $(mimedir)/packages +- -update-mime-database $(mimedir) +- install -m 644 desktop/gbsplay.desktop $(appdir) +- -update-desktop-database $(appdir) + install -m 644 $(docs) $(docdir) + install -m 644 $(examples) $(exampledir) + for i in $(mos); do \ diff --git a/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild b/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild deleted file mode 100644 index 78a4fa830bf5..000000000000 --- a/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="de en" -inherit plocale toolchain-funcs - -DESCRIPTION="Nintendo Gameboy sound player for GBS format" -HOMEPAGE="https://www.cgarbs.de/gbsplay.en.html" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+alsa nas nls oss" - -RDEPEND="alsa? ( media-libs/alsa-lib:0 ) - nas? ( media-libs/nas:0 )" - -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext:0 )" - -PATCHES=( - "${FILESDIR}/${P}-fix-buildsystem.patch" -) - -src_configure() { - tc-export AR CC - - # No econf, because "unknown option '--build=x86_64-pc-linux-gnu'" - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --docdir=/usr/share/doc/${PF} \ - --without-xmmsplugin \ - --without-test \ - $(use_enable nls i18n) \ - $(use_enable oss devdsp) \ - $(use_enable alsa) \ - $(use_enable nas) || die "Configure failed." -} - -src_compile() { - emake CC="$(tc-getCC)" SPLINT="true" -} - -remove_disabled_locale() { - rm -r "${D}"/usr/share/locale/$1 || die -} - -src_install() { - default - - plocale_for_each_disabled_locale remove_disabled_locale -} diff --git a/media-sound/gbsplay/gbsplay-0.0.94.ebuild b/media-sound/gbsplay/gbsplay-0.0.94.ebuild new file mode 100644 index 000000000000..7e0fdf78678b --- /dev/null +++ b/media-sound/gbsplay/gbsplay-0.0.94.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="de en" +inherit plocale toolchain-funcs + +DESCRIPTION="Nintendo Gameboy sound player for GBS format" +HOMEPAGE="https://www.cgarbs.de/gbsplay.en.html" +SRC_URI="https://github.com/mmitch/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+alsa nas nls oss pulseaudio" + +RDEPEND=" + alsa? ( media-libs/alsa-lib:0 ) + nas? ( media-libs/nas:0 ) + pulseaudio? ( media-libs/libpulse ) +" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext:0 )" + +PATCHES=( + # git master + "${FILESDIR}/${P}-fix-sharedlib-build.patch" + "${FILESDIR}/${P}-fix-off-by-one-err.patch" + "${FILESDIR}/${P}-fix-buildsys-1.patch" + "${FILESDIR}/${P}-fix-buildsys-2.patch" + # downstream + "${FILESDIR}/${P}-no-install-desktop-mime.patch" +) + +src_configure() { + tc-export AR CC + + local myconfargs=( + --prefix=/usr + --mandir=/usr/share/man + --docdir=/usr/share/doc/${PF} + --disable-hardening + --without-xmmsplugin + --without-test + $(use_enable alsa) + $(use_enable nas) + $(use_enable nls i18n) + $(use_enable oss devdsp) + $(use_enable pulseaudio pulse) + ) + + # No econf, because "unknown option '--libdir=/usr/lib64" + ./configure ${myconfargs[@]} || die "Configure failed." +} + +src_compile() { + emake CC="$(tc-getCC)" SPLINT="true" +} + +src_install() { + remove_disabled_locale() { + rm -r "${D}"/usr/share/locale/$1 || die + } + default + + plocale_for_each_disabled_locale remove_disabled_locale +} diff --git a/media-sound/gbsplay/metadata.xml b/media-sound/gbsplay/metadata.xml index 93423219a5bc..678e48727127 100644 --- a/media-sound/gbsplay/metadata.xml +++ b/media-sound/gbsplay/metadata.xml @@ -5,4 +5,7 @@ sound@gentoo.org Gentoo Sound project + + mmitch/gbsplay + -- cgit v1.2.3