pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
naev: began the update
Module Name: pkgsrc-wip
Committed By: Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By: nuclearkev
Date: Wed May 15 21:54:23 2024 -0400
Changeset: 503732bd7749e5a0e83e0b28afebba523c542626
Modified Files:
naev/Makefile
naev/distinfo
Added Files:
naev/TODO
naev/patches/patch-meson.build
Removed Files:
naev/patches/patch-Makefile.am
naev/patches/patch-build_shave.in
naev/patches/patch-configure.ac
naev/patches/patch-src_tk_widget_input.c
naev/patches/patch-src_utf8.c
naev/patches/patch-utils_build_naev.sh
Log Message:
naev: began the update
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=503732bd7749e5a0e83e0b28afebba523c542626
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
naev/Makefile | 35 ++++++++++++++++---------
naev/TODO | 4 +++
naev/distinfo | 13 +++-------
naev/patches/patch-Makefile.am | 17 ------------
naev/patches/patch-build_shave.in | 16 ------------
naev/patches/patch-configure.ac | 44 --------------------------------
naev/patches/patch-meson.build | 27 ++++++++++++++++++++
naev/patches/patch-src_tk_widget_input.c | 16 ------------
naev/patches/patch-src_utf8.c | 18 -------------
naev/patches/patch-utils_build_naev.sh | 15 -----------
10 files changed, 58 insertions(+), 147 deletions(-)
diffs:
diff --git a/naev/Makefile b/naev/Makefile
index 00543f7cc3..6236ed48d1 100644
--- a/naev/Makefile
+++ b/naev/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.7 2020/11/05 09:08:13 ryoon Exp $
-DISTNAME= naev-0.8.2
+DISTNAME= naev-0.11.4
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GITHUB:=naev/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -10,24 +10,27 @@ HOMEPAGE= https://github.com/naev/naev
COMMENT= 2D space trading and combat game
LICENSE= gnu-gpl-v3
-USE_TOOLS+= autoreconf autoconf automake
-USE_TOOLS+= gmake intltool pkg-config
-GNU_CONFIGURE= yes
+#USE_TOOLS+= autoreconf autoconf automake
+USE_TOOLS+= meson pkg-config
+#GNU_CONFIGURE= yes
DEPENDS+= bash-[0-9]*:../../shells/bash
+DEPENDS+= py311-yaml-[0-9]*:../../textproc/py-yaml
REPLACE_BASH= naev-confupdate.sh
INSTALL_TARGET= install install-data-local
-CONFIGURE_ARGS+= --enable-debug=no
-CONFIGURE_ARGS+= --enable-lua=shared
-CONFIGURE_ARGS+= --disable-sdltest
+MESON_ARGS+= -Dndata_path="${INSTALL_GAME_DIR}"
-INSTALL_MAKE_FLAGS+= INSTALL_GAME_DIR="${INSTALL_GAME_DIR}"
-INSTALL_MAKE_FLAGS+= INSTALL_GAME_DATA="${INSTALL_GAME_DATA}"
+#CONFIGURE_ARGS+= --enable-debug=no
+#CONFIGURE_ARGS+= --enable-lua=shared
+#CONFIGURE_ARGS+= --disable-sdltest
-pre-configure:
- cd ${WRKSRC} && ${SH} autogen.sh
+#INSTALL_MAKE_FLAGS+= INSTALL_GAME_DIR="${INSTALL_GAME_DIR}"
+#INSTALL_MAKE_FLAGS+= INSTALL_GAME_DATA="${INSTALL_GAME_DATA}"
+
+#pre-configure:
+# cd ${WRKSRC} && ${SH} autogen.sh
# These scripts are not used once
# installed, they appear to be for
@@ -43,17 +46,25 @@ pre-build:
.include "../../archivers/libzip/buildlink3.mk"
.include "../../audio/openal-soft/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
.include "../../audio/SDL2_mixer/buildlink3.mk"
.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../devel/physfs/buildlink3.mk"
.include "../../graphics/SDL2_image/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../lang/lua51/buildlink3.mk"
+.include "../../lang/LuaJIT2/buildlink3.mk"
.include "../../lang/python/tool.mk"
+.include "../../math/glpk/buildlink3.mk"
+.include "../../math/openblas/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
+.include "../../net/enet/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libunibreak/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../wip/suitesparse/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/naev/TODO b/naev/TODO
new file mode 100644
index 0000000000..6adedfe1d6
--- /dev/null
+++ b/naev/TODO
@@ -0,0 +1,4 @@
+- figure out the artwork submodule
+- building
+- testing
+- conquering the galaxy
diff --git a/naev/distinfo b/naev/distinfo
index 030df42de6..d4b1095aaf 100644
--- a/naev/distinfo
+++ b/naev/distinfo
@@ -1,11 +1,6 @@
$NetBSD: distinfo,v 1.1 2019/10/01 12:25:37 nia Exp $
-RMD160 (naev-0.8.2.tar.gz) = eb2800d6ce529e48de49105844ad2c636133525d
-SHA512 (naev-0.8.2.tar.gz) = c37a514dbe7ed1bca21563d20a4bb05892a07ee437eeaddefe00b5abe7009c2671da3c587db19bc8f1407db4ff3518f0cf5b28cb095778ba61946dcf87f61e5e
-Size (naev-0.8.2.tar.gz) = 359479151 bytes
-SHA1 (patch-Makefile.am) = 2519d0d8a1d45fe1b2cca924599c29fb945c7edd
-SHA1 (patch-build_shave.in) = e548c7547bc81a16a7cfbf3e7a97e4e3e23787fc
-SHA1 (patch-configure.ac) = b54678d7b79c06bd82fe1c8917184965561919ef
-SHA1 (patch-src_tk_widget_input.c) = 4aaaa3d1969bdb975bc7433494f1d3eadc543aab
-SHA1 (patch-src_utf8.c) = 4c10e8d8ec97cc7a4608870e90dcb38320794e03
-SHA1 (patch-utils_build_naev.sh) = ae67f5fbec418b058baaceafebdb056765627b73
+BLAKE2s (naev-0.11.4.tar.gz) = 5b3db98a722bf8bfc02ab238cd584ea3e62c978031063cf79081911d0d2beb71
+SHA512 (naev-0.11.4.tar.gz) = ab5319e650c55956381178eeaf9ce51c08b9f29e3b9543d83f259de2d32ce36afd124edccee2600b7428b9a0ae36c8c8cd273fa873068a6faf9f92dc6d6b6eb8
+Size (naev-0.11.4.tar.gz) = 20209263 bytes
+SHA1 (patch-meson.build) = bc9de39c6aedd37bc44a1594144a6aad0b9872c2
diff --git a/naev/patches/patch-Makefile.am b/naev/patches/patch-Makefile.am
deleted file mode 100644
index f9a394bf0d..0000000000
--- a/naev/patches/patch-Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Fix installation commands.
-
---- Makefile.am.orig 2021-01-09 04:18:47.000000000 +0000
-+++ Makefile.am
-@@ -119,8 +119,8 @@ $(MKSPR):
-
- install-data-local:
- (cd $(top_srcdir)/dat \
-- && find . -type d -exec install -d "{}" "$(DESTDIR)$(pkgdatadir)/dat/{}" \; \
-- && find . -type f -exec install -m 644 "{}" "$(DESTDIR)$(pkgdatadir)/dat/{}" \; )
-+ && find . -type d -exec ${INSTALL_GAME_DIR} "{}" "$(DESTDIR)$(pkgdatadir)/dat/{}" \; \
-+ && find . -type f -exec ${INSTALL_GAME_DATA} "{}" "$(DESTDIR)$(pkgdatadir)/dat/{}" \; )
-
- clean-local:
- (rm -rf $(top_builddir)/dat/gettext)
diff --git a/naev/patches/patch-build_shave.in b/naev/patches/patch-build_shave.in
deleted file mode 100644
index 6fbbd78e35..0000000000
--- a/naev/patches/patch-build_shave.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-build_shave.in,v 1.1 2015/08/19 20:11:36 yhardy Exp $
-
-Fix shell script.
-
---- build/shave.in.orig 2010-01-18 14:18:12.000000000 +0200
-+++ build/shave.in 2010-01-18 14:19:29.000000000 +0200
-@@ -57,7 +57,8 @@
- preserved_args="$preserved_args $opt"
- ;;
- -out:*|/out:*)
-- lt_output="${opt:5}"
-+ lt_output="${opt#-out:}"
-+ lt_output="${lt_output#/out:}"
- preserved_args="$preserved_args $opt"
- ;;
- *)
diff --git a/naev/patches/patch-configure.ac b/naev/patches/patch-configure.ac
deleted file mode 100644
index e244f739b0..0000000000
--- a/naev/patches/patch-configure.ac
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2019/10/01 12:25:37 nia Exp $
-
-Add compile and linker flags for Free/Net/OpenBSD.
-
---- configure.ac.orig 2020-12-17 02:23:41.000000000 +0000
-+++ configure.ac
-@@ -344,6 +344,15 @@ case "$host" in
- *-linux*)
- SDL_CFLAGS="$SDL_CFLAGS -D_GNU_SOURCE=1"
- ;;
-+ *-freebsd*)
-+ SDL_CFLAGS="$SDL_CFLAGS -D_GNU_SOURCE=1"
-+ ;;
-+ *-netbsd*)
-+ SDL_CFLAGS="$SDL_CFLAGS -D_GNU_SOURCE=1"
-+ ;;
-+ *-openbsd*)
-+ SDL_CFLAGS="$SDL_CFLAGS -D_GNU_SOURCE=1"
-+ ;;
- esac
-
- # global
-@@ -364,6 +373,12 @@ case "$host" in
- *-linux*)
- GLOBAL_LIBS="$NAEV_LIBS -lm" # feels so wrong
- ;;
-+ *-freebsd*)
-+ GLOBAL_LIBS="$NAEV_LIBS -lm"
-+ ;;
-+ *-netbsd*)
-+ GLOBAL_LIBS="$NAEV_LIBS -lm"
-+ ;;
- *-mingw*)
- GLOBAL_LIBS="$NAEV_LIBS -lwsock32"
- ;;
-@@ -383,7 +398,7 @@ case "$host" in
- *-mingw*)
- ;;
- *)
-- NAEV_LIBS="$NAEV_LIBS -ldl"
-+ NAEV_LIBS="$NAEV_LIBS ${DL_LIBS}"
- ;;
- esac
-
diff --git a/naev/patches/patch-meson.build b/naev/patches/patch-meson.build
new file mode 100644
index 0000000000..9f4f185197
--- /dev/null
+++ b/naev/patches/patch-meson.build
@@ -0,0 +1,27 @@
+$NetBSD$
+
+--- meson.build.orig 2024-05-16 01:40:41.502270466 +0000
++++ meson.build
+@@ -191,13 +191,15 @@ if buildExec.disabled() == false
+ ### Soft deps (required: false)
+
+ # libdl can be used for debugging stack traces. On non-Windows platforms, GLAD relies on dlopen().
+- glad_requires_libdl = not cc.has_header('windows.h')
+- if glad_requires_libdl or debug
+- libdl = cc.find_library('dl', required: host_machine.system()!='windows')
+- if libdl.found()
+- naev_deps += libdl
+- else
+- naev_deps += subproject('dlfcn-win32').get_variable('dl_dep')
++ if host_machine.system() == 'linux'
++ glad_requires_libdl = not cc.has_header('windows.h')
++ if glad_requires_libdl or debug
++ libdl = cc.find_library('dl', required: host_machine.system()!='windows')
++ if libdl.found()
++ naev_deps += libdl
++ else
++ naev_deps += subproject('dlfcn-win32').get_variable('dl_dep')
++ endif
+ endif
+ endif
+
diff --git a/naev/patches/patch-src_tk_widget_input.c b/naev/patches/patch-src_tk_widget_input.c
deleted file mode 100644
index 25359cefca..0000000000
--- a/naev/patches/patch-src_tk_widget_input.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Fix a warning when compiling on NetBSD (namely, use an int argument
-for isspace instead of char).
-
---- src/tk/widget/input.c.orig 2020-12-17 02:23:41.000000000 +0000
-+++ src/tk/widget/input.c
-@@ -314,7 +314,7 @@ static int inp_key( Widget* inp, SDL_Key
- line_end = curr_line_start + inp_rangeFromWidth( inp, curr_line_start, -1 );
- if (inp->dat.inp.input[line_end] == '\0')
- next_line_start = SIZE_MAX;
-- else if (isspace(inp->dat.inp.input[line_end]))
-+ else if (isspace((int)inp->dat.inp.input[line_end]))
- next_line_start = line_end + 1;
- else
- next_line_start = line_end;
diff --git a/naev/patches/patch-src_utf8.c b/naev/patches/patch-src_utf8.c
deleted file mode 100644
index 793f91b8a6..0000000000
--- a/naev/patches/patch-src_utf8.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-alloca(3) is in stdlib.h on NetBSD (others?)
-
---- src/utf8.c.orig 2020-12-17 02:23:41.000000000 +0000
-+++ src/utf8.c
-@@ -23,7 +23,11 @@
- #if HAS_WIN32
- #include <malloc.h>
- #else /* HAS_WIN32 */
-+#ifdef __linux__
- #include <alloca.h> /* Not available in windows, necessary for linux. */
-+#else
-+#include <stdlib.h>
-+#endif /* __linux__ */
- #endif /* HAS_WIN32 */
- #include <assert.h>
-
diff --git a/naev/patches/patch-utils_build_naev.sh b/naev/patches/patch-utils_build_naev.sh
deleted file mode 100644
index 4d44dd6c2c..0000000000
--- a/naev/patches/patch-utils_build_naev.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix equality test.
-
---- utils/build/naev.sh.orig 2020-12-17 02:23:41.000000000 +0000
-+++ utils/build/naev.sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
- cd @source_root@
- type "gdb" > /dev/null
--if [ "$?" == 0 ]; then
-+if [ "$?" = 0 ]; then
- gdb -x @source_root@/.gdbinit @naev_bin@ "$@"
- else
- @naev_bin@ "$@"
Home |
Main Index |
Thread Index |
Old Index