Hi,
On Tue, 23 Feb 2021 02:28:47 -0700
"Anthony J. Bentley" <anthony@anjbe.name> wrote:
> Hi,
>
> Here's an update to agar-1.6.0 and agartest-1.6.0.
>
> The update is actually still broken with -fno-common, but it's only
> one variable so it was easy enough to fix for real.
>
> There was a lot of weird churn in this update. For instance, there's
> no point in enabling iconv because it will unfixably break the build.
> The end result seems to work though, as demonstrated by running the
> tests in agartest.
>
> ok?
OK cwen@, but an extra patch is needed to make agar built on powerpc.
The 'rlwimi' powerpc instruction wants a 32-bit integer to work with.
It was already present in the 1.5.0 patches but in a different place.
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/x11/agar/Makefile.inc,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile.inc
--- Makefile.inc 9 Nov 2020 21:48:25 -0000 1.4
+++ Makefile.inc 27 Feb 2021 08:51:04 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.4 2020/11/09 21:48:25 cwen Exp $
-V ?= 1.5.0
+V ?= 1.6.0
DISTNAME ?= agar-$V
CATEGORIES ?= x11
@@ -10,7 +10,7 @@ HOMEPAGE ?= https://libagar.org/
# BSD
PERMIT_PACKAGE ?= Yes
-MASTER_SITES ?= http://stable.hypertriton.com/agar/
+MASTER_SITES ?= https://stable.hypertriton.com/agar/
CONFIGURE_STYLE ?= simple
Index: agar/Makefile
===================================================================
RCS file: /cvs/ports/x11/agar/agar/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- agar/Makefile 1 Aug 2020 18:47:33 -0000 1.7
+++ agar/Makefile 27 Feb 2021 08:51:04 -0000
@@ -3,31 +3,30 @@
COMMENT = cross-platform widget toolkit
PKGNAME = agar-$V
-REVISION = 4
-SHARED_LIBS += ag_au 0.0 # 5.0
-SHARED_LIBS += ag_core 0.0 # 5.0
-SHARED_LIBS += ag_dev 0.0 # 5.0
-SHARED_LIBS += ag_gui 0.0 # 5.0
-SHARED_LIBS += ag_math 0.0 # 5.0
-SHARED_LIBS += ag_vg 0.0 # 5.0
-
-WANTLIB += GL SDL X11 X11-xcb Xdamage Xext Xfixes Xinerama Xxf86vm
-WANTLIB += db drm expat fontconfig freetype glapi iconv jpeg m
-WANTLIB += png pthread sndio usbhid xcb xcb-dri2
-WANTLIB += xcb-glx z
+SHARED_LIBS += ag_au 0.1 # 5.0
+SHARED_LIBS += ag_core 1.0 # 5.0
+SHARED_LIBS += ag_gui 1.0 # 5.0
+SHARED_LIBS += ag_map 0.0 # 5.0
+SHARED_LIBS += ag_math 1.0 # 5.0
+SHARED_LIBS += ag_net 0.0 # 5.0
+SHARED_LIBS += ag_sg 0.0 # 5.0
+SHARED_LIBS += ag_sk 0.0 # 5.0
+SHARED_LIBS += ag_vg 1.0 # 5.0
LIB_DEPENDS = audio/libsndfile \
audio/portaudio-svn \
- converters/libiconv \
- databases/db/v4 \
devel/sdl \
graphics/jpeg \
graphics/png
-CONFIGURE_ARGS += --with-gl=${X11BASE} \
+CONFIGURE_ARGS += --enable-au \
+ --enable-map \
+ --with-gl=${X11BASE} \
--with-x=${X11BASE} \
--with-portaudio=${LOCALBASE} \
--with-sndfile=${LOCALBASE}
+
+MAKE_FLAGS = PKGCONFIG_LIBDIR=${PREFIX}/lib/pkgconfig
.include <bsd.port.mk>
Index: agar/distinfo
===================================================================
RCS file: /cvs/ports/x11/agar/agar/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- agar/distinfo 10 Oct 2016 09:33:17 -0000 1.1.1.1
+++ agar/distinfo 27 Feb 2021 08:51:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (agar-1.5.0.tar.gz) = gjQt7TQsV4FBmEvv6TGPPTdhduX0J64yePiYXyZmPAA=
-SIZE (agar-1.5.0.tar.gz) = 2427644
+SHA256 (agar-1.6.0.tar.gz) = dQAC8LNo+1guRWlqjfxT+0X1U2eSp/BSDNzCC0iMni4=
+SIZE (agar-1.6.0.tar.gz) = 22133371
Index: agar/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/agar/agar/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile
--- agar/patches/patch-Makefile 10 Oct 2016 09:33:17 -0000 1.1.1.1
+++ agar/patches/patch-Makefile 27 Feb 2021 08:51:04 -0000
@@ -1,15 +1,17 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2016/10/10 09:33:17 bentley Exp $
---- Makefile.orig Mon Aug 24 03:08:39 2015
-+++ Makefile Mon Aug 24 03:08:48 2015
-@@ -83,9 +83,9 @@ install-config:
- ${SUDO} ${INSTALL_PROG} $$PROG ${DESTDIR}${BINDIR}; \
- done
- @echo "${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal"
-- @${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/aclocal
-+ @${SUDO} ${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -90,10 +90,10 @@ install-config:
+ fi
+ @if [ ! -e "${DESTDIR}${PREFIX}/share/aclocal" ]; then \
+ echo "${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal"; \
+- ${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/aclocal; \
++ ${SUDO} ${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal; \
+ fi
@echo "${INSTALL_DATA} ${SRCDIR}/mk/agar.m4 ${PREFIX}/share/aclocal"
- @${SUDO} ${INSTALL_DATA} ${SRCDIR}/mk/agar.m4 ${DESTDIR}${PREFIX}/share/aclocal
+ @${SUDO} ${INSTALL_DATA} ${SRCDIR}/mk/agar.m4 ${PREFIX}/share/aclocal
deinstall-config:
- @for PROG in ${CONFSCRIPTS}; do \
+ @for F in ${AVAIL_CONFIGSCRIPTS}; do \
Index: agar/patches/patch-core_byteswap_h
===================================================================
RCS file: agar/patches/patch-core_byteswap_h
diff -N agar/patches/patch-core_byteswap_h
--- agar/patches/patch-core_byteswap_h 9 Nov 2020 21:48:25 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-core_byteswap_h,v 1.2 2020/11/09 21:48:25 cwen Exp $
-
-Hunk #1: Fix the build on powerpc, upstream code has been totally changed
-Hunk #2: Extracted from https://github.com/JulNadeauCA/libagar/commit/56b3500
-
-Index: core/byteswap.h
---- core/byteswap.h.orig
-+++ core/byteswap.h
-@@ -33,15 +33,17 @@ AG_Swap16(Uint16 x)
- "0" (x));
- return (x);
- }
--#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-+#elif (defined(__GNUC__) || defined(__clang__)) && \
-+ (defined(__powerpc__) || defined(__ppc__)) && \
-+ (!defined(__powerpc64__) && !defined(__ppc64__))
- static __inline__ Uint16
- AG_Swap16(Uint16 x)
- {
-- Uint16 rv;
-+ Uint32 rv;
- __asm__("rlwimi %0,%2,8,16,23" :
- "=&r" (rv) :
- "0" (x >> 8), "r" (x));
-- return (rv);
-+ return (Uint16) (rv);
- }
- #else
- static __inline__ Uint16
-@@ -72,7 +74,9 @@ AG_Swap32(Uint32 x)
- "0" (x));
- return (x);
- }
--#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-+#elif (defined(__GNUC__) || defined(__clang__)) && \
-+ (defined(__powerpc__) || defined(__ppc__)) && \
-+ (!defined(__powerpc64__) && !defined(__ppc64__))
- static __inline__ Uint32
- AG_Swap32(Uint32 x)
- {
Index: agar/patches/patch-core_cpuinfo_c
===================================================================
RCS file: /cvs/ports/x11/agar/agar/patches/patch-core_cpuinfo_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-core_cpuinfo_c
--- agar/patches/patch-core_cpuinfo_c 9 Nov 2020 21:48:25 -0000 1.2
+++ agar/patches/patch-core_cpuinfo_c 27 Feb 2021 08:51:04 -0000
@@ -37,24 +37,7 @@ Index: core/cpuinfo.c
struct cpuid_regs {
Uint32 a;
Uint32 b;
-@@ -139,16 +132,6 @@ Conv32(char *d, unsigned int v)
- d[3] = (v >> 24) & 0xff;
- }
-
--#if !defined(__APPLE__) && !defined(__MACOSX__) && !defined(__ppc__) && \
-- defined(HAVE_ALTIVEC) && defined(_MK_HAVE_SIGNAL) && defined(_MK_HAVE_SETJMP)
--/* SIGILL handler for AltiVec test */
--static void
--IllegalInsn(int sig)
--{
-- longjmp(jmpbuf, 1);
--}
--
No comments:
Post a Comment