pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

anura: Upgrade to the latest; builds on NetBSD 9.0/amd64



Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <dressupgeekout%gmail.com@localhost>
Pushed By:	cfkoch
Date:		Mon Apr 26 19:51:58 2021 -0700
Changeset:	6a797171fb4fc1cc961ad67db2f5ef1d16e1fdf5

Modified Files:
	anura/Makefile
	anura/distinfo
Added Files:
	anura/patches/patch-imgui_imgui_draw.cpp
Removed Files:
	anura/patches/patch-Makefile
	anura/patches/patch-src_tbs_matchmaking_server.cpp

Log Message:
anura: Upgrade to the latest; builds on NetBSD 9.0/amd64

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6a797171fb4fc1cc961ad67db2f5ef1d16e1fdf5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 anura/Makefile                                     | 23 ++++++++++++----------
 anura/distinfo                                     | 10 +++++-----
 anura/patches/patch-Makefile                       | 12 -----------
 anura/patches/patch-imgui_imgui_draw.cpp           | 14 +++++++++++++
 anura/patches/patch-src_tbs_matchmaking_server.cpp | 21 --------------------
 5 files changed, 32 insertions(+), 48 deletions(-)

diffs:
diff --git a/anura/Makefile b/anura/Makefile
index 2f4e2b8cea..f6bfb58db6 100644
--- a/anura/Makefile
+++ b/anura/Makefile
@@ -1,36 +1,39 @@
 # $NetBSD$
 
-DISTNAME=	anura
-PKGNAME=	anura-0
-CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GITHUB:=anura-engine/}
-GITHUB_TAG=	6185d6d5f0774610375f4277d0e39d4f6f239202
+DISTNAME=	anura-0
+CATEGORIES=	devel games
+GIT_REPO=	https://github.com/anura-engine/anura.git
+GIT_REVISION=	188004394edf268bd9e798d0781ac394b84f5489
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
 COMMENT=	Fully-featured game engine
 LICENSE=	modified-bsd AND mit
 
 USE_LANGUAGES=	c c++
-GCC_REQD=	4.8
-EXTRACT_USING=	gtar
+GCC_REQD+=	4.8
 USE_TOOLS+=	pkg-config gmake
-WRKSRC=		${WRKDIR}/anura-${GITHUB_TAG}
 AUTO_MKDIRS=	yes
 
 CFLAGS+=	-Wno-sign-compare
+CFLAGS+=	-Wno-deprecated-declarations
+
+.if "${OPSYS}" == "NetBSD"
 LDFLAGS+=	-lexecinfo
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/anura ${DESTDIR}${PREFIX}/bin/anura
 
+.include "../../audio/SDL2_mixer/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/SDL2/buildlink3.mk"
-.include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../fonts/SDL2_ttf/buildlink3.mk"
 .include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/anura/distinfo b/anura/distinfo
