Re: update games/taisei 1.0 -> 1.3.1
On 07/02/2020 11:33, Charlene Wendling wrote:
On Fri, 7 Feb 2020 09:27:34 +0100
Solene Rapenne wrote:
On Fri, Feb 07, 2020 at 08:55:09AM +0100, Benoit Lecocq wrote:
On 06/02/2020 19:14, Charlene Wendling wrote:
Ping :)
Works fine on amd64, ok benoit@
ok solene@
I found that git error in the install step, but I'm not sure it's
important to patch it out.
[1/4] Generating version information with a custom command.
fatal: not a git repository (or any parent up to mount point /)
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not
set).
Command '['git', 'describe', '--dirty', '--match', 'v[0-9]*[!asz]']'
returned non-zero exit status 128.
Warning: git not found or not a git repository; using fallback version
v1.3.1
Well, i think we should :)
I added an extra patch because -Dversion_fallback does not override the
git calls, and hardcoded the version string to upstream supplied VERSION
to have some consistent naming. It's not really needed because the
fallback is by default what is in WRKSRC/meson.build, but in case
upstream forget to bump the version in this file, it still helps.
...
[1/4] Generating version information with a custom command.
git external calls disabled
Warning: git not found or not a git repository; using fallback version
v1.3.1
...
ok benoit@
Index: Makefile
===
RCS file: /cvs/ports/games/taisei/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.6
+++ Makefile7 Feb 2020 10:27:59 -
@@ -1,33 +1,52 @@
# $OpenBSD: Makefile,v 1.6 2019/07/12 20:46:25 sthen Exp $
+# Requires OpenGL>=3.3, only usable on archs that support
+# modern video cards
+ONLY_FOR_ARCHS = amd64 aarch64 i386
+
COMMENT = clone of the touhou games
-V = 1.0a
-DISTNAME = taisei-$V
-REVISION = 3
+VERSION = v1.3.1
+DISTNAME = taisei-${VERSION}
+PKGNAME = taisei-${VERSION:S/^v//}
CATEGORIES = games
-HOMEPAGE = http://taisei-project.org/
+HOMEPAGE = https://taisei-project.org/
# MIT
+# Soundtrack: CC-BY 4.0 / Photos: PD and CC-0
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU SDL SDL_ttf alut c freetype m openal png pthread
+WANTLIB += SDL2 SDL2_mixer c crypto freetype m opusfile png webpdecoder
WANTLIB += z
-GH_ACCOUNT = laochailan
-GH_PROJECT = taisei
-GH_TAGNAME = v$V
+MASTER_SITES=
https://github.com/taisei-project/taisei/releases/download/${VERSION}/
+
+EXTRACT_SUFX= .tar.xz
+
+MODULES = devel/meson \
+ lang/python
+
+MODPY_RUNDEP = No
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-CFLAGS += -fgnu89-inline
-MODULES = devel/cmake
RUN_DEPENDS = devel/desktop-file-utils \
+ misc/shared-mime-info \
x11/gtk+3,-guic
-LIB_DEPENDS = audio/freealut \
- audio/openal \
- devel/sdl-ttf \
- graphics/png
+
+LIB_DEPENDS = audio/opusfile \
+ devel/sdl2>=2.0.5 \
+ devel/sdl2-mixer>=2.0.4 \
+ graphics/libwebp>=0.5 \
+ graphics/png>=1.5.0
+
+# Don't include docs
+# Don't zip the ressources, it avoids using archivers/libzip
+# Don't call git(1), use upstream version as version string
+CONFIGURE_ARGS += -Ddocs=false \
+ -Denable_zip=false \
+ -Dversion_fallback=${VERSION}
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/taisei/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo22 Aug 2015 09:38:07 - 1.1.1.1
+++ distinfo7 Feb 2020 10:27:59 -
@@ -1,2 +1,2 @@
-SHA256 (taisei-1.0a.tar.gz) = FWHITJ/YucepG4ZL38B/uBG7baXFTPMqK2vWPeX48/8=
-SIZE (taisei-1.0a.tar.gz) = 91854864
+SHA256 (taisei-v1.3.1.tar.xz) = hlg6OnEAk+YwFKWua2glGgacslraBsb41zT4XzGtyYU=
+SIZE (taisei-v1.3.1.tar.xz) = 70763196
Index: patches/patch-scripts_taiseilib_version_py
===
RCS file: patches/patch-scripts_taiseilib_version_py
diff -N patches/patch-scripts_taiseilib_version_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-scripts_taiseilib_version_py 7 Feb 2020 10:27:59 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: scripts/taiseilib/version.py
+--- scripts/taiseilib/version.py.orig
scripts/taiseilib/version.py
+@@ -62,6 +62,9 @@ def get(*, rootdir=None, fallback=None, args=common.de
+ rootdir = pathlib.Path(__file__).parent
+
+ try:
++# XXX do not call git, use port-provided fallback instead
++raise subprocess.SubprocessError("git external calls
Re: update games/taisei 1.0 -> 1.3.1
On Fri, 7 Feb 2020 09:27:34 +0100
Solene Rapenne wrote:
> On Fri, Feb 07, 2020 at 08:55:09AM +0100, Benoit Lecocq wrote:
> >
> >
> > On 06/02/2020 19:14, Charlene Wendling wrote:
> > > Ping :)
> >
> > Works fine on amd64, ok benoit@
> >
>
> ok solene@
>
> I found that git error in the install step, but I'm not sure it's
> important to patch it out.
>
> [1/4] Generating version information with a custom command.
> fatal: not a git repository (or any parent up to mount point /)
> Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not
> set).
> Command '['git', 'describe', '--dirty', '--match', 'v[0-9]*[!asz]']'
> returned non-zero exit status 128.
> Warning: git not found or not a git repository; using fallback version
> v1.3.1
>
Well, i think we should :)
I added an extra patch because -Dversion_fallback does not override the
git calls, and hardcoded the version string to upstream supplied VERSION
to have some consistent naming. It's not really needed because the
fallback is by default what is in WRKSRC/meson.build, but in case
upstream forget to bump the version in this file, it still helps.
Index: Makefile
===
RCS file: /cvs/ports/games/taisei/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.6
+++ Makefile7 Feb 2020 10:27:59 -
@@ -1,33 +1,52 @@
# $OpenBSD: Makefile,v 1.6 2019/07/12 20:46:25 sthen Exp $
+# Requires OpenGL>=3.3, only usable on archs that support
+# modern video cards
+ONLY_FOR_ARCHS = amd64 aarch64 i386
+
COMMENT = clone of the touhou games
-V =1.0a
-DISTNAME = taisei-$V
-REVISION = 3
+VERSION = v1.3.1
+DISTNAME = taisei-${VERSION}
+PKGNAME = taisei-${VERSION:S/^v//}
CATEGORIES = games
-HOMEPAGE = http://taisei-project.org/
+HOMEPAGE = https://taisei-project.org/
# MIT
+# Soundtrack: CC-BY 4.0 / Photos: PD and CC-0
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU SDL SDL_ttf alut c freetype m openal png pthread
+WANTLIB += SDL2 SDL2_mixer c crypto freetype m opusfile png webpdecoder
WANTLIB += z
-GH_ACCOUNT = laochailan
-GH_PROJECT = taisei
-GH_TAGNAME = v$V
+MASTER_SITES=
https://github.com/taisei-project/taisei/releases/download/${VERSION}/
+
+EXTRACT_SUFX= .tar.xz
+
+MODULES = devel/meson \
+ lang/python
+
+MODPY_RUNDEP = No
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-CFLAGS += -fgnu89-inline
-MODULES = devel/cmake
RUN_DEPENDS = devel/desktop-file-utils \
+ misc/shared-mime-info \
x11/gtk+3,-guic
-LIB_DEPENDS = audio/freealut \
- audio/openal \
- devel/sdl-ttf \
- graphics/png
+
+LIB_DEPENDS = audio/opusfile \
+ devel/sdl2>=2.0.5 \
+ devel/sdl2-mixer>=2.0.4 \
+ graphics/libwebp>=0.5 \
+ graphics/png>=1.5.0
+
+# Don't include docs
+# Don't zip the ressources, it avoids using archivers/libzip
+# Don't call git(1), use upstream version as version string
+CONFIGURE_ARGS += -Ddocs=false \
+ -Denable_zip=false \
+ -Dversion_fallback=${VERSION}
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/taisei/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo22 Aug 2015 09:38:07 - 1.1.1.1
+++ distinfo7 Feb 2020 10:27:59 -
@@ -1,2 +1,2 @@
-SHA256 (taisei-1.0a.tar.gz) = FWHITJ/YucepG4ZL38B/uBG7baXFTPMqK2vWPeX48/8=
-SIZE (taisei-1.0a.tar.gz) = 91854864
+SHA256 (taisei-v1.3.1.tar.xz) = hlg6OnEAk+YwFKWua2glGgacslraBsb41zT4XzGtyYU=
+SIZE (taisei-v1.3.1.tar.xz) = 70763196
Index: patches/patch-scripts_taiseilib_version_py
===
RCS file: patches/patch-scripts_taiseilib_version_py
diff -N patches/patch-scripts_taiseilib_version_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-scripts_taiseilib_version_py 7 Feb 2020 10:27:59 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: scripts/taiseilib/version.py
+--- scripts/taiseilib/version.py.orig
scripts/taiseilib/version.py
+@@ -62,6 +62,9 @@ def get(*, rootdir=None, fallback=None, args=common.de
+ rootdir = pathlib.Path(__file__).parent
+
+ try:
++# XXX do not call git, use port-provided fallback instead
++raise subprocess.SubprocessError("git external calls disabled")
++
+ version_str = subprocess.check_output(
+ shlex.split('git describe --dirty --match v[0-9]*[!asz]'),
+
Re: update games/taisei 1.0 -> 1.3.1
On Fri, Feb 07, 2020 at 08:55:09AM +0100, Benoit Lecocq wrote: > > > On 06/02/2020 19:14, Charlene Wendling wrote: > > Ping :) > > Works fine on amd64, ok benoit@ > ok solene@ I found that git error in the install step, but I'm not sure it's important to patch it out. [1/4] Generating version information with a custom command. fatal: not a git repository (or any parent up to mount point /) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set). Command '['git', 'describe', '--dirty', '--match', 'v[0-9]*[!asz]']' returned non-zero exit status 128. Warning: git not found or not a git repository; using fallback version v1.3.1
Re: update games/taisei 1.0 -> 1.3.1
On 06/02/2020 19:14, Charlene Wendling wrote:
Ping :)
Works fine on amd64, ok benoit@
On Sun, 26 Jan 2020 19:20:17 +0100
Charlene Wendling wrote:
On Wed, 15 Jan 2020 18:10:10 +0100
Charlene Wendling wrote:
Hi,
On Wed, 15 Jan 2020 14:36:48 +0100
Omar Polo wrote:
Hi,
First time here, hoping I didn't mess up too much.
It works for you at least, so it's already nice :)
By the way, it was already in -wip --
https://github.com/jasperla/openbsd-wip/tree/master/games/taisei
The patch below
updates games/taisei from 1.0 to the latest 1.3.1 with the
followings changes:
- use https for HOMEPAGE
- upstream repo changed
- dropped all the patches, they're not needed anymore
- dependecies updated
Also [0]:
- it breaks the runtime with amdgpu and radeondrm, and that's why i
did not propose it. But if there is popular demand, i think we
should go for it :)
I brought back my old video card on my amd64 box:
radeondrm0 at pci9 dev 0 function 0 "ATI Radeon HD 7450" rev 0x00
I wanted to correct myself, taisei works fine with radeondrm(4) and
inteldrm(4). As such, i think this update would benefit to most of
us.
I'm providing again the diff for convenience.
- Requires OpenGL>=3.3, so works only on modern archs
Built and played on amd64, everything seems to work fine (audio
too.)
[...]
I'm proposing here the diff from -wip if someone want to test/review
it.
Charlène.
[0] https://marc.info/?l=openbsd-ports=155611903608886=2
Index: Makefile
===
RCS file: /cvs/ports/games/taisei/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.6
+++ Makefile15 Jan 2020 17:01:17 -
@@ -1,33 +1,50 @@
# $OpenBSD: Makefile,v 1.6 2019/07/12 20:46:25 sthen Exp $
+# Requires OpenGL>=3.3, only usable on archs that support
+# modern video cards
+ONLY_FOR_ARCHS = amd64 aarch64 i386
+
COMMENT = clone of the touhou games
-V = 1.0a
-DISTNAME = taisei-$V
-REVISION = 3
+VERSION = v1.3.1
+DISTNAME = taisei-${VERSION}
+PKGNAME = taisei-${VERSION:S/^v//}
CATEGORIES = games
-HOMEPAGE = http://taisei-project.org/
+HOMEPAGE = https://taisei-project.org/
# MIT
+# Soundtrack: CC-BY 4.0 / Photos: PD and CC-0
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU SDL SDL_ttf alut c freetype m openal png pthread
+WANTLIB += SDL2 SDL2_mixer c crypto freetype m opusfile png webpdecoder
WANTLIB += z
-GH_ACCOUNT = laochailan
-GH_PROJECT = taisei
-GH_TAGNAME = v$V
+MASTER_SITES=
https://github.com/taisei-project/taisei/releases/download/${VERSION}/
+
+EXTRACT_SUFX= .tar.xz
+
+MODULES = devel/meson \
+ lang/python
+
+MODPY_RUNDEP = No
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-CFLAGS += -fgnu89-inline
-MODULES = devel/cmake
RUN_DEPENDS = devel/desktop-file-utils \
+ misc/shared-mime-info \
x11/gtk+3,-guic
-LIB_DEPENDS = audio/freealut \
- audio/openal \
- devel/sdl-ttf \
- graphics/png
+
+LIB_DEPENDS = audio/opusfile \
+ devel/sdl2>=2.0.5 \
+ devel/sdl2-mixer>=2.0.4 \
+ graphics/libwebp>=0.5 \
+ graphics/png>=1.5.0
+
+# Don't include docs
+# Don't zip the ressources, it avoids using archivers/libzip
+CONFIGURE_ARGS += -Ddocs=false \
+ -Denable_zip=false
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/taisei/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo22 Aug 2015 09:38:07 - 1.1.1.1
+++ distinfo15 Jan 2020 17:01:17 -
@@ -1,2 +1,2 @@
-SHA256 (taisei-1.0a.tar.gz) = FWHITJ/YucepG4ZL38B/uBG7baXFTPMqK2vWPeX48/8=
-SIZE (taisei-1.0a.tar.gz) = 91854864
+SHA256 (taisei-v1.3.1.tar.xz) = hlg6OnEAk+YwFKWua2glGgacslraBsb41zT4XzGtyYU=
+SIZE (taisei-v1.3.1.tar.xz) = 70763196
Index: patches/patch-src_boss_h
===
RCS file: patches/patch-src_boss_h
diff -N patches/patch-src_boss_h
--- patches/patch-src_boss_h17 May 2017 22:54:28 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_boss_h,v 1.1 2017/05/17 22:54:28 espie Exp $
-
-Index: src/boss.h
src/boss.h.orig
-+++ src/boss.h
-@@ -9,6 +9,8 @@
- #define BOSS_H
-
- #include
-+#undef complex
-+#define complex double _Complex
-
- #include
- struct Boss;
Index: patches/patch-src_enemy_h
===
RCS file: patches/patch-src_enemy_h
diff -N
Re: update games/taisei 1.0 -> 1.3.1
Ping :)
On Sun, 26 Jan 2020 19:20:17 +0100
Charlene Wendling wrote:
>
> On Wed, 15 Jan 2020 18:10:10 +0100
> Charlene Wendling wrote:
>
> > Hi,
> >
> > On Wed, 15 Jan 2020 14:36:48 +0100
> > Omar Polo wrote:
> >
> > > Hi,
> > >
> > > First time here, hoping I didn't mess up too much.
> >
> > It works for you at least, so it's already nice :)
> >
> > By the way, it was already in -wip --
> > https://github.com/jasperla/openbsd-wip/tree/master/games/taisei
> >
> > > The patch below
> > > updates games/taisei from 1.0 to the latest 1.3.1 with the
> > > followings changes:
> > >
> > > - use https for HOMEPAGE
> > > - upstream repo changed
> > > - dropped all the patches, they're not needed anymore
> > > - dependecies updated
> > Also [0]:
> > - it breaks the runtime with amdgpu and radeondrm, and that's why i
> >did not propose it. But if there is popular demand, i think we
> > should go for it :)
>
> I brought back my old video card on my amd64 box:
>
> radeondrm0 at pci9 dev 0 function 0 "ATI Radeon HD 7450" rev 0x00
>
> I wanted to correct myself, taisei works fine with radeondrm(4) and
> inteldrm(4). As such, i think this update would benefit to most of
> us.
>
> I'm providing again the diff for convenience.
>
> > - Requires OpenGL>=3.3, so works only on modern archs
> > >
> > > Built and played on amd64, everything seems to work fine (audio
> > > too.)
> >
> > [...]
> >
> > I'm proposing here the diff from -wip if someone want to test/review
> > it.
> >
> > Charlène.
> >
> >
> > [0] https://marc.info/?l=openbsd-ports=155611903608886=2
> >
>
Index: Makefile
===
RCS file: /cvs/ports/games/taisei/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.6
+++ Makefile15 Jan 2020 17:01:17 -
@@ -1,33 +1,50 @@
# $OpenBSD: Makefile,v 1.6 2019/07/12 20:46:25 sthen Exp $
+# Requires OpenGL>=3.3, only usable on archs that support
+# modern video cards
+ONLY_FOR_ARCHS = amd64 aarch64 i386
+
COMMENT = clone of the touhou games
-V =1.0a
-DISTNAME = taisei-$V
-REVISION = 3
+VERSION = v1.3.1
+DISTNAME = taisei-${VERSION}
+PKGNAME = taisei-${VERSION:S/^v//}
CATEGORIES = games
-HOMEPAGE = http://taisei-project.org/
+HOMEPAGE = https://taisei-project.org/
# MIT
+# Soundtrack: CC-BY 4.0 / Photos: PD and CC-0
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU SDL SDL_ttf alut c freetype m openal png pthread
+WANTLIB += SDL2 SDL2_mixer c crypto freetype m opusfile png webpdecoder
WANTLIB += z
-GH_ACCOUNT = laochailan
-GH_PROJECT = taisei
-GH_TAGNAME = v$V
+MASTER_SITES=
https://github.com/taisei-project/taisei/releases/download/${VERSION}/
+
+EXTRACT_SUFX= .tar.xz
+
+MODULES = devel/meson \
+ lang/python
+
+MODPY_RUNDEP = No
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-CFLAGS += -fgnu89-inline
-MODULES = devel/cmake
RUN_DEPENDS = devel/desktop-file-utils \
+ misc/shared-mime-info \
x11/gtk+3,-guic
-LIB_DEPENDS = audio/freealut \
- audio/openal \
- devel/sdl-ttf \
- graphics/png
+
+LIB_DEPENDS = audio/opusfile \
+ devel/sdl2>=2.0.5 \
+ devel/sdl2-mixer>=2.0.4 \
+ graphics/libwebp>=0.5 \
+ graphics/png>=1.5.0
+
+# Don't include docs
+# Don't zip the ressources, it avoids using archivers/libzip
+CONFIGURE_ARGS += -Ddocs=false \
+ -Denable_zip=false
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/taisei/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo22 Aug 2015 09:38:07 - 1.1.1.1
+++ distinfo15 Jan 2020 17:01:17 -
@@ -1,2 +1,2 @@
-SHA256 (taisei-1.0a.tar.gz) = FWHITJ/YucepG4ZL38B/uBG7baXFTPMqK2vWPeX48/8=
-SIZE (taisei-1.0a.tar.gz) = 91854864
+SHA256 (taisei-v1.3.1.tar.xz) = hlg6OnEAk+YwFKWua2glGgacslraBsb41zT4XzGtyYU=
+SIZE (taisei-v1.3.1.tar.xz) = 70763196
Index: patches/patch-src_boss_h
===
RCS file: patches/patch-src_boss_h
diff -N patches/patch-src_boss_h
--- patches/patch-src_boss_h17 May 2017 22:54:28 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_boss_h,v 1.1 2017/05/17 22:54:28 espie Exp $
-
-Index: src/boss.h
src/boss.h.orig
-+++ src/boss.h
-@@ -9,6 +9,8 @@
- #define BOSS_H
-
- #include
-+#undef complex
-+#define complex double _Complex
-
- #include
-
Re: update games/taisei 1.0 -> 1.3.1
On Wed, 15 Jan 2020 18:10:10 +0100
Charlene Wendling wrote:
> Hi,
>
> On Wed, 15 Jan 2020 14:36:48 +0100
> Omar Polo wrote:
>
> > Hi,
> >
> > First time here, hoping I didn't mess up too much.
>
> It works for you at least, so it's already nice :)
>
> By the way, it was already in -wip --
> https://github.com/jasperla/openbsd-wip/tree/master/games/taisei
>
> > The patch below
> > updates games/taisei from 1.0 to the latest 1.3.1 with the
> > followings changes:
> >
> > - use https for HOMEPAGE
> > - upstream repo changed
> > - dropped all the patches, they're not needed anymore
> > - dependecies updated
> Also [0]:
> - it breaks the runtime with amdgpu and radeondrm, and that's why i
>did not propose it. But if there is popular demand, i think we
> should go for it :)
I brought back my old video card on my amd64 box:
radeondrm0 at pci9 dev 0 function 0 "ATI Radeon HD 7450" rev 0x00
I wanted to correct myself, taisei works fine with radeondrm(4) and
inteldrm(4). As such, i think this update would benefit to most of
us.
I'm providing again the diff for convenience.
> - Requires OpenGL>=3.3, so works only on modern archs
> >
> > Built and played on amd64, everything seems to work fine (audio
> > too.)
>
> [...]
>
> I'm proposing here the diff from -wip if someone want to test/review
> it.
>
> Charlène.
>
>
> [0] https://marc.info/?l=openbsd-ports=155611903608886=2
>
Index: Makefile
===
RCS file: /cvs/ports/games/taisei/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.6
+++ Makefile15 Jan 2020 17:01:17 -
@@ -1,33 +1,50 @@
# $OpenBSD: Makefile,v 1.6 2019/07/12 20:46:25 sthen Exp $
+# Requires OpenGL>=3.3, only usable on archs that support
+# modern video cards
+ONLY_FOR_ARCHS = amd64 aarch64 i386
+
COMMENT = clone of the touhou games
-V =1.0a
-DISTNAME = taisei-$V
-REVISION = 3
+VERSION = v1.3.1
+DISTNAME = taisei-${VERSION}
+PKGNAME = taisei-${VERSION:S/^v//}
CATEGORIES = games
-HOMEPAGE = http://taisei-project.org/
+HOMEPAGE = https://taisei-project.org/
# MIT
+# Soundtrack: CC-BY 4.0 / Photos: PD and CC-0
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU SDL SDL_ttf alut c freetype m openal png pthread
+WANTLIB += SDL2 SDL2_mixer c crypto freetype m opusfile png webpdecoder
WANTLIB += z
-GH_ACCOUNT = laochailan
-GH_PROJECT = taisei
-GH_TAGNAME = v$V
+MASTER_SITES=
https://github.com/taisei-project/taisei/releases/download/${VERSION}/
+
+EXTRACT_SUFX= .tar.xz
+
+MODULES = devel/meson \
+ lang/python
+
+MODPY_RUNDEP = No
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-CFLAGS += -fgnu89-inline
-MODULES = devel/cmake
RUN_DEPENDS = devel/desktop-file-utils \
+ misc/shared-mime-info \
x11/gtk+3,-guic
-LIB_DEPENDS = audio/freealut \
- audio/openal \
- devel/sdl-ttf \
- graphics/png
+
+LIB_DEPENDS = audio/opusfile \
+ devel/sdl2>=2.0.5 \
+ devel/sdl2-mixer>=2.0.4 \
+ graphics/libwebp>=0.5 \
+ graphics/png>=1.5.0
+
+# Don't include docs
+# Don't zip the ressources, it avoids using archivers/libzip
+CONFIGURE_ARGS += -Ddocs=false \
+ -Denable_zip=false
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/taisei/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo22 Aug 2015 09:38:07 - 1.1.1.1
+++ distinfo15 Jan 2020 17:01:17 -
@@ -1,2 +1,2 @@
-SHA256 (taisei-1.0a.tar.gz) = FWHITJ/YucepG4ZL38B/uBG7baXFTPMqK2vWPeX48/8=
-SIZE (taisei-1.0a.tar.gz) = 91854864
+SHA256 (taisei-v1.3.1.tar.xz) = hlg6OnEAk+YwFKWua2glGgacslraBsb41zT4XzGtyYU=
+SIZE (taisei-v1.3.1.tar.xz) = 70763196
Index: patches/patch-src_boss_h
===
RCS file: patches/patch-src_boss_h
diff -N patches/patch-src_boss_h
--- patches/patch-src_boss_h17 May 2017 22:54:28 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_boss_h,v 1.1 2017/05/17 22:54:28 espie Exp $
-
-Index: src/boss.h
src/boss.h.orig
-+++ src/boss.h
-@@ -9,6 +9,8 @@
- #define BOSS_H
-
- #include
-+#undef complex
-+#define complex double _Complex
-
- #include
- struct Boss;
Index: patches/patch-src_enemy_h
===
RCS file: patches/patch-src_enemy_h
diff -N patches/patch-src_enemy_h
---
Re: update games/taisei 1.0 -> 1.3.1
> [snip]
>
> Regarding the amdgpu issue, I haven't experienced any of those when
> I tested the game, but after building with your diff 2 out of 3
> times the menu won't render at all. I'll do some more testing
> tomorrow, given that's a random thing maybe this morning I was just
> lucky.
Yup, I was just lucky. I can confirm the lags on amdgpu.
Anyway, thanks again for looking into this :)
> FWIW, I have a ryzen with an integrated radeon vega:
>
> cpu0: AMD Ryzen 5 2400G with Radeon Vega Graphics, 3593.94 MHz, 17-11-00
>
> > > portcheck does not complain, but is the DISTFILE bit correct? I
> > > needed to add PKGNAME because of "bad package name" during make
> > > package.
> >
> > Some comments:
> >
> > - REVISION is only needed when the version stays the same,
> > if you bump the upstream version you should just remove it.
> > - There are some DEPENDS that are missing, and other that should go.
> > Dependencies should be alphabetically ordered.
> > - You don't need to patch meson options, you just need to give the
> > proper flags to meson
> > - DISTFILES is not needed
> > - i'm not sure we want resources in zip files
>
> thanks for the comments, I'll keep them in mind :)
>
> > I'm proposing here the diff from -wip if someone want to test/review
> > it.
> >
> > Charlène.
> >
> >
> > [0] https://marc.info/?l=openbsd-ports=155611903608886=2
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/games/taisei/Makefile,v
> > retrieving revision 1.6
> > diff -u -p -u -p -r1.6 Makefile
> > --- Makefile12 Jul 2019 20:46:25 - 1.6
> > +++ Makefile15 Jan 2020 17:01:17 -
> > @@ -1,33 +1,50 @@
> > # $OpenBSD: Makefile,v 1.6 2019/07/12 20:46:25 sthen Exp $
> >
> > +# Requires OpenGL>=3.3, only usable on archs that support
> > +# modern video cards
> > +ONLY_FOR_ARCHS = amd64 aarch64 i386
> > +
> > COMMENT = clone of the touhou games
> >
> > -V =1.0a
> > -DISTNAME = taisei-$V
> > -REVISION = 3
> > +VERSION = v1.3.1
> > +DISTNAME = taisei-${VERSION}
> > +PKGNAME = taisei-${VERSION:S/^v//}
> >
> > CATEGORIES = games
> >
> > -HOMEPAGE = http://taisei-project.org/
> > +HOMEPAGE = https://taisei-project.org/
> >
> > # MIT
> > +# Soundtrack: CC-BY 4.0 / Photos: PD and CC-0
> > PERMIT_PACKAGE = Yes
> >
> > -WANTLIB += GL GLU SDL SDL_ttf alut c freetype m openal png pthread
> > +WANTLIB += SDL2 SDL2_mixer c crypto freetype m opusfile png webpdecoder
> > WANTLIB += z
> >
> > -GH_ACCOUNT = laochailan
> > -GH_PROJECT = taisei
> > -GH_TAGNAME = v$V
> > +MASTER_SITES=
> > https://github.com/taisei-project/taisei/releases/download/${VERSION}/
> > +
> > +EXTRACT_SUFX= .tar.xz
> > +
> > +MODULES = devel/meson \
> > + lang/python
> > +
> > +MODPY_RUNDEP = No
> > +MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
> >
> > -CFLAGS += -fgnu89-inline
> > -MODULES = devel/cmake
> > RUN_DEPENDS = devel/desktop-file-utils \
> > + misc/shared-mime-info \
> > x11/gtk+3,-guic
> > -LIB_DEPENDS = audio/freealut \
> > - audio/openal \
> > - devel/sdl-ttf \
> > - graphics/png
> > +
> > +LIB_DEPENDS = audio/opusfile \
> > + devel/sdl2>=2.0.5 \
> > + devel/sdl2-mixer>=2.0.4 \
> > + graphics/libwebp>=0.5 \
> > + graphics/png>=1.5.0
> > +
> > +# Don't include docs
> > +# Don't zip the ressources, it avoids using archivers/libzip
> > +CONFIGURE_ARGS += -Ddocs=false \
> > + -Denable_zip=false
> >
> > NO_TEST = Yes
> >
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/games/taisei/distinfo,v
> > retrieving revision 1.1.1.1
> > diff -u -p -u -p -r1.1.1.1 distinfo
> > --- distinfo22 Aug 2015 09:38:07 - 1.1.1.1
> > +++ distinfo15 Jan 2020 17:01:17 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (taisei-1.0a.tar.gz) = FWHITJ/YucepG4ZL38B/uBG7baXFTPMqK2vWPeX48/8=
> > -SIZE (taisei-1.0a.tar.gz) = 91854864
> > +SHA256 (taisei-v1.3.1.tar.xz) =
> > hlg6OnEAk+YwFKWua2glGgacslraBsb41zT4XzGtyYU=
> > +SIZE (taisei-v1.3.1.tar.xz) = 70763196
> > Index: patches/patch-src_boss_h
> > ===
> > RCS file: patches/patch-src_boss_h
> > diff -N patches/patch-src_boss_h
> > --- patches/patch-src_boss_h17 May 2017 22:54:28 - 1.1
> > +++ /dev/null 1 Jan 1970 00:00:00 -
> > @@ -1,14 +0,0 @@
> > -$OpenBSD: patch-src_boss_h,v 1.1 2017/05/17 22:54:28 espie Exp $
> > -
> > -Index: src/boss.h
> > src/boss.h.orig
>
Re: update games/taisei 1.0 -> 1.3.1
On Wed, Jan 15, 2020 at 06:10:10PM +0100, Charlene Wendling wrote:
> Hi,
>
> On Wed, 15 Jan 2020 14:36:48 +0100
> Omar Polo wrote:
>
> > Hi,
> >
> > First time here, hoping I didn't mess up too much.
>
> It works for you at least, so it's already nice :)
>
> By the way, it was already in -wip --
> https://github.com/jasperla/openbsd-wip/tree/master/games/taisei
>
> > The patch below
> > updates games/taisei from 1.0 to the latest 1.3.1 with the followings
> > changes:
> >
> > - use https for HOMEPAGE
> > - upstream repo changed
> > - dropped all the patches, they're not needed anymore
> > - dependecies updated
> Also [0]:
> - it breaks the runtime with amdgpu and radeondrm, and that's why i
>did not propose it. But if there is popular demand, i think we should
>go for it :)
> - Requires OpenGL>=3.3, so works only on modern archs
> >
> > Built and played on amd64, everything seems to work fine (audio too.)
I'm sorry I forgot to check for previous submissions, next time
I'll search before posting.
Regarding the amdgpu issue, I haven't experienced any of those when
I tested the game, but after building with your diff 2 out of 3
times the menu won't render at all. I'll do some more testing
tomorrow, given that's a random thing maybe this morning I was just
lucky.
FWIW, I have a ryzen with an integrated radeon vega:
cpu0: AMD Ryzen 5 2400G with Radeon Vega Graphics, 3593.94 MHz, 17-11-00
> > portcheck does not complain, but is the DISTFILE bit correct? I
> > needed to add PKGNAME because of "bad package name" during make
> > package.
>
> Some comments:
>
> - REVISION is only needed when the version stays the same,
> if you bump the upstream version you should just remove it.
> - There are some DEPENDS that are missing, and other that should go.
> Dependencies should be alphabetically ordered.
> - You don't need to patch meson options, you just need to give the
> proper flags to meson
> - DISTFILES is not needed
> - i'm not sure we want resources in zip files
thanks for the comments, I'll keep them in mind :)
> I'm proposing here the diff from -wip if someone want to test/review
> it.
>
> Charlène.
>
>
> [0] https://marc.info/?l=openbsd-ports=155611903608886=2
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/taisei/Makefile,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 Makefile
> --- Makefile 12 Jul 2019 20:46:25 - 1.6
> +++ Makefile 15 Jan 2020 17:01:17 -
> @@ -1,33 +1,50 @@
> # $OpenBSD: Makefile,v 1.6 2019/07/12 20:46:25 sthen Exp $
>
> +# Requires OpenGL>=3.3, only usable on archs that support
> +# modern video cards
> +ONLY_FOR_ARCHS = amd64 aarch64 i386
> +
> COMMENT =clone of the touhou games
>
> -V = 1.0a
> -DISTNAME = taisei-$V
> -REVISION = 3
> +VERSION =v1.3.1
> +DISTNAME = taisei-${VERSION}
> +PKGNAME =taisei-${VERSION:S/^v//}
>
> CATEGORIES = games
>
> -HOMEPAGE = http://taisei-project.org/
> +HOMEPAGE = https://taisei-project.org/
>
> # MIT
> +# Soundtrack: CC-BY 4.0 / Photos: PD and CC-0
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += GL GLU SDL SDL_ttf alut c freetype m openal png pthread
> +WANTLIB += SDL2 SDL2_mixer c crypto freetype m opusfile png webpdecoder
> WANTLIB += z
>
> -GH_ACCOUNT = laochailan
> -GH_PROJECT = taisei
> -GH_TAGNAME = v$V
> +MASTER_SITES=
> https://github.com/taisei-project/taisei/releases/download/${VERSION}/
> +
> +EXTRACT_SUFX=.tar.xz
> +
> +MODULES =devel/meson \
> + lang/python
> +
> +MODPY_RUNDEP = No
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> -CFLAGS +=-fgnu89-inline
> -MODULES =devel/cmake
> RUN_DEPENDS =devel/desktop-file-utils \
> + misc/shared-mime-info \
> x11/gtk+3,-guic
> -LIB_DEPENDS =audio/freealut \
> - audio/openal \
> - devel/sdl-ttf \
> - graphics/png
> +
> +LIB_DEPENDS =audio/opusfile \
> + devel/sdl2>=2.0.5 \
> + devel/sdl2-mixer>=2.0.4 \
> + graphics/libwebp>=0.5 \
> + graphics/png>=1.5.0
> +
> +# Don't include docs
> +# Don't zip the ressources, it avoids using archivers/libzip
> +CONFIGURE_ARGS +=-Ddocs=false \
> + -Denable_zip=false
>
> NO_TEST =Yes
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/taisei/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo 22 Aug 2015 09:38:07 - 1.1.1.1
> +++ distinfo 15 Jan 2020 17:01:17 -
> @@ -1,2 +1,2 @@
> -SHA256
Re: update games/taisei 1.0 -> 1.3.1
Hi,
On Wed, 15 Jan 2020 14:36:48 +0100
Omar Polo wrote:
> Hi,
>
> First time here, hoping I didn't mess up too much.
It works for you at least, so it's already nice :)
By the way, it was already in -wip --
https://github.com/jasperla/openbsd-wip/tree/master/games/taisei
> The patch below
> updates games/taisei from 1.0 to the latest 1.3.1 with the followings
> changes:
>
> - use https for HOMEPAGE
> - upstream repo changed
> - dropped all the patches, they're not needed anymore
> - dependecies updated
Also [0]:
- it breaks the runtime with amdgpu and radeondrm, and that's why i
did not propose it. But if there is popular demand, i think we should
go for it :)
- Requires OpenGL>=3.3, so works only on modern archs
>
> Built and played on amd64, everything seems to work fine (audio too.)
> portcheck does not complain, but is the DISTFILE bit correct? I
> needed to add PKGNAME because of "bad package name" during make
> package.
Some comments:
- REVISION is only needed when the version stays the same,
if you bump the upstream version you should just remove it.
- There are some DEPENDS that are missing, and other that should go.
Dependencies should be alphabetically ordered.
- You don't need to patch meson options, you just need to give the
proper flags to meson
- DISTFILES is not needed
- i'm not sure we want resources in zip files
I'm proposing here the diff from -wip if someone want to test/review
it.
Charlène.
[0] https://marc.info/?l=openbsd-ports=155611903608886=2
Index: Makefile
===
RCS file: /cvs/ports/games/taisei/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.6
+++ Makefile15 Jan 2020 17:01:17 -
@@ -1,33 +1,50 @@
# $OpenBSD: Makefile,v 1.6 2019/07/12 20:46:25 sthen Exp $
+# Requires OpenGL>=3.3, only usable on archs that support
+# modern video cards
+ONLY_FOR_ARCHS = amd64 aarch64 i386
+
COMMENT = clone of the touhou games
-V =1.0a
-DISTNAME = taisei-$V
-REVISION = 3
+VERSION = v1.3.1
+DISTNAME = taisei-${VERSION}
+PKGNAME = taisei-${VERSION:S/^v//}
CATEGORIES = games
-HOMEPAGE = http://taisei-project.org/
+HOMEPAGE = https://taisei-project.org/
# MIT
+# Soundtrack: CC-BY 4.0 / Photos: PD and CC-0
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU SDL SDL_ttf alut c freetype m openal png pthread
+WANTLIB += SDL2 SDL2_mixer c crypto freetype m opusfile png webpdecoder
WANTLIB += z
-GH_ACCOUNT = laochailan
-GH_PROJECT = taisei
-GH_TAGNAME = v$V
+MASTER_SITES=
https://github.com/taisei-project/taisei/releases/download/${VERSION}/
+
+EXTRACT_SUFX= .tar.xz
+
+MODULES = devel/meson \
+ lang/python
+
+MODPY_RUNDEP = No
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-CFLAGS += -fgnu89-inline
-MODULES = devel/cmake
RUN_DEPENDS = devel/desktop-file-utils \
+ misc/shared-mime-info \
x11/gtk+3,-guic
-LIB_DEPENDS = audio/freealut \
- audio/openal \
- devel/sdl-ttf \
- graphics/png
+
+LIB_DEPENDS = audio/opusfile \
+ devel/sdl2>=2.0.5 \
+ devel/sdl2-mixer>=2.0.4 \
+ graphics/libwebp>=0.5 \
+ graphics/png>=1.5.0
+
+# Don't include docs
+# Don't zip the ressources, it avoids using archivers/libzip
+CONFIGURE_ARGS += -Ddocs=false \
+ -Denable_zip=false
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/taisei/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo22 Aug 2015 09:38:07 - 1.1.1.1
+++ distinfo15 Jan 2020 17:01:17 -
@@ -1,2 +1,2 @@
-SHA256 (taisei-1.0a.tar.gz) = FWHITJ/YucepG4ZL38B/uBG7baXFTPMqK2vWPeX48/8=
-SIZE (taisei-1.0a.tar.gz) = 91854864
+SHA256 (taisei-v1.3.1.tar.xz) = hlg6OnEAk+YwFKWua2glGgacslraBsb41zT4XzGtyYU=
+SIZE (taisei-v1.3.1.tar.xz) = 70763196
Index: patches/patch-src_boss_h
===
RCS file: patches/patch-src_boss_h
diff -N patches/patch-src_boss_h
--- patches/patch-src_boss_h17 May 2017 22:54:28 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_boss_h,v 1.1 2017/05/17 22:54:28 espie Exp $
-
-Index: src/boss.h
src/boss.h.orig
-+++ src/boss.h
-@@ -9,6 +9,8 @@
- #define BOSS_H
-
- #include
-+#undef complex
-+#define complex double _Complex
-
- #include
- struct Boss;
Index: patches/patch-src_enemy_h
update games/taisei 1.0 -> 1.3.1
Hi,
First time here, hoping I didn't mess up too much. The patch below
updates games/taisei from 1.0 to the latest 1.3.1 with the followings
changes:
- use https for HOMEPAGE
- upstream repo changed
- dropped all the patches, they're not needed anymore
- dependecies updated
Built and played on amd64, everything seems to work fine (audio too.)
portcheck does not complain, but is the DISTFILE bit correct? I
needed to add PKGNAME because of "bad package name" during make
package.
--
/Omar Polo
Index: Makefile
===
RCS file: /cvs/ports/games/taisei/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.6
+++ Makefile15 Jan 2020 12:54:27 -
@@ -2,32 +2,40 @@
COMMENT = clone of the touhou games
-V =1.0a
-DISTNAME = taisei-$V
-REVISION = 3
+V =1.3.1
+DISTNAME = taisei-v$V
+PKGNAME = taisei-$V
+REVISION = 0
CATEGORIES = games
-HOMEPAGE = http://taisei-project.org/
+HOMEPAGE = https://taisei-project.org/
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU SDL SDL_ttf alut c freetype m openal png pthread
-WANTLIB += z
+WANTLIB += GL GLU SDL2 SDL2_ttf SDL2_mixer c freetype m openal png pthread
+WANTLIB += z zip
-GH_ACCOUNT = laochailan
-GH_PROJECT = taisei
-GH_TAGNAME = v$V
+MASTER_SITES = https://github.com/taisei-project/
+
+EXTRACT_SUFX = .tar.xz
+
+DISTFILES =
{taisei/releases/download/v${V}/}${DISTNAME}${EXTRACT_SUFX}
CFLAGS += -fgnu89-inline
-MODULES = devel/cmake
-RUN_DEPENDS = devel/desktop-file-utils \
- x11/gtk+3,-guic
-LIB_DEPENDS = audio/freealut \
+MODULES = devel/meson
+
+RUN_DEPENDS = x11/gtk+3,-guic \
+ devel/desktop-file-utils \
+ misc/shared-mime-info
+
+LIB_DEPENDS = devel/sdl2 \
+ devel/sdl2-mixer \
+ devel/sdl2-ttf \
audio/openal \
- devel/sdl-ttf \
- graphics/png
+ graphics/png \
+ archivers/libzip
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/taisei/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo22 Aug 2015 09:38:07 - 1.1.1.1
+++ distinfo15 Jan 2020 12:54:27 -
@@ -1,2 +1,2 @@
-SHA256 (taisei-1.0a.tar.gz) = FWHITJ/YucepG4ZL38B/uBG7baXFTPMqK2vWPeX48/8=
-SIZE (taisei-1.0a.tar.gz) = 91854864
+SHA256 (taisei-v1.3.1.tar.xz) = hlg6OnEAk+YwFKWua2glGgacslraBsb41zT4XzGtyYU=
+SIZE (taisei-v1.3.1.tar.xz) = 70763196
Index: patches/patch-meson_options_txt
===
RCS file: patches/patch-meson_options_txt
diff -N patches/patch-meson_options_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-meson_options_txt 15 Jan 2020 12:54:27 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: meson_options.txt
+--- meson_options.txt.orig
meson_options.txt
+@@ -96,7 +96,7 @@ option(
+ option(
+ 'docs',
+ type : 'boolean',
+-value : true,
++value : false,
+ description : 'Build and install documentation'
+ )
+
Index: patches/patch-src_boss_h
===
RCS file: patches/patch-src_boss_h
diff -N patches/patch-src_boss_h
--- patches/patch-src_boss_h17 May 2017 22:54:28 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_boss_h,v 1.1 2017/05/17 22:54:28 espie Exp $
-
-Index: src/boss.h
src/boss.h.orig
-+++ src/boss.h
-@@ -9,6 +9,8 @@
- #define BOSS_H
-
- #include
-+#undef complex
-+#define complex double _Complex
-
- #include
- struct Boss;
Index: patches/patch-src_enemy_h
===
RCS file: patches/patch-src_enemy_h
diff -N patches/patch-src_enemy_h
--- patches/patch-src_enemy_h 17 May 2017 22:54:28 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_enemy_h,v 1.1 2017/05/17 22:54:28 espie Exp $
-
-Index: src/enemy.h
src/enemy.h.orig
-+++ src/enemy.h
-@@ -8,6 +8,8 @@
- #ifndef ENEMY_H
- #define ENEMY_H
- #include
-+#undef complex
-+#define complex double _Complex
- #include "projectile.h"
-
- #undef complex
Index: patches/patch-src_item_c
===
RCS file: patches/patch-src_item_c
diff -N patches/patch-src_item_c
--- patches/patch-src_item_c17 May 2017 22:54:28 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD:
