From d1c14e94a73fba924761cdad7298f3e48c6bc160 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 Jul 2024 08:00:51 +0100 Subject: gentoo auto-resync : 01:07:2024 - 08:00:50 --- media-libs/nas/Manifest | 3 +- .../nas/files/nas-1.9.5-gcc14-build-fix.patch | 76 +++++++++++++ media-libs/nas/nas-1.9.5-r1.ebuild | 123 -------------------- media-libs/nas/nas-1.9.5-r2.ebuild | 124 +++++++++++++++++++++ 4 files changed, 202 insertions(+), 124 deletions(-) create mode 100644 media-libs/nas/files/nas-1.9.5-gcc14-build-fix.patch delete mode 100644 media-libs/nas/nas-1.9.5-r1.ebuild create mode 100644 media-libs/nas/nas-1.9.5-r2.ebuild (limited to 'media-libs/nas') diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest index e38e99f99060..5a4db0f995ba 100644 --- a/media-libs/nas/Manifest +++ b/media-libs/nas/Manifest @@ -1,9 +1,10 @@ AUX nas-1.9.2-asneeded.patch 374 BLAKE2B a142f505190214db4f235ef8ec6283029c127b9b3c313b2405e6222a6f3d6d89931066d64a71b350b289ed07bed198bbc71a862396ef77d3fb5e7a2426b5abad SHA512 ad9275577d2e10f5201556e21f6251065d392a9620c475e1451b673fa62dc50ac8e45248862a802a70cd0efb19ad67205b50e05df1588f91ef854e66860334a3 AUX nas-1.9.4-libfl.patch 349 BLAKE2B ee8d3ec8859fc47c87bf5d9a40cc2b468c136983a6b8dfb22d4c6469630b5dae92d3ec382ff7afc5ac2f94435ac8208059f90313a03700c4da7b93a19e34c05c SHA512 e4291fce8199f4340b969da6e2742e26ef6589e71ecc947a0fb1d68b9f995ae7dd514ad98232a4c11d1ebc7ea0ab3ea95674893fedbae7626c97c06c9ba88459 +AUX nas-1.9.5-gcc14-build-fix.patch 3319 BLAKE2B d72a07e751b176e76b97791cf0eb551ed4e6ce7cfb290ca41ec69fa07573894bc383e4db34a67858e731e197e056ac24ce81a790332538474afcffa8f29ed880 SHA512 f29e77ef52a923787017a9451fcf83ffb63612bfd06aef403ac6e9ce1caa7502bd2a96c8135366fa29e37ad2c94e5f942b130a2a26121339e975be70b8dbdf5a AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468 DIST nas-1.9.5-patches.tar.xz 7788 BLAKE2B 54172eba6547b0890cdef7b87a38b7d85bf05ffbec2d459da6b66b48ce7e627a9c7a4c4d4550729d0c4acd3de99a0299d57d2cc75ecea74f745764f284a9d0e7 SHA512 dce3e68c3018aa0553b4c48baa66e37db4db54ed33aad388902e2b05c9dcc6e696b69b1c00f9adbcfddcd262ed65758ea5897a13856315edd522297814df0899 DIST nas-1.9.5.tar.gz 1170144 BLAKE2B 81b063f888d66534f8779d6b0534397ada703868ff711c49b998fbf56bc6e4313fa245b6168fe9913936afa0685bab595df24f9f4bd5663dfa560c4b64534466 SHA512 051b32593e7ace09cf2d12720fb80e38d4f83f36858debacfb828c759e98b3e29401c76e3e3770f57fbbd1750a84b17a18e712f0de3dbe0ff56f2505c2488d9a -EBUILD nas-1.9.5-r1.ebuild 2814 BLAKE2B 1c0cf5f1bb726d21e101107a008094beb2911f7e8da2be51e9ffb6621fd768a07f255ca5230b78ae8abc10da9fe633f1c240104b632e5d8fcbf75a25874c548b SHA512 8af6f82b14aed22d54485d498008cdb38316e5a648761a7bd72fd39f0971f1a487bb505fd6708b12fb7ac252381cb872900d3508a69f1f29f37a921324d16d20 +EBUILD nas-1.9.5-r2.ebuild 2848 BLAKE2B 8a8864723605c928d38c5065d21e4d3f8c07a299eb5af2f860063f267b3ede25aaa9c8f0d6a6e79b8900be1a9a20f7178e1faa93cb7d5a4c82a3a417aff6f7b1 SHA512 9f55dde0117aa4ed5c8c06cc37eb96bb7e86d53419deeeaad53dac96ad9841ac37c419264287ad3da5f7979c2c23496d1656b2ad27b3486b05eb9a0be5406bcf EBUILD nas-1.9.5.ebuild 2628 BLAKE2B ebb4afbf0d60114193377c788ef96aa86537aaa26779c5175e5351d930a9b1504ff3c21958d5e0af5b01fd2c3cf2957425bbe8d26aab91e9f8d912e276b6f3cc SHA512 c99ac280908dc1ee24d1627ca0c3289d6e3a0a0cf85ea78a61a88201da3a860794230d2dcb203df2528b80cd5707eef77325a0dac5c2518322ebba2a81035ae4 MISC metadata.xml 327 BLAKE2B 61fd2aff2796ecff70b16eb84bc90e9242cc3b08d8fb8fff9eb702310ad248ed2c0946fa3f974a420684ad9db4c47f871111ec1170e7d44eca89f263ce533f80 SHA512 bc1d1fa01d3ae21da48bc805c5f822cdff2f14f6a9c6c1ad5ee65063c265bd1c62efb3f45746fe9d1cbf55ff742c7812113f94068a47907042952016067310a7 diff --git a/media-libs/nas/files/nas-1.9.5-gcc14-build-fix.patch b/media-libs/nas/files/nas-1.9.5-gcc14-build-fix.patch new file mode 100644 index 000000000000..629bd5dff2f0 --- /dev/null +++ b/media-libs/nas/files/nas-1.9.5-gcc14-build-fix.patch @@ -0,0 +1,76 @@ +https://sourceforge.net/p/nas/bugs/15/ +From: Brahmajit Das +Date: Tue, 30 Apr 2024 01:06:32 +0530 +Subject: [PATCH 1/1] Partially revert commit e792e42 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit e792e42 introduced some regression with GCC 14 and 15 espcially +to the chaged sections of the code in audemo.c. Thus resutling in errors +such as: + +audemo.c: In function ‘rescanCB’: +audemo.c:524:23: error: passing argument 2 of ‘XawListChange’ from incompatible pointer type [-Wincompatible-pointer-types] + 524 | (const char **)makeFileList(globals->fileNames, globals->numFiles), + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | | + | const char ** +In file included from audemo.c:97: +/usr/include/X11/Xaw/List.h:170:26: note: expected ‘char **’ but argument is of type ‘const char **’ + 170 | String *list, + | ~~~~~~~~~~~~~~~~~~~~~~~~^~~~ +audemo.c:530:41: error: passing argument 2 of ‘XawListChange’ from incompatible pointer type [-Wincompatible-pointer-types] + 530 | XawListChange(globals->samples, &noFilesString, 1, -1, True); + | ^~~~~~~~~~~~~~ + | | + | const char ** +/usr/include/X11/Xaw/List.h:170:26: note: expected ‘char **’ but argument is of type ‘const char **’ + 170 | String *list, + | ~~~~~~~~~~~~~~~~~~~~~~~~^~~~ + +First observed on Gentoo Linux with GCC 14, I reproduced with GCC 15 as +well. Please reffer: https://bugs.gentoo.org/927451 + +Signed-off-by: Brahmajit Das +--- a/clients/audio/audemo/audemo.c ++++ b/clients/audio/audemo/audemo.c +@@ -501,7 +501,7 @@ static void + rescanCB(Widget w, XtPointer globalsp, XtPointer call_data) + { + GlobalDataPtr globals = (GlobalDataPtr) globalsp; +- static const char *noFilesString = "No files found"; ++ static char *noFilesString = "No files found"; + char *dir, + *template; + int i; +@@ -521,7 +521,7 @@ rescanCB(Widget w, XtPointer globalsp, XtPointer call_data) + if (globals->numFiles) + { + XawListChange(globals->samples, +- (const char **)makeFileList(globals->fileNames, globals->numFiles), ++ makeFileList(globals->fileNames, globals->numFiles), + globals->numFiles, -1, True); + XtSetSensitive(globals->samples, True); + } +@@ -597,7 +597,7 @@ bucketQueryCB(Widget w, XtPointer globalsp, XtPointer call_data) + access[4], + desc[COMMENT_LEN]; + int i; +- static const char *noBucketString = "No buckets"; ++ static char *noBucketString = "No buckets"; + + if (buf->numBuckets) + { +@@ -652,7 +652,7 @@ bucketQueryCB(Widget w, XtPointer globalsp, XtPointer call_data) + + if (buf->numBuckets) + { +- XawListChange(buf->bucketList, (const char **)buf->bucketText, ++ XawListChange(buf->bucketList, buf->bucketText, + buf->numBuckets, -1, True); + XtSetSensitive(buf->bucketList, True); + } +-- +2.45.0.rc1.218.g7b19149425.dirty + diff --git a/media-libs/nas/nas-1.9.5-r1.ebuild b/media-libs/nas/nas-1.9.5-r1.ebuild deleted file mode 100644 index 79a34f036d84..000000000000 --- a/media-libs/nas/nas-1.9.5-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs - -DESCRIPTION="Network Audio System" -HOMEPAGE="https://radscan.com/nas.html" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.9.5-patches.tar.xz" - -LICENSE="HPND MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="doc static-libs" - -RDEPEND=" - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau[${MULTILIB_USEDEP}] - x11-libs/libXaw - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt[${MULTILIB_USEDEP}]" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto" -BDEPEND=" - app-text/rman - app-alternatives/yacc - app-alternatives/lex - sys-devel/gcc - x11-misc/gccmakedep - riscv? ( x11-misc/xorg-cf-files ) - >=x11-misc/imake-1.0.8-r1" - -DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO ) - -PATCHES=( - "${WORKDIR}"/${PN}-1.9.5-patches -) - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/859934 - # https://sourceforge.net/p/nas/bugs/13/ - filter-lto - - # Need to run econf so that config.guess is updated - pushd config || die - econf - popd || die - - local cpp=($(get_abi_CHOST ${DEFAULT_ABI})-gcc $(get_abi_CFLAGS) -E) #884203 - CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ - IMAKECPP="${IMAKECPP:-${cpp[*]}}" \ - xmkmf -a || die -} - -multilib_src_compile() { - # EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2 - local emakeopts=( - AR="$(tc-getAR) cq" - AS="$(tc-getAS)" - CC="$(tc-getCC)" - CDEBUGFLAGS="${CFLAGS}" - CXX="$(tc-getCXX)" - CXXDEBUFLAGS="${CXXFLAGS}" - EXTRA_LDOPTIONS="${LDFLAGS}" - LD="$(tc-getLD)" - MAKE="${MAKE:-gmake}" - RANLIB="$(tc-getRANLIB)" - SHLIBGLOBALSFLAGS="${LDFLAGS}" - WORLDOPTS= - ) - - if multilib_is_native_abi ; then - # dumb fix for parallel make issue wrt #446598, Imake sux - emake "${emakeopts[@]}" -C server/dia all - emake "${emakeopts[@]}" -C server/dda/voxware all - emake "${emakeopts[@]}" -C server/os all - else - sed -i \ - -e 's/SUBDIRS =.*/SUBDIRS = include lib config/' \ - Makefile || die - fi - - emake "${emakeopts[@]}" -} - -multilib_src_install() { - # ranlib is used at install phase too wrt #446600 - emake RANLIB="$(tc-getRANLIB)" \ - DESTDIR="${D}" USRLIBDIR=/usr/$(get_libdir) \ - install install.man -} - -multilib_src_install_all() { - einstalldocs - if use doc; then - docinto doc - dodoc doc/{actions,protocol.txt,README} - docinto pdf - dodoc doc/pdf/*.pdf - fi - - mv -vf "${D}"/etc/nas/nasd.conf{.eg,} || die - - newconfd "${FILESDIR}"/nas.conf.d nas - newinitd "${FILESDIR}"/nas.init.d nas - - if ! use static-libs; then - rm -f "${D}"/usr/lib*/libaudio.a || die - fi -} diff --git a/media-libs/nas/nas-1.9.5-r2.ebuild b/media-libs/nas/nas-1.9.5-r2.ebuild new file mode 100644 index 000000000000..3fb113d0881f --- /dev/null +++ b/media-libs/nas/nas-1.9.5-r2.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs + +DESCRIPTION="Network Audio System" +HOMEPAGE="https://radscan.com/nas.html" +SRC_URI="https://sourceforge.net/${PN}/${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.9.5-patches.tar.xz" + +LICENSE="HPND MIT" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv sparc x86" +IUSE="doc static-libs" + +RDEPEND=" + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau[${MULTILIB_USEDEP}] + x11-libs/libXaw + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt[${MULTILIB_USEDEP}]" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + app-text/rman + app-alternatives/yacc + app-alternatives/lex + sys-devel/gcc + x11-misc/gccmakedep + riscv? ( x11-misc/xorg-cf-files ) + >=x11-misc/imake-1.0.8-r1" + +DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO ) + +PATCHES=( + "${WORKDIR}"/${PN}-1.9.5-patches + "${FILESDIR}"/${PN}-1.9.5-gcc14-build-fix.patch +) + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/859934 + # https://sourceforge.net/p/nas/bugs/13/ + filter-lto + + # Need to run econf so that config.guess is updated + pushd config || die + econf + popd || die + + local cpp=($(get_abi_CHOST ${DEFAULT_ABI})-gcc $(get_abi_CFLAGS) -E) #884203 + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${cpp[*]}}" \ + xmkmf -a || die +} + +multilib_src_compile() { + # EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2 + local emakeopts=( + AR="$(tc-getAR) cq" + AS="$(tc-getAS)" + CC="$(tc-getCC)" + CDEBUGFLAGS="${CFLAGS}" + CXX="$(tc-getCXX)" + CXXDEBUFLAGS="${CXXFLAGS}" + EXTRA_LDOPTIONS="${LDFLAGS}" + LD="$(tc-getLD)" + MAKE="${MAKE:-gmake}" + RANLIB="$(tc-getRANLIB)" + SHLIBGLOBALSFLAGS="${LDFLAGS}" + WORLDOPTS= + ) + + if multilib_is_native_abi ; then + # dumb fix for parallel make issue wrt #446598, Imake sux + emake "${emakeopts[@]}" -C server/dia all + emake "${emakeopts[@]}" -C server/dda/voxware all + emake "${emakeopts[@]}" -C server/os all + else + sed -i \ + -e 's/SUBDIRS =.*/SUBDIRS = include lib config/' \ + Makefile || die + fi + + emake "${emakeopts[@]}" +} + +multilib_src_install() { + # ranlib is used at install phase too wrt #446600 + emake RANLIB="$(tc-getRANLIB)" \ + DESTDIR="${D}" USRLIBDIR=/usr/$(get_libdir) \ + install install.man +} + +multilib_src_install_all() { + einstalldocs + if use doc; then + docinto doc + dodoc doc/{actions,protocol.txt,README} + docinto pdf + dodoc doc/pdf/*.pdf + fi + + mv -vf "${D}"/etc/nas/nasd.conf{.eg,} || die + + newconfd "${FILESDIR}"/nas.conf.d nas + newinitd "${FILESDIR}"/nas.init.d nas + + if ! use static-libs; then + rm -f "${D}"/usr/lib*/libaudio.a || die + fi +} -- cgit v1.2.3