index 874e022a6a..29bff1b472 100644
--- a/anura/distinfo
+++ b/anura/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (anura-6185d6d5f0774610375f4277d0e39d4f6f239202.tar.gz) = 30b2b9fa1483e8408f8299d483affd5109e4f1de
-RMD160 (anura-6185d6d5f0774610375f4277d0e39d4f6f239202.tar.gz) = eb10eabd1275decd4e61d491fb8903908b1ea82e
-Size (anura-6185d6d5f0774610375f4277d0e39d4f6f239202.tar.gz) = 77911584 bytes
-SHA1 (patch-Makefile) = 7d7abccec1be5728e1fb1ddd914ebd52c768c494
-SHA1 (patch-src_tbs_matchmaking_server.cpp) = 1acf1234ed7f213c00f480edc399d0d7c923a078
+SHA1 (anura-188004394edf268bd9e798d0781ac394b84f5489.tar.gz) = 8716f3b8ebc88afef4175b36470d58fc59fb6752
+RMD160 (anura-188004394edf268bd9e798d0781ac394b84f5489.tar.gz) = d1bc0c2a49323cc8d195ced181aa8e55ff8c6c4d
+SHA512 (anura-188004394edf268bd9e798d0781ac394b84f5489.tar.gz) = bb5da8d2a3c969725da212267ccb0f041a928c64e81481c8ac43456bfa1d459fad44950c989e3499d832dc240494d12bef257fed2afd7ff43317619a08ba3c1d
+Size (anura-188004394edf268bd9e798d0781ac394b84f5489.tar.gz) = 108348876 bytes
+SHA1 (patch-imgui_imgui_draw.cpp) = 9524d39ea6715cfd9aaa40eb8702f67eae7888f5
diff --git a/anura/patches/patch-Makefile b/anura/patches/patch-Makefile
deleted file mode 100644
index 6a6155e5fa..0000000000
--- a/anura/patches/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
---- ./Makefile.orig	2016-01-25 15:02:26.000000000 -0800
-+++ ./Makefile	2016-01-25 23:03:50.000000000 -0800
-@@ -145,7 +145,7 @@
- 	@$(CXX) $(BASE_CXXFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(INC) $(INCLUDES) -MM $$< > $$@.d
- 	@mv -f $$@.d $$@.d.tmp
- 	@sed -e 's|.*:|$$@:|' < $$@.d.tmp > $$@.d
--	@sed -e 's/.*://' -e 's/\\$$$$//' < $$@.d.tmp | fmt -1 | \
-+	@sed -e 's/.*://' -e 's/\\$$$$//' < $$@.d.tmp | \
- 		sed -e 's/^ *//' -e 's/$$$$/:/' >> $$@.d
- 	@rm -f $$@.d.tmp
- endef
diff --git a/anura/patches/patch-imgui_imgui_draw.cpp b/anura/patches/patch-imgui_imgui_draw.cpp
new file mode 100644
index 0000000000..bcd64cdb0e
--- /dev/null
+++ b/anura/patches/patch-imgui_imgui_draw.cpp
@@ -0,0 +1,14 @@
+$NetBSD$
+
+NetBSD's alloca(3) can be found in stdlib.h.
+--- imgui/imgui_draw.cpp.orig	2021-04-26 19:27:27.434449487 -0700
++++ imgui/imgui_draw.cpp	2021-04-26 19:28:18.554672461 -0700
+@@ -21,7 +21,7 @@
+ #if !defined(alloca)
+ #ifdef _WIN32
+ #include <malloc.h>     // alloca
+-#elif (defined(__FreeBSD__) || defined(FreeBSD_kernel) || defined(__DragonFly__)) && !defined(__GLIBC__)
++#elif (defined(__FreeBSD__) || defined(FreeBSD_kernel) || defined(__DragonFly__) || defined(__NetBSD__)) && !defined(__GLIBC__)
+ #include <stdlib.h>     // alloca. FreeBSD uses stdlib.h unless GLIBC
+ #else
+ #include <alloca.h>     // alloca
diff --git a/anura/patches/patch-src_tbs_matchmaking_server.cpp b/anura/patches/patch-src_tbs_matchmaking_server.cpp
deleted file mode 100644
index f9140e3725..0000000000
--- a/anura/patches/patch-src_tbs_matchmaking_server.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
---- ./src/tbs_matchmaking_server.cpp.orig	2016-01-26 00:52:11.000000000 -0800
-+++ ./src/tbs_matchmaking_server.cpp	2016-01-26 00:52:47.000000000 -0800
-@@ -31,7 +31,7 @@
- #include <iostream>
- 
- #include <sys/types.h>
--#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__)
- #include <sys/wait.h>
- #include <unistd.h>
- #endif
-@@ -85,7 +85,7 @@
- 
- void sendEmail(std::string email_addr, std::string subject, std::string message)
- {
--#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__)
- 
- 	std::ostringstream s;
- 	s << "/usr/sbin/sendmail " << email_addr;


Home | Main Index | Thread Index | Old Index