[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink/, games-rpg/freedink/files/

[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink/, games-rpg/freedink/files/

[Ionen Wolkens]

commit:     92561523ab995f58eec490f9da3962ad661b9e2f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  8 00:58:19 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Nov  8 05:36:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92561523

games-rpg/freedink: add 109.6

Now uses SDL2.

ebuild changes:
* EAPI6->8
* fix licenses wrt bug #880183 (minus public-domain, binreloc.c
  is not in this version)
* update HOMEPAGE, old domain seems dead
* tentatively drop -O? -> -O0 replace-flags, many changes including
  using C++ and hopefully is not relevant anymore (or at least, I can
  load save games even with -O3)
  -> also drop filter-flags, it had no arguments and was no-op
    (likely was meant to be strip-flags)
* change windres workaround to not need a patch

(note it gives a misleading error about lacking Ogg support, but
if look at debug output it successfully finds Ogg differently)

Closes: https://bugs.gentoo.org/880183
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-rpg/freedink/Manifest                       |  1 +
 games-rpg/freedink/files/freedink-109.6-odr.patch | 14 +++++++
 games-rpg/freedink/files/freedink-109.6-sdl.patch | 20 +++++++++
 games-rpg/freedink/freedink-109.6.ebuild          | 50 +++++++++++++++++++++++
 4 files changed, 85 insertions(+)

diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest
index 8dda84256cf9..56d7ac3ac4e8 100644
--- a/games-rpg/freedink/Manifest
+++ b/games-rpg/freedink/Manifest
@@ -1 +1,2 @@
 DIST freedink-108.4.tar.gz 1897701 BLAKE2B b26129f3e5d17895a08cac9564973e31d6e8e2458ac9a2ed4b00f53cd1b8004073022a8e3f4cf8ded2e44cc4bb73909f021a7c960d219e78aec47b4c4ce7c18e SHA512 1496b6a7826bf694a2919add22a8b4b08a4967d8a7fdebf2d599bd99c7a7ce67de6c2b11124423c7aa1f0feb2e7c03ce1cf00252070182936e7481791dafee61
+DIST freedink-109.6.tar.gz 1587238 BLAKE2B dc7892114af6968170ed35771d85fd4d8bef969ee2df9b45b315b8b70f50058f5713e22c657ea48e8297cd15c2401e1749c1660bd59140495eba9bcaaf6bf1fc SHA512 9de4155e65c1af58166e30f3f642fed2111eeff2cfccedcd51ea7715e91795d9c9f89d4fa30a801e9a998b7d734682b7d2588ef1ebaba464764c3c3156b6a7ad

diff --git a/games-rpg/freedink/files/freedink-109.6-odr.patch b/games-rpg/freedink/files/freedink-109.6-odr.patch
new file mode 100644
index 000000000000..560c3ddc6537
--- /dev/null
+++ b/games-rpg/freedink/files/freedink-109.6-odr.patch
@@ -0,0 +1,14 @@
+Only ever used as struct FF_Handle *, not seeing why this void is here.
+error: 'FastFileOpen' violates the C++ One Definition Rule [-Werror=odr]
+--- a/src/fastfile.cpp
++++ b/src/fastfile.cpp
+@@ -217,3 +217,3 @@
+ 
+-void *
++struct FF_Handle *
+ FastFileOpen(char *name)
+@@ -254,3 +254,3 @@
+ 		    i->len = next_off - i->off;
+-		  return (void*)i;
++		  return i;
+ 		}

diff --git a/games-rpg/freedink/files/freedink-109.6-sdl.patch b/games-rpg/freedink/files/freedink-109.6-sdl.patch
new file mode 100644
index 000000000000..f00735d7b377
--- /dev/null
+++ b/games-rpg/freedink/files/freedink-109.6-sdl.patch
@@ -0,0 +1,20 @@
+For newer sdl2 and sdl2-ttf
+https://lists.gnu.org/archive/html/bug-freedink/2019-08/msg00000.html
+https://lists.gnu.org/archive/html/bug-freedink/2022-07/msg00001.html
+--- a/src/gfx_fonts.cpp
++++ b/src/gfx_fonts.cpp
+@@ -295,6 +295,6 @@
+ {
+-  char *familyname = TTF_FontFaceFamilyName(font);
++  const char *familyname = TTF_FontFaceFamilyName(font);
+   if(familyname)
+     log_info("The family name of the face in the font is: %s", familyname);
+-  char *stylename = TTF_FontFaceStyleName(font);
++  const char *stylename = TTF_FontFaceStyleName(font);
+   if(stylename)
+--- a/src/input.cpp
++++ b/src/input.cpp
+@@ -93,3 +93,2 @@
+   // fake mouse events often are de-centered
+-  SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "0");
+ 

