[gentoo-commits] repo/gentoo:master commit in: games-strategy/dunelegacy/files/, games-strategy/dunelegacy/

[gentoo-commits] repo/gentoo:master commit in: games-strategy/dunelegacy/files/, games-strategy/dunelegacy/

[James Le Cuirot]

commit:     122a953aa399d7e096f63443ed1236102f099fc9
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 17:25:08 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 17:25:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=122a953a

games-strategy/dunelegacy: Drop old and broken 0.96.3

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-strategy/dunelegacy/Manifest                 |  2 -
 games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild | 57 --------------------
 .../dunelegacy/files/dunelegacy-0.96.3-build.patch | 60 ----------------------
 3 files changed, 119 deletions(-)

diff --git a/games-strategy/dunelegacy/Manifest b/games-strategy/dunelegacy/Manifest
index 1094eeaea8c..226e2902561 100644
--- a/games-strategy/dunelegacy/Manifest
+++ b/games-strategy/dunelegacy/Manifest
@@ -1,3 +1 @@
-DIST dunelegacy-0.96.3-no-autoreconf.patch.xz 8908 BLAKE2B eb1c0a5a155851e199ad2c1f0cbd8f7c583ac148f92e1b2829607c0960bf09a6d8bea8e34749df726f394b3cf796f0c457086d993ace2b3336ce99ed36fb77e1 SHA512 fc17c771a19611057b2990b76eda0eea08e011dcac455bdf7e26bba1f2e2aa6cec120f2dcbce488a2318553f9e58b4a2b5ea24c7e1e27ada9ec5740f2b66ca4c
-DIST dunelegacy-0.96.3-src.tar.bz2 1652302 BLAKE2B 4502300f1364027f1734a0738a648a9ac473a142e8091d08f5c44996fa41a26e91ab030f90d3f961b95b44e7e2bcb72a376915dc014aafee5e3d0dc4f6c8915b SHA512 c84281b44bdac4eec360d90e2f23aa75468cf08c6edd6a5002c539e609312fd39e3284518ef5498201f2b0433d11cf2478cd13a2159af7c6bbef326e680fa241
 DIST dunelegacy-0.96.4-src.tar.bz2 2513167 BLAKE2B 119ccabc319a54fbc85906a215ccb44079dabf82568dbd446447bbc6fade873c4760da83a50351acf63aec49bf8364c50386eef2b0681bc7a895db870673340f SHA512 d6e152da4bc526ed05ac89fafc2e3467b1a95b3670987eeca262b7207e7dbe67dd228483cb5a432fe08232e34a52d4cb500b42cd186adb4bcde5da17419f7db0

diff --git a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild b/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
deleted file mode 100644
index ee94d40caa6..00000000000
--- a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# do not use autotools related stuff in stable ebuilds
-# unless you like random breakage: 469796, 469798, 424041
-
-EAPI=5
-inherit eutils gnome2-utils games # STABLE ARCH
-#inherit autotools eutils gnome2-utils games # UNSTABLE ARCH
-
-DESCRIPTION="Updated clone of Westood Studios' Dune2"
-HOMEPAGE="http://dunelegacy.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~hasufell/distfiles/${P}-no-autoreconf.patch.xz" # STABLE ARCH
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+alsa pulseaudio"
-
-RDEPEND="media-libs/libsdl[X,alsa?,sound,pulseaudio?,video]
-	media-libs/sdl-mixer[midi,mp3,vorbis]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# exits on start without libsdl[alsa] or libsdl[pulseaudio]
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-src_prepare() {
-	epatch "${DISTDIR}"/${P}-no-autoreconf.patch.xz # STABLE ARCH
-#	epatch "${FILESDIR}"/${P}-build.patch # UNSTABLE ARCH
-#	eautoreconf # UNSTABLE ARCH
-}
-
-src_install() {
-	default
-
-	doicon -s scalable ${PN}.svg
-	doicon -s 48 ${PN}.png
-	make_desktop_entry ${PN} "Dune Legacy"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch b/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
deleted file mode 100644
index 93dd907738b..00000000000
--- a/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Aug 9 18:57:40 2012 +0200
-
-    respect flags
-    use pkg-config
-    use LDADD instead of LDFLAGS for libs
-
---- configure.ac
-+++ configure.ac
-@@ -16,14 +16,6 @@
- 
- AC_SUBST(dunelegacydatadir)
- 
--dnl Some flags for gcc
--CXXFLAGS="-O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -DNDEBUG"
--dnl Additional flags: -Wconversion -Wno-sign-conversion
--
--dnl Some flags for clang
--dnl CXXFLAGS="-O3 -pipe -pedantic -Weverything -Wno-sign-conversion -Wno-conversion -Wno-shadow -Wno-missing-noreturn -Wno-padded -Wno-packed -Wno-weak-vtables -Wno-c++11-narrowing -Wno-cast-align -Wno-unreachable-code -Wno-missing-prototypes -Wno-float-equal -Wno-global-constructors -Wno-exit-time-destructors -Wno-format-nonliteral -Wno-unused-macros -Wextra -Wno-unused-parameter"
--
--
- dnl test for -ffp-contract=off (gcc >= 4.6) and use -mno-fused-madd instead
- oldCFLAGS="$CFLAGS"
- CFLAGS="-ffp-contract=off"
-@@ -33,34 +25,14 @@
- )
- CFLAGS="$oldCFLAGS"
- 
--case "$target_cpu" in
--i*86) CXXFLAGS="$CXXFLAGS -mfpmath=sse -msse";;
--esac
--
--AC_ARG_ENABLE([debug],
--            [AS_HELP_STRING([--enable-debug],
--              [compile with debug information @<:@default=disabled@:>@])],
--            [],
--            [])
--
--if test "$enable_debug" = "yes" ; then
--	CXXFLAGS="$CXXFLAGS -g"
--fi
- 
- dnl Check for SDL library
- SDL_VERSION=1.2.0
--AM_PATH_SDL($SDL_VERSION, : , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
-+PKG_CHECK_MODULES([SDL], [sdl >= $SDL_VERSION SDL_mixer])
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- 
--dnl Check for SDL_mixer library.
--AC_CHECK_LIB(SDL_mixer, 
--       Mix_OpenAudio, 
--       LIBS="$LIBS -lSDL_mixer", 
--       AC_MSG_ERROR([*** SDL_mixer library not found!]) 
--)
--
- dnl enet defines
- AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)])
- AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAS_GETHOSTBYNAME_R)])

