Re: x11/agar update + -fno-common fix
Hi,
On Tue, 23 Feb 2021 02:28:47 -0700
"Anthony J. Bentley" 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.inc9 Nov 2020 21:48:25 - 1.4
+++ Makefile.inc27 Feb 2021 08:51:04 -
@@ -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 - 1.7
+++ agar/Makefile 27 Feb 2021 08:51:04 -
@@ -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_dev0.0 # 5.0
-SHARED_LIBS += ag_gui0.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_gui1.0 # 5.0
+SHARED_LIBS += ag_map0.0 # 5.0
+SHARED_LIBS += ag_math 1.0 # 5.0
+SHARED_LIBS += ag_net0.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
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 - 1.1.1.1
+++ agar/distinfo 27 Feb 2021 08:51:04 -
@@ -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 - 1.1.1.1
+++ agar/patches/patch-Makefile 27 Feb 2021 08:51:04 -
@@ -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}
x11/agar update + -fno-common fix
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?
Index: Makefile.inc
===
RCS file: /cvs/ports/x11/agar/Makefile.inc,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.inc
--- Makefile.inc9 Nov 2020 21:48:25 - 1.4
+++ Makefile.inc23 Feb 2021 09:25:32 -
@@ -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 -r1.7 Makefile
--- agar/Makefile 1 Aug 2020 18:47:33 - 1.7
+++ agar/Makefile 23 Feb 2021 09:25:32 -
@@ -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_dev0.0 # 5.0
-SHARED_LIBS += ag_gui0.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_gui1.0 # 5.0
+SHARED_LIBS += ag_map0.0 # 5.0
+SHARED_LIBS += ag_math 1.0 # 5.0
+SHARED_LIBS += ag_net0.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
Index: agar/distinfo
===
RCS file: /cvs/ports/x11/agar/agar/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- agar/distinfo 10 Oct 2016 09:33:17 - 1.1.1.1
+++ agar/distinfo 23 Feb 2021 09:25:32 -
@@ -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 -r1.1.1.1 patch-Makefile
--- agar/patches/patch-Makefile 10 Oct 2016 09:33:17 - 1.1.1.1
+++ agar/patches/patch-Makefile 23 Feb 2021 09:25:32 -
@@ -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}
