diff options
Diffstat (limited to 'media-libs')
23 files changed, 599 insertions, 958 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 024ff1754de2..7527473f39db 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest index d61da429bf37..ca070990eede 100644 --- a/media-libs/alsa-ucm-conf/Manifest +++ b/media-libs/alsa-ucm-conf/Manifest @@ -1,9 +1,5 @@ AUX alsa-ucm-conf-1.2.13-ucm2-intel-product_name.patch 2064 BLAKE2B ae7b0b6306bb74ef2c3fa5950b5e472adb8a146567e73cdeca43fa8b11732f5def1b91cef2b098301e963f7fc4afcfb941cdf7e3022ad8d1d1c7e37364fb7a44 SHA512 28428300c1d93eac575747615780f4c874cc0c33e7bbfd6335fc3ae05e7d8bdcf6ffb8877969da055eebd0f0c2a1477600a2c62ed0aa0b97ed95259b3f7ee998 AUX alsa-ucm-conf-1.2.13-ucm2-intel-sys_vendor.patch 1314 BLAKE2B e0c2454c372c11b81670c775fb92c310630d5a49d5441fcaaeefec94157b2c058a0d2bbde800d56fd0b22d498b596241e1c4ad1e4fbcde513759e205db102ee1 SHA512 e1211e5d3f498770e986cb061bb5de2ad85841e287bec0c18652a5c952502a513c451e3d05c77a7040dea43a64d70bf493fe2448be1f125aa72743b760e017c4 -DIST alsa-ucm-conf-1.2.11.tar.bz2 49172 BLAKE2B 8b57ad990eac676ca8f5044a81a57a85951e425bd059679ac3dc7097e3c4a089cb73bbd01869335c4e94161d9f3f86aba7549b6a666e69ba76578d785e53fbb4 SHA512 b202e7410a579789be0005564b4868f70bca0fd8664c02add95fc9ff90ab64faebda978fbd3e83a3274c37242dccf8efbebd03f529e35ca3033daf55f425cb8d -DIST alsa-ucm-conf-1.2.12.tar.bz2 52618 BLAKE2B 65f429afa6a9134f1896acac3827f6065ce9315f1920d27d5ea97244fe376f1f7780c9537cf33b8a91eeaebfde7489842bd603a7d60c0d20b6017f2e7e1eda4e SHA512 391dde123271172d899c04865d1d6e21b4ad0060ee9b2256dfbc6fc89ad48edcaa43c861893ab0e5c70d972e20d15c528defc19c00308e7465f13f954cce25d7 DIST alsa-ucm-conf-1.2.13.tar.bz2 58408 BLAKE2B 87e4bf2285961e316ca853e9245e02447ea9e60fa506e124c072e2b6ed71345fc0c30b19bf8c849f8123a6b95a4facd22225eafccba8164266961110a60ef44c SHA512 cad867268851ac178f3a5378a00e292184b0e0ec7955f297ae7ed56073d3dddb06c08666b23b1bf6b0065068a9370ee34608bd687763658c79d34b64059b1c85 -EBUILD alsa-ucm-conf-1.2.11.ebuild 503 BLAKE2B 8acbe87d7a55847e4848a6c975cdac618cd0c53cc9873eb21678864d0901f7da716226a5c7a0d729fdacda4f9adb63c186d2e4e196e74204d3aadda72a4d2c8f SHA512 910abd4c03c5eb5df31b6cda01735d23a266f5efa9fbd72bf0baa4cac09b6b1354cc4606101df4d572a3ffa8fb91557f0daacc7951336ad6340f951ba347e716 -EBUILD alsa-ucm-conf-1.2.12.ebuild 503 BLAKE2B 8acbe87d7a55847e4848a6c975cdac618cd0c53cc9873eb21678864d0901f7da716226a5c7a0d729fdacda4f9adb63c186d2e4e196e74204d3aadda72a4d2c8f SHA512 910abd4c03c5eb5df31b6cda01735d23a266f5efa9fbd72bf0baa4cac09b6b1354cc4606101df4d572a3ffa8fb91557f0daacc7951336ad6340f951ba347e716 EBUILD alsa-ucm-conf-1.2.13.ebuild 614 BLAKE2B 6d0c8a8f084fd697658ca5c5f2bdbfeadee299e76c076d669773739f4e5bc73d528c628a2c600d6be2c984a885c1422af510af7536449556348db275cd8f3512 SHA512 f3873a64ab37ed1678ef974bcbbf5b0dfdf0428983d43dee9dfb000258fc87ba2cdd5ed59a775618e33bec47c70751e7f04ae905eba9710b8ecae0139c97131a MISC metadata.xml 403 BLAKE2B c1555457584c9ccfc55d8cf423c2980863a68e45a2993133c56f124996c33a8ca402f7611fb22c4f6fd87cd5ea70e417f1424d4df5bc5aebca6ccbd2b5efb3e6 SHA512 23290395834ba3d4b58cc79ec5fca79b1b2710b69504a49057f3d26bb5f3ae3b1b7f2c4957d8b3d13168f81795c25df4cb5007ec3c60bbe61c7f588ae2445d43 diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.11.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.11.ebuild deleted file mode 100644 index 4a6eff8061f4..000000000000 --- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.11.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="ALSA ucm configuration files" -HOMEPAGE="https://alsa-project.org/wiki/Main_Page" -SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86" - -RDEPEND="!<media-libs/alsa-lib-1.2.1" -DEPEND="${RDEPEND}" - -src_install() { - insinto /usr/share/alsa - doins -r ucm{,2} -} diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.12.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.12.ebuild deleted file mode 100644 index 4a6eff8061f4..000000000000 --- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.12.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="ALSA ucm configuration files" -HOMEPAGE="https://alsa-project.org/wiki/Main_Page" -SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86" - -RDEPEND="!<media-libs/alsa-lib-1.2.1" -DEPEND="${RDEPEND}" - -src_install() { - insinto /usr/share/alsa - doins -r ucm{,2} -} diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest index 806b6a689f9c..920b7ba78ae4 100644 --- a/media-libs/libavif/Manifest +++ b/media-libs/libavif/Manifest @@ -1,6 +1,7 @@ +DIST libargparse-ee74d1b53bd680748af14e737378de57e2a0a954.tar.gz 22394 BLAKE2B 18b08d8d8723e0b9c4b018ff318c1f45c3903996621be123508cfab7c193d7311fd0349bd0855202498f26c40287b9af3eb582fb53ca8efd0107ee1bc154385b SHA512 6d6e47f4c1a63f085a90bc4d9f6dca7462f5e72d2a4a3b7a6d6df54632edbd4a9deb8f9b8c08517031b0c9ca89e0a1b48bb35261b3e660e4601e28a39f8e7ef1 DIST libavif-1.1.1.tar.gz 13644189 BLAKE2B c0a473b172206ea32358c28e7b94d8038b24030e4845611341076518cd82fd2bea78eb8e22e5481062b893ffb70789619ce4f85129a94a0db70a667c000f4fd0 SHA512 ba72b8d02b098f361643a073361fccafd22eaac14e46dd06378d5e7acd9853538c5d166473e1de0b020de62dac25be83e42bd57ba51f675d11e2ddf155fbfa21 DIST libavif-1.2.0.tar.gz 13939380 BLAKE2B 272d855bec6568dc15f2a953fdf79ec1df190e151c2f265ea00f680f2c828780e0875580d72000fb56a0252c7ae06ef115f2b609db23ec3afc9e8a1c4bac4197 SHA512 f88eda1c699910a20e63a0aa0bcf782fb67b477c4d99aa88723628a53b0d849f35f73ff6a2e8bb53e170dc77662bde4a5c5c38b655f5adcfb73ddcf7ec264805 EBUILD libavif-1.1.1.ebuild 2856 BLAKE2B 763fce77023cda7a64e6aa9ab79c175f675925ff8fa5d37701a9f693ad6a014fe5b50364862179b613767a461bdd9b89f983b74a7cc97ad2223a574b8ef44b55 SHA512 bde522cf659a9daa42fc661a14f0db306ab7073dc973123a874ba6c2846c8dbe51f2538cf7d8db2f4884f08be14a86c866562b98465f87af473426e9c2f98501 -EBUILD libavif-1.2.0.ebuild 2908 BLAKE2B 5e83695960c5e1eb9e919c60af379462240a7205278741d5b6214ae602ccc33e5200cf4723835e5120b13892c30b6e1cbb50c09321a1339e022e2dd978632fe4 SHA512 771b3d2ea16f0e8425b32bedf7dffb94e50540780ea1f024602f44aa854e986e27e59cad7320f38dd0474f281cf873efd54c6f4d2ab68bc72808a543021cbb3b +EBUILD libavif-1.2.0.ebuild 3228 BLAKE2B 00bc5b94e3d9a29da7ad9deb84188c344374dbfb21244d39fb76c5f738532e2ef94ac0296e31d6768883aad9f14f67ea26d44838f41d3e2ba8798a9589b5f653 SHA512 a21f79d6d38cfd1da3a081702878223c8b1c467dd98fa2f6eee46311ca6ff1bcfc9079dfc260b61fc7e5399128416662a8d64c016ade37a596de8819b56797f4 EBUILD libavif-9999.ebuild 2800 BLAKE2B 8d73a623bc972fffe048f1002048220deca7430fdac8c62727d8d52896496cda076ca78d4c11d34996968874dfc9c28382873bb3eabae5bd4b40bdccdaa82d99 SHA512 e26434fdc4d2d90fc12a078aaa81c080d2c283b7706ba56ec30543c06e6dd4d7a513b90ecb075d4e114dd7d36ebc2f9505828faf2f867086655665d505e3ecdb MISC metadata.xml 1102 BLAKE2B f9a8a774847f705cc9e665d0c0da900607857980d745912ddf94dcf67e46d205dff7e03c09ef8ba318fc375ccef908f10e50f9d971201447b57c6963b2458b9b SHA512 a10b47eb35f0db17bf48bb1da7caff9848f377ad0d75a4244c13b91d697d0c1776dceeb0431241c9f9c462a4de13c06b58bed250eaef96092579238616e55f31 diff --git a/media-libs/libavif/libavif-1.2.0.ebuild b/media-libs/libavif/libavif-1.2.0.ebuild index bcae76648e56..c66e8a353453 100644 --- a/media-libs/libavif/libavif-1.2.0.ebuild +++ b/media-libs/libavif/libavif-1.2.0.ebuild @@ -5,14 +5,22 @@ EAPI=8 inherit cmake-multilib gnome2-utils +ARGPARSE_COMMIT="ee74d1b53bd680748af14e737378de57e2a0a954" DESCRIPTION="Library for encoding and decoding .avif files" HOMEPAGE="https://github.com/AOMediaCodec/libavif" SRC_URI=" https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz + extras? ( + https://github.com/kmurray/libargparse/archive/${ARGPARSE_COMMIT}.tar.gz + -> libargparse-${ARGPARSE_COMMIT}.tar.gz + ) " -LICENSE="BSD-2" +LICENSE=" + BSD-2 + extras? ( MIT ) +" # See bug #822336 re subslot SLOT="0/16.1.1" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc64 ~riscv ~sparc ~x86" @@ -46,6 +54,16 @@ BDEPEND=" virtual/pkgconfig " +src_prepare() { + cmake_src_prepare + + # Bug: https://bugs.gentoo.org/951614 + if use extras; then + mv "${WORKDIR}/libargparse-${ARGPARSE_COMMIT}" "${S}/ext/libargparse" || + die "mv failed" + fi +} + multilib_src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=ON @@ -71,7 +89,6 @@ multilib_src_configure() { -DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF) -DAVIF_BUILD_APPS=$(usex extras ON OFF) -DAVIF_BUILD_TESTS=$(usex test ON OFF) - -DAVIF_ENABLE_GTEST=$(usex extras $(usex test ON OFF) OFF) -DAVIF_GTEST=$(usex extras $(usex test SYSTEM OFF) OFF) ) else @@ -82,7 +99,6 @@ multilib_src_configure() { -DAVIF_BUILD_EXAMPLES=OFF -DAVIF_BUILD_APPS=OFF -DAVIF_BUILD_TESTS=OFF - -DAVIF_ENABLE_GTEST=OFF -DAVIF_GTEST=OFF ) diff --git a/media-libs/libxmi/Manifest b/media-libs/libxmi/Manifest index 10999066c90e..64584ae3485c 100644 --- a/media-libs/libxmi/Manifest +++ b/media-libs/libxmi/Manifest @@ -1,3 +1,6 @@ +AUX libxmi-1.3-gcc15.patch 767 BLAKE2B 53aa41a9a548dd04917b26fef538299752fa7f06f54c16719460df0e9e74c4d26470db494a1f35350aba09c37e52d057a5159148ce20b22c8b38f5b565e93228 SHA512 c803bcb78a0d41e09bc527767d4e35e8ab69acf2f2c23af31ea1d7b8bb65e304e6dcf869ba23e57c6f1c10b208cc17df644b99a7a213d8737992f98f636c602c +AUX libxmi-1.3-implicit.patch 295 BLAKE2B 578c12b247355f68449240f7995fec6ee3962252214c2b25b39fe2d2ced03d3110dc2943065750460d059ae963b2d0b4b3746d33f6859b4f87ed651f77665626 SHA512 bc63deeab7c4494a44f1b49a7bb8c597e4be5075a7ebd41a6b14f90f5e508e4bb1c97bbc1bf5dd1d0d0949d5c5b9f23d6d2656d714749ee6cf7f171154fb19b6 DIST libxmi-1.3.tar.xz 258672 BLAKE2B 7eb50a9a7804bd37fdacd238e41241d54e9b0ee00aac9267e9d6a62a1a61338522c26df56021821fd7af74123550f99305a233dadb55a6a9514feb124fd70d32 SHA512 f54b0925e2b848f7cfb31bd0f9eed27df6fd6e704ffeeb58eb490d49e7ca76f46e03eee6ed89d6644f6a3bad05c7b0b986f9634d0cd23c49f31ee80f23ff8262 EBUILD libxmi-1.3-r1.ebuild 698 BLAKE2B d2fcc6da8ff955774eceb9f15c75bd5fc873e3c75495a596d07ea1b24b6ea56640375c4257cd6e86b9180939fdda48402f3a0887b9a91ca05aee16ba06e94999 SHA512 3a227d20a7efa16a1b21dbebe5aad74b0c9be5708ac56b6ba4f0a21f39422739717cd5f230e7b59553c5475a1219e596e7065a0e040acb4491e764005b88b56d +EBUILD libxmi-1.3-r2.ebuild 740 BLAKE2B 54f8ce2c072f04b1b9a489ecea3db166f19b1b85be5026f477653690b1454737b5965017271e603eb7feb44cb21f012557cf96eeff54cd92e578629fe719ef44 SHA512 ed03983ceb0bd43af157e7e786d3e80f54702505a0af71131193a31f1d7aa7ed75c4550edea7b9f4deced2be0af2410845161b223786c039295bcabd6ac630b3 MISC metadata.xml 1201 BLAKE2B 6cfc326240c7d56fe478959983dd36378ffa79a1567af73a6c03a6d11869430c9c4ae4e3ee01b21d3b594d77a2ab7917e5da14766fc04a80934d2eaa3bba2459 SHA512 e08b967e0b8cfdc90beadb21f7a1a4b2a06f5fbb2d62a796313203c17d820645aa74278a1308eb3b987872ba2ecf2392e318e85241c5b9b54692a4387589ad14 diff --git a/media-libs/libxmi/files/libxmi-1.3-gcc15.patch b/media-libs/libxmi/files/libxmi-1.3-gcc15.patch new file mode 100644 index 000000000000..44074fd0370b --- /dev/null +++ b/media-libs/libxmi/files/libxmi-1.3-gcc15.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/944450 + +--- a/sys-defines.h ++++ b/sys-defines.h +@@ -166,17 +166,7 @@ extern __C_LINKAGE void free (void * ptr); + /* Support the `bool' datatype, which our code uses extensively. */ + /**************************************************************************/ + +-#ifndef __cplusplus +-#ifndef HAVE_BOOL_IN_CC +-#ifdef __STDC__ +-typedef enum { false = 0, true = 1 } bool; +-#else /* not __STDC__, do things the old-fashioned way */ +-typedef int bool; +-#define false 0 +-#define true 1 +-#endif +-#endif /* not HAVE_BOOL_IN_CC */ +-#endif /* not __cplusplus */ ++#include <stdbool.h> + + /**************************************************************************/ + /* Define numerical constants (unofficial, so may not be in math.h). */ diff --git a/media-libs/libxmi/files/libxmi-1.3-implicit.patch b/media-libs/libxmi/files/libxmi-1.3-implicit.patch new file mode 100644 index 000000000000..ff1d38900e07 --- /dev/null +++ b/media-libs/libxmi/files/libxmi-1.3-implicit.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/899832 + +--- a/configure.in ++++ b/configure.in +@@ -77,7 +77,7 @@ int main() + int i; + for (i=0; i < B; i++) + Array[[i]] = i - 3; +- exit (Array[[1]] != -2); ++ return (Array[[1]] != -2); + }], + ac_cv_c_gcc_strength_bug="no", + ac_cv_c_gcc_strength_bug="yes", diff --git a/media-libs/libxmi/libxmi-1.3-r2.ebuild b/media-libs/libxmi/libxmi-1.3-r2.ebuild new file mode 100644 index 000000000000..e007f893bb5a --- /dev/null +++ b/media-libs/libxmi/libxmi-1.3-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="C/C++ function library for rasterizing 2-D vector graphics" +HOMEPAGE="https://www.gnu.org/software/libxmi/" +SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" +#mirror://gnu/${PN}/${P}.tar.gz" +# Version unbundled from plotutils + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +PATCHES=( + "${FILESDIR}/${P}-gcc15.patch" + "${FILESDIR}/${P}-implicit.patch" +) + +src_prepare() { + default + mv configure.in configure.ac || die + eautoreconf +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 463d47c7e273..febc8e2ea7de 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -2,6 +2,7 @@ DIST mesa-24.1.7.tar.xz 29206724 BLAKE2B b3102fcf96c032d07826186c2d60dc93e5c17b2 DIST mesa-24.3.4.tar.xz 30691532 BLAKE2B a5cf1f49c6d809d19510793f5d1dcec1a3842495d3b4166e303d7f2d4744d179811697d264c5c9b39f2819ebc64a76357195b3eae6b1d2a83128de141354e3c2 SHA512 9c23cd86fda4cf0289c5a78b08ceea8b01e5b141d86ee3e659fa46e62ff9586ff92a4984d2a340b5bf209c4c7f3414bf99f3ced19feee8fb39ef99fe572dbd55 DIST mesa-25.0.0.tar.xz 46643728 BLAKE2B 9aca2416ea4e304d46fda648cb9b8e04caa053458b91893fb874e9a30d8293722c3bed1098c2720b04b0c7278eba3b0387900b56e13b6133a23c0f6be705025c SHA512 7f5b6674c40b6c8dcab7934512ff754b40a6a8a466422c90236f614d322033d4d465307ddcd983f9f3afb1310e132ec3186a085d261c95493a0c460b2ec59ce8 DIST mesa-25.0.1.tar.xz 46679784 BLAKE2B 9a73a3321c9f1d7d4384779f647c43bcb536b316dcc9a61b8a78a6f4bfd4642366e418155db5c2190b530cebee434554c6c4d2d59f68a87bb4056467fe601825 SHA512 1ecb1b90c5f78de4c61f177888543778285731faccc6f78d266d4b437f7b422a78b705a6e9fc6c9eab62c08f2573db5dd725eaa9cc9e5bedcaa7d8cfe6b47a1f +DIST mesa-25.0.2.tar.xz 46705776 BLAKE2B 6e387806e880d518a68b3a8d4cb25071e9d50732aee06cc8b88f717c569c2764d658d40a8710ff362820a30133d5fde6b82ea7fb552fd0f690bcdf276a6f5e67 SHA512 2de8e8b514619d9ad5f407f5e1ff04fff8039d66b5f32257c2e8ca3d9f3b190269066aeba0779d6e0b2a2c0739237382fc6a98ea8563ed97801a809c96163386 DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434 @@ -13,5 +14,6 @@ EBUILD mesa-24.1.7-r1.ebuild 13769 BLAKE2B cbdd0130cb55c039d1d81d67eeb2b0b8493fe EBUILD mesa-24.3.4-r1.ebuild 13759 BLAKE2B a0be1b47c3055f7302281d6413880db6787ffffbaf75d40a665078868b3a754419d45b47a35f26457556b46e049f81ef23aa6a13fb1874f5b2022f1d2c80737f SHA512 b5f84b9ec1c7789b2e3dc44b8f7a2752d72c9a5adc421630c8bedd8ea40cf0541868daaaaa59d142cc41f707d9ff66ca45bb9a181b5fc3e7088aa27dce222683 EBUILD mesa-25.0.0.ebuild 13811 BLAKE2B 10b36021bf5a99e1a9c32a287e086db61b4af5814564e96306af87e61c919e2ace543796076e9401b82524dde81958fe1a35db0ca6595ec5182038669f3b306c SHA512 8971ea07468b5240b50bc81232adc44b9cb02360534aa48d9e9c31a7a235422c00a6ab92481a7c89794d43668ccf5114df90d858b1ab93f523748109fed630ca EBUILD mesa-25.0.1.ebuild 13811 BLAKE2B 10b36021bf5a99e1a9c32a287e086db61b4af5814564e96306af87e61c919e2ace543796076e9401b82524dde81958fe1a35db0ca6595ec5182038669f3b306c SHA512 8971ea07468b5240b50bc81232adc44b9cb02360534aa48d9e9c31a7a235422c00a6ab92481a7c89794d43668ccf5114df90d858b1ab93f523748109fed630ca +EBUILD mesa-25.0.2.ebuild 13757 BLAKE2B f76ae3de911bf81416881c47bccd7e76e8c00b5c125de7eea71f989308d8267b97f942ecdf6f606332eeb7c587d6aecb4a9f8dcda5938edce841d412612498af SHA512 a7d908a0ebce0b5cacbd605d478d02b87c42e351d4576b9d86b1d1d6191dfa26408b4c513150e3c6314c40a7d6d8f8755c003c5fe99b80034bb6f334e868f0de EBUILD mesa-9999.ebuild 13782 BLAKE2B 4b32effefb93effa317588d2f8dec01a314942c4dfbd6bf9a175f7112a2d0145e4442279e1d0e5141b43b973d4286fc37f6f667f61ee72310e6e44414a962f52 SHA512 018a2c0fdd5e602808876d3f2c503f5582c0b4d3c5fd86d4745b5902c6f45777f4317d9261edf56467e581e41acd49b41c1da22506e4b1c9892dfd4eecaf88b0 MISC metadata.xml 1303 BLAKE2B 348e84a15156bd8ae4634c1866f83f1b283b77f8478e66e57dd3f047a6346d1cc67a7c808ce159b82d292dfab62e8b6c4d17cefcae7aea6fa38739667947258b SHA512 448c3d73ded90117f38cec7c80eead4bdac1599c563798c91c96bca8543b9db2e5c2a06f26f9b7496af085a964aff51ed8b0882aa88f18404b64447de2f65598 diff --git a/media-libs/mesa/mesa-25.0.2.ebuild b/media-libs/mesa/mesa-25.0.2.ebuild new file mode 100644 index 000000000000..7453690ea338 --- /dev/null +++ b/media-libs/mesa/mesa-25.0.2.ebuild @@ -0,0 +1,505 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {15..19} ) +LLVM_OPTIONAL=1 +CARGO_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain + +MY_P="${P/_/-}" + +CRATES=" + syn@2.0.68 + proc-macro2@1.0.86 + quote@1.0.33 + unicode-ident@1.0.12 + paste@1.0.14 +" + +RUST_MIN_VER="1.78.0" +RUST_MULTILIB=1 +RUST_OPTIONAL=1 + +inherit cargo + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + SRC_URI=" + https://archive.mesa3d.org/${MY_P}.tar.xz + " + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +fi + +# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files, +# but there are "stale" distfiles on the mirrors with the wrong names. +# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}" +SRC_URI+=" + ${CARGO_CRATE_URIS} +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +LICENSE="MIT SGI-B-2.0" +SLOT="0" + +RADEON_CARDS="r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} + d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl + vivante vmware zink" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + cpu_flags_x86_sse2 d3d9 debug +llvm + lm-sensors opencl +opengl osmesa +proprietary-codecs + test unwind vaapi valgrind vdpau vulkan + wayland +X xa +zstd" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + d3d9? ( + || ( + video_cards_freedreno + video_cards_intel + video_cards_nouveau + video_cards_panfrost + video_cards_r300 + video_cards_r600 + video_cards_radeonsi + video_cards_vmware + video_cards_zink + ) + ) + llvm? ( ${LLVM_REQUIRED_USE} ) + video_cards_lavapipe? ( llvm vulkan ) + video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_zink? ( vulkan opengl ) + video_cards_nvk? ( vulkan video_cards_nouveau ) + vdpau? ( X ) + xa? ( X ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121" +RDEPEND=" + >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-1.3.231.0[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}] + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + $(llvm_gen_dep " + llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + opencl? ( + dev-util/spirv-llvm-translator:\${LLVM_SLOT} + llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + =llvm-core/libclc-\${LLVM_SLOT}*[spirv(-)] + ) + ") + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + >=virtual/opencl-3 + llvm-core/libclc[spirv(-)] + virtual/libelf:0= + ) + vaapi? ( + >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + ) + vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] ) + video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) + video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) + vulkan? ( virtual/libudev:= ) + wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +DEPEND="${RDEPEND} + video_cards_d3d12? ( >=dev-util/directx-headers-1.614.1[${MULTILIB_USEDEP}] ) + valgrind? ( dev-debug/valgrind ) + wayland? ( >=dev-libs/wayland-protocols-1.38 ) + X? ( + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto + ) +" +BDEPEND=" + ${PYTHON_DEPS} + opencl? ( + >=dev-build/meson-1.7.0 + >=dev-util/bindgen-0.71.0 + ${RUST_DEPEND} + ) + >=dev-build/meson-1.4.1 + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + dev-python/pyyaml[\${PYTHON_USEDEP}] + ") + video_cards_intel? ( + ~dev-util/mesa_clc-${PV} + llvm-core/libclc[spirv(-)] + $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") + ) + vulkan? ( + dev-util/glslang + video_cards_nvk? ( + >=dev-build/meson-1.7.0 + >=dev-util/bindgen-0.71.0 + >=dev-util/cbindgen-0.26.0 + ${RUST_DEPEND} + ) + ) + wayland? ( dev-util/wayland-scanner ) +" + +QA_WX_LOAD=" +x86? ( + usr/lib/libgallium-*.so + usr/lib/libOSMesa.so.8.0.0 + usr/lib/libGLX_mesa.so.0.0.0 +)" + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + unpack ${MY_P}.tar.xz + fi + + # We need this because we cannot tell meson to use DISTDIR yet + pushd "${DISTDIR}" >/dev/null || die + mkdir -p "${S}"/subprojects/packagecache || die + local i + for i in *.crate; do + ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die + done + popd >/dev/null || die +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_d3d12 && + ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_lavapipe && + ! use video_cards_nouveau && + ! use video_cards_nvk && + ! use video_cards_panfrost && + ! use video_cards_radeonsi && + ! use video_cards_v3d && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl" + fi + fi + + # VA + if use vaapi; then + if ! use video_cards_d3d12 && + ! use video_cards_nouveau && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" + fi + fi + + if use vdpau; then + if ! use video_cards_d3d12 && + ! use video_cards_nouveau && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware" + fi + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi +} + +python_check_deps() { + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1 + if use llvm && use vulkan && use video_cards_intel && use amd64; then + python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 + fi +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version llvm-core/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use video_cards_intel || + use video_cards_radeonsi; then + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi + linux-info_pkg_setup + fi + + use llvm && llvm-r1_pkg_setup + python-any-r1_pkg_setup + + if use opencl || (use vulkan && use video_cards_nvk); then + rust_pkg_setup + fi +} + +src_prepare() { + default + sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \ + bin/symbols-check.py || die # bug #830728 +} + +multilib_src_configure() { + local emesonargs=() + + # bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140 + filter-lto + + local platforms + use X && platforms+="x11" + use wayland && platforms+=",wayland" + emesonargs+=(-Dplatforms=${platforms#,}) + + if use video_cards_freedreno || + use video_cards_intel || # crocus i915 iris + use video_cards_nouveau || + use video_cards_panfrost || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_vmware || # svga + use video_cards_zink; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_d3d12 || + use video_cards_nouveau || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_virgl; then + emesonargs+=($(meson_feature vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=disabled) + fi + + if use video_cards_d3d12; then + emesonargs+=($(meson_feature vaapi gallium-d3d12-video)) + fi + + if use video_cards_d3d12 || + use video_cards_nouveau || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_virgl; then + emesonargs+=($(meson_feature vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=disabled) + fi + + if use video_cards_freedreno || + use video_cards_intel || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_feature xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=disabled) + fi + + gallium_enable !llvm softpipe + gallium_enable llvm llvmpipe + gallium_enable video_cards_d3d12 d3d12 + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_intel crocus i915 iris + gallium_enable video_cards_lima lima + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_v3d v3d + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_virgl virgl + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_zink zink + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + if use llvm && use opencl; then + PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst + emesonargs+=( + $(meson_native_true gallium-rusticl) + -Drust_std=2021 + ) + fi + + if use vulkan; then + vulkan_enable video_cards_d3d12 microsoft-experimental + vulkan_enable video_cards_freedreno freedreno + vulkan_enable video_cards_intel intel intel_hasvk + vulkan_enable video_cards_lavapipe swrast + vulkan_enable video_cards_panfrost panfrost + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + vulkan_enable video_cards_vc4 broadcom + vulkan_enable video_cards_virgl virtio + if use video_cards_nvk; then + vulkan_enable video_cards_nvk nouveau + if ! multilib_is_native_abi; then + echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini" + emesonargs+=( + --native-file "${T}"/rust_fix.ini + ) + fi + fi + + emesonargs+=(-Dvulkan-layers=device-select,overlay) + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + if use opengl && use X; then + emesonargs+=(-Dglx=dri) + else + emesonargs+=(-Dglx=disabled) + fi + + if [[ "${ABI}" == amd64 ]]; then + emesonargs+=($(meson_feature video_cards_intel intel-rt)) + fi + + use debug && EMESON_BUILDTYPE=debug + + emesonargs+=( + $(meson_use test build-tests) + -Dshared-glapi=enabled + -Dlegacy-x11=dri2 + -Dexpat=enabled + $(meson_use opengl) + $(meson_feature opengl gbm) + $(meson_feature opengl gles1) + $(meson_feature opengl gles2) + $(meson_feature opengl glvnd) + $(meson_feature opengl egl) + $(meson_feature llvm) + $(meson_feature lm-sensors lmsensors) + $(meson_use osmesa) + $(meson_feature unwind libunwind) + $(meson_feature zstd) + $(meson_use cpu_flags_x86_sse2 sse2) + -Dmesa-clc=$(usex video_cards_intel system auto) + -Dvalgrind=$(usex valgrind auto disabled) + -Dvideo-codecs=$(usex proprietary-codecs "all" "all_free") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure + + if ! multilib_is_native_abi && use video_cards_nvk; then + sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die + fi +} + +multilib_src_compile() { + if [[ ${ABI} == x86 ]]; then + # Bug 939803 + BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile + else + meson_src_compile + fi +} + +multilib_src_test() { + meson_src_test -t 100 +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest index 21364aece6f3..05af18565e7e 100644 --- a/media-libs/urt/Manifest +++ b/media-libs/urt/Manifest @@ -1,16 +1,5 @@ -AUX gentoo-config 989 BLAKE2B cbf31d5d55ba2e104c2e757baac3d6cc097fe19e4950de41d11a5f61de83ce159b1c6b438bb05824eb1dc04d0cee6f7f001b00abf7cf859fd0df30cf25dda132 SHA512 bfd38aeb08f26b158dd1127c33bc858f5e59cda0b3aecf79d2283391018201b35ccac051309662ae11df46241fc30461923e2d542d4fa2580e3dc6f8c8d91f6d -AUX urt-3.1b-compile-updates.patch 3441 BLAKE2B f3c09e7bbd8f19c9ebe949c0f030e017e84f7d4ff73d6c5e160e709d63b95dc05be6a8b8ee4ab75027192ff7c8d1850e8e8599ec2f7efc773b9af691bde01677 SHA512 aec58e4065cafeded2de5adb7c679867f7144bfc501d03a9dd8d9d65f8dcf380360f2365a1a117a933882888c17917b76e2aafe72283a363b7ebe29f1b2d698c -AUX urt-3.1b-implicit-function-declarations.patch 1840 BLAKE2B 00c019eacc36814c0ddf8b709c510538ee2c8829498c37b899b0b107371bb09dc6e098231eab3e3384a825df4a48392d56a5286a74c1a8a409df7eb8f6754070 SHA512 91474bbfa13a9d5249ed8eeafbc3291447f97a39a085cab4b0bccd48658b41bf4e9c534b466a410aa9b91418a7bbc85dcd13a50770313747f8edfe0d00e0e137 -AUX urt-3.1b-librle-toolchain.patch 1491 BLAKE2B 6fcdae4a255cb2ab7ee9dd6a2ad7e5dde6d5b42647029ea892d67e0171c7b299dabe352f0bc920eeb09f617d1840f8c9a7ff0138b9457036853f63f2fb2ac459 SHA512 49dbf6d00e27c1bbd7f25d14427219e55c1c7fb49d209d5c940118113dfb911c57d3ccf8488182e06f9cb34224defe54fc5fa64a1e04f53746e9afd04ce65503 -AUX urt-3.1b-make.patch 2455 BLAKE2B 9709fdbb29f33326f3006d0205cf7885cdf737fb18a9fab0daa98fcf39be3c69de1cb5558416d0b661099511993a1121b53f28ea1a45daff2774f50a3be76afb SHA512 44b4463fb9b63e5a0c9af3f574ff523138117f7e0b5012e4bbd5c7b3119797f812410da7909d22dce914017bc3e704ea830307d63f908b4c508b48fff8d8898a -AUX urt-3.1b-r2-build-fixes.patch 4888 BLAKE2B 0bb2dba64a62429df650652937712a7a51e5839af8565bab393f2d4df9d240e31872aeb7a113af0f85117036dafe600a486d3c7ad3f5debef2f7307c0fb0650a SHA512 698594422160f4f5102f7dd45cab479e981d753d68801862dc90a2c84e174d8bacc08afa650b3a1c54aefd0d73d358830f396cd2a3b682c1bdf3b64bdf922ae3 -AUX urt-3.1b-rle-fixes.patch 5108 BLAKE2B 0aca69e90f54386a654d1a20958239c988b48dd8a5bf1c879d2000df202beaa134a6d1aad538de4f9333e7c78010f27c55e227e332cef2dd232f84c834527d0c SHA512 b5a05d2ee083ee35105346fd7d0aa9e0f36c98f709abaa40e354adf858480c90793cfebfbd0a6214e832454c446828d50baedbc9767e7bc742209c9e86d0b030 -AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c222981de896c8c6e9d66a8dbb1cbe5b90e54e3f24b07bea23c508c260e0639720b4103ada81fea3277e06ca63939 SHA512 6403f48e858af2f8a177588e231367c09f8c939fc614198a10e45ca83ec000f9d5baf67681c5a65fe75177d59d34ab10c19c3621ac0eda6382793ed3b6bd8d84 -AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f AUX urt-3.2_rc1_p20250101-ar.patch 967 BLAKE2B 659fbfb052eb039e5c098c214491a1ddc74e9e63352aba92c62bb6ab0589c6f45236d0511f9fcfeb71a7123ba9e8d06cc71ba2937067f2b99f1dd6044008d58f SHA512 ccac18ebbe8b70ade62cc1cd9ac2985aeb3695d0b6b7b5863a6b8fdae04bee27bc49da48cc56029cbdeb973fb3d4ecf024c9b4eb9923bdc49851089ab625b8f0 AUX urt-3.2_rc1_p20250101-respect-ldflags.patch 372 BLAKE2B 7d520c7e59f9e8fe9c9e445f32a4a9691b1e96e6579f471838d3c8ae10c5d98d84a0f3e5992ff0d0a91dc5c9f133568f2f88e23ad18316d969bfca4a3fd91cde SHA512 ba3cce51a80a023843bb95fa096ea3230d74363076ff8e38fe5991e6affafe0aaa2d9bffe6de2863a554551810bf0fa07a2f752ceee2c404de14088ac93c56d5 -DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d DIST urt-3.2_rc1_p20250101.tar.gz 1079866 BLAKE2B 519760a11b10d1cad1d2f9ba6b0de3918000ad9a6fa0a3edbf0382d8bdf99248aa12e89aec09bbe134db0138f8eb1326bad06a9c6ad581766b5f45bee3152989 SHA512 347fabddc2ff14f9313d2ed2ad7902b0fdc2108e1cb0d472f4040c2ab42c171360be390833359d813ad03bf4ea94537fe481a1bd5facfd9b72b2178622771e66 -EBUILD urt-3.1b-r3.ebuild 2365 BLAKE2B 9e04a0253611de38a45a5ccc2879c9ef37f949431df1187d9543e0887260e32ff3578557d1ffdea0174932ef1a827e5e727e3d0bbd4731ae7822ffc6c5b682be SHA512 cfeb7898d007d4c9e2f1b5b67432c08af4baf19a18bbe7861b6d7d16af32357c92da223fb9145dee3eda045f07af792edfaf3bf088ccbeb50d88b1f6e2d843b0 EBUILD urt-3.2_rc1_p20250101.ebuild 1957 BLAKE2B 6beec849f978faebe3948e3df0f4d578520a7faf0946e8ec104d11e08b10bae6b31c308b4c2fec500ad8e3137b6a88d6108c4b88af3fee74779c34532c09dfa1 SHA512 b76abf200ddd422f3d51943b053b6ce426724db44234964645803480a27bcc62b42f02da03425f1d1812347e9e03885377cdd04dad66c58f2b571e8611dc5291 MISC metadata.xml 301 BLAKE2B dd6601ae6f8bcdd95c8cdde5da28f782689b737212887167ed671341b6bc09b5c7d36fff3cd1e83089e76645ca1d4a35b245358cce07c832fff8a9e2c6a288d3 SHA512 82b0ef3316b221ed81fe24d67105bd55e2a7d86da73ae441b0d71f15ff297dff77ddc727e135fde511b4639170f1411f4e43286913abb3b1b3e06284fd46fdfc diff --git a/media-libs/urt/files/gentoo-config b/media-libs/urt/files/gentoo-config deleted file mode 100644 index 3ad38b961166..000000000000 --- a/media-libs/urt/files/gentoo-config +++ /dev/null @@ -1,53 +0,0 @@ -#define ABEKASA60 -##define ABEKASA62 bug #455970 -#define ALIAS -##define CGM -#define CUBICOMP -##define DVIRLE -#define GRAYFILES -#define MACPAINT -##define PBMPLUS -##define SUNRASTER -#define TARGA -#define VICAR -#define WASATCH -#define WAVEFRONT - -#define GCC - -#define CONST_DECL -#define NO_MAKE_MAKEFILE -#define USE_TIME_H -#define SYS_V_SETPGRP -#define USE_PROTOTYPES -#define USE_RANDOM -#define USE_STDARG -#define USE_STDLIB_H -#define USE_UNISTD_H -#define USE_STRING_H -#define VOID_STAR -#define USE_XLIBINT_H -#define X_SHARED_MEMORY - -#defpath DEST bin -#defpath MAN_DEST man-dest -#defpath RI include -#defpath RL lib - -ROFF = nroff -ROFFOPT = -man -ROFFPIPE = | lpr - -INCTIFF = -LIBTIFF = -ltiff -INCX11 = -LIBX11 = -lX11 - -# Most people have migrated X11 to /usr/lib, but just in case ... -check_x11=$(shell \ - echo 'int main(){}' > test.c ; \ - if ! $(CC) test.c -lX11 -o .urt-x11-test 2>/dev/null ; then \ - echo "-L/usr/X11R6/lib" ; \ - fi ; \ - rm -f .urt-x11-test test.c) -LIBX11 += $(call check_x11) diff --git a/media-libs/urt/files/urt-3.1b-compile-updates.patch b/media-libs/urt/files/urt-3.1b-compile-updates.patch deleted file mode 100644 index d33f004fe80f..000000000000 --- a/media-libs/urt/files/urt-3.1b-compile-updates.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- a/get/getx11/XGetHClrs.c -+++ b/get/getx11/XGetHClrs.c -@@ -1,5 +1,4 @@ - #ifndef XLIBINT_H_NOT_AVAILABLE --#include <X11/copyright.h> - - /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */ - /* Copyright Massachusetts Institute of Technology 1986 */ ---- a/tools/mallocNd.c -+++ b/tools/mallocNd.c -@@ -67,7 +67,7 @@ - - /* Imports */ - #include <stdio.h> --extern char *malloc(); -+#include <string.h> - - /* Forward declarations */ - char *BuildIndirectionTable(); ---- a/tools/into.c -+++ b/tools/into.c -@@ -40,8 +40,8 @@ - static char buf[MAXPATHLEN+1]; - short forceflg; /* overwrite an unwritable file? */ - --extern int errno; --extern char *sys_errlist[]; -+#include <errno.h> -+#include <string.h> - - void - main(argc, argv) -@@ -103,7 +103,7 @@ - if (ferror(outf)) - { - fprintf(stderr, "into: %s, \"%s\" not modified\n", -- sys_errlist[errno], argv[1]); -+ strerror(errno), argv[1]); - unlink(buf); - exit(1); - } ---- a/cnv/tex/dvirle2.c -+++ b/cnv/tex/dvirle2.c -@@ -55,7 +55,6 @@ - void DumpTopOfBand(), MoveDown(), WriteBuf(), WriteBlanks(); - - char *ProgName; --extern int errno; - extern char *optarg; - extern int optind; - ---- a/cnv/wasatchrle.c -+++ b/cnv/wasatchrle.c -@@ -32,7 +32,6 @@ - #include <errno.h> - #include "rle.h" - --extern int errno; - - /* "short" in our world is 16 bits. Beware of swyte-bopping. */ - ---- a/get/getx11/x11_stuff.c -+++ b/get/getx11/x11_stuff.c -@@ -155,7 +155,6 @@ - IPC_CREAT|0777 ); - if ( img->shm_img.shmid < 0 ) - { -- extern int errno; - if ( errno == ENOSPC ) - { - if ( !no_shared_space ) -@@ -361,7 +360,6 @@ Boolean reallocate; - XDestroyImage( image ); - if ( img->shm_pix.shmid < 0 ) - { -- extern int errno; - if ( errno == ENOSPC ) - { - if ( !no_shared_space ) ---- a/get/qcr/qcr.h -+++ b/get/qcr/qcr.h -@@ -6,8 +6,6 @@ - #define GREEN 1 - #define BLUE 2 - --extern int errno; -- - /* Command defs for QCR-Z Film Recorder */ - - /* These are for 8 bit Look Up Tables */ ---- a/get/gettaac.c -+++ b/get/gettaac.c -@@ -24,6 +24,7 @@ - * Send bug fixes and improvements to: ksp@maxwell.nde.swri.edu - */ - -+#include <errno.h> - #include <stdio.h> - #include <strings.h> - #include <signal.h> -@@ -459,7 +460,6 @@ char *template; - char nonUnique; - char twiddleUserCompletion; - -- extern int errno; - struct direct *nameEntry; - DIR *dirChan; - struct passwd *pwdEntry; ---- a/tools/clock/rleClock.c -+++ b/tools/clock/rleClock.c -@@ -598,7 +598,7 @@ - { TRUE, "-tf", STRING, "Text area format string", (char *)&FormatString }, - { FALSE, "-Xm", BOOL, "Output the alpha channel on RGB", (char *)&DebugAlpha }, - { FALSE, "-D", BOOL, "Turn on debugging", (char *)&Debug }, -- NULL -+ { FALSE, NULL } - }; - - void ---- a/tools/to8.c -+++ b/tools/to8.c -@@ -175,7 +175,7 @@ - * Give it a background color of black, since the real background - * will be dithered anyway. - */ -- if ( in_hdr.background != NULL ) -+ if ( in_hdr.background != 0 ) - { - out_hdr.bg_color = (int *)malloc( sizeof( int ) ); - RLE_CHECK_ALLOC( cmd_name( argv ), out_hdr.bg_color, 0 ); ---- a/cnv/rletoabA62/rletoabA62.c -+++ b/cnv/rletoabA62/rletoabA62.c -@@ -157,7 +157,7 @@ - exit(1); - } - if (optind < argc) { -- if ((file = open(argv[optind], 0)) == NULL) { -+ if ((file = open(argv[optind], 0)) == -1) { - perror(argv[optind]); - exit(1); - } diff --git a/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch b/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch deleted file mode 100644 index 4e0e31e660b1..000000000000 --- a/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch +++ /dev/null @@ -1,96 +0,0 @@ -Fix implicit declaration of functions - ---- a/cnv/rletoabA62/rletoabA62.c -+++ b/cnv/rletoabA62/rletoabA62.c -@@ -42,6 +42,10 @@ - */ - - #include <stdio.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <sys/stat.h> -+#include <fcntl.h> - - #ifndef TRUE - #define TRUE 1 ---- a/tools/mallocNd.c -+++ b/tools/mallocNd.c -@@ -67,6 +67,7 @@ - - /* Imports */ - #include <stdio.h> -+#include <stdlib.h> - #include <string.h> - - /* Forward declarations */ ---- a/get/getx11/getx11.h -+++ b/get/getx11/getx11.h -@@ -29,6 +29,8 @@ - #include <stdio.h> - #include <math.h> - #include <ctype.h> -+#include <unistd.h> -+#include <X11/Xlibint.h> - #include <X11/X.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> ---- a/tools/into.c -+++ b/tools/into.c -@@ -27,6 +27,7 @@ - - #include "rle_config.h" - #include <stdio.h> -+#include <unistd.h> - #include <errno.h> - #include <sys/types.h> - #include <sys/param.h> /* for MAXPATHLEN */ ---- a/tools/rlecat.c -+++ b/tools/rlecat.c -@@ -15,6 +15,7 @@ - */ - - #include <stdio.h> -+#include <unistd.h> - #include "rle.h" - #include "rle_raw.h" - ---- a/tools/rleaddcom.c -+++ b/tools/rleaddcom.c -@@ -26,6 +26,7 @@ - */ - - #include <stdio.h> -+#include <unistd.h> - #include "rle.h" - #include <sys/types.h> - #include <sys/param.h> /* for MAXPATHLEN */ ---- a/tools/rlenoise.c -+++ b/tools/rlenoise.c -@@ -20,6 +20,7 @@ - */ - - #include <stdio.h> -+#include <time.h> - #include "rle.h" - - /* Change this according the value on your system. This is a crock. */ ---- a/cnv/rletorla.c -+++ b/cnv/rletorla.c -@@ -29,6 +29,7 @@ - * System includes. - */ - #include <stdio.h> -+#include <unistd.h> - #include "rlb_header.h" - #include "rle.h" - ---- a/cnv/giftorle.c -+++ b/cnv/giftorle.c -@@ -22,6 +22,7 @@ - /* +------------------------------------------------------------------+ */ - - #include <stdio.h> -+#include <unistd.h> - #include "rle.h" - - #ifndef lint diff --git a/media-libs/urt/files/urt-3.1b-librle-toolchain.patch b/media-libs/urt/files/urt-3.1b-librle-toolchain.patch deleted file mode 100644 index 19c492988a1e..000000000000 --- a/media-libs/urt/files/urt-3.1b-librle-toolchain.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/lib/makefile.src -+++ b/lib/makefile.src -@@ -5,10 +5,6 @@ - DEST = - #endif - --#ifndef NO_RANLIB --RANLIB = ranlib --#endif -- - # If nothing else is specified, default is to build the library. - default: buildlib - -@@ -40,8 +36,8 @@ - echo cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \ - cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \ - if test x$(RANLIB) != x ; then \ -- echo ranlib $(DEST)/$(LIBNAME) ; \ -- ranlib $(DEST)/$(LIBNAME) ; \ -+ echo $(RANLIB) $(DEST)/$(LIBNAME) ; \ -+ $(RANLIB) $(DEST)/$(LIBNAME) ; \ - else \ - true ; \ - fi ; \ -@@ -49,11 +45,11 @@ - echo cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \ - if test x$(RANLIB) != x ; then \ - cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \ -- echo ranlib $(DEST)/debug/$(LIBNAME) ; \ -+ echo $(RANLIB) $(DEST)/debug/$(LIBNAME) ; \ - else \ - true ; \ - fi ; \ -- ranlib $(DEST)/debug/$(LIBNAME) ; \ -+ $(RANLIB) $(DEST)/debug/$(LIBNAME) ; \ - else \ - true ; \ - fi ; \ -@@ -65,13 +61,18 @@ - # Rebuild the library from all the .o files. - buildlib: $(OBJS) - -rm -f $(LIBNAME) -- ar rc $(LIBNAME) -- ar q $(LIBNAME) $(OBJS) -+ $(AR) rc $(LIBNAME) $(OBJS) - #ifndef NO_RANLIB -- ranlib $(LIBNAME) -+ $(RANLIB) $(LIBNAME) - #endif - touch buildlib - -+# Gentoo wants dynamic linking -+buildlibso: $(OBJS) -+ -rm -f $(LIBNAME).so -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=librle-0.0.0.so $(OBJS) -lm -o librle.so -+ touch buildlibso -+ - # Clean up installed stuff and binaries - pristine: clean - -@if test $(DEST)X != X ; then \ diff --git a/media-libs/urt/files/urt-3.1b-make.patch b/media-libs/urt/files/urt-3.1b-make.patch deleted file mode 100644 index d8f6c74cd890..000000000000 --- a/media-libs/urt/files/urt-3.1b-make.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: urt/makefile.src -=================================================================== ---- urt.orig/makefile.src -+++ urt/makefile.src -@@ -17,7 +17,7 @@ all: default - # clean deletes all but source, pristine (below) deletes installed stuff, too - default clean: doit - @for d in $(DIRS) ; do \ -- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ -+ ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ - done - - # install puts library, binaries and documentation into global location -@@ -29,7 +29,7 @@ MAKE_TARGET = - - install $(MAKE_TARGET) pristine depend:: doit - @for d in $(ALLDIRS) ; do \ -- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ -+ ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ - done - - -Index: urt/tools/makefile.src -=================================================================== ---- urt.orig/tools/makefile.src -+++ urt/tools/makefile.src -@@ -82,7 +82,7 @@ rlebox.out: rlebox.c rle_box.o - # rleClock has it's own directory, must be built special - - rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c -- (cd clock ; make) -+ (cd clock ; $(MAKE)) - - # Incremental install, copies everything ("$?") since last install to DEST dir. - install: $(PGMS) install-pgm -Index: urt/makefile.tlr -=================================================================== ---- urt.orig/makefile.tlr -+++ urt/makefile.tlr -@@ -7,7 +7,7 @@ subdirs: - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'set -e ; for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Make ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) ) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \ - done' ; \ - else \ - true ; \ -@@ -46,7 +46,7 @@ install-subdirs: subdirs - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Install ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) install) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \ - done' ; \ - else \ - true ; \ -@@ -105,7 +105,7 @@ pristine-pgm: clean-pgm - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Make ${HERE}$$dir pristine ; \ -- make $(MFLAGS) pristine); \ -+ $(MAKE) $(MFLAGS) pristine); \ - else \ - true; \ - fi; \ -@@ -124,7 +124,7 @@ clean-pgm: - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Clean ${HERE}$$dir ; \ -- make $(MFLAGS) clean); \ -+ $(MAKE) $(MFLAGS) clean); \ - else \ - true; \ - fi; \ diff --git a/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch b/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch deleted file mode 100644 index 0463abec15de..000000000000 --- a/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch +++ /dev/null @@ -1,139 +0,0 @@ -some hosts are more anal about ar usage than others -http://bugs.gentoo.org/107428 - -respect user LDFLAGS -http://bugs.gentoo.org/126872 - ---- a/tools/clock/makefile.src -+++ b/tools/clock/makefile.src -@@ -6,7 +6,7 @@ install: rleClock - mv rleClock ../rleClock.out - - rleClock:rleClock.o font.o -- ${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock -+ ${CC} ${CFLAGS} ${LDFLAGS} rleClock.o font.o ${LIBS} -o rleClock -lm - - font.c:font.src makeFont - chmod +x makeFont ---- a/tools/makefile.src -+++ b/tools/makefile.src -@@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h - pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h - $(CC) $(CFLAGS) pyrlib.c -c - pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h -- $(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new -+ $(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new - mv pyrmask.new pyrmask.out - - fant.out: fant.o mallocNd.o -- $(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new -+ $(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new - mv fant.new fant.out - - # rlebox and crop use some common code. - rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h - - crop.out: crop.c rle_box.o -- ${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new -+ ${CC} ${LDFLAGS} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new - mv crop.new crop.out - rlebox.out: rlebox.c rle_box.o -- ${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new -+ ${CC} ${LDFLAGS} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new - mv rlebox.new rlebox.out - - # rleClock has it's own directory, must be built special -@@ -100,7 +100,7 @@ clean: clean-pgm - .SUFFIXES: - .SUFFIXES: .out .c .o - .c.out: -- $(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new -+ $(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -lm -o $*.new - mv $*.new $@ - - .c.o: ---- a/cnv/makefile.src -+++ b/cnv/makefile.src -@@ -76,13 +76,13 @@ PBMDIR = - # ppmtorle - ppm format to RLE - # rletoppm - RLE to ppm format - pgmtorle.out: pgmtorle.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - ppmtorle.out: ppmtorle.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - rletoppm.out: rletoppm.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - #endif - -@@ -95,10 +95,10 @@ rletoppm.out: rletoppm.c - # iristorle/rletoiris - Convert between RLE and SGI image format. - # - iristorle.out: iristorle.c -- $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new - mv $*.new $@ - rletoiris.out: rletoiris.c -- $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new - mv $*.new $@ - #endif - -@@ -108,10 +108,10 @@ TIFFDIR = - # tifftorle - Convert TIFF images to RLE - # rletotiff - Convert RLE images to TIFF - rletotiff.out: rletotiff.c -- $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new - mv $*.new $@ - tifftorle.out: tifftorle.c -- $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new - mv $*.new $@ - #endif - -@@ -125,7 +125,7 @@ tifftorle.out: tifftorle.c - # Will build with the default rule. - # rletorla - RLE to Wavefront RLA - rletorla.out: rletorla.c -- $(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new - mv $*.new $@ - #endif WAVEFRONT - -@@ -144,7 +144,7 @@ pristine: pristine-pgm - .SUFFIXES: - .SUFFIXES: .out .c - .c.out: -- $(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) -lm -o $*.new - mv $*.new $@ - - # Dependency lines. Make sure to #ifdef them. ---- a/cnv/rletoabA62/makefile.src -+++ b/cnv/rletoabA62/makefile.src -@@ -15,7 +15,7 @@ all : $(PGMS) - # Executables. The .out will be stripped off in the install action. - - rletoabA62.out : rletoabA62.o rle.o -- $(CC) $(CFLAGS) -o rletoabA62.new \ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o rletoabA62.new \ - rletoabA62.o rle.o $(LIBS) - mv rletoabA62.new rletoabA62.out - ---- a/cnv/rletogif/makefile.src -+++ b/cnv/rletogif/makefile.src -@@ -15,7 +15,7 @@ all: $(PGMS) - # The executable. The ".out" will be stripped off in the install action. - - rletogif.out: ${OBJ} -- ${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new -+ ${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o rletogif.new - mv rletogif.new rletogif.out - - # Incremental install, copies executable to DEST dir. diff --git a/media-libs/urt/files/urt-3.1b-rle-fixes.patch b/media-libs/urt/files/urt-3.1b-rle-fixes.patch deleted file mode 100644 index b892f0acdeee..000000000000 --- a/media-libs/urt/files/urt-3.1b-rle-fixes.patch +++ /dev/null @@ -1,203 +0,0 @@ -Fixes taken from netpbm - ---- a/lib/rle_global.c -+++ b/lib/rle_global.c -@@ -76,7 +76,7 @@ rle_hdr rle_dflt_hdr = { - 8, /* cmaplen (log2 of length of color map) */ - NULL, /* pointer to color map */ - NULL, /* pointer to comment strings */ -- stdout, /* output file */ -+ NULL, /* output file -- must be set dynamically */ - { 7 }, /* RGB channels only */ - 0L, /* Can't free name and file fields. */ - "Urt", /* Default "program name". */ ---- a/lib/rle_hdr.c -+++ b/lib/rle_hdr.c -@@ -269,6 +273,9 @@ - { - rle_hdr *ret_hdr; - -+ rle_dflt_hdr.rle_file = stdout; -+ /* The rest of rle_dflt_hdr is set by the loader's data initialization */ -+ - if ( the_hdr == &rle_dflt_hdr ) - return the_hdr; - ---- a/lib/dither.c -+++ b/lib/dither.c -@@ -38,10 +38,10 @@ void make_square(); - #endif - - static int magic4x4[4][4] = { -- 0, 14, 3, 13, -- 11, 5, 8, 6, -- 12, 2, 15, 1, -- 7, 9, 4, 10 -+{ 0, 14, 3, 13}, -+{ 11, 5, 8, 6}, -+{ 12, 2, 15, 1}, -+{ 7, 9, 4, 10} - }; - - /* basic dithering macro */ ---- a/lib/rle_open_f.c -+++ b/lib/rle_open_f.c -@@ -9,7 +9,11 @@ - */ - - #include "rle_config.h" -+#define _XOPEN_SOURCE /* Make sure fdopen() is in stdio.h */ -+ - #include <stdio.h> -+#include <unistd.h> -+#include <fcntl.h> - - #ifndef NO_OPEN_PIPES - /* Need to have a SIGCLD signal catcher. */ -@@ -260,7 +260,6 @@ - int pipefd[2]; - int i; - char *argv[4]; -- extern int errno; - - /* Check args. */ - if ( *mode != 'r' && *mode != 'w' ) ---- a/lib/rle_getcom.c -+++ b/lib/rle_getcom.c -@@ -53,11 +53,12 @@ - { - for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) - ; -- if (*n == '\0' || *n == '=') -+ if (*n == '\0' || *n == '=') { - if ( *v == '\0' ) - return v; - else if ( *v == '=' ) - return ++v; -+ } - - return NULL; - } ---- a/lib/scanargs.c -+++ b/lib/scanargs.c -@@ -128,10 +130,10 @@ - va_list argl; - { - -- register check; /* check counter to be sure all argvs -+ int check; /* check counter to be sure all argvs - are processed */ - register CONST_DECL char *cp; -- register cnt; -+ int cnt; - int optarg = 0; /* where optional args start */ - int nopt = 0; - char tmpflg, /* temp flag */ -@@ -375,11 +377,12 @@ - if ( optarg > 0 ) /* end optional args? */ - { - /* Eat the arg, too, if necessary */ -- if ( list_cnt == 0 ) -+ if ( list_cnt == 0 ) { - if ( typchr == 's' ) - (void)va_arg( argl, char * ); - else - (void)va_arg( argl, ptr ); -+ } - break; - } - else -@@ -567,7 +570,7 @@ - * Do conversion for n and N types - */ - tmpflg = typchr; -- if (typchr == 'n' || typchr == 'N' ) -+ if (typchr == 'n' || typchr == 'N' ) { - if (*argp != '0') - tmpflg = 'd'; - else if (*(argp+1) == 'x' || -@@ -578,6 +581,7 @@ - } - else - tmpflg = 'o'; -+ } - if (typchr == 'N') - tmpflg = toupper( tmpflg ); - ---- a/lib/inv_cmap.c -+++ b/lib/inv_cmap.c -@@ -42,7 +42,7 @@ - static long cbinc, cginc, crinc; - static unsigned long *gdp, *rdp, *cdp; - static unsigned char *grgbp, *rrgbp, *crgbp; --static gstride, rstride; -+static long gstride, rstride; - static long x, xsqr, colormax; - static int cindex; - #ifdef INSTRUMENT_IT ---- a/lib/rle_getrow.c -+++ b/lib/rle_getrow.c -@@ -351,7 +351,7 @@ - bzero( (char *)scanline[-1] + the_hdr->xmin, - the_hdr->xmax - the_hdr->xmin + 1 ); - for ( nc = 0; nc < the_hdr->ncolors; nc++ ) -- if ( RLE_BIT( *the_hdr, nc ) ) -+ if ( RLE_BIT( *the_hdr, nc ) ) { - /* Unless bg color given explicitly, use 0. */ - if ( the_hdr->background != 2 || the_hdr->bg_color[nc] == 0 ) - bzero( (char *)scanline[nc] + the_hdr->xmin, -@@ -360,6 +360,7 @@ - bfill( (char *)scanline[nc] + the_hdr->xmin, - the_hdr->xmax - the_hdr->xmin + 1, - the_hdr->bg_color[nc] ); -+ } - } - - /* If skipping, then just return */ -@@ -367,7 +368,7 @@ - { - the_hdr->priv.get.vert_skip--; - the_hdr->priv.get.scan_y++; -- if ( the_hdr->priv.get.vert_skip > 0 ) -+ if ( the_hdr->priv.get.vert_skip > 0 ) { - if ( the_hdr->priv.get.scan_y >= the_hdr->ymax ) - { - int y = the_hdr->priv.get.scan_y; -@@ -377,6 +378,7 @@ - } - else - return the_hdr->priv.get.scan_y; -+ } - } - - /* If EOF has been encountered, return also */ -@@ -457,11 +459,12 @@ - else - nc = DATUM(inst); - nc++; -- if ( debug_f ) -+ if ( debug_f ) { - if ( RLE_BIT( *the_hdr, channel ) ) - fprintf( stderr, "Pixel data %d (to %d):", nc, scan_x+nc ); - else - fprintf( stderr, "Pixel data %d (to %d)\n", nc, scan_x+nc); -+ } - if ( RLE_BIT( *the_hdr, channel ) ) - { - /* Don't fill past end of scanline! */ ---- a/lib/rle_putcom.c -+++ b/lib/rle_putcom.c -@@ -53,11 +53,12 @@ - { - for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) - ; -- if (*n == '\0' || *n == '=') -+ if (*n == '\0' || *n == '=') { - if ( *v == '\0' ) - return v; - else if ( *v == '=' ) - return ++v; -+ } - - return NULL; - } diff --git a/media-libs/urt/files/urt-3.1b-solaris.patch b/media-libs/urt/files/urt-3.1b-solaris.patch deleted file mode 100644 index 739b937d8903..000000000000 --- a/media-libs/urt/files/urt-3.1b-solaris.patch +++ /dev/null @@ -1,14 +0,0 @@ -usage of errno requires errno.h - -Fabian Groffen <grobian@gentoo.org> - ---- a/get/getx11/x11_stuff.c -+++ b/get/getx11/x11_stuff.c -@@ -42,6 +42,7 @@ - #ifdef X_SHARED_MEMORY - #include <sys/errno.h> - #endif -+#include <errno.h> - - #include "circle.bitmap" - #include "circle_mask.bitmap" diff --git a/media-libs/urt/files/urt-3.1b-tempfile.patch b/media-libs/urt/files/urt-3.1b-tempfile.patch deleted file mode 100644 index 8be2793ed71c..000000000000 --- a/media-libs/urt/files/urt-3.1b-tempfile.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/tools/rlecat.c -+++ b/tools/rlecat.c -@@ -110,8 +110,14 @@ - nflag = 0; /* Not really repeating! */ - else - { -- mktemp( temp ); /* Make a temporary file name */ -- tmpfile = rle_open_f( cmd_name( argv ), temp, "w+" ); -+ /* we dont have to use rle_open_f() because all it does in -+ * this case is run fopen() ... we're creating a file so all -+ * the checks for opening an existing file aren't needed */ -+ int fd = mkstemp(temp); -+ if (fd == -1 || (tmpfile = fdopen(fd, "w+")) == NULL) { -+ perror("Unable to open tempfile"); -+ exit(-1); -+ } - } - } - diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild deleted file mode 100644 index bdf0851dc3cf..000000000000 --- a/media-libs/urt/urt-3.1b-r3.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="the Utah Raster Toolkit is a library for dealing with raster images" -HOMEPAGE="https://www.cs.utah.edu/gdc/projects/urt/" -SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z" -S="${WORKDIR}" - -LICENSE="URT gif? ( free-noncomm )" -SLOT="0/3.1b-r2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" -IUSE="gif postscript static-libs tiff tools X" - -RDEPEND=" - X? ( x11-libs/libXext ) - gif? ( media-libs/giflib ) - postscript? ( app-text/ghostscript-gpl ) - tiff? ( media-libs/tiff:= ) -" -DEPEND=" - ${RDEPEND} - X? ( x11-base/xorg-proto ) -" - -PATCHES=( - "${FILESDIR}"/${P}-rle-fixes.patch - "${FILESDIR}"/${P}-compile-updates.patch - "${FILESDIR}"/${P}-tempfile.patch - "${FILESDIR}"/${P}-r2-build-fixes.patch - "${FILESDIR}"/${P}-make.patch - "${FILESDIR}"/${P}-solaris.patch - "${FILESDIR}"/${P}-librle-toolchain.patch - "${FILESDIR}"/${P}-implicit-function-declarations.patch -) - -urt_config() { - use $1 && echo "#define $2" || echo "##define $2" -} - -src_prepare() { - rm -f bin/README || die - - default - - # punt bogus manpage #109511 - rm -f man/man1/template.1 || die - - # stupid OS X declares a stack_t type already #107428 - sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c || die - -} - -src_configure() { - append-cflags -fPIC - - sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr || die - - cp "${FILESDIR}"/gentoo-config config/gentoo || die - cat >> config/gentoo <<-EOF - $(urt_config X X11) - $(urt_config postscript POSTSCRIPT) - $(urt_config tiff TIFF) - ExtraCFLAGS = ${CFLAGS} - MFLAGS = ${MAKEOPTS} - # prevent circular depend #111455 - $(has_version media-libs/giflib && urt_config gif GIF) - EOF - - ./Configure config/gentoo || die "configure failed" -} - -src_compile() { - tc-export AR RANLIB - - emake CC="$(tc-getCC)" -C lib buildlibso - emake CC="$(tc-getCC)" -} - -src_install() { - mkdir -p man-dest/man{1,3,5} - # this just installs it into some local dirs - emake install - - use tools && dobin bin/* - - use static-libs && dolib.a lib/librle.a - - dolib.so lib/librle.so - dosym librle.so /usr/$(get_libdir)/librle-0.0.0.so - - insinto /usr/include - doins include/rle*.h - doman man-dest/man?/*.[135] - dodoc *-changes CHANGES* README blurb -} |