[gentoo-commits] repo/gentoo:master commit in: games-strategy/dunelegacy/files/, games-strategy/dunelegacy/

[James Le Cuirot]

commit:     48f7a59f93de9b9f17250ae88bcda5b01f99a0fa
Author:     Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com>
AuthorDate: Fri Jul 19 01:58:12 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 20:14:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f7a59f

games-strategy/dunelegacy: add 0.97.02

Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37610
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-strategy/dunelegacy/Manifest                 |  1 +
 .../dunelegacy/dunelegacy-0.97.02.ebuild           | 49 ++++++++++++++++++++++
 .../files/dunelegacy-0.97.02-flickering.patch      | 15 +++++++
 .../files/dunelegacy-0.97.02-text-manager.patch    | 15 +++++++
 4 files changed, 80 insertions(+)

diff --git a/games-strategy/dunelegacy/Manifest b/games-strategy/dunelegacy/Manifest
index 226e2902561d..74a92e7a4ca8 100644
--- a/games-strategy/dunelegacy/Manifest
+++ b/games-strategy/dunelegacy/Manifest
@@ -1 +1,2 @@
 DIST dunelegacy-0.96.4-src.tar.bz2 2513167 BLAKE2B 119ccabc319a54fbc85906a215ccb44079dabf82568dbd446447bbc6fade873c4760da83a50351acf63aec49bf8364c50386eef2b0681bc7a895db870673340f SHA512 d6e152da4bc526ed05ac89fafc2e3467b1a95b3670987eeca262b7207e7dbe67dd228483cb5a432fe08232e34a52d4cb500b42cd186adb4bcde5da17419f7db0
+DIST dunelegacy-0.97.02.zip 3241175 BLAKE2B bd99c0d186e3ea2ee94fa77aa9587990ffae51fad30178669a4686c1bf0793c5949c5f13c360359ba44fb6989c00a2a509d746e071b9dc578d966d346b932a74 SHA512 07dd04b3348ed9dc729eabfb7d1646d4ac30351911ca3024991fad58d6ee48f478068fbab25855d637890d5e549ae687af57231c8bf0af1ef8e815fedfbdfd54

diff --git a/games-strategy/dunelegacy/dunelegacy-0.97.02.ebuild b/games-strategy/dunelegacy/dunelegacy-0.97.02.ebuild
new file mode 100644
index 000000000000..991bbd0f0738
--- /dev/null
+++ b/games-strategy/dunelegacy/dunelegacy-0.97.02.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg
+
+DESCRIPTION="Updated clone of Westood Studios' Dune II"
+HOMEPAGE="https://dunelegacy.sourceforge.net"
+
+COMMIT="6ea9ac96854daa8c75ba429e78dc6716b147e106"
+SRC_URI="https://sourceforge.net/code-snapshots/git/d/du/${PN}/code.git/${PN}-code-${COMMIT}.zip -> ${P}.zip"
+S="${WORKDIR}/${PN}-code-${COMMIT}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+
+RDEPEND="
+	media-libs/libsdl2[sound,threads(+),video]
+	media-libs/sdl2-mixer[midi]
+	media-libs/sdl2-ttf
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flickering.patch
+	"${FILESDIR}"/${P}-text-manager.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	sed -i s/0.96.4/0.97.02/ configure.ac || die
+}
+
+src_install() {
+	default
+
+	doicon -s scalable ${PN}.svg
+	doicon -s 48 ${PN}.png
+	newicon -s 128 ${PN}-128x128.png ${PN}.png
+	make_desktop_entry ${PN} "Dune Legacy"
+}

diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.97.02-flickering.patch b/games-strategy/dunelegacy/files/dunelegacy-0.97.02-flickering.patch
new file mode 100644
index 000000000000..19a125f8c797
--- /dev/null
+++ b/games-strategy/dunelegacy/files/dunelegacy-0.97.02-flickering.patch
@@ -0,0 +1,15 @@
+# https://sourceforge.net/p/dunelegacy/bugs/75/#12bf
+
+    Fix flickering in the game
+
+--- a/src/Game.cpp
++++ b/src/Game.cpp
+@@ -1094,8 +1094,6 @@ void Game::runMainLoop() {
+ 
+         drawScreen();
+ 
+-        SDL_RenderPresent(renderer);
+-
+         SDL_SetRenderTarget(renderer, nullptr);
+         SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
+         SDL_RenderClear(renderer);

diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.97.02-text-manager.patch b/games-strategy/dunelegacy/files/dunelegacy-0.97.02-text-manager.patch
new file mode 100644
index 000000000000..25c339198ab7
--- /dev/null
+++ b/games-strategy/dunelegacy/files/dunelegacy-0.97.02-text-manager.patch
@@ -0,0 +1,15 @@
+# https://aur.archlinux.org/packages/dunelegacy
+# https://aur.archlinux.org/cgit/aur.git/tree/text_manager.patch?h=dunelegacy
+
+    Fix missing <array> inclusion
+
+--- a/include/FileClasses/TextManager.h
++++ b/include/FileClasses/TextManager.h
+@@ -21,6 +21,7 @@
+ #include "IndexedTextFile.h"
+ #include "MentatTextFile.h"
+ 
++#include <array>
+ #include <string>
+ #include <vector>
+ #include <map>

[gentoo-commits] repo/gentoo:master commit in: games-strategy/dunelegacy/files/, games-strategy/dunelegacy/

[James Le Cuirot]

commit:     23b787904d2105aa773a80f57e0bef9ecd563636
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 20:33:42 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 20:33:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b78790

games-strategy/dunelegacy: Fix flags with patch

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-strategy/dunelegacy/dunelegacy-0.97.02.ebuild        |  1 +
 .../dunelegacy/files/dunelegacy-0.97.02-flags.patch        | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/games-strategy/dunelegacy/dunelegacy-0.97.02.ebuild b/games-strategy/dunelegacy/dunelegacy-0.97.02.ebuild
index 80d4cc705e50..47d0fe0bfdd5 100644
--- a/games-strategy/dunelegacy/dunelegacy-0.97.02.ebuild
+++ b/games-strategy/dunelegacy/dunelegacy-0.97.02.ebuild
@@ -30,6 +30,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-flickering.patch
 	"${FILESDIR}"/${P}-text-manager.patch
+	"${FILESDIR}"/${P}-flags.patch
 )
 
 src_prepare() {

diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.97.02-flags.patch b/games-strategy/dunelegacy/files/dunelegacy-0.97.02-flags.patch
new file mode 100644
index 000000000000..1c18bc0bd0c1
--- /dev/null
+++ b/games-strategy/dunelegacy/files/dunelegacy-0.97.02-flags.patch
@@ -0,0 +1,14 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2022-12-29 05:22:09.000000000 +0000
++++ b/configure.ac	2024-07-28 21:30:14.793202700 +0100
+@@ -19,8 +19,8 @@
+ AC_SUBST(dunelegacydatadir)
+ 
+ dnl Some flags for gcc
+-CXXFLAGS="-std=c++14 -pthread -fPIC -O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -Wno-shift-negative-value -Wno-unknown-pragmas -D__STDC_FORMAT_MACROS -DNDEBUG"
+-CFLAGS="-std=c99 -pthread -fPIC -O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -Wno-shift-negative-value -Wno-unknown-pragmas -D__STDC_FORMAT_MACROS -DNDEBUG"
++CXXFLAGS="$CXXFLAGS -std=c++14 -pthread -fPIC -pedantic -Wall -Wextra -Wno-unused-parameter -Wno-shift-negative-value -Wno-unknown-pragmas -D__STDC_FORMAT_MACROS -DNDEBUG"
++CFLAGS="$CFLAGS -std=c99 -pthread -fPIC -pedantic -Wall -Wextra -Wno-unused-parameter -Wno-shift-negative-value -Wno-unknown-pragmas -D__STDC_FORMAT_MACROS -DNDEBUG"
+ dnl Additional flags: -Wconversion -Wno-sign-conversion -Wlogical-op
+ 
+ dnl Some flags for clang