From d1c14e94a73fba924761cdad7298f3e48c6bc160 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 1 Jul 2024 08:00:51 +0100
Subject: gentoo auto-resync : 01:07:2024 - 08:00:50
---
media-libs/Manifest.gz | Bin 69183 -> 69186 bytes
media-libs/cimg/Manifest | 4 +-
media-libs/cimg/cimg-3.4.0.ebuild | 25 +++++
media-libs/cimg/metadata.xml | 1 -
media-libs/libdisplay-info/Manifest | 2 +-
.../libdisplay-info/libdisplay-info-0.1.1.ebuild | 2 +-
media-libs/nanosvg/Manifest | 2 +
media-libs/nanosvg/nanosvg-20231202.ebuild | 17 +++
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 +++++++++++++++++++++
12 files changed, 251 insertions(+), 128 deletions(-)
create mode 100644 media-libs/cimg/cimg-3.4.0.ebuild
create mode 100644 media-libs/nanosvg/nanosvg-20231202.ebuild
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')
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index cd5d70523a0e..c1648695282e 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index fec273bac150..53b2f7543826 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,5 +1,7 @@
DIST cimg-2.9.3.tar.gz 11222797 BLAKE2B c2135a0219305dafde642198888f5a813f7c73a34dbb015b271cbfd601a4265fe0495cbd74a0ac502cbbd1b8ead49687a945d35d7eaffe5127cbdc9c67664c14 SHA512 038cfa0dbb8beeffa53cc84491988bfee27b0e3e74c3f802185669be5ddc85f0ab002a6bce0e57e3692aa6380715436078cbcccadb0e2b34442db50fc19c1aed
DIST cimg-3.2.4.tar.gz 12660194 BLAKE2B f30f24e388a066a6923a72be00055449862cc643bbe870e55198718e185d2fe9213cb8f19cb83c68fe6ff5ea4e93c2529f70c7256b2d022b304cb2b020f0db11 SHA512 71cbf5161a7778a14e105d8aa41bf0431303b6f4a0f4982d3788903b0505f5ae96be9515c67ea6a52e0e76fdcb25efe3cfd7684980545d078ff41e10dbb4fbb6
+DIST cimg-3.4.0.tar.gz 12666868 BLAKE2B e3beea58774b687a310c8aac594571c34097205bf2efd02abd0af50e8bb87afb8db1cd4a38a5ad9ed6e7cdd777f269434e033bdab8dd795957dd2bc30714b711 SHA512 a960354bc245e933a0b6e175bfe1f9d03abff300a9d9e74e67203e204302349a9ec9dc500e2023776c614180d07a408bdfe9f044185c0707b25714f6ac9d8b85
EBUILD cimg-2.9.3.ebuild 593 BLAKE2B 70b3d6bc70942f9296567570d314ec26a1c95c080b543a5ccce0b6444eb6d8d0ddc0cadda74c487c214de92033af187f2c1489ebe3e73f612b510a74ef451960 SHA512 d974bee754336765eec6ec5488fe25089b725ce8057d53a0965072438bdbf784d776c6616d28bfea0953a0db41722f6dfa66ab56e72104e008d9d40f8b8839d6
EBUILD cimg-3.2.4.ebuild 592 BLAKE2B 6a1d471309cddac88153b113d90e92870f1037cfe54b8b6d0d9f7afea058879c02628227f717a97d072d50798d959243679bbcb09b07985e10e1fe3630670160 SHA512 4d22c05e8c37666810a2403d93e9096f89840ed9e574d2953b0dfb714e03a0b4b951543b7fee41fe43fbe2d29c1bd3af6de7741c532ce5a9c53523e7070c778f
-MISC metadata.xml 348 BLAKE2B 5d1a8915f037183b86b6df233986b747c9c3f288a44f50384e6946b311a4f82145024ec0cc7e06880903724bcfa92ef3e3c7de98714072749d6a555b4922601a SHA512 aa18c74c6ab9bc318bda782ebbdcb7b83601bb3a92fac01863acd56785df38c6dab91c53a99b08bd278fd79be73ccefe47d98e339168c72c5631941604c9f506
+EBUILD cimg-3.4.0.ebuild 592 BLAKE2B 85b45e53554357ec149a6125a8d545bf0152324f34b99d5a3064123d79a691a1f4f895a28be73a8bedfadd074016cd5a1f9869854878045d1e0a1259cfe88ae6 SHA512 f4d2728375dc7ff893dafc2da8f942a4a0498c5666adad3ad1404b4b47ff711a9d3e8fb9698756d31b18f061631456be1e59bd36be7d711499a77cb57e32d1d2
+MISC metadata.xml 299 BLAKE2B dd8e2707db89c2dc70b41134566ee0ddd45fe680d09193578112ec2dfc580f6dfa523a0891a0c1685d08e8876c745894569d50c9bcddde93cf3c63d5124e8aca SHA512 3e6f11de12e1d83026f948fcb55ef9b7a0eb7b8688c5f91b729a3d593e664058eb2b617d1ba74224b6950c6ff972c7157240a3065fb0265db628b2bb2cde04ec
diff --git a/media-libs/cimg/cimg-3.4.0.ebuild b/media-libs/cimg/cimg-3.4.0.ebuild
new file mode 100644
index 000000000000..81ead1e98430
--- /dev/null
+++ b/media-libs/cimg/cimg-3.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="C++ template image processing toolkit"
+HOMEPAGE="https://cimg.eu/ https://github.com/GreycLab/CImg"
+SRC_URI="https://github.com/GreycLab/CImg/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CImg-v.${PV}"
+
+LICENSE="CeCILL-2 CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+src_install() {
+ doheader CImg.h
+ dodoc README.txt
+
+ use doc && dodoc -r html
+ if use examples; then
+ dodoc -r examples
+ docompress -x "/usr/share/doc/${PF}/examples"
+ fi
+}
diff --git a/media-libs/cimg/metadata.xml b/media-libs/cimg/metadata.xml
index b8430415cf27..5d7cc3ce7038 100644
--- a/media-libs/cimg/metadata.xml
+++ b/media-libs/cimg/metadata.xml
@@ -4,7 +4,6 @@
<!-- maintainer-needed -->
<upstream>
<remote-id type="github">GreycLab/CImg</remote-id>
- <remote-id type="sourceforge">cimg</remote-id>
<remote-id type="cpe">cpe:/a:cimg:cimg</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-libs/libdisplay-info/Manifest b/media-libs/libdisplay-info/Manifest
index 02c7b3a9d93b..ad96e29e262f 100644
--- a/media-libs/libdisplay-info/Manifest
+++ b/media-libs/libdisplay-info/Manifest
@@ -1,3 +1,3 @@
DIST libdisplay-info-0.1.1.tar.xz 76864 BLAKE2B 262f275a61efefaa57ec48558c4b9f9dd9cb6d8012e50a9873e10a593e1b03e2cc37c2d690be392f26ded171be9dcc8a7e80139129d2b4d85ebc7f9ef0eedaf9 SHA512 95c199211504af96816d92ec8e531bea993dd5d4a2935f1977f1e665b924b1628df25b81cd20da29543d008a8e6d757bdbceb09c74e031c0c213d60be9a10d7a
-EBUILD libdisplay-info-0.1.1.ebuild 639 BLAKE2B c4814bf12a50f7dc55c67fbbfa0ea88d76fe71906a5dfb1c8a996899cd1f082b0ea6bc034c94d323833a6aa3be2bc4e1d0e01205eae5fdb3c543751295a96424 SHA512 3bfd7b112872d50c5adea607255f1c6318606566ac3e0d268f4644e00d0371d0d01d7e61c39a0dcb21c1c6fc704eb8f96025944e04f884cd489e090050a3f01e
+EBUILD libdisplay-info-0.1.1.ebuild 638 BLAKE2B 2377f2e2160d5fbaa0e68d89c45826731925ce2ca0caf827926be1e36aa38c8808981759e33e04a8c5254f0e5b26fa6003e922f297afc1fce0ef89c1e45147b3 SHA512 c62506b8ce12d7180c4ff9cb38b91d9d9123ef4b38266a55a634bcb2eb278a0915fc57189a6d061559d2093f86f0a9ffc9c32824224d17eb67538cc87f07da7d
MISC metadata.xml 349 BLAKE2B 0a82833d63b02c6572b7ee005a433ab4768fc3b6b4f6af5ef1bcbb2651d48bf8638cb32994c12370347302f0b8fb66e17b85b188177e1df8bb98e0a2bc65f920 SHA512 e5c06e09ec11cf204a2cf82176778d0fac91c658813d20e7da4e6dbb80ba6b2e27eb4a12b1daa244dceee894c24e9617c313a2d07732f5ca8ee2aa79cc162cf5
diff --git a/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild b/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
index 6c147ce2cb64..72e98a8a227b 100644
--- a/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
+++ b/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/${PV}/download
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/nanosvg/Manifest b/media-libs/nanosvg/Manifest
index 7e092c99ba19..e7a7ed6a53ba 100644
--- a/media-libs/nanosvg/Manifest
+++ b/media-libs/nanosvg/Manifest
@@ -1,3 +1,5 @@
DIST nanosvg-20221222.gh.tar.gz 298209 BLAKE2B 64e3342ad354dd08f4a1ffcb243603f6d3b940031415c3a1aed43f9879fca349bc0f71305584cd999bb44095bf6d157a8824c2f9ad8c49fdc66b37a0a6ea54b7 SHA512 a9b62cdc54c1803907da8d3553a71451a5a19588b951c32e3765e9d620a1dacb618d768e4df8f3dbf507518a6ce8fcfde5d8e8f5edcfccc975c1ad57e3e7f22c
+DIST nanosvg-20231202.gh.tar.gz 298249 BLAKE2B 938f0a20791c3975336fc273e4cf160f631eacf47a47a0a34038e6877eedf08539f21e7a2c65ed75965258beed935c35c146cc278f39ce2540493bd2ba843574 SHA512 eb7feebe3349b8eaa54eb40406515070533d292670bfbd654e955a3fcdb16b381b1489c95ac5989c1154f2305b7fbd68af1f097889ba5359a4a5d534fbfdacae
EBUILD nanosvg-20221222.ebuild 500 BLAKE2B bd87db58bdd2670189cc75e5c2c361cf8602f99c6e113da6ab9977f1f6a5a26c5caf2627b47873f921e77b876934ce5f077a61b0128a67ba29704795878611a1 SHA512 37b329b3e4c66a6fc88e0aef1f97e4609345b809a8bdbb8ead0950951f8169fc364513a5968cda9b5407337c40b49c1231b1c02a3d8e22524387c5612d16113c
+EBUILD nanosvg-20231202.ebuild 463 BLAKE2B 29201dd138bdf5488f6240ca0caf604507c9553996ed185cc466ada20f8b60e5e0b292737be5fba62c28b726558afe3f2ffb0889777ad0d4465fb302a461a2ad SHA512 1c0c5b5df6e1ebe2813e05ab788cf3688fa4e14238da056d06a39fe0901c3bcd637731e7ddc59f728eac67fbc4e6a8b894e4b8c8929a9657c9c502f420715dcb
MISC metadata.xml 245 BLAKE2B 88a70bee970cde88d22b83bf91ac664d8435a85c11d8bab0bb5be93bb35fbcf331fcc2b02627826e43f0678fb3c8aac75570f672de8506a24172c8ace7a9eefd SHA512 b23e06e41dfeae8931ec1c5441e65304eb137966f011d8ac98d56134b9fed9c08e786778c5f2e7540ce7c2faa4a3be33e859f854d9c4d2221ee93c1c2c51e4db
diff --git a/media-libs/nanosvg/nanosvg-20231202.ebuild b/media-libs/nanosvg/nanosvg-20231202.ebuild
new file mode 100644
index 000000000000..5ed44ccfc76b
--- /dev/null
+++ b/media-libs/nanosvg/nanosvg-20231202.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="fltk_${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
+DESCRIPTION="NanoSVG is a simple stupid single-header-file SVG parse."
+HOMEPAGE="https://github.com/fltk/nanosvg"
+SRC_URI="https://github.com/fltk/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
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 <brahmajit.xyz@gmail.com>
+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 <brahmajit.xyz@gmail.com>
+--- 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