diff --git a/games-rpg/freedink/freedink-109.6.ebuild b/games-rpg/freedink/freedink-109.6.ebuild
new file mode 100644
index 000000000000..bec7622f80e2
--- /dev/null
+++ b/games-rpg/freedink/freedink-109.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)"
+HOMEPAGE="https://www.gnu.org/s/freedink/"
+SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	media-libs/fontconfig
+	media-libs/libsdl2[joystick,sound,video]
+	media-libs/sdl2-gfx
+	media-libs/sdl2-image
+	media-libs/sdl2-mixer[midi,vorbis,wav]
+	media-libs/sdl2-ttf"
+RDEPEND="
+	${COMMON_DEPEND}
+	games-rpg/freedink-data"
+DEPEND="
+	${COMMON_DEPEND}
+	media-libs/glm"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-odr.patch
+	"${FILESDIR}"/${P}-sdl.patch
+)
+
+src_configure() {
+	local econfargs=(
+		# TODO? Needs unpackaged cxxtest, but that package (currently) seem
+		# dead and may not be worth adding just for testing this.
+		--disable-tests
+
+		# Fails if finds a windres executable
+		ac_cv_prog_WINDRES=
+		ac_cv_prog_ac_ct_WINDRES=
+	)
+
+	econf "${econfargs[@]}"
+}

[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink/, games-rpg/freedink/files/

[Ionen Wolkens]

commit:     862a879b14190394ffd43f5b77b44f1bc17cd185
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  8 05:26:39 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Nov  8 05:36:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862a879b

games-rpg/freedink: drop 108.4-r1

EAPI6, sdl1, and is buggy requiring -O0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-rpg/freedink/Manifest                        |  1 -
 .../freedink/files/freedink-108.4-no-windres.patch | 20 ---------
 games-rpg/freedink/freedink-108.4-r1.ebuild        | 50 ----------------------
 3 files changed, 71 deletions(-)

diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest
index 56d7ac3ac4e8..8204bf5f2698 100644
--- a/games-rpg/freedink/Manifest
+++ b/games-rpg/freedink/Manifest
@@ -1,2 +1 @@
-DIST freedink-108.4.tar.gz 1897701 BLAKE2B b26129f3e5d17895a08cac9564973e31d6e8e2458ac9a2ed4b00f53cd1b8004073022a8e3f4cf8ded2e44cc4bb73909f021a7c960d219e78aec47b4c4ce7c18e SHA512 1496b6a7826bf694a2919add22a8b4b08a4967d8a7fdebf2d599bd99c7a7ce67de6c2b11124423c7aa1f0feb2e7c03ce1cf00252070182936e7481791dafee61
 DIST freedink-109.6.tar.gz 1587238 BLAKE2B dc7892114af6968170ed35771d85fd4d8bef969ee2df9b45b315b8b70f50058f5713e22c657ea48e8297cd15c2401e1749c1660bd59140495eba9bcaaf6bf1fc SHA512 9de4155e65c1af58166e30f3f642fed2111eeff2cfccedcd51ea7715e91795d9c9f89d4fa30a801e9a998b7d734682b7d2588ef1ebaba464764c3c3156b6a7ad

diff --git a/games-rpg/freedink/files/freedink-108.4-no-windres.patch b/games-rpg/freedink/files/freedink-108.4-no-windres.patch
deleted file mode 100644
index 81c72e00dae0..000000000000
--- a/games-rpg/freedink/files/freedink-108.4-no-windres.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -226,7 +226,7 @@
- 	update_frame.h
- am_freedink_OBJECTS = $(am__objects_3) freedink.$(OBJEXT) \
- 	update_frame.$(OBJEXT)
--@HAVE_WINDRES_TRUE@am__objects_4 = woeres.$(OBJEXT)
-+#@HAVE_WINDRES_TRUE@am__objects_4 = woeres.$(OBJEXT)
- nodist_freedink_OBJECTS = $(am__objects_4)
- freedink_OBJECTS = $(am_freedink_OBJECTS) $(nodist_freedink_OBJECTS)
- freedink_LDADD = $(LDADD)
-@@ -1143,7 +1143,7 @@
- @HAVE_WINDRES_FALSE@WOERES = 
- 
- # How do we handle resources embedded in the executable binary?
--@HAVE_WINDRES_TRUE@WOERES = woeres.rc
-+#@HAVE_WINDRES_TRUE@WOERES = woeres.rc
- 
- # Other projects that use Autotools and support MinGW
- # http://sourceforge.net/projects/chocolate-doom (Doom port)

diff --git a/games-rpg/freedink/freedink-108.4-r1.ebuild b/games-rpg/freedink/freedink-108.4-r1.ebuild
deleted file mode 100644
index 743ce07e7546..000000000000
--- a/games-rpg/freedink/freedink-108.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)"
-HOMEPAGE="http://www.freedink.org/"
-SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-libs/fontconfig-2.4
-	>=media-libs/libsdl-1.2[X,sound,joystick,video]
-	>=media-libs/sdl-gfx-2.0
-	>=media-libs/sdl-image-1.2
-	>=media-libs/sdl-mixer-1.2[midi,vorbis,wav]
-	>=media-libs/sdl-ttf-2.0.9
-"
-RDEPEND="${DEPEND}
-	games-rpg/freedink-data
-"
-DEPEND="${DEPEND}
-	dev-libs/check
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-108.4-no-windres.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's#^datarootdir =.*$#datarootdir = /usr/share#' \
-		share/Makefile.in || die
-	# seems like the code is fragile (bug #559548)
-	filter-flags
-	replace-flags -O? -O0
-}
-
-src_configure() {
-	econf \
-		--disable-embedded-resources \
-		--localedir="/usr/share/locale"
-}