From a6764d56b1c85c8272783500983011c143c72d80 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Dec 2024 02:07:17 +0000 Subject: gentoo auto-resync : 05:12:2024 - 02:07:17 --- games-arcade/Manifest.gz | Bin 20098 -> 20097 bytes games-arcade/jazz2/Manifest | 6 +- .../jazz2/files/jazz2-2.8.0-about-section.patch | 20 ------ .../jazz2/files/jazz2-2.8.0-strict-aliasing.patch | 33 --------- games-arcade/jazz2/jazz2-2.8.0-r1.ebuild | 74 --------------------- games-arcade/jazz2/jazz2-3.0.0.ebuild | 70 +++++++++++++++++++ 6 files changed, 72 insertions(+), 131 deletions(-) delete mode 100644 games-arcade/jazz2/files/jazz2-2.8.0-about-section.patch delete mode 100644 games-arcade/jazz2/files/jazz2-2.8.0-strict-aliasing.patch delete mode 100644 games-arcade/jazz2/jazz2-2.8.0-r1.ebuild create mode 100644 games-arcade/jazz2/jazz2-3.0.0.ebuild (limited to 'games-arcade') diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz index ab13d6d7daaf..e95d4149ea80 100644 Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ diff --git a/games-arcade/jazz2/Manifest b/games-arcade/jazz2/Manifest index b95de0af1677..3888a5b1c850 100644 --- a/games-arcade/jazz2/Manifest +++ b/games-arcade/jazz2/Manifest @@ -1,9 +1,7 @@ -AUX jazz2-2.8.0-about-section.patch 720 BLAKE2B 96bead2d6233b02232eb3db865928fcbd3f79bc701e4f387c0db0adca61ebf4772cdfe9ed63a6e3799798f560db925c3007aae61fed38d28e5bcc6a7a11b8200 SHA512 2eca42570c28883c8e3d83cd1ae5c6952985f0ceba72fc5c3995799b59a36d3ced973eacb102c88ef5bdd9245a763dfe17de35dd1432da4f5a2a6116efa31d26 -AUX jazz2-2.8.0-strict-aliasing.patch 1006 BLAKE2B ecb71fc596427b4ddee85a50738be4ccfc54f0c108449d2593f3ef65ad6bdc1dde984dcf8101a6300d78473d45d71bde48a916c456bdf1ddb7e29dfa98f02efa SHA512 79adebbbaa7720637975394aa83583284039ae9f95453c44ca5f6e6055c3c7cc1a23b0467f13dc22ef6028dc68901bdbc1db7af8b290c83c514f33a4b3d8729c DIST jazz2-0.6.7.tar.gz 11031735 BLAKE2B 014ff24c6f5a834a727aaed3760a1e228d9f7d9653dd293e98030c9105cbf15a3b420c2d515605e36187cc833ae892ed30589f1bf821c0b674b883cea216f3f5 SHA512 7172a3ccb367122d1c9bfbd36b76cc3d365024affba9aea5cfa595fd11a9b4dc980e57c1cfdb0d32bc28bb7ecb5f6f5225909697c4c93c43117596f44d80ff8f -DIST jazz2-2.8.0.tar.gz 3656018 BLAKE2B c023e722871304754e45a1329cfff9e0e713413a6a05b5265dd000bab8a057ac5dbdb1a263b29f562df0221b97eb326fbd15f3c6b6f316b756630c2521413bec SHA512 1a6b61cb654c5afee7d615cca912b75ef4f1e90929d7808800467bd13a1ebd9096430d1c1fa969cfacf8c10ff1e696c74371c1809a0ffbda90c5db31c686ae05 DIST jazz2-2.9.1.tar.gz 3700152 BLAKE2B dee3ada0bfa95294dac9fa2c37019edc20dd9a9f462671dea1d083575bc1f231e013bb5f9076b9163cdf0682a7775932f07050e894dad2f492e65150d47b42dd SHA512 d908a2c24d010122d4c9e2db17ed7392780785ef98799401f960cee41b5dfd9504859e30410e0bcf4678d1a73e5e153f4c46259da672b923cdc8decae25aae1c +DIST jazz2-3.0.0.tar.gz 3781625 BLAKE2B d044d4fe5128eaff45ddf57c5bf9090c279730e7c0b5ddf3951744f6fdd81be09335d3d1c9089f930dadbdac906746686af13791ec8f212fed034afa8e8dd35a SHA512 e643e5b3196020737a9a25929684254becd77cb5ba0715f70c313b1d254e42a2178f082abae5155028ad2ffdf605563a3553e8c7beede3bd6a10c0001c7ecfe7 EBUILD jazz2-0.6.7-r1.ebuild 1845 BLAKE2B 4e811e21b4a2dfd300d26a676bf040b7c1a632f6f31c403c154b9b55e748b01b9784e45aa1cbd3df2aeaadae2c2038e6e5af6cb5819e36e6141ea294e81bcc8e SHA512 77f9fb6c54b7de2c82149a9cdd1275b494f8243ad6595740ff73e9ae47d23b9cad15f9a18c1b3d7635aa0e1d277414c0bd6b35524c398d77cb79140b622947de -EBUILD jazz2-2.8.0-r1.ebuild 1461 BLAKE2B c5725d1b212cbe6c21164858b22cdafbf6ccb374402e617a6caf9abd70c6abc1ce53a148f11dda41b24bf6d8d5229901c38dda2284a6e446c12fc1363c7fabb3 SHA512 cf7be904449785a28f3eeb108d2900e404d37eb4153c95de6f9d0b54e0457f685643e4cd2c605552d31255d9126e70edf26df48f9f1976438f8cbaa0c67f0784 EBUILD jazz2-2.9.1.ebuild 1375 BLAKE2B 8d9480af3599e9204ed15e5d845dc6fdb1afac0f794f91ae8c276568503cda2ebf6f6fbb8ffecc4d3984b5dcd822f437eb73825228e8126044af3db01586e681 SHA512 9de3b8291a4b3188024a6a7f9414479bcc79c3e58282abe2354bee9fe57a632230158ec624cdd66616ec84124d88279cec8ca4dc9a09d31ea3654844436d6e31 +EBUILD jazz2-3.0.0.ebuild 1375 BLAKE2B 8d9480af3599e9204ed15e5d845dc6fdb1afac0f794f91ae8c276568503cda2ebf6f6fbb8ffecc4d3984b5dcd822f437eb73825228e8126044af3db01586e681 SHA512 9de3b8291a4b3188024a6a7f9414479bcc79c3e58282abe2354bee9fe57a632230158ec624cdd66616ec84124d88279cec8ca4dc9a09d31ea3654844436d6e31 MISC metadata.xml 534 BLAKE2B d4854038d3768cbe033bb6e22fcdf81f0f964d8c08a0e46dc33f033bac741609903a64fd551a8ce742d18a9427bc11790772571d78de15458435230645b9b9d7 SHA512 ba8a143912432f5c8d4f0e698e59463cbf9b5c601ec95ac499938efa21c489d8dd070ef879dc68526c7ec5f3fdacef03cf7dd14a1eb368c9fc9d464c4fd6dac2 diff --git a/games-arcade/jazz2/files/jazz2-2.8.0-about-section.patch b/games-arcade/jazz2/files/jazz2-2.8.0-about-section.patch deleted file mode 100644 index 349ec40fd180..000000000000 --- a/games-arcade/jazz2/files/jazz2-2.8.0-about-section.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 04d43f938c8b656bf5fb0dbed464566af4c0062c Mon Sep 17 00:00:00 2001 -From: Death Killer <884052+deathkiller@users.noreply.github.com> -Date: Sun, 4 Aug 2024 16:49:59 +0200 -Subject: [PATCH] Fixed about screen - -https://github.com/deathkiller/jazz2-native/commit/04d43f938c8b656bf5fb0dbed464566af4c0062c - -diff --git a/Sources/Jazz2/UI/Menu/AboutSection.cpp b/Sources/Jazz2/UI/Menu/AboutSection.cpp -index 9c3afd59..ea7723e9 100644 ---- a/Sources/Jazz2/UI/Menu/AboutSection.cpp -+++ b/Sources/Jazz2/UI/Menu/AboutSection.cpp -@@ -62,7 +62,7 @@ - # define _i7 "\nOpenAL \f[c:#707070]ยท \f[h:80]https://github.com/kcat/openal-soft\f[/h]\f[/c]" - # endif - #else --# define _i6 "" -+# define _i7 "" - #endif - - #if defined(WITH_VORBIS) diff --git a/games-arcade/jazz2/files/jazz2-2.8.0-strict-aliasing.patch b/games-arcade/jazz2/files/jazz2-2.8.0-strict-aliasing.patch deleted file mode 100644 index 1c727478e1d5..000000000000 --- a/games-arcade/jazz2/files/jazz2-2.8.0-strict-aliasing.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ac7e3bf7237c12ac5a43fef52d42d31779cd62f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Van=C4=9Bk?= -Date: Mon, 30 Sep 2024 09:54:56 +0200 -Subject: [PATCH] Use union for int-float type conversion - -Union based type punning seems to be safer for int-float type conversion -as it works around strict aliasing rules, which improves portability. - -PR: https://github.com/deathkiller/jazz2-native/pull/80 - -diff --git a/Sources/nCine/Base/Algorithms.cpp b/Sources/nCine/Base/Algorithms.cpp -index 99fa88bf..e7805fda 100644 ---- a/Sources/nCine/Base/Algorithms.cpp -+++ b/Sources/nCine/Base/Algorithms.cpp -@@ -247,12 +247,16 @@ namespace nCine - - static inline std::uint32_t as_uint32(const float x) - { -- return *(std::uint32_t*)&x; -+ union {float f; uint32_t i;} u; -+ u.f = x; -+ return u.i; - } - - static inline float as_float(const std::uint32_t x) - { -- return *(float*)&x; -+ union {float f; uint32_t i;} u; -+ u.i = x; -+ return u.f; - } - - float halfToFloat(std::uint16_t value) diff --git a/games-arcade/jazz2/jazz2-2.8.0-r1.ebuild b/games-arcade/jazz2/jazz2-2.8.0-r1.ebuild deleted file mode 100644 index 2293ae2aff09..000000000000 --- a/games-arcade/jazz2/jazz2-2.8.0-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg-utils - -DESCRIPTION="Open source reimplementation of Jazz Jackrabbit 2" -HOMEPAGE=" - https://deat.tk/jazz2/ - https://github.com/deathkiller/jazz2-native -" -SRC_URI=" - https://github.com/deathkiller/jazz2-native/archive/refs/tags/${PV}.tar.gz - -> ${P}.tar.gz -" -S="${WORKDIR}/${PN}-native-${PV}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+openal sdl" - -DEPEND=" - sys-libs/zlib:= - openal? ( - media-libs/libopenmpt - media-libs/openal - ) - !sdl? ( media-libs/glfw:= ) - sdl? ( media-libs/libsdl2:= ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-about-section.patch" - "${FILESDIR}/${P}-strict-aliasing.patch" #940326 -) - -src_prepare() { - # We need to install README.md to a different directory, default - # src_install will handle that. - sed -i '/README_INSTALL_DESTINATION/d' cmake/ncine_installation.cmake || die - cmake_src_prepare -} - -src_configure() { - local backend=GLFW - use sdl && backend=SDL2 - local mycmakeargs=( - -DNCINE_LINUX_PACKAGE="${PN}" - - -DNCINE_DOWNLOAD_DEPENDENCIES=OFF - -DNCINE_LINKTIME_OPTIMIZATION=OFF - -DNCINE_STRIP_BINARIES=OFF - -DNCINE_VERSION_FROM_GIT=OFF - -DNCINE_WITH_BACKWARD=OFF - - -DNCINE_WITH_GLEW=OFF - - -DNCINE_PREFERRED_BACKEND=${backend} - - -DNCINE_WITH_AUDIO=$(usex openal) - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/games-arcade/jazz2/jazz2-3.0.0.ebuild b/games-arcade/jazz2/jazz2-3.0.0.ebuild new file mode 100644 index 000000000000..4a7c0ac77fc6 --- /dev/null +++ b/games-arcade/jazz2/jazz2-3.0.0.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Open source reimplementation of Jazz Jackrabbit 2" +HOMEPAGE=" + https://deat.tk/jazz2/ + https://github.com/deathkiller/jazz2-native +" +SRC_URI=" + https://github.com/deathkiller/jazz2-native/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz +" +S="${WORKDIR}/${PN}-native-${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+openal sdl" + +DEPEND=" + sys-libs/zlib:= + media-libs/libglvnd + openal? ( + media-libs/libopenmpt + media-libs/openal + ) + !sdl? ( media-libs/glfw ) + sdl? ( media-libs/libsdl2 ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + # We need to install README.md to a different directory, default + # src_install will handle that. + sed -i '/README_INSTALL_DESTINATION/d' cmake/ncine_installation.cmake || die + cmake_src_prepare +} + +src_configure() { + local backend=GLFW + use sdl && backend=SDL2 + local mycmakeargs=( + -DNCINE_LINUX_PACKAGE="${PN}" + + -DNCINE_DOWNLOAD_DEPENDENCIES=OFF + -DNCINE_LINKTIME_OPTIMIZATION=OFF + -DNCINE_STRIP_BINARIES=OFF + -DNCINE_VERSION_FROM_GIT=OFF + -DNCINE_WITH_BACKWARD=OFF + + -DNCINE_WITH_GLEW=OFF + + -DNCINE_PREFERRED_BACKEND=${backend} + + -DNCINE_WITH_AUDIO=$(usex openal) + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} -- cgit v1.2.3