From 2a8d2f71d1d9963368e0ef3d641d75979a689d12 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 4 Jul 2024 08:06:08 +0100 Subject: gentoo auto-resync : 04:07:2024 - 08:06:07 --- dev-games/clanlib/Manifest | 6 +- dev-games/clanlib/clanlib-0.8.1-r2.ebuild | 13 ++- dev-games/clanlib/clanlib-0.8.1-r3.ebuild | 106 ++++++++++++++++++ dev-games/clanlib/clanlib-2.3.7-r4.ebuild | 120 +++++++++++++++++++++ dev-games/clanlib/clanlib-4.1.0-r1.ebuild | 77 +++++++++++++ .../clanlib-0.8.1-makefile-duplicate-headers.patch | 29 +++++ 6 files changed, 349 insertions(+), 2 deletions(-) create mode 100644 dev-games/clanlib/clanlib-0.8.1-r3.ebuild create mode 100644 dev-games/clanlib/clanlib-2.3.7-r4.ebuild create mode 100644 dev-games/clanlib/clanlib-4.1.0-r1.ebuild create mode 100644 dev-games/clanlib/files/clanlib-0.8.1-makefile-duplicate-headers.patch (limited to 'dev-games/clanlib') diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest index 0063c157fc01..ed7b2508d778 100644 --- a/dev-games/clanlib/Manifest +++ b/dev-games/clanlib/Manifest @@ -7,6 +7,7 @@ AUX clanlib-0.8.1-gcc6.patch 530 BLAKE2B f076e15e0061aad13da8f608ed966f7929a2e71 AUX clanlib-0.8.1-glibc2.34.patch 536 BLAKE2B 17eab65b09e8764831ed11ad6ef12d3c9a6ff46445e6ad423b4480366ea017f6577b309661fc0bf31e26c2bc27621a50551880ffdf8a37dd240b5aea19c3a491 SHA512 119a4b5aef1f9aceac0ad424f5bd5b4a60203485b1e6394c2f9c1b00d2bbf5d5072967812ae210d255b18d6d255a81953f5794971780ccd5eaa23a7b57e6b68b AUX clanlib-0.8.1-libpng15.patch 381 BLAKE2B 4f928698bd0121d6a1c4475b4aa58ae00a1146004f3273440fc257cc324d9ab26841247e0241ad2b6016162692136906131d5dc5f3730aab3b52783a95ba154c SHA512 2b54b5c5094de33582292fa84572fb826668f48cf6e6f82c4fa978db888fbc2ea379a08951e2084ab6eb1d3f2007d19aa00940d2760fa5bee973f6181a0ba804 AUX clanlib-0.8.1-llvm.patch 4301 BLAKE2B c1472ca77f985da747c84e20ebc60b401f7d3178e96cbfb0d81adf5039ce1c8917743dcdc2d35e613243d59c9b8a5bdf1ebba3f76108c738d9b21b34348f06f5 SHA512 277901f40ee7bc16327378f5895382b7249c0d0f0c0084605357966b7f4a665dcf1147dd95b65753ba33f126f58027364289f9540bf0711b20fc4887d0016e6a +AUX clanlib-0.8.1-makefile-duplicate-headers.patch 985 BLAKE2B ab43e680b2bab5f3f647843c4bdda9479b37518c06f0ef94fbd427ec83b8ee73bb0b5cf699f228d7749bd316cf720eb0f013386f5e321339b2396ed18c13a3c5 SHA512 00075e345a6dc25ee60fc858af10b19013aed967f15abe2cb26b10203d47e641611d9ffc893ddf6c899fd62e354f10e7131cd93407fd7e3cc72f7e4006ac10e2 AUX clanlib-0.8.1-ndebug.patch 553 BLAKE2B 3ad0629f0598a3d9191dafb596aece7aa5f40db99bc959e13bcd4bdd9082483988fca49d3ebd22812eef1502d7bd5eb2b831707ee4f5f2abe7270ef9f1b94a11 SHA512 dcda9fdf32861c05b37ed71194d7ca595fe07c85e754016324fce9fcf668cb4042d071c68c4019234faac4a116ae4877d457374fc11fc74be148e132fdee7cce AUX clanlib-2.3.7-32bit-opengl.patch 515 BLAKE2B 96823139c5235c5e780727c8be48615d860fcc4ad0f46f9e2846836bd42571697d7e4a9201bbdde676dca3ffcbaa0dc6e96b3507dbc0cf79b8dc447b35b45717 SHA512 5a76c9a85f0b7881ae494749f379f1d5dd177d0d271e328da5ffbc580c02c1965da95ba204b10d9b25e80a2b9ff42e7257d8cb0915264be58f4349920e663175 AUX clanlib-2.3.7-autotools.patch 1458 BLAKE2B ecf797fa09893422b94364ac0df8156b3e2c3b2164530cd845201ad266977426b692860efce1b2cf6f6dee0cb098c6e28e8c3e203567c81713f63fc6099c30a9 SHA512 170580de7780e638e3a1788eb2bfcfe58f64d5f5695cbbd550ddc5bf59933303dea7970191792adefc8b1408647d4e3c816c30aaf253a9ceb139f9300b9e5807 @@ -21,7 +22,10 @@ AUX clanlib-2.3.7-non-x86.patch 1263 BLAKE2B af0f26f0148e66ed20cc226539b30fe44a4 DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 7f238111931212e3f9c82ed43842706bf16ee145896735ca35595e29dd357e52364cc592be55d88e231f962adc313bc8f57357bc74c9f1b8b134bc411497f5e9 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 109ba92baf21174022c8dbc4044e39ec16ec77c730b57590733418e246ab71d18d81bbf281cd469dd9e2aebd4ac4302fbb581f27dc7fc0054a8c7ce69699e19d SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a DIST clanlib-4.1.0.tar.gz 6871886 BLAKE2B 0aeb9e89998a9ef6975bf16a2e77f461e6415aacda9a26a5c0a9c6ec3c19a136a5f092c7866b60898251fbd6cb8aa7e96c86f6b87afb564824298fac77bf20c3 SHA512 34f5d1fdb7b071a218f081a6b06a6018a9c20cedc4c8500a9796be02d335f06fa148304379eeb1a35e08b9a734e504ceb490a6558a43d1611187bd97be01f4b0 -EBUILD clanlib-0.8.1-r2.ebuild 2299 BLAKE2B c0f7f7c2d297ec7fc39f15f43a88ecce8407eeea66eb9a4fa4daeaded28d187afc0b8ab166e83e7ae1ac4122135358b0246cc2f732bb37a69640ac2988383b68 SHA512 96784a424c20fa45225d5f1ca659222eccd6f4f4c194d3ee9151e4f5a09491942aeae4ed4df376570f603cfae40940e49e5e4c79c5455a64d9f2a7ca5dcad9a0 +EBUILD clanlib-0.8.1-r2.ebuild 2566 BLAKE2B 37c8ed89d17edd9c25e5ab09e03d0a7e1f29839b4740ed6fe00127f7ddba49f2992076d5907d1f67cc54aff37f5efc56cd45d0d5ffc3d7de23f77431a4a6e2a6 SHA512 d548312568bfa43c5b9d16148489f07e126bd883041c209a76030c324ea7eb3d4ba6e10ec484a3909a2013b96670cea2256ce574050fe15bdd7f249c6a7cb292 +EBUILD clanlib-0.8.1-r3.ebuild 2568 BLAKE2B d1fb2037b95a23745fd7bea69dfc4d51108b824779b8700547e5ec7c9e3126c93a2afba62b83d45bd8a4cb1949c68622ee41b2fea5dde602df1d1430ec4ae06b SHA512 d2c41fb50f840b1171e0b08a6d4caf5ea562632d8c91ebc5052e43e22298e74a9eb8a55ff1016ff4661ba9c6942fcce3d7bca1dbdaad8c26357bb5c911343c47 EBUILD clanlib-2.3.7-r3.ebuild 2476 BLAKE2B 930c63a15b380ecd96eda42bae4a53a7e9799d138581aee939ec03a7d1ec1bb565a0a518c2bc19a80ce2e11b620858fb46b51dc8240807c87f6357e031eca899 SHA512 429e9b1478ce18b790ca73505a6f7794ddcac707159104309db3488e0ad0961e7386741e266bdd8530b4a63773a0ef2fbe504683f51eada98997c97bd32db8a9 +EBUILD clanlib-2.3.7-r4.ebuild 2513 BLAKE2B b3fb83bc734f82a87b05654ff95332cb124351743adaa4967242d49ae1121886170088c793c7dd7edfb3c194fda048703862398cb2f3d5d8980caaacf85dc962 SHA512 3835f793489af05ff43374def37e46312fe8af4241d121e9de41746e574b73302b5a2003d55c6cbb461cdd9c4256462604fc20f6b3a0aced2773251c76c96d11 +EBUILD clanlib-4.1.0-r1.ebuild 1493 BLAKE2B 1a640d54cf9aa0adf6aaa2d52146f82b0d036c65af0440e6150ef1d0ed9f9bd2eb41d4e61e6c26127259f935231523022c0095bc4faa8ebc4b4a8780d197c840 SHA512 11ef22ad2032fd3c97f4e00578469c4460e03b519a65eeda4eaa3ac911f4290fd8494a295443de16395226a7f9c322bb00e4dee6fe15511cbf03976c134e3af5 EBUILD clanlib-4.1.0.ebuild 1491 BLAKE2B 10474339905ef7d380908b566b7bd1f1216f4139a4df671fc59405b4d2e39f7087a62327b34eed6e70055ebb2918e0e1922a356c2442a2a396e26e2ea2a7b4ee SHA512 e101ec697d3388029ed5cd26f98a0b8422d650ec7b70cef50a1e6ce0db56621ba9c52559fc8987e3ce5e0509979f98dee16fbb9c92ef58b08b26231840e1febc MISC metadata.xml 3097 BLAKE2B a17189a5334540d64d105470c7785d223628d8cff00f5ac162084acc0b4905c537abfbe9383bfa293c751b2efbe5d30a9a3280c92c7954cb3c4a8e04d2c925c5 SHA512 e86eda205bb05a47d49160a458c27d6eb9d67ff1f23921880f6dd46e4c16a930b405f6f2fc41fcd1623458f50452ea5ccdea36abafee802cc6933a7b3b471992 diff --git a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild index 4235f050aabd..6cb8b3b5e63e 100644 --- a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild +++ b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools flag-o-matic + DESCRIPTION="Multi-platform game development library" HOMEPAGE="https://github.com/sphair/ClanLib" SRC_URI="mirror://gentoo/ClanLib-${PV}.tgz" @@ -48,6 +50,7 @@ PATCHES=( "${FILESDIR}/${P}-docbuilder.patch" "${FILESDIR}/${P}-glibc2.34.patch" "${FILESDIR}/${P}-gcc12.patch" + "${FILESDIR}"/${P}-makefile-duplicate-headers.patch ) DOCS=( @@ -57,12 +60,20 @@ DOCS=( src_prepare() { default + eautoreconf # See #739358 sed -i -e "s:libdir=\${exec_prefix}/lib:libdir=@libdir@:g" \ pkgconfig/*.pc.in || die } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/855308 + # Fixed in newer versions + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + # clanSound only controls mikmod/vorbis so there's # no need to pass --{en,dis}able-clanSound ... # clanDisplay only controls X, SDL, OpenGL plugins diff --git a/dev-games/clanlib/clanlib-0.8.1-r3.ebuild b/dev-games/clanlib/clanlib-0.8.1-r3.ebuild new file mode 100644 index 000000000000..91061dde6339 --- /dev/null +++ b/dev-games/clanlib/clanlib-0.8.1-r3.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Multi-platform game development library" +HOMEPAGE="https://github.com/sphair/ClanLib" +SRC_URI="mirror://gentoo/ClanLib-${PV}.tgz" +S="${WORKDIR}"/ClanLib-${PV} + +LICENSE="ZLIB" +SLOT="0.8" +# Not big endian safe! #82779 +KEYWORDS="~amd64 ~x86" +IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis" + +# opengl keyword does not drop the GL/GLU requirement. +# Autoconf files need to be fixed +RDEPEND=" + media-libs/alsa-lib + media-libs/libpng:0 + virtual/jpeg:0 + virtual/glu + virtual/opengl + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXxf86vm + mikmod? ( media-libs/libmikmod ) + sdl? ( + media-libs/libsdl[X] + media-libs/sdl-gfx + ) + vorbis? ( media-libs/libvorbis ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}/${P}-ndebug.patch" + "${FILESDIR}/${P}-gcc43.patch" + "${FILESDIR}/${P}-gcc44.patch" + "${FILESDIR}/${P}-gcc47.patch" + "${FILESDIR}/${P}-gcc6.patch" + "${FILESDIR}/${P}-llvm.patch" + "${FILESDIR}/${P}-libpng15.patch" + "${FILESDIR}/${P}-docbuilder.patch" + "${FILESDIR}/${P}-glibc2.34.patch" + "${FILESDIR}/${P}-gcc12.patch" + "${FILESDIR}"/${P}-makefile-duplicate-headers.patch +) + +DOCS=( + CODING_STYLE CREDITS NEWS PATCHES + README{,.anjuta,.distros,.kdevelop,.sdl,.upgrade} INSTALL.linux +) + +src_prepare() { + default + eautoreconf + # See #739358 + sed -i -e "s:libdir=\${exec_prefix}/lib:libdir=@libdir@:g" \ + pkgconfig/*.pc.in || die +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/855308 + # Fixed in newer versions + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + # clanSound only controls mikmod/vorbis so there's + # no need to pass --{en,dis}able-clanSound ... + # clanDisplay only controls X, SDL, OpenGL plugins + # so no need to pass --{en,dis}able-clanDisplay + # also same reason why we don't have to use clanGUI + econf \ + --enable-dyn \ + --enable-clanNetwork \ + $(use_enable x86 asm386) \ + $(use_enable doc docs) \ + $(use_enable opengl clanGL) \ + $(use_enable sdl clanSDL) \ + $(use_enable vorbis clanVorbis) \ + $(use_enable mikmod clanMikMod) \ + $(use_enable ipv6 getaddr) \ + $(use_enable static-libs static) +} + +src_install() { + default + + if use doc ; then + dodir /usr/share/doc/${PF}/html + mv "${D}"/usr/share/doc/clanlib/* "${D}"/usr/share/doc/${PF}/html/ || die + rm -rf "${D}"/usr/share/doc/clanlib + cp -r Examples Resources "${D}"/usr/share/doc/${PF}/ || die + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-games/clanlib/clanlib-2.3.7-r4.ebuild b/dev-games/clanlib/clanlib-2.3.7-r4.ebuild new file mode 100644 index 000000000000..24cbee039a3e --- /dev/null +++ b/dev-games/clanlib/clanlib-2.3.7-r4.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +MY_P=ClanLib-${PV} +DESCRIPTION="Multi-platform game development library" +HOMEPAGE="https://github.com/sphair/ClanLib" +SRC_URI="mirror://gentoo/${MY_P}.tgz" +S="${WORKDIR}"/${MY_P} + +LICENSE="ZLIB" +SLOT="2.3" +KEYWORDS="~amd64 ~x86" +IUSE="doc ipv6 mikmod opengl +sound sqlite cpu_flags_x86_sse2 static-libs vorbis X" +REQUIRED_USE="opengl? ( X )" + +BDEPEND=" + virtual/pkgconfig + doc? ( + app-text/doxygen + dev-lang/perl + media-gfx/graphviz + ) +" +RDEPEND=" + sys-libs/zlib + X? ( + app-arch/bzip2 + media-libs/libpng:0 + media-libs/freetype + media-libs/fontconfig + media-libs/libjpeg-turbo:0= + x11-libs/libX11 + opengl? ( virtual/opengl ) + ) + mikmod? ( + media-libs/alsa-lib + media-libs/libmikmod + ) + sqlite? ( dev-db/sqlite:3 ) + sound? ( media-libs/alsa-lib ) + vorbis? ( + media-libs/alsa-lib + media-libs/libogg + media-libs/libvorbis + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-autotools.patch + "${FILESDIR}"/${P}-doc.patch + "${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902 + "${FILESDIR}"/${P}-glibc2.34.patch + "${FILESDIR}"/${P}-32bit-opengl.patch + # From Fedora + "${FILESDIR}"/${P}-gcc47.patch + "${FILESDIR}"/${P}-gcc7.patch + "${FILESDIR}"/${P}-non-x86.patch + "${FILESDIR}"/${P}-no-ldflags-for-conftest.patch + "${FILESDIR}"/${P}-no-wm_type-in-fs.patch +) + +DOCS=( CODING_STYLE CREDITS PATCHES README ) + +src_prepare() { + default + + eautoreconf + + ln -sf ../../../Sources/API Documentation/Utilities/ReferenceDocs/ClanLib || die +} + +src_configure() { + # Add -DPACKAGE_BUGREPORT? + local myeconfargs=( + $(use_enable doc docs) + $(use_enable cpu_flags_x86_sse2 sse2) + $(use_enable opengl clanGL) + $(use_enable opengl clanGL1) + $(use_enable opengl clanGUI) + $(use_enable X clanDisplay) + $(use_enable vorbis clanVorbis) + $(use_enable mikmod clanMikMod) + $(use_enable sqlite clanSqlite) + $(use_enable ipv6 getaddr) + $(use_enable static-libs static) + ) + + use sound \ + || use vorbis \ + || use mikmod \ + || myeconfargs+=( --disable-clanSound ) + + tc-export PKG_CONFIG + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake + + use doc && emake html +} + +# html files are keeped in a directory that is dependent on the SLOT +# so to keep eventual bookmarks to the doc from version to version +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die + + if use doc ; then + emake DESTDIR="${D}" install-html + dodoc -r Examples Resources + fi +} diff --git a/dev-games/clanlib/clanlib-4.1.0-r1.ebuild b/dev-games/clanlib/clanlib-4.1.0-r1.ebuild new file mode 100644 index 000000000000..8ddb515551e2 --- /dev/null +++ b/dev-games/clanlib/clanlib-4.1.0-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +MY_PN=ClanLib + +DESCRIPTION="Multi-platform game development library" +HOMEPAGE="https://github.com/sphair/ClanLib" +SRC_URI="https://github.com/sphair/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="ZLIB" +SLOT="4.1" +KEYWORDS="~amd64 ~x86" #not big endian safe #82779 +IUSE="cpu_flags_x86_sse2 doc examples ipv6 opengl +sound static-libs X" +REQUIRED_USE="opengl? ( X )" + +RDEPEND=" + sys-libs/zlib + X? ( + media-libs/freetype:2 + media-libs/fontconfig + x11-libs/libX11 + opengl? ( + virtual/opengl + x11-libs/libXrender + ) + ) + sound? ( media-libs/alsa-lib )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-text/doxygen + dev-lang/perl + media-gfx/graphviz + )" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable doc docs) + $(use_enable cpu_flags_x86_sse2 sse2) + $(use_enable opengl clanGL) + $(use_enable opengl clanUI) + $(use_enable X clanDisplay) + $(use_enable sound clanSound) + $(use_enable ipv6 getaddr) + $(use_enable static-libs static) + ) + + tc-export PKG_CONFIG + + econf "${myeconfargs[@]}" +} + +src_compile() { + default + use doc && emake html +} + +src_install() { + default + + use doc && emake DESTDIR="${D}" install-html + use examples && dodoc -r Examples Resources + + # package provides .pc files + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-games/clanlib/files/clanlib-0.8.1-makefile-duplicate-headers.patch b/dev-games/clanlib/files/clanlib-0.8.1-makefile-duplicate-headers.patch new file mode 100644 index 000000000000..cdd7e67f83ab --- /dev/null +++ b/dev-games/clanlib/files/clanlib-0.8.1-makefile-duplicate-headers.patch @@ -0,0 +1,29 @@ +From 54eb2a8e72f782792ab53d7c989deec52059990a Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Sun, 30 Jun 2024 19:24:50 -0400 +Subject: [PATCH] build: fix duplicated header in Makefile.am + +Regenerating configure/Makefiles with newer autotools versions results +in build failures: a more optimized routine is used for installing +headers in bulk, which is sensitive to listing the same file twice as +part of a single `install ...` invocation. Not present in newer clanlib +versions. +--- + Sources/API/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Sources/API/Makefile.am b/Sources/API/Makefile.am +index 5686330..8dcb56e 100644 +--- a/Sources/API/Makefile.am ++++ b/Sources/API/Makefile.am +@@ -232,7 +232,6 @@ clanCore_includes = \ + Core/System/event_trigger.h \ + Core/System/console_window.h \ + Core/System/keep_alive.h \ +- Core/System/log.h \ + Core/System/crash_reporter.h \ + Core/System/call_stack.h \ + Core/System/clanstring.h \ +-- +2.44.2 + -- cgit v1.2.3