From 4968fd889f69d50cfcab1ffa12e56bdf476d9939 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jul 2024 12:30:10 +0100 Subject: gentoo auto-resync : 21:07:2024 - 12:30:10 --- games-rpg/xu4/Manifest | 7 +-- games-rpg/xu4/files/1.2.1-desktop-file.patch | 25 -------- games-rpg/xu4/files/1.2.1-system-minizip.patch | 82 -------------------------- games-rpg/xu4/files/1.4-system-minizip.patch | 82 ++++++++++++++++++++++++++ games-rpg/xu4/xu4-1.2.1.ebuild | 62 ------------------- games-rpg/xu4/xu4-1.4.ebuild | 61 +++++++++++++++++++ 6 files changed, 146 insertions(+), 173 deletions(-) delete mode 100644 games-rpg/xu4/files/1.2.1-desktop-file.patch delete mode 100644 games-rpg/xu4/files/1.2.1-system-minizip.patch create mode 100644 games-rpg/xu4/files/1.4-system-minizip.patch delete mode 100644 games-rpg/xu4/xu4-1.2.1.ebuild create mode 100644 games-rpg/xu4/xu4-1.4.ebuild (limited to 'games-rpg/xu4') diff --git a/games-rpg/xu4/Manifest b/games-rpg/xu4/Manifest index e2d8dbe1fde2..13f914b7d52c 100644 --- a/games-rpg/xu4/Manifest +++ b/games-rpg/xu4/Manifest @@ -1,7 +1,6 @@ -AUX 1.2.1-desktop-file.patch 565 BLAKE2B fa6746ab5fe1395949040e6a8e4665c7a94c85808beeb29222916bda4033d80354ba8ba39987f65e52a890bb774b68667ec53207f2e9cf176f5857e95739935c SHA512 d4ff28aa332d6b9d42f99b51652f8740a3754328d3e9c9d1afaddd407ceb6d931aa0c7c54e0687db9d54c79cc14e5416c1d579805a1487712b5df1e54e55adc8 -AUX 1.2.1-system-minizip.patch 2027 BLAKE2B 4605e637383f3da505885ae412cd15fd1afd5c292734092685d60145a4ceb02a3fbaeb828dbbf42719bd940a2f7f0c6c23397955207ef745c997f0da2309edee SHA512 7a61e9193354db9565ffe09278d0a9c7294b99c6de8ff2a646b77f49cf83e9c5ccaa53a427f5f33a04d9fa1a32c425a5ada1c9b967a860d0c9c4842d03ee8132 +AUX 1.4-system-minizip.patch 2032 BLAKE2B 4048fcecbe2296d05a5602b8451d66c1a12f718709ca9d92f213c640d2cfaff997d91f98e7284da9267c8bf4c53d38899a7970b923f031b3b3bd519c256b94b4 SHA512 b0c487f5555a908bb486dca7a4886c74828c0bbf56954307515bd1e9bf655e6beeec3957d5859ab26223878fefa008d361a77702a3dcd8df3651ce9d1238c257 DIST u4upgrad.zip 632072 BLAKE2B 3691f1cbac940021ef6043dd5e2ee26dcee5f8d7181ed525179211a6984f5ab498b84533d28146129c3e747f0af8946f7d691b7cb817a5a4ecb39e71e2df7b9a SHA512 4832d8cfd266d3ccc5eab5184bd2b6b9acd4c0203478873fb5e11704d95104dd9285a7752bad77f873d4f8603673184ae9421964509b948ec69944a4ceadd083 DIST ultima4.zip 529099 BLAKE2B 62a7e6e05344d0c3496ee3240d6cd98c61f1ff8b8f5d869a8cecec8f786b76c8a42e1bef40fa63861d5652352c00ba67708e49b5e6c9ddfdebbb3ae47ae01e2e SHA512 efc65a53492c0f68c9e2f1507afed4da925992cdfec7a699095e6369725af8156331000c575778121e04ef6ca252af2eef97f8f7183b8378f22a4e7e509fb9a5 -DIST xu4-1.2.1.gh.tar.gz 8031041 BLAKE2B 54c75d1752bc7a5cf59724e2e97ccfed23b8edf8351b6ccf9ca4f967145bbbb897e06337c107ffe09af5094f2f112094cd60485d9957abac6e61a3e40dd6731e SHA512 ffdfcb9f323b4f3ff664b146b485085dd96fce756682392695e8a25f636c70d6b2d945b65f861a58fd1a47653a788869aa3085be8e1bcc702814fb220cfdeb3e -EBUILD xu4-1.2.1.ebuild 1512 BLAKE2B 7bc0f32d111b22a6582efb631d5ff879ddd9e47ae4c51bbeb429354613244d3036b58598d5fc1e01aaa60c79ac7f25cd21fa166552ececd3a9d631627893a50b SHA512 d012b6cc8bbe76ae35d13e2d8f7fc31aaf571a01a1c7cfec614ac9910c54d649f9a53d6aab8893cb3a9585fb79de7619944d935b68704ed29799b3ecf3f67bcf +DIST xu4-1.4.gh.tar.gz 8053080 BLAKE2B 3d098c426bce5b9e6c7665007388be9f189d2fc780b575fa586418e77196027f23092201bc566d41b1d9725180b85f1a7fcbb811a274c19f94d907adb6df4f43 SHA512 2061db91727fe372007c7a79c9f23f9bc78fcc6e1359e2e14ed2e7277e745e3e2a9a8fd7a16e7b42f8bd85ca692115ef22ba95122f8fbfe67c72c2cbed39c95b +EBUILD xu4-1.4.ebuild 1470 BLAKE2B d5258b0538420fb1c6037db2770e370c960be88efbff2ce8b1b92ee2dd8257c7117a8fbfc6651a978baffb028b61a2cc92e9373dc164032e601d5591d5b89850 SHA512 5280a3eae01a82a5af48dec1d5aa09fed9d9faf9d72b42fbad7ed731beae6ce59e87cc4f71b001634575d042bee16a856925cd05385e4f7ab1116000d4cd34b2 MISC metadata.xml 380 BLAKE2B 65d2fee26c17071008bb1b02ab8101239735c241e4c90dcd84b0f3fe920696b14be733a10a45681706146fc4edb6df044d5b646070c6ca739257db081b771f4f SHA512 28f0cea0923a1c0f1b9800ad5eaac3af5c5fc393d6ac1580516b89d9d108638e07a8b07d18572fd21ed9149a6899f8fbb05a5e18cd999bd1a08fd8398f9171f5 diff --git a/games-rpg/xu4/files/1.2.1-desktop-file.patch b/games-rpg/xu4/files/1.2.1-desktop-file.patch deleted file mode 100644 index 442deb0971b3..000000000000 --- a/games-rpg/xu4/files/1.2.1-desktop-file.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d5065c2c7f3b26bb21cb6d55bab8b0161c60b7d6 Mon Sep 17 00:00:00 2001 -From: "Azamat H. Hackimov" -Date: Fri, 28 Apr 2023 20:42:37 +0300 -Subject: [PATCH] Update .desktop file - -Follow to Desktop Entry Specification. - -https://github.com/xu4-engine/u4/pull/15 - ---- a/dist/xu4.desktop -+++ b/dist/xu4.desktop -@@ -3,7 +3,7 @@ Encoding=UTF-8 - Name=Ultima 4 - Comment=Ultima 4 (xu4) - Exec=xu4 --Icon=xu4.png --Terminal=0 -+Icon=xu4 -+Terminal=false - Type=Application --Categories=Application;Game;RolePlaying; -+Categories=Game;RolePlaying; --- -2.39.2 - diff --git a/games-rpg/xu4/files/1.2.1-system-minizip.patch b/games-rpg/xu4/files/1.2.1-system-minizip.patch deleted file mode 100644 index 8466e27550c5..000000000000 --- a/games-rpg/xu4/files/1.2.1-system-minizip.patch +++ /dev/null @@ -1,82 +0,0 @@ -From bce27acd4063d43da601e0a7a85b35fab69cf4bd Mon Sep 17 00:00:00 2001 -From: "Azamat H. Hackimov" -Date: Fri, 28 Apr 2023 16:30:40 +0300 -Subject: [PATCH] Switch to external zlib minizip library - -Bundled unzip.[ch] uses deprecated zlib macros and fails to compile. -Additionaly added pkg-config calls to use system libraries and includes. - -https://github.com/xu4-engine/u4/pull/16 ---- a/src/Makefile -+++ b/src/Makefile -@@ -8,11 +8,13 @@ UI ?= glv - GPU ?= scale - SOUND=faun - -+PKG_CONFIG ?= pkg-config -+ - ifeq ($(UI), allegro) - ifeq ($(SOUND),allegro) -- UILIBS=-lallegro_acodec -lallegro_audio -lallegro -+ UILIBS=$(shell ${PKG_CONFIG} --libs allegro-5 allegro_acodec-5 allegro_audio-5) - else -- UILIBS=-lallegro -+ UILIBS=$(shell ${PKG_CONFIG} --libs allegro-5) - endif - endif - -@@ -37,23 +39,25 @@ endif - UILIBS+=-lboron - #endif - --CXXFLAGS=-Wall -I. -Isupport $(UIFLAGS) -DVERSION=\"$(VERSION)\" -+CXXFLAGS+=-Wall -I. -Isupport $(UIFLAGS) -DVERSION=\"$(VERSION)\" - #CXXFLAGS+=-rdynamic -DHAVE_BACKTRACE=1 -DHAVE_VARIADIC_MACROS=1 - - # Choose one of these for debug/release mode. - #CXXFLAGS+=-g -DDEBUG - CXXFLAGS+=-O3 -DNDEBUG - -+CXXFLAGS+=$(shell ${PKG_CONFIG} --cflags minizip) -+ - ifeq ($(UI), glv) - CXXFLAGS+=-Iglv/x11 - GLV_SRC=glv/x11/glv.c --UILIBS+=-lXcursor -lX11 -+UILIBS+=$(shell ${PKG_CONFIG} --libs xcursor x11) - CFLAGS=$(CXXFLAGS) -DUSE_CURSORS - else - CFLAGS=$(CXXFLAGS) - endif - --LIBS=$(UILIBS) -lGL -lpng -lz -+LIBS=$(UILIBS) $(shell ${PKG_CONFIG} --libs gl libpng minizip zlib) - - ifeq ($(STATIC_GCC_LIBS),true) - LDFLAGS+=-L. -static-libgcc ---- a/src/Makefile.common -+++ b/src/Makefile.common -@@ -9,7 +9,6 @@ CSRCS=\ - support/notify.c \ - support/stringTable.c \ - support/txf_draw.c \ -- unzip.c \ - $(NULL) - - CXXSRCS=\ ---- a/src/u4file.cpp -+++ b/src/u4file.cpp -@@ -6,9 +6,9 @@ - #include - #include - #include -+#include - - #include "u4file.h" --#include "unzip.h" - #include "debug.h" - #include "xu4.h" - --- -2.39.2 - diff --git a/games-rpg/xu4/files/1.4-system-minizip.patch b/games-rpg/xu4/files/1.4-system-minizip.patch new file mode 100644 index 000000000000..ed30687e7b4c --- /dev/null +++ b/games-rpg/xu4/files/1.4-system-minizip.patch @@ -0,0 +1,82 @@ +From bce27acd4063d43da601e0a7a85b35fab69cf4bd Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Fri, 28 Apr 2023 16:30:40 +0300 +Subject: [PATCH] Switch to external zlib minizip library + +Bundled unzip.[ch] uses deprecated zlib macros and fails to compile. +Additionaly added pkg-config calls to use system libraries and includes. + +https://github.com/xu4-engine/u4/pull/16 +--- a/src/Makefile ++++ b/src/Makefile +@@ -8,11 +8,13 @@ UI ?= glv + GPU ?= scale + SOUND=faun + ++PKG_CONFIG ?= pkg-config ++ + ifeq ($(UI), allegro) + ifeq ($(SOUND),allegro) +- UILIBS=-lallegro_acodec -lallegro_audio -lallegro ++ UILIBS=$(shell ${PKG_CONFIG} --libs allegro-5 allegro_acodec-5 allegro_audio-5) + else +- UILIBS=-lallegro ++ UILIBS=$(shell ${PKG_CONFIG} --libs allegro-5) + endif + endif + +@@ -37,23 +39,25 @@ endif + UILIBS+=-lboron + #endif + +-CXXFLAGS=-Wall -I. -Isupport $(UIFLAGS) -DVERSION=\"$(VERSION)\" ++CXXFLAGS+=-Wall -I. -Isupport $(UIFLAGS) -DVERSION=\"$(VERSION)\" + #CXXFLAGS+=-rdynamic -DHAVE_BACKTRACE=1 -DHAVE_VARIADIC_MACROS=1 + + # Choose one of these for debug/release mode. + #CXXFLAGS+=-g -DDEBUG + CXXFLAGS+=-O3 -DNDEBUG + ++CXXFLAGS+=$(shell ${PKG_CONFIG} --cflags minizip) ++ + ifeq ($(UI), glv) + CXXFLAGS+=-Iglv/x11 + GLV_SRC=glv/x11/glv.c +-UILIBS+=-lXcursor -lX11 ++UILIBS+=$(shell ${PKG_CONFIG} --libs xcursor x11) + CFLAGS=$(CXXFLAGS) -DUSE_CURSORS + else + CFLAGS=$(CXXFLAGS) + endif + +-LIBS=$(UILIBS) -lGL -lpng -lz ++LIBS=$(UILIBS) $(shell ${PKG_CONFIG} --libs gl libpng minizip zlib) + + ifeq ($(STATIC_GCC_LIBS),true) + LDFLAGS+=-L. -static-libgcc +--- a/src/Makefile.common ++++ b/src/Makefile.common +@@ -9,7 +9,6 @@ CSRCS=\ + support/notify.c \ + support/stringTable.c \ + support/txf_draw.c \ +- support/unzip.c \ + $(NULL) + + CXXSRCS=\ +--- a/src/u4file.cpp ++++ b/src/u4file.cpp +@@ -6,9 +6,9 @@ + #include + #include + #include ++#include + + #include "u4file.h" +-#include "unzip.h" + #include "debug.h" + #include "xu4.h" + +-- +2.39.2 + diff --git a/games-rpg/xu4/xu4-1.2.1.ebuild b/games-rpg/xu4/xu4-1.2.1.ebuild deleted file mode 100644 index 3c52dcb8012c..000000000000 --- a/games-rpg/xu4/xu4-1.2.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A remake of the computer game Ultima IV" -HOMEPAGE="https://xu4.sourceforge.net/" -SRC_URI="https://github.com/xu4-engine/u4/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz - https://ultima.thatfleminggent.com/ultima4.zip - https://downloads.sourceforge.net/xu4/u4upgrad.zip" -S="${WORKDIR}/u4-${PV}/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-libs/boron - media-libs/allegro:5[opengl] - media-libs/faun - media-libs/libglvnd - media-libs/libpng:= - sys-libs/zlib:=[minizip] -" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/unzip" - -PATCHES=( - "${FILESDIR}/1.2.1-system-minizip.patch" - "${FILESDIR}/1.2.1-desktop-file.patch" -) - -src_unpack() { - # xu4 will read the data files right out of the zip files - # but we want the docs from the original. - unpack ${P}.gh.tar.gz - unpack ultima4.zip - # Place zips where make install expects them - cp "${DISTDIR}/ultima4.zip" "${DISTDIR}/u4upgrad.zip" "${S}" || die -} - -src_prepare() { - default - - # rm as part of using system minizip patch - rm -f src/unzip.{c,h} || die - sed -i -e '/CXXFLAGS+=-O3 -DNDEBUG/d' src/Makefile || die - # Don't strip executable - sed -i -e 's:-s src/xu4:src/xu4:g' Makefile || die -} - -src_configure() { - # custom configure - ./configure --allegro || die -} - -src_install() { - emake DESTDIR="${D}/usr" install - dodoc AUTHORS README.md doc/*.txt "${WORKDIR}"/*.txt - insinto "/usr/share/xu4" - doins "${DISTDIR}/ultima4.zip" -} diff --git a/games-rpg/xu4/xu4-1.4.ebuild b/games-rpg/xu4/xu4-1.4.ebuild new file mode 100644 index 000000000000..be0cd21ecb06 --- /dev/null +++ b/games-rpg/xu4/xu4-1.4.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A remake of the computer game Ultima IV" +HOMEPAGE="https://xu4.sourceforge.net/" +SRC_URI="https://github.com/xu4-engine/u4/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz + https://ultima.thatfleminggent.com/ultima4.zip + https://downloads.sourceforge.net/xu4/u4upgrad.zip" +S="${WORKDIR}/u4-${PV}/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/boron + media-libs/allegro:5[opengl] + media-libs/faun + media-libs/libglvnd + media-libs/libpng:= + sys-libs/zlib:=[minizip] +" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip" + +PATCHES=( + "${FILESDIR}/1.4-system-minizip.patch" +) + +src_unpack() { + # xu4 will read the data files right out of the zip files + # but we want the docs from the original. + unpack ${P}.gh.tar.gz + unpack ultima4.zip + # Place zips where make install expects them + cp "${DISTDIR}/ultima4.zip" "${DISTDIR}/u4upgrad.zip" "${S}" || die +} + +src_prepare() { + default + + # rm as part of using system minizip patch + rm -f src/unzip.{c,h} || die + sed -i -e '/CXXFLAGS+=-O3 -DNDEBUG/d' src/Makefile || die + # Don't strip executable + sed -i -e 's:-s src/xu4:src/xu4:g' Makefile || die +} + +src_configure() { + # custom configure + ./configure --allegro || die +} + +src_install() { + emake DESTDIR="${D}/usr" install + dodoc AUTHORS README.md doc/*.txt "${WORKDIR}"/*.txt + insinto "/usr/share/xu4" + doins "${DISTDIR}/ultima4.zip" +} -- cgit v1.2.3