Re: update games/eduke32 for ion fury compatibility
On Fri, Dec 27, 2019 at 09:28:34PM -0800, Ryan Freeman wrote: > On Fri, Dec 27, 2019 at 08:43:47PM -0800, Ryan Freeman wrote: > > On Sat, Dec 28, 2019 at 03:18:28PM +1100, Jonathan Gray wrote: > > > On Fri, Dec 27, 2019 at 06:21:35PM -0800, Ryan Freeman wrote: > > > > On Sat, Dec 28, 2019 at 01:17:33AM +1100, Jonathan Gray wrote: > > > > > On Tue, Dec 24, 2019 at 08:16:22PM +1100, Jonathan Gray wrote: > > > > > > On Tue, Dec 24, 2019 at 09:22:27AM +0100, Solene Rapenne wrote: > > > > > > > Le Tue, 24 Dec 2019 10:46:41 +1100, > > > > > > > Jonathan Gray a écrit : > > > > > > > > > > > > > > > On Mon, Dec 23, 2019 at 07:41:32PM +0100, Solene Rapenne wrote: > > > > > > > > > This patch updates eduke32 to last version and enable playing > > > > > > > > > Ion > > > > > > > > > Fury > > > > > > > > > > > > > > > > > > most of the diff comes from the following thread > > > > > > > > > https://marc.info/?l=openbsd-misc&m=156907261602397&w=2 > > > > > > > > > > > > > > > > > > tested Ion Fury, works fine on an old T400 (smooth if > > > > > > > > > I disabled sound...) but smooth on a T480, it's really CPU > > > > > > > > > intensive > > > > > > > > > > > > > > > > > > duke32 shareware data still works fine out of the box > > > > > > > > > > > > > > > > This looks mostly fine but why have you dropped base-clang from > > > > > > > > COMPILER? > > > > > > > > > > > > > > > > > > > > > > I forgot to explain why I dropped base-clang, this is because > > > > > > > eduke32 > > > > > > > fails with this error: > > > > > > > > > > > > > > ===> Building for eduke32-2.0.0.8494 > > > > > > > mkdir -p obj/duke3d > > > > > > > c++ -std=gnu++11 -fno-exceptions -fno-rtti -fomit-frame-pointer > > > > > > > -fno-strict-aliasing -fno-threadsafe-statics -fjump-tables > > > > > > > -fno-stack-protector -O2 -pipe -W -Wall -Wextra -Wpointer-arith > > > > > > > -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings > > > > > > > -Wuninitialized -Wno-attributes -Wno-strict-overflow > > > > > > > -Isource/build/include -Isource/mact/include > > > > > > > -Isource/audiolib/include -Isource/glad/include > > > > > > > -Isource/voidwrap/include -MP -MMD -funsigned-char > > > > > > > -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -DNDEBUG -DNOASM > > > > > > > -DRENDERTYPESDL=1 -DSTARTUP_WINDOW -DUSE_OPENGL -DPOLYMER > > > > > > > -I/usr/local/include -DUSE_LIBVPX -DHAVE_VORBIS -DHAVE_FLAC > > > > > > > -DHAVE_XMP -DSDL_TARGET=2 -I/usr/local/include > > > > > > > -I/usr/local/include/SDL2 -I/usr/X11R6/include -D_REENTRANT > > > > > > > -I/usr/X11R6/include -DHAVE_GTK2 -I/usr/local/include/gtk-2.0 > > > > > > > -I/usr/local/lib/gtk-2.0/include -I/usr/local/include/pango-1.0 > > > > > > > -I/usr/local/include/gio-unix-2.0 -I/usr/X11R6/include > > > > > > > -I/usr/local/include/cairo -I/usr/local/include/atk-1.0 > > > > > > > -I/usr/local/include/gdk-pixbuf-2.0 -I/usr/local/include -pthread > > > > > > > -I/usr/local/include/fribidi -I/usr/X11R6/include/pixman-1 > > > > > > > -I/usr/local/include/libpng16 -I/usr/local/include/harfbuzz > > > > > > > -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include > > > > > > > -I/usr/X11R6/include/freetype2 -Isource/duke3d/src -c > > > > > > > source/duke3d/src/actors.cpp -o obj/duke3d/actors.o > > > > > > > In file included from source/duke3d/src/actors.cpp:25: > > > > > > > In file included from source/duke3d/src/duke3d.h:134: > > > > > > > In file included from source/duke3d/src/game.h:34: > > > > > > > source/duke3d/src/gamevars.h:254:85: error: fallthrough > > > > > > > annotation does not directly precede switch label > > > > > > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum > > > > > > > & (MAXPLAYERS-1)]; fallthrough__; > > > > > > > > > > > > > > ^ > > > > > > > source/build/include/compat.h:267:25: note: expanded from macro > > > > > > > 'fallthrough__' > > > > > > > # define fallthrough__ [[fallthrough]] > > > > > > > ^ > > > > > > > 1 error generated. > > > > > > > gmake: *** [GNUmakefile:1074: obj/duke3d/actors.o] Error 1 > > > > > > > *** Error 2 in . (/home/ports/infrastructure/mk/bsd.port.mk:2890 > > > > > > > '/home/ports/pobj/eduke32-2.0.0.8494/.build_done') > > > > > > > *** Error 1 in /usr/ports/games/eduke32 > > > > > > > (/home/ports/infrastructure/mk/bsd.port.mk:2556 'all') > > > > > > > > > > > > case GAMEVAR_PERACTOR: iptr = &var.pValues[vm.spriteNum & > > > > > > (MAXSPRITES-1)]; goto jmp; > > > > > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & > > > > > > (MAXPLAYERS-1)]; fallthrough__; > > > > > > jmp: default: *iptr = libdivide_s32_do(*iptr, dptr); break; > > > > > > > > > > > > it should be enough to change this to > > > > > > > > > > > > default: jmp: ... > > > > > > > > > > eduke32 rev 8495 and later has this change. > > > > > > > > > > > > > Thanks Jonathan, I built the
Re: update games/eduke32 for ion fury compatibility
On Fri, Dec 27, 2019 at 08:43:47PM -0800, Ryan Freeman wrote: > On Sat, Dec 28, 2019 at 03:18:28PM +1100, Jonathan Gray wrote: > > On Fri, Dec 27, 2019 at 06:21:35PM -0800, Ryan Freeman wrote: > > > On Sat, Dec 28, 2019 at 01:17:33AM +1100, Jonathan Gray wrote: > > > > On Tue, Dec 24, 2019 at 08:16:22PM +1100, Jonathan Gray wrote: > > > > > On Tue, Dec 24, 2019 at 09:22:27AM +0100, Solene Rapenne wrote: > > > > > > Le Tue, 24 Dec 2019 10:46:41 +1100, > > > > > > Jonathan Gray a écrit : > > > > > > > > > > > > > On Mon, Dec 23, 2019 at 07:41:32PM +0100, Solene Rapenne wrote: > > > > > > > > This patch updates eduke32 to last version and enable playing > > > > > > > > Ion > > > > > > > > Fury > > > > > > > > > > > > > > > > most of the diff comes from the following thread > > > > > > > > https://marc.info/?l=openbsd-misc&m=156907261602397&w=2 > > > > > > > > > > > > > > > > tested Ion Fury, works fine on an old T400 (smooth if > > > > > > > > I disabled sound...) but smooth on a T480, it's really CPU > > > > > > > > intensive > > > > > > > > > > > > > > > > duke32 shareware data still works fine out of the box > > > > > > > > > > > > > > This looks mostly fine but why have you dropped base-clang from > > > > > > > COMPILER? > > > > > > > > > > > > > > > > > > > I forgot to explain why I dropped base-clang, this is because > > > > > > eduke32 > > > > > > fails with this error: > > > > > > > > > > > > ===> Building for eduke32-2.0.0.8494 > > > > > > mkdir -p obj/duke3d > > > > > > c++ -std=gnu++11 -fno-exceptions -fno-rtti -fomit-frame-pointer > > > > > > -fno-strict-aliasing -fno-threadsafe-statics -fjump-tables > > > > > > -fno-stack-protector -O2 -pipe -W -Wall -Wextra -Wpointer-arith > > > > > > -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings > > > > > > -Wuninitialized -Wno-attributes -Wno-strict-overflow > > > > > > -Isource/build/include -Isource/mact/include > > > > > > -Isource/audiolib/include -Isource/glad/include > > > > > > -Isource/voidwrap/include -MP -MMD -funsigned-char > > > > > > -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -DNDEBUG -DNOASM > > > > > > -DRENDERTYPESDL=1 -DSTARTUP_WINDOW -DUSE_OPENGL -DPOLYMER > > > > > > -I/usr/local/include -DUSE_LIBVPX -DHAVE_VORBIS -DHAVE_FLAC > > > > > > -DHAVE_XMP -DSDL_TARGET=2 -I/usr/local/include > > > > > > -I/usr/local/include/SDL2 -I/usr/X11R6/include -D_REENTRANT > > > > > > -I/usr/X11R6/include -DHAVE_GTK2 -I/usr/local/include/gtk-2.0 > > > > > > -I/usr/local/lib/gtk-2.0/include -I/usr/local/include/pango-1.0 > > > > > > -I/usr/local/include/gio-unix-2.0 -I/usr/X11R6/include > > > > > > -I/usr/local/include/cairo -I/usr/local/include/atk-1.0 > > > > > > -I/usr/local/include/gdk-pixbuf-2.0 -I/usr/local/include -pthread > > > > > > -I/usr/local/include/fribidi -I/usr/X11R6/include/pixman-1 > > > > > > -I/usr/local/include/libpng16 -I/usr/local/include/harfbuzz > > > > > > -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include > > > > > > -I/usr/X11R6/include/freetype2 -Isource/duke3d/src -c > > > > > > source/duke3d/src/actors.cpp -o obj/duke3d/actors.o > > > > > > In file included from source/duke3d/src/actors.cpp:25: > > > > > > In file included from source/duke3d/src/duke3d.h:134: > > > > > > In file included from source/duke3d/src/game.h:34: > > > > > > source/duke3d/src/gamevars.h:254:85: error: fallthrough annotation > > > > > > does not directly precede switch label > > > > > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & > > > > > > (MAXPLAYERS-1)]; fallthrough__; > > > > > > > > > > > > ^ > > > > > > source/build/include/compat.h:267:25: note: expanded from macro > > > > > > 'fallthrough__' > > > > > > # define fallthrough__ [[fallthrough]] > > > > > > ^ > > > > > > 1 error generated. > > > > > > gmake: *** [GNUmakefile:1074: obj/duke3d/actors.o] Error 1 > > > > > > *** Error 2 in . (/home/ports/infrastructure/mk/bsd.port.mk:2890 > > > > > > '/home/ports/pobj/eduke32-2.0.0.8494/.build_done') > > > > > > *** Error 1 in /usr/ports/games/eduke32 > > > > > > (/home/ports/infrastructure/mk/bsd.port.mk:2556 'all') > > > > > > > > > > case GAMEVAR_PERACTOR: iptr = &var.pValues[vm.spriteNum & > > > > > (MAXSPRITES-1)]; goto jmp; > > > > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & > > > > > (MAXPLAYERS-1)]; fallthrough__; > > > > > jmp: default: *iptr = libdivide_s32_do(*iptr, dptr); break; > > > > > > > > > > it should be enough to change this to > > > > > > > > > > default: jmp: ... > > > > > > > > eduke32 rev 8495 and later has this change. > > > > > > > > > > Thanks Jonathan, I built the port with that change cherry-picked, plus > > > base-clang > > > re-added to the COMPILERS line. I hit this error: > > > > > > c++ -std=gnu++11 -fno-exceptions -fno-rtti -fomit-frame-pointer > > > -fno-strict-aliasing -fno-threadsafe-sta
Re: update games/eduke32 for ion fury compatibility
On Fri, Dec 27, 2019 at 08:43:47PM -0800, Ryan Freeman wrote: > On Sat, Dec 28, 2019 at 03:18:28PM +1100, Jonathan Gray wrote: > > On Fri, Dec 27, 2019 at 06:21:35PM -0800, Ryan Freeman wrote: > > > On Sat, Dec 28, 2019 at 01:17:33AM +1100, Jonathan Gray wrote: > > > > On Tue, Dec 24, 2019 at 08:16:22PM +1100, Jonathan Gray wrote: > > > > > On Tue, Dec 24, 2019 at 09:22:27AM +0100, Solene Rapenne wrote: > > > > > > Le Tue, 24 Dec 2019 10:46:41 +1100, > > > > > > Jonathan Gray a écrit : > > > > > > > > > > > > > On Mon, Dec 23, 2019 at 07:41:32PM +0100, Solene Rapenne wrote: > > > > > > > > This patch updates eduke32 to last version and enable playing > > > > > > > > Ion > > > > > > > > Fury > > > > > > > > > > > > > > > > most of the diff comes from the following thread > > > > > > > > https://marc.info/?l=openbsd-misc&m=156907261602397&w=2 > > > > > > > > > > > > > > > > tested Ion Fury, works fine on an old T400 (smooth if > > > > > > > > I disabled sound...) but smooth on a T480, it's really CPU > > > > > > > > intensive > > > > > > > > > > > > > > > > duke32 shareware data still works fine out of the box > > > > > > > > > > > > > > This looks mostly fine but why have you dropped base-clang from > > > > > > > COMPILER? > > > > > > > > > > > > > > > > > > > I forgot to explain why I dropped base-clang, this is because > > > > > > eduke32 > > > > > > fails with this error: > > > > > > > > > > > > ===> Building for eduke32-2.0.0.8494 > > > > > > mkdir -p obj/duke3d > > > > > > c++ -std=gnu++11 -fno-exceptions -fno-rtti -fomit-frame-pointer > > > > > > -fno-strict-aliasing -fno-threadsafe-statics -fjump-tables > > > > > > -fno-stack-protector -O2 -pipe -W -Wall -Wextra -Wpointer-arith > > > > > > -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings > > > > > > -Wuninitialized -Wno-attributes -Wno-strict-overflow > > > > > > -Isource/build/include -Isource/mact/include > > > > > > -Isource/audiolib/include -Isource/glad/include > > > > > > -Isource/voidwrap/include -MP -MMD -funsigned-char > > > > > > -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -DNDEBUG -DNOASM > > > > > > -DRENDERTYPESDL=1 -DSTARTUP_WINDOW -DUSE_OPENGL -DPOLYMER > > > > > > -I/usr/local/include -DUSE_LIBVPX -DHAVE_VORBIS -DHAVE_FLAC > > > > > > -DHAVE_XMP -DSDL_TARGET=2 -I/usr/local/include > > > > > > -I/usr/local/include/SDL2 -I/usr/X11R6/include -D_REENTRANT > > > > > > -I/usr/X11R6/include -DHAVE_GTK2 -I/usr/local/include/gtk-2.0 > > > > > > -I/usr/local/lib/gtk-2.0/include -I/usr/local/include/pango-1.0 > > > > > > -I/usr/local/include/gio-unix-2.0 -I/usr/X11R6/include > > > > > > -I/usr/local/include/cairo -I/usr/local/include/atk-1.0 > > > > > > -I/usr/local/include/gdk-pixbuf-2.0 -I/usr/local/include -pthread > > > > > > -I/usr/local/include/fribidi -I/usr/X11R6/include/pixman-1 > > > > > > -I/usr/local/include/libpng16 -I/usr/local/include/harfbuzz > > > > > > -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include > > > > > > -I/usr/X11R6/include/freetype2 -Isource/duke3d/src -c > > > > > > source/duke3d/src/actors.cpp -o obj/duke3d/actors.o > > > > > > In file included from source/duke3d/src/actors.cpp:25: > > > > > > In file included from source/duke3d/src/duke3d.h:134: > > > > > > In file included from source/duke3d/src/game.h:34: > > > > > > source/duke3d/src/gamevars.h:254:85: error: fallthrough annotation > > > > > > does not directly precede switch label > > > > > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & > > > > > > (MAXPLAYERS-1)]; fallthrough__; > > > > > > > > > > > > ^ > > > > > > source/build/include/compat.h:267:25: note: expanded from macro > > > > > > 'fallthrough__' > > > > > > # define fallthrough__ [[fallthrough]] > > > > > > ^ > > > > > > 1 error generated. > > > > > > gmake: *** [GNUmakefile:1074: obj/duke3d/actors.o] Error 1 > > > > > > *** Error 2 in . (/home/ports/infrastructure/mk/bsd.port.mk:2890 > > > > > > '/home/ports/pobj/eduke32-2.0.0.8494/.build_done') > > > > > > *** Error 1 in /usr/ports/games/eduke32 > > > > > > (/home/ports/infrastructure/mk/bsd.port.mk:2556 'all') > > > > > > > > > > case GAMEVAR_PERACTOR: iptr = &var.pValues[vm.spriteNum & > > > > > (MAXSPRITES-1)]; goto jmp; > > > > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & > > > > > (MAXPLAYERS-1)]; fallthrough__; > > > > > jmp: default: *iptr = libdivide_s32_do(*iptr, dptr); break; > > > > > > > > > > it should be enough to change this to > > > > > > > > > > default: jmp: ... > > > > > > > > eduke32 rev 8495 and later has this change. > > > > > > > > > > Thanks Jonathan, I built the port with that change cherry-picked, plus > > > base-clang > > > re-added to the COMPILERS line. I hit this error: > > > > > > c++ -std=gnu++11 -fno-exceptions -fno-rtti -fomit-frame-pointer > > > -fno-strict-aliasing -fno-threadsafe-sta
Re: update games/eduke32 for ion fury compatibility
On Sat, Dec 28, 2019 at 03:18:28PM +1100, Jonathan Gray wrote: > On Fri, Dec 27, 2019 at 06:21:35PM -0800, Ryan Freeman wrote: > > On Sat, Dec 28, 2019 at 01:17:33AM +1100, Jonathan Gray wrote: > > > On Tue, Dec 24, 2019 at 08:16:22PM +1100, Jonathan Gray wrote: > > > > On Tue, Dec 24, 2019 at 09:22:27AM +0100, Solene Rapenne wrote: > > > > > Le Tue, 24 Dec 2019 10:46:41 +1100, > > > > > Jonathan Gray a écrit : > > > > > > > > > > > On Mon, Dec 23, 2019 at 07:41:32PM +0100, Solene Rapenne wrote: > > > > > > > This patch updates eduke32 to last version and enable playing Ion > > > > > > > Fury > > > > > > > > > > > > > > most of the diff comes from the following thread > > > > > > > https://marc.info/?l=openbsd-misc&m=156907261602397&w=2 > > > > > > > > > > > > > > tested Ion Fury, works fine on an old T400 (smooth if > > > > > > > I disabled sound...) but smooth on a T480, it's really CPU > > > > > > > intensive > > > > > > > > > > > > > > duke32 shareware data still works fine out of the box > > > > > > > > > > > > This looks mostly fine but why have you dropped base-clang from > > > > > > COMPILER? > > > > > > > > > > > > > > > > I forgot to explain why I dropped base-clang, this is because eduke32 > > > > > fails with this error: > > > > > > > > > > ===> Building for eduke32-2.0.0.8494 > > > > > mkdir -p obj/duke3d > > > > > c++ -std=gnu++11 -fno-exceptions -fno-rtti -fomit-frame-pointer > > > > > -fno-strict-aliasing -fno-threadsafe-statics -fjump-tables > > > > > -fno-stack-protector -O2 -pipe -W -Wall -Wextra -Wpointer-arith > > > > > -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings > > > > > -Wuninitialized -Wno-attributes -Wno-strict-overflow > > > > > -Isource/build/include -Isource/mact/include > > > > > -Isource/audiolib/include -Isource/glad/include > > > > > -Isource/voidwrap/include -MP -MMD -funsigned-char -U_FORTIFY_SOURCE > > > > > -D_FORTIFY_SOURCE=0 -DNDEBUG -DNOASM -DRENDERTYPESDL=1 > > > > > -DSTARTUP_WINDOW -DUSE_OPENGL -DPOLYMER -I/usr/local/include > > > > > -DUSE_LIBVPX -DHAVE_VORBIS -DHAVE_FLAC -DHAVE_XMP -DSDL_TARGET=2 > > > > > -I/usr/local/include -I/usr/local/include/SDL2 -I/usr/X11R6/include > > > > > -D_REENTRANT -I/usr/X11R6/include -DHAVE_GTK2 > > > > > -I/usr/local/include/gtk-2.0 -I/usr/local/lib/gtk-2.0/include > > > > > -I/usr/local/include/pango-1.0 -I/usr/local/include/gio-unix-2.0 > > > > > -I/usr/X11R6/include -I/usr/local/include/cairo > > > > > -I/usr/local/include/atk-1.0 -I/usr/local/include/gdk-pixbuf-2.0 > > > > > -I/usr/local/include -pthread -I/usr/local/include/fribidi > > > > > -I/usr/X11R6/include/pixman-1 -I/usr/local/include/libpng16 > > > > > -I/usr/local/include/harfbuzz -I/usr/local/include/glib-2.0 > > > > > -I/usr/local/lib/glib-2.0/include -I/usr/X11R6/include/freetype2 > > > > > -Isource/duke3d/src -c source/duke3d/src/actors.cpp -o > > > > > obj/duke3d/actors.o > > > > > In file included from source/duke3d/src/actors.cpp:25: > > > > > In file included from source/duke3d/src/duke3d.h:134: > > > > > In file included from source/duke3d/src/game.h:34: > > > > > source/duke3d/src/gamevars.h:254:85: error: fallthrough annotation > > > > > does not directly precede switch label > > > > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & > > > > > (MAXPLAYERS-1)]; fallthrough__; > > > > > > > > > > ^ > > > > > source/build/include/compat.h:267:25: note: expanded from macro > > > > > 'fallthrough__' > > > > > # define fallthrough__ [[fallthrough]] > > > > > ^ > > > > > 1 error generated. > > > > > gmake: *** [GNUmakefile:1074: obj/duke3d/actors.o] Error 1 > > > > > *** Error 2 in . (/home/ports/infrastructure/mk/bsd.port.mk:2890 > > > > > '/home/ports/pobj/eduke32-2.0.0.8494/.build_done') > > > > > *** Error 1 in /usr/ports/games/eduke32 > > > > > (/home/ports/infrastructure/mk/bsd.port.mk:2556 'all') > > > > > > > > case GAMEVAR_PERACTOR: iptr = &var.pValues[vm.spriteNum & > > > > (MAXSPRITES-1)]; goto jmp; > > > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & > > > > (MAXPLAYERS-1)]; fallthrough__; > > > > jmp: default: *iptr = libdivide_s32_do(*iptr, dptr); break; > > > > > > > > it should be enough to change this to > > > > > > > > default: jmp: ... > > > > > > eduke32 rev 8495 and later has this change. > > > > > > > Thanks Jonathan, I built the port with that change cherry-picked, plus > > base-clang > > re-added to the COMPILERS line. I hit this error: > > > > c++ -std=gnu++11 -fno-exceptions -fno-rtti -fomit-frame-pointer > > -fno-strict-aliasing -fno-threadsafe-statics -fjump-tables > > -fno-stack-protector -O2 -pipe -W -Wall -Wextra -Wpointer-arith > > -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings -Wuninitialized > > -Wno-attributes -Wno-strict-overflow -Isource/build/include > > -Isource/mact/include -Isource/a
Re: update games/eduke32 for ion fury compatibility
On Fri, Dec 27, 2019 at 06:21:35PM -0800, Ryan Freeman wrote: > On Sat, Dec 28, 2019 at 01:17:33AM +1100, Jonathan Gray wrote: > > On Tue, Dec 24, 2019 at 08:16:22PM +1100, Jonathan Gray wrote: > > > On Tue, Dec 24, 2019 at 09:22:27AM +0100, Solene Rapenne wrote: > > > > Le Tue, 24 Dec 2019 10:46:41 +1100, > > > > Jonathan Gray a écrit : > > > > > > > > > On Mon, Dec 23, 2019 at 07:41:32PM +0100, Solene Rapenne wrote: > > > > > > This patch updates eduke32 to last version and enable playing Ion > > > > > > Fury > > > > > > > > > > > > most of the diff comes from the following thread > > > > > > https://marc.info/?l=openbsd-misc&m=156907261602397&w=2 > > > > > > > > > > > > tested Ion Fury, works fine on an old T400 (smooth if > > > > > > I disabled sound...) but smooth on a T480, it's really CPU intensive > > > > > > > > > > > > duke32 shareware data still works fine out of the box > > > > > > > > > > This looks mostly fine but why have you dropped base-clang from > > > > > COMPILER? > > > > > > > > > > > > > I forgot to explain why I dropped base-clang, this is because eduke32 > > > > fails with this error: > > > > > > > > ===> Building for eduke32-2.0.0.8494 > > > > mkdir -p obj/duke3d > > > > c++ -std=gnu++11 -fno-exceptions -fno-rtti -fomit-frame-pointer > > > > -fno-strict-aliasing -fno-threadsafe-statics -fjump-tables > > > > -fno-stack-protector -O2 -pipe -W -Wall -Wextra -Wpointer-arith > > > > -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings > > > > -Wuninitialized -Wno-attributes -Wno-strict-overflow > > > > -Isource/build/include -Isource/mact/include -Isource/audiolib/include > > > > -Isource/glad/include -Isource/voidwrap/include -MP -MMD > > > > -funsigned-char -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -DNDEBUG -DNOASM > > > > -DRENDERTYPESDL=1 -DSTARTUP_WINDOW -DUSE_OPENGL -DPOLYMER > > > > -I/usr/local/include -DUSE_LIBVPX -DHAVE_VORBIS -DHAVE_FLAC -DHAVE_XMP > > > > -DSDL_TARGET=2 -I/usr/local/include -I/usr/local/include/SDL2 > > > > -I/usr/X11R6/include -D_REENTRANT -I/usr/X11R6/include -DHAVE_GTK2 > > > > -I/usr/local/include/gtk-2.0 -I/usr/local/lib/gtk-2.0/include > > > > -I/usr/local/include/pango-1.0 -I/usr/local/include/gio-unix-2.0 > > > > -I/usr/X11R6/include -I/usr/local/include/cairo > > > > -I/usr/local/include/atk-1.0 -I/usr/local/include/gdk-pixbuf-2.0 > > > > -I/usr/local/include -pthread -I/usr/local/include/fribidi > > > > -I/usr/X11R6/include/pixman-1 -I/usr/local/include/libpng16 > > > > -I/usr/local/include/harfbuzz -I/usr/local/include/glib-2.0 > > > > -I/usr/local/lib/glib-2.0/include -I/usr/X11R6/include/freetype2 > > > > -Isource/duke3d/src -c source/duke3d/src/actors.cpp -o > > > > obj/duke3d/actors.o > > > > In file included from source/duke3d/src/actors.cpp:25: > > > > In file included from source/duke3d/src/duke3d.h:134: > > > > In file included from source/duke3d/src/game.h:34: > > > > source/duke3d/src/gamevars.h:254:85: error: fallthrough annotation does > > > > not directly precede switch label > > > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & > > > > (MAXPLAYERS-1)]; fallthrough__; > > > > > > > > ^ > > > > source/build/include/compat.h:267:25: note: expanded from macro > > > > 'fallthrough__' > > > > # define fallthrough__ [[fallthrough]] > > > > ^ > > > > 1 error generated. > > > > gmake: *** [GNUmakefile:1074: obj/duke3d/actors.o] Error 1 > > > > *** Error 2 in . (/home/ports/infrastructure/mk/bsd.port.mk:2890 > > > > '/home/ports/pobj/eduke32-2.0.0.8494/.build_done') > > > > *** Error 1 in /usr/ports/games/eduke32 > > > > (/home/ports/infrastructure/mk/bsd.port.mk:2556 'all') > > > > > > case GAMEVAR_PERACTOR: iptr = &var.pValues[vm.spriteNum & > > > (MAXSPRITES-1)]; goto jmp; > > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & > > > (MAXPLAYERS-1)]; fallthrough__; > > > jmp: default: *iptr = libdivide_s32_do(*iptr, dptr); break; > > > > > > it should be enough to change this to > > > > > > default: jmp: ... > > > > eduke32 rev 8495 and later has this change. > > > > Thanks Jonathan, I built the port with that change cherry-picked, plus > base-clang > re-added to the COMPILERS line. I hit this error: > > c++ -std=gnu++11 -fno-exceptions -fno-rtti -fomit-frame-pointer > -fno-strict-aliasing -fno-threadsafe-statics -fjump-tables > -fno-stack-protector -O2 -pipe -W -Wall -Wextra -Wpointer-arith > -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings -Wuninitialized > -Wno-attributes -Wno-strict-overflow -Isource/build/include > -Isource/mact/include -Isource/audiolib/include -Isource/glad/include > -Isource/voidwrap/include -MP -MMD -funsigned-char -U_FORTIFY_SOURCE > -D_FORTIFY_SOURCE=0 -DNDEBUG -DNOASM -DRENDERTYPESDL=1 -DSTARTUP_WINDOW > -DUSE_OPENGL -DPOLYMER -I/usr/local/include -DUSE_LIBVPX -DHAVE_VORBIS > -DHAVE_FLAC -
Re: Ruby 2.7.0
On Fri, 27 Dec 2019 15:56:58 -0800 Jeremy Evans wrote: > I fixed the copy coroutine issue upstream. For the other issue, it may > be easier to work around with rb_cv_function_name_string=__func__ added > to CONFIGURE_ENV, instead of patching configure. I haven't figured out > how to fix that properly upstream in configure.ac yet. Once I can > recreate the issue in a development environment, I'll work on that. Might need to delete the RUBY_WERROR_FLAG call around the __func__ check in configure.ac. The called macro is in tool/m4/ruby_werror_flag.m4. I did a "make test" in /usr/ports/lang/ruby/2.7 on powerpc. Results are better than ever: I saw 2 failures, 2 errors. The early tests (before the big ./test/runner.rb) all pass. I feared that ./test/runner.rb got stuck in an infinite loop, but it wasn't stuck: it runs thousands of tests without output. If I let it run for a few hours, it finishes. I'm pasting the end of "make test" output for powerpc. --George ruby -v: ruby 2.7.0p0 (2019-12-25 revision 647ee6f091) [powerpc-openbsd] exec ./miniruby -I./lib -I. -I.ext/common ./tool/runruby.rb --extout=.ext -- - -disable-gems "./test/runner.rb" --ruby="./miniruby -I./lib -I. -I.ext/common . /tool/runruby.rb --extout=.ext -- --disable-gems" --excludes-dir=./test/exclude s --name=!/memory_leak/ generate_index tests are being skipped. Install builder gem. Gem::Indexer tests are being skipped. Install builder gem. Run options: "--ruby=./miniruby -I./lib -I. -I.ext/common ./tool/runruby.rb --e xtout=.ext -- --disable-gems" --excludes-dir=./test/excludes --name=!/memory_le ak/ # Running tests: Leaked thread: DRbTests::TestDRbTCP#test_immediate_close: # 1) Failure: Fiddle::TestImport#test_gettimeofday [/usr/ports/pobj/ruby-2.7.0/ruby-2.7.0/test /fiddle/test_import.rb:126]: Failed assertion, no message given. 2) Failure: TestFiber#test_stack_size [/usr/ports/pobj/ruby-2.7.0/ruby-2.7.0/test/ruby/test_ fiber.rb:389]: Expected 17 to be >= 18. 3) Error: TestRefinement#test_prepend_after_refine_wb_miss: Timeout::Error: execution of assert_normal_exit expired timeout (30 sec) pid 43213 exit 1 | -:38:in `block in ': NameError | from -:3:in `times' | from -:3:in `' | /usr/ports/pobj/ruby-2.7.0/ruby-2.7.0/test/ruby/test_refinement.rb:913:in `t est_prepend_after_refine_wb_miss' 4) Error: TestWEBrickSSLServer#test_slow_connect: Timeout::Error: execution expired /usr/ports/pobj/ruby-2.7.0/ruby-2.7.0/.ext/common/openssl/ssl.rb:235:in `add r' /usr/ports/pobj/ruby-2.7.0/ruby-2.7.0/.ext/common/openssl/ssl.rb:235:in `add r' /usr/ports/pobj/ruby-2.7.0/ruby-2.7.0/lib/webrick/server.rb:110:in `initiali ze' /usr/ports/pobj/ruby-2.7.0/ruby-2.7.0/test/webrick/utils.rb:56:in `new' /usr/ports/pobj/ruby-2.7.0/ruby-2.7.0/test/webrick/utils.rb:56:in `block in start_server' Finished tests in 9608.291331s, 2.1812 tests/s, 283.6097 assertions/s. 20958 tests, 2725005 assertions, 2 failures, 2 errors, 72 skips ruby -v: ruby 2.7.0p0 (2019-12-25 revision 647ee6f091) [powerpc-openbsd] *** Error 4 in /usr/ports/pobj/ruby-2.7.0/ruby-2.7.0 (Makefile:1470 'yes-test-al l') *** Error 1 in . (Makefile:43 'do-test') *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2919 '/usr/ports/pobj /ruby-2.7.0/.test_done') *** Error 1 in /usr/ports/lang/ruby/2.7 (/usr/ports/infrastructure/mk/bsd.port.m k:2556 'test')
Re: update games/eduke32 for ion fury compatibility
On Sat, Dec 28, 2019 at 01:17:33AM +1100, Jonathan Gray wrote: > On Tue, Dec 24, 2019 at 08:16:22PM +1100, Jonathan Gray wrote: > > On Tue, Dec 24, 2019 at 09:22:27AM +0100, Solene Rapenne wrote: > > > Le Tue, 24 Dec 2019 10:46:41 +1100, > > > Jonathan Gray a écrit : > > > > > > > On Mon, Dec 23, 2019 at 07:41:32PM +0100, Solene Rapenne wrote: > > > > > This patch updates eduke32 to last version and enable playing Ion > > > > > Fury > > > > > > > > > > most of the diff comes from the following thread > > > > > https://marc.info/?l=openbsd-misc&m=156907261602397&w=2 > > > > > > > > > > tested Ion Fury, works fine on an old T400 (smooth if > > > > > I disabled sound...) but smooth on a T480, it's really CPU intensive > > > > > > > > > > duke32 shareware data still works fine out of the box > > > > > > > > This looks mostly fine but why have you dropped base-clang from > > > > COMPILER? > > > > > > > > > > I forgot to explain why I dropped base-clang, this is because eduke32 > > > fails with this error: > > > > > > ===> Building for eduke32-2.0.0.8494 > > > mkdir -p obj/duke3d > > > c++ -std=gnu++11 -fno-exceptions -fno-rtti -fomit-frame-pointer > > > -fno-strict-aliasing -fno-threadsafe-statics -fjump-tables > > > -fno-stack-protector -O2 -pipe -W -Wall -Wextra -Wpointer-arith > > > -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings -Wuninitialized > > > -Wno-attributes -Wno-strict-overflow -Isource/build/include > > > -Isource/mact/include -Isource/audiolib/include -Isource/glad/include > > > -Isource/voidwrap/include -MP -MMD -funsigned-char -U_FORTIFY_SOURCE > > > -D_FORTIFY_SOURCE=0 -DNDEBUG -DNOASM -DRENDERTYPESDL=1 -DSTARTUP_WINDOW > > > -DUSE_OPENGL -DPOLYMER -I/usr/local/include -DUSE_LIBVPX -DHAVE_VORBIS > > > -DHAVE_FLAC -DHAVE_XMP -DSDL_TARGET=2 -I/usr/local/include > > > -I/usr/local/include/SDL2 -I/usr/X11R6/include -D_REENTRANT > > > -I/usr/X11R6/include -DHAVE_GTK2 -I/usr/local/include/gtk-2.0 > > > -I/usr/local/lib/gtk-2.0/include -I/usr/local/include/pango-1.0 > > > -I/usr/local/include/gio-unix-2.0 -I/usr/X11R6/include > > > -I/usr/local/include/cairo -I/usr/local/include/atk-1.0 > > > -I/usr/local/include/gdk-pixbuf-2.0 -I/usr/local/include -pthread > > > -I/usr/local/include/fribidi -I/usr/X11R6/include/pixman-1 > > > -I/usr/local/include/libpng16 -I/usr/local/include/harfbuzz > > > -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include > > > -I/usr/X11R6/include/freetype2 -Isource/duke3d/src -c > > > source/duke3d/src/actors.cpp -o obj/duke3d/actors.o > > > In file included from source/duke3d/src/actors.cpp:25: > > > In file included from source/duke3d/src/duke3d.h:134: > > > In file included from source/duke3d/src/game.h:34: > > > source/duke3d/src/gamevars.h:254:85: error: fallthrough annotation does > > > not directly precede switch label > > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & > > > (MAXPLAYERS-1)]; fallthrough__; > > > > > > ^ > > > source/build/include/compat.h:267:25: note: expanded from macro > > > 'fallthrough__' > > > # define fallthrough__ [[fallthrough]] > > > ^ > > > 1 error generated. > > > gmake: *** [GNUmakefile:1074: obj/duke3d/actors.o] Error 1 > > > *** Error 2 in . (/home/ports/infrastructure/mk/bsd.port.mk:2890 > > > '/home/ports/pobj/eduke32-2.0.0.8494/.build_done') > > > *** Error 1 in /usr/ports/games/eduke32 > > > (/home/ports/infrastructure/mk/bsd.port.mk:2556 'all') > > > > case GAMEVAR_PERACTOR: iptr = &var.pValues[vm.spriteNum & (MAXSPRITES-1)]; > > goto jmp; > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & (MAXPLAYERS-1)]; > > fallthrough__; > > jmp: default: *iptr = libdivide_s32_do(*iptr, dptr); break; > > > > it should be enough to change this to > > > > default: jmp: ... > > eduke32 rev 8495 and later has this change. > Thanks Jonathan, I built the port with that change cherry-picked, plus base-clang re-added to the COMPILERS line. I hit this error: c++ -std=gnu++11 -fno-exceptions -fno-rtti -fomit-frame-pointer -fno-strict-aliasing -fno-threadsafe-statics -fjump-tables -fno-stack-protector -O2 -pipe -W -Wall -Wextra -Wpointer-arith -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings -Wuninitialized -Wno-attributes -Wno-strict-overflow -Isource/build/include -Isource/mact/include -Isource/audiolib/include -Isource/glad/include -Isource/voidwrap/include -MP -MMD -funsigned-char -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -DNDEBUG -DNOASM -DRENDERTYPESDL=1 -DSTARTUP_WINDOW -DUSE_OPENGL -DPOLYMER -I/usr/local/include -DUSE_LIBVPX -DHAVE_VORBIS -DHAVE_FLAC -DHAVE_XMP -DSDL_TARGET=2 -I/usr/local/include -I/usr/local/include/SDL2 -I/usr/X11R6/include -D_REENTRANT -I/usr/X11R6/include -DHAVE_GTK2 -I/usr/local/include/gtk-2.0 -I/usr/local/lib/gtk-2.0/include -I/usr/local/include/pango-1.0 -I/usr/local/include/gio-u
Re: UPDATE: mail/msmtp 1.6.6p1 -> 1.8.6
Friendly ping. Xiyue Deng writes: > Dear ports maintainers, > > I have updated msmtp to the latest version (1.8.6) in ports. It > includes the following changes: > > * GnuTLS is recommended and deprecated OpenSSL. > - So now GnuTLS is part of the build dependencies. > > * Use libidn2 instead of the older libidn. > - Configure switch remains as "--with-libidn". > > * Refreshed patches to apply cleanly. > > I also have a few questions when working on this ports: > > * Many of the patches just replace "#!/usr/bin/env bash" to > "#!/bin/sh". Now most of scripts are changed to use "#!/usr/bin/env > sh" which should now be the same thing. Should we just drop those > patches? > > * One of the patches changes the system /etc/msmtprc to provide an > "account default" that listens on localhost:25, which will then use > smtpd as server by default. I think the intention is to provide a > working configure that works out of the box. However this may not do > what you want because if one try to configure an account in a user > configuration and somehow it contains errors (e.g. not properly > provide a "from" address), msmtp will just send the mail through smtpd > and returns OK which will result in the mail stuck in the system mail > queue forever. So my suggestion is to leave this file untouched so > that the system /etc/msmtprc will just provide a fake "account > default" and any mail not handled with a user provided account will > fail immediately. > > Tested on mips64el/loongson on 6.6-stable. Please let me know what you > think. The diff is attached. > > Index: Makefile > === > RCS file: /cvs/ports/mail/msmtp/Makefile,v > retrieving revision 1.47 > diff -u -p -r1.47 Makefile > --- Makefile 12 Jul 2019 20:47:30 - 1.47 > +++ Makefile 21 Dec 2019 13:54:18 - > @@ -2,27 +2,27 @@ > > COMMENT =SMTP plugin for MUAs > > -DISTNAME = msmtp-1.6.6 > +DISTNAME = msmtp-1.8.6 > CATEGORIES = mail > -REVISION = 1 > > HOMEPAGE = https://marlam.de/msmtp/ > > # GPLv3 > PERMIT_PACKAGE = Yes > > -WANTLIB = c crypto iconv idn intl ssl > +WANTLIB = c crypto iconv idn2 intl gnutls > > MASTER_SITES = https://marlam.de/msmtp/releases/ > EXTRACT_SUFX = .tar.xz > > -LIB_DEPENDS =devel/libidn > +LIB_DEPENDS =devel/libidn2 \ > + security/gnutls > > SEPARATE_BUILD = Yes > CONFIGURE_STYLE =gnu > CONFIGURE_ARGS = --with-libgsasl=no \ > --with-libidn=yes \ > - --with-tls=openssl \ > + --with-tls=gnutls \ > --without-libsecret > > post-install: > Index: distinfo > === > RCS file: /cvs/ports/mail/msmtp/distinfo,v > retrieving revision 1.30 > diff -u -p -r1.30 distinfo > --- distinfo 26 Mar 2017 13:34:06 - 1.30 > +++ distinfo 21 Dec 2019 13:54:18 - > @@ -1,2 +1,2 @@ > -SHA256 (msmtp-1.6.6.tar.xz) = 2hXbH2K9AgH85TEK24nIYYi+kc10W3yztiuBpQHn+14= > -SIZE (msmtp-1.6.6.tar.xz) = 283744 > +SHA256 (msmtp-1.8.6.tar.xz) = ZiXxR0MMZbqFJ/UsT+XU0zVS08D7bXk7p9+BmjswQuE= > +SIZE (msmtp-1.8.6.tar.xz) = 339732 > Index: patches/patch-doc_msmtprc-system_example > === > RCS file: /cvs/ports/mail/msmtp/patches/patch-doc_msmtprc-system_example,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-doc_msmtprc-system_example > --- patches/patch-doc_msmtprc-system_example 13 Feb 2009 14:59:01 - > 1.1 > +++ patches/patch-doc_msmtprc-system_example 21 Dec 2019 13:54:18 - > @@ -1,16 +1,25 @@ > $OpenBSD: patch-doc_msmtprc-system_example,v 1.1 2009/02/13 14:59:01 pirofti > Exp $ > doc/msmtprc-system.example.orig Sat Apr 7 18:20:34 2007 > -+++ doc/msmtprc-system.example Fri Feb 13 16:53:09 2009 > -@@ -6,10 +6,10 @@ > +--- doc/msmtprc-system.example.orig Thu Dec 13 00:22:06 2018 > doc/msmtprc-system.example Sat Dec 21 01:17:17 2019 > +@@ -6,15 +6,15 @@ > account default > > - # The SMTP smarthost. > + # The SMTP smarthost > -host mailhub.oursite.example > +host localhost > > - # Construct envelope-from addresses of the form "user@oursite.example". > +-# Use TLS on port 465 > +-port 465 > +-tls on > +-tls_starttls off > ++## Use TLS on port 465 > ++#port 465 > ++#tls on > ++#tls_starttls off > + > + # Construct envelope-from addresses of the form "user@oursite.example" > -#auto_from on > +auto_from on > #maildomain oursite.example > > - # Use TLS. > + # Syslog logging with facility LOG_MAIL instead of the default LOG_USER > Index: patches/patch-scripts_msmtpq_msmtp-queue > === > RCS file: /cvs/ports/mail/msmtp/patches/patch-script
Re: Ruby 2.7.0
On 12/27 12:58, Jeremy Evans wrote: > On 12/26 11:38, George Koehler wrote: > > On Thu, 26 Dec 2019 21:58:36 +0100 > > Jeremie Courreges-Anglas wrote: > > > > > On Wed, Dec 25 2019, Jeremy Evans wrote: > > > > Tested on amd64, for about 9 months starting with the first preview > > > > release. OK to import? > > > > > > This fails on sparc64, log attached. It *seems* that the configure > > > tests are picky because of APIWARN and libgmp. And indeed the build > > > fails similarly on amd64 with USE_LLD=No (only ld.bfd warns about unsafe > > > functions, ld.lld does not). > > > > I built ruby-2.7.0 on macppc/powerpc with the diff below. > > > > The ld.bfd warning from libgmp broke the configure test for __func__, so > > RUBY_FUNCTION_NAME_STRING went missing. This test might have been > > broken for a long time, but RUBY_FUNCTION_NAME_STRING was optional until > > Nov 17 [1], so it didn't break the build before 2.7.0. Some other tests > > in my config.log get the same warning from libgmp, but seem to ignore > > the warning. For upstream Ruby, I suggest to check if __func__ can > > become an allowed C99 feature [2]. If so, Ruby can remove this > > configure test and always use __func__. > > > > I got another error where coroutine/copy/Context.h included , > > so I deleted the include. OpenBSD (except amd64, i386) is the only > > system where Ruby enables --with-coroutine=copy by default, so this code > > is mostly for OpenBSD, but didn't work on OpenBSD, because we have no > > ! I don't check HAVE_ALLOCA_H because the coroutine code > > doesn't include the Ruby header for HAVE_ALLOCA_H. > > > > I have not reported these bugs to https://bugs.ruby-lang.org/ but might > > report them tomorrow. --George > > Thank you very much to both Jeremie for the report and George for the > analysis and patch. Jeremie, does the diff below work for sparc64? If > so, is it OK to import? I accidentally deleted the diff George sent when replying, but that's the diff I was referring to. > I'll fix both issues upstream and mark them for backporting, so they > hopefully will be fixed in Ruby 2.7.1. I fixed the copy coroutine issue upstream. For the other issue, it may be easier to work around with rb_cv_function_name_string=__func__ added to CONFIGURE_ENV, instead of patching configure. I haven't figured out how to fix that properly upstream in configure.ac yet. Once I can recreate the issue in a development environment, I'll work on that. Thanks, Jeremy
Re: Build fix for textproc/aspell/core on mips64el
Friendly ping.
Xiyue Deng writes:
> Stuart Henderson writes:
>
>> On 2019/12/24 00:29, Xiyue Deng wrote:
>>> Hi ports maintainers,
>>>
>>> Some time ago I reported textproc/aspell/core build issue[1] which was
>>> due to a ld.bfd ICE issue. Recently Stuart and Brian helped me fix
>>> several other build failure related to ld.bfd by using ld.lld, and I
>>> applied a similar fix to aspell and it also worked.
>>>
>>> The patch is attached. As aspell doesn't seem to have a dedicated
>>> maintainer someone will be needed to help submit it. Thanks!
>>>
>>> [1] https://marc.info/?l=openbsd-ports&m=154900374211243&w=2
>>>
>>
>>> Index: Makefile
>>> ===
>>> RCS file: /cvs/ports/textproc/aspell/core/Makefile,v
>>> retrieving revision 1.46
>>> diff -u -p -r1.46 Makefile
>>> --- Makefile12 Jul 2019 20:49:56 - 1.46
>>> +++ Makefile24 Dec 2019 07:36:57 -
>>> @@ -24,7 +24,7 @@ PERMIT_PACKAGE= Yes
>>>
>>> WANTLIB= c iconv intl m curses pthread ${COMPILER_LIBCXX}
>>>
>>> -COMPILER = base-clang ports-gcc base-gcc
>>> +COMPILER = base-clang ports-clang base-gcc
>>
>> This may potentially break things on powerpc/sparc64. I think this more
>> targetted setup might be better:
>>
>> COMPILER = base-clang ports-clang ports-gcc base-gcc
>> MODCLANG_ARCHS = mips64 mips64el
>>
>>>
>>> LIB_DEPENDS= devel/gettext,-runtime
>>>
>>> @@ -35,6 +35,11 @@ CONFIGURE_ARGS+= --enable-static \
>>> --enable-curses=ncursesw \
>>> --enable-dict-dir=${PREFIX}/share/aspell \
>>> --enable-docdir=${PREFIX}/share/doc/aspell
>>> +
>>> +.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
>>> +USE_LLD = Yes
>>> +CONIFGURE_ENV += LD="/usr/bin/ld.lld" LDFLAGS="-fuse-ld=lld"
>>
>> Setting LD/LDFLAGS should not be needed, that is taken care of by the wrapper
>> script.
>>
>> CONFIGURE is misspelt anyway so that line isn't doing anything.
>>
>>> +.endif
>>>
>>> post-build:
>>> cd ${WRKDIR}/${DIST_EN} && \
>
> Thanks for the comments! The updated diff is attached.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/aspell/core/Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile
> --- Makefile 12 Jul 2019 20:49:56 - 1.46
> +++ Makefile 24 Dec 2019 14:31:52 -
> @@ -24,7 +24,8 @@ PERMIT_PACKAGE= Yes
>
> WANTLIB= c iconv intl m curses pthread ${COMPILER_LIBCXX}
>
> -COMPILER = base-clang ports-gcc base-gcc
> +COMPILER = base-clang ports-clang ports-gcc base-gcc
> +MODCLANG_ARCHS = mips64 mips64el
>
> LIB_DEPENDS= devel/gettext,-runtime
>
> @@ -35,6 +36,10 @@ CONFIGURE_ARGS+= --enable-static \
> --enable-curses=ncursesw \
> --enable-dict-dir=${PREFIX}/share/aspell \
> --enable-docdir=${PREFIX}/share/doc/aspell
> +
> +.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
> +USE_LLD =Yes
> +.endif
>
> post-build:
> cd ${WRKDIR}/${DIST_EN} && \
signature.asc
Description: PGP signature
Re: [Update] net/wireguard-tools : Update to 1.0.20191226
On Fri, Dec 27, 2019 at 8:59 PM Stuart Henderson wrote:
>
> On 2019/12/27 19:06, Jason A. Donenfeld wrote:
> > On Fri, Dec 27, 2019 at 6:46 PM Klemens Nanni wrote:
> > >
> > > On Fri, Dec 27, 2019 at 05:38:20PM +0100, Jason A. Donenfeld wrote:
> > > > -V = 0.0.20191212
> > > > -DISTNAME = WireGuard-$V
> > > > +V = 1.0.20191226
> > > > +DISTNAME = wireguard-tools-$V
> > > > PKGNAME =wireguard-tools-$V
> > > Now they're the same, so PKGNAME can go as it defaults to DISTNAME.
> >
> > Feel free to make this change as you commit it to cvs.
> >
>
> Let's wait a bit for port maintainer comments first. The original diff had a
> stray space at the end of the sha256 signature so here's a tidied version
> with that fixed and merging V/PKGNAME/DISTNAME. Bonus typo in README.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/wireguard-tools/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile14 Dec 2019 14:13:23 - 1.12
> +++ Makefile27 Dec 2019 19:58:13 -
> @@ -2,9 +2,7 @@
>
> COMMENT = fast and secure VPN
>
> -V =0.0.20191212
> -DISTNAME = WireGuard-$V
> -PKGNAME = wireguard-tools-$V
> +DISTNAME = wireguard-tools-1.0.20191226
> EPOCH =0
>
> CATEGORIES = net security
> @@ -18,7 +16,7 @@ PERMIT_PACKAGE = Yes
>
> WANTLIB += c
>
> -MASTER_SITES = https://git.zx2c4.com/WireGuard/snapshot/
> +MASTER_SITES = https://git.zx2c4.com/wireguard-tools/snapshot/
>
> EXTRACT_SUFX = .tar.xz
>
> @@ -37,7 +35,7 @@ USE_GMAKE = Yes
>
> NO_TEST = Yes
>
> -WRKSRC = ${WRKDIST}/src/tools
> +WRKSRC = ${WRKDIST}/src
>
> ALL_TARGET = wg
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/wireguard-tools/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo14 Dec 2019 14:13:23 - 1.8
> +++ distinfo27 Dec 2019 19:58:13 -
> @@ -1,2 +1,2 @@
> -SHA256 (WireGuard-0.0.20191212.tar.xz) =
> sNcYOA96iCKy8S115GL6Tq+jp3hxACmB82fNT+KhsHE=
> -SIZE (WireGuard-0.0.20191212.tar.xz) = 333024
> +SHA256 (wireguard-tools-1.0.20191226.tar.xz) =
> qorw/cmHLTadjIkKhNvCokZrVXldzNW0dyGy2XZEsE8=
> +SIZE (wireguard-tools-1.0.20191226.tar.xz) = 90720
> Index: pkg/README
> ===
> RCS file: /cvs/ports/net/wireguard-tools/pkg/README,v
> retrieving revision 1.2
> diff -u -p -r1.2 README
> --- pkg/README 18 Sep 2019 10:59:37 - 1.2
> +++ pkg/README 27 Dec 2019 19:58:13 -
> @@ -24,7 +24,7 @@ server and client:
> Networking setup
>
>
> -On wg1 a few setting are required:
> +On wg1 a few settings are required:
>
> # sysctl net.inet.ip.forwarding=1
> # echo 'pass out on egress inet from (tun0:network) nat-to (egress:0)' >>
> /etc/pf.conf
Thanks.
ok zx2c4@
sparc64 bulk build report
Bulk build on sparc64-0.ports.openbsd.org Started : Wed Dec 25 00:43:47 MST 2019 Finished: Fri Dec 27 15:24:42 MST 2019 Duration: 2 Days 14 hours 41 minutes Built using OpenBSD 6.6-current (GENERIC.MP) #168: Tue Dec 24 16:48:30 MST 2019 Built 9747 packages Number of packages built each day: Dec 25: 7780 Dec 26: 1664 Dec 27: 303 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2019-12-25/summary.log Build failures: 57 http://build-failures.rhaalovely.net/sparc64/2019-12-25/cad/magic.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/cad/netgen.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/cad/qucs.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/chinese/libpinyin.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/comms/mgetty+sendfax.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/comms/xastir.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/devel/py-unicorn.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/devel/rebar,erlang21.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/emulators/BasiliskII.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/emulators/citra.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/emulators/fs-uae.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/emulators/ppsspp.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/games/pokerth.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/games/xevil.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/geo/spatialite/gis.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/graphics/asymptote.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/graphics/colord-gtk.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/graphics/gimp/stable.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/graphics/pecl-imagick,php73.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/graphics/ruby-rmagick,ruby25.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/lang/apl.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/lang/janet.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/lang/quickjs.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/mail/exim,ldap,-eximon.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/mail/kopano/core.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/mail/rspamd.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/math/kst.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/math/py-scikit-learn.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/multimedia/mkvtoolnix.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/multimedia/synfig.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/net/bitcoin,no_x11.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/net/dleyna/renderer.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/net/dleyna/server.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/net/litecoin.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/net/mutella.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/net/routinator.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/net/telegram-purple.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/net/ttg.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/print/hplip,-common.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/productivity/gnucash.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/security/sslscan,openssl.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/sysutils/collectd,-main.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/sysutils/syslog-ng.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/telephony/iaxclient.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/telephony/pjsua,-main.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/www/newsboat.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/www/ruby-passenger,ruby26.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/x11/gnome/bijiben.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/x11/gnome/builder.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/x11/gnome/grilo.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/x11/gnome/mutter.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/x11/gtk+4,-cloudprint.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/x11/kde4/libs.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/x11/kde4/smokeqt.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/x11/libdbus-c++.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/x11/libhandy.log http://build-failures.rhaalovely.net/sparc64/2019-12-25/x11/ogre.log Recurrent failures: failures/emulators/fs-uae.log failures/emulators/ppsspp.log failures/games/pokerth.log failures/games/xevil.log failur
Re: games/dmagnetic: Update from 0.18 to 0.19
On 2019/12/27 23:19, Thomas Dettbarn wrote: > oh shoot...sorry! > > I will take better care next time. Sorry about that! > Thank you for giving me the opportunity to publish > my awesome project within your ports tree! No worries :) Nice to have it, I remember the original version of The Pawn that my grandad had on his QL.
Re: games/dmagnetic: Update from 0.18 to 0.19
oh shoot...sorry!
I will take better care next time. Sorry about that! Thank you for giving
me the opportunity to publish my awesome project within your ports tree!
Thomas
Stuart Henderson < s...@spacehopper.org> hat am 27. Dezember 2019 um
23:16 geschrieben:
On 2019/12/27 21:15, dettus wrote:
Hello.
Today is the day where I released dMagnetic 0.19. It is now
possible to run the original MS-DOS binaries natively on the
Interpreter, including the much better looking graphics.
Additionally, the random number generator was given an overhaul,
which allows for a completely different experience whilst
playing. (If desired)
A more detailed description (including new screenshots) can be
found on my website, please go to
http://www.dettus.net/dMagnetic/ to check it out.
Attached to this email is the patch that needs to be applied to
the games/dmagnetic directory in the ports tree of OpenBSD.
--- Makefile.orig 2019-12-27 21:03:36.953568996 +0100 +++
Makefile 2019-12-27 21:03:36.957569030 +0100 @@ -1,4 +1,4 @@ -#
$OpenBSD: Makefile,v 1.5 2019/11/13 06:34:01 rsadowski Exp $ +#
$OpenBSD$
V = 0.18 COMMENT = interpreter for Magnetic Scrolls games ---
distinfo.orig 2019-12-27 21:03:36.953568996 +0100 +++ distinfo
2019-12-27 21:03:36.957569030 +0100 @@ -1,2 +1,2 @@ -SHA256
(dMagnetic_0.18.tar.gz) =
527cd6dd9140a3ff01c29545f74be140d146b8207bafbccca54a36cb79c3610f
-SIZE (dMagnetic_0.18.tar.gz) = 61210 +SHA256
(dMagnetic_0.19.tar.bz2) =
7a57aa1e0dffa6b433bf5d4f33c4aefc01268a9f2680b2c319c102e2e6275fda
+SIZE (dMagnetic_0.19.tar.bz2) = 61096
Thanks Thomas - diff is missing Makefile changes (and we normally use
a base64 sha256's in distinfo, I missed that before :-) so I will
commit this instead:
Index: Makefile
===
RCS file: /cvs/ports/games/dmagnetic/Makefile,v retrieving revision
1.5 diff -u -p -r1.5 Makefile --- Makefile 13 Nov 2019 06:34:01 -
1.5 +++ Makefile 27 Dec 2019 22:05:51 - @@ -1,9 +1,12 @@ #
$OpenBSD: Makefile,v 1.5 2019/11/13 06:34:01 rsadowski Exp $
-V = 0.18 COMMENT = interpreter for Magnetic Scrolls games + +V =
0.19 DISTNAME = dMagnetic_${V} PKGNAME = dmagnetic-${V} +EXTRACT_SUFX
= .tar.bz2 + CATEGORIES = games
HOMEPAGE = https://www.dettus.net/dMagnetic/ Index: distinfo
===
RCS file: /cvs/ports/games/dmagnetic/distinfo,v retrieving revision
1.4 diff -u -p -r1.4 distinfo --- distinfo 13 Nov 2019 06:34:01 -
1.4 +++ distinfo 27 Dec 2019 22:05:51 - @@ -1,2 +1,2 @@ -SHA256
(dMagnetic_0.18.tar.gz) =
527cd6dd9140a3ff01c29545f74be140d146b8207bafbccca54a36cb79c3610f
-SIZE (dMagnetic_0.18.tar.gz) = 61210 +SHA256
(dMagnetic_0.19.tar.bz2) =
eleqHg3/prQzv11PM8Su/AEmip8mgLLDGcEC4uYnX9o= +SIZE
(dMagnetic_0.19.tar.bz2) = 61096
Re: games/dmagnetic: Update from 0.18 to 0.19
On 2019/12/27 21:15, dettus wrote:
> Hello.
>
>
> Today is the day where I released dMagnetic 0.19. It is now possible to run
> the original
> MS-DOS binaries natively on the Interpreter, including the much better
> looking graphics.
>
> Additionally, the random number generator was given an overhaul, which
> allows for a
> completely different experience whilst playing. (If desired)
>
>
> A more detailed description (including new screenshots) can be found on my
> website,
> please go to http://www.dettus.net/dMagnetic/ to check it out.
>
>
>
> Attached to this email is the patch that needs to be applied to the
> games/dmagnetic
> directory in the ports tree of OpenBSD.
> --- Makefile.orig 2019-12-27 21:03:36.953568996 +0100
> +++ Makefile 2019-12-27 21:03:36.957569030 +0100
> @@ -1,4 +1,4 @@
> -# $OpenBSD: Makefile,v 1.5 2019/11/13 06:34:01 rsadowski Exp $
> +# $OpenBSD$
>
> V = 0.18
> COMMENT =interpreter for Magnetic Scrolls games
> --- distinfo.orig 2019-12-27 21:03:36.953568996 +0100
> +++ distinfo 2019-12-27 21:03:36.957569030 +0100
> @@ -1,2 +1,2 @@
> -SHA256 (dMagnetic_0.18.tar.gz) =
> 527cd6dd9140a3ff01c29545f74be140d146b8207bafbccca54a36cb79c3610f
> -SIZE (dMagnetic_0.18.tar.gz) = 61210
> +SHA256 (dMagnetic_0.19.tar.bz2) =
> 7a57aa1e0dffa6b433bf5d4f33c4aefc01268a9f2680b2c319c102e2e6275fda
> +SIZE (dMagnetic_0.19.tar.bz2) = 61096
Thanks Thomas - diff is missing Makefile changes (and we normally use a
base64 sha256's in distinfo, I missed that before :-) so I will commit
this instead:
Index: Makefile
===
RCS file: /cvs/ports/games/dmagnetic/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile13 Nov 2019 06:34:01 - 1.5
+++ Makefile27 Dec 2019 22:05:51 -
@@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2019/11/13 06:34:01 rsadowski Exp $
-V =0.18
COMMENT = interpreter for Magnetic Scrolls games
+
+V =0.19
DISTNAME = dMagnetic_${V}
PKGNAME = dmagnetic-${V}
+EXTRACT_SUFX = .tar.bz2
+
CATEGORIES = games
HOMEPAGE = https://www.dettus.net/dMagnetic/
Index: distinfo
===
RCS file: /cvs/ports/games/dmagnetic/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo13 Nov 2019 06:34:01 - 1.4
+++ distinfo27 Dec 2019 22:05:51 -
@@ -1,2 +1,2 @@
-SHA256 (dMagnetic_0.18.tar.gz) =
527cd6dd9140a3ff01c29545f74be140d146b8207bafbccca54a36cb79c3610f
-SIZE (dMagnetic_0.18.tar.gz) = 61210
+SHA256 (dMagnetic_0.19.tar.bz2) = eleqHg3/prQzv11PM8Su/AEmip8mgLLDGcEC4uYnX9o=
+SIZE (dMagnetic_0.19.tar.bz2) = 61096
Re: NEW: libsmb2
On Fri, Dec 27, 2019 at 09:45:04PM +, Stuart Henderson wrote: > On 2019/12/26 18:11, Brad Smith wrote: > > Attached is a port of libsmb2. > > > > Comment: > > userspace client library for accessing SMB2/SMB3 shares > > > > Description: > > Libsmb2 is a userspace client library for accessing SMB2/SMB3 shares on > > a network. It is high performAnce and fully async. It supports both > > zero-copy for SMB READ/WRITE commands as well as compounded commands. > > Needs NO_TEST and s/performAnce/performance/ in DESCR, otherwise ok. Here is an updated copy with fixes included. libsmb2.tar.gz Description: application/tar-gz
Re: NEW: libsmb2
On 2019/12/26 18:11, Brad Smith wrote: > Attached is a port of libsmb2. > > Comment: > userspace client library for accessing SMB2/SMB3 shares > > Description: > Libsmb2 is a userspace client library for accessing SMB2/SMB3 shares on > a network. It is high performAnce and fully async. It supports both > zero-copy for SMB READ/WRITE commands as well as compounded commands. Needs NO_TEST and s/performAnce/performance/ in DESCR, otherwise ok.
Re: NEW: math/coinutils (2.11.3)
On 2019/12/25 00:04, Kristaps Dzonsons wrote: > I'm not sure why portcheck complains about WANTLIB libraries being > masked by RUN_DEPENDS though. My diff for ceres-solver should give a clue about this.
Re: NEW: math/flann (1.9.1)
On 2019/12/25 00:03, Kristaps Dzonsons wrote:
> flann is a C++ solver for approximate nearest neighbours.
>
> The tests don't work as they require downloading things that don't exist
> any more and the docs are a PDF, so I left it off.
>
> This is a requirement for alicevision (upcoming).
Light tidying / style, regen plist with -current.
diff 696dc85af394ec6545c88e1b54d30803f6994f29 /usr/ports/mystuff
blob - de0b86cfd962d526f62ccb5837691648e9b90256
file + math/flann/Makefile
--- math/flann/Makefile
+++ math/flann/Makefile
@@ -2,33 +2,27 @@
COMMENT = Fast Library for Approximate Nearest Neighbors
-V =1.9.1
GH_ACCOUNT = mariusmuja
GH_PROJECT = flann
-GH_TAGNAME = ${V}
-DISTNAME = ${GH_PROJECT}-${V:S/+//}
-WRKDIST = ${WRKDIR}/${GH_PROJECT}-${V:S/+/-/}
+GH_TAGNAME = 1.9.1
CATEGORIES = math
-# All homepages listed for this project don't exist anymore.
-
SHARED_LIBS += flann 0.0 # 1.9
SHARED_LIBS += flann_cpp 0.0 # 1.9
-# BSD License
+# BSD
PERMIT_PACKAGE = Yes
-COMPILER = base-clang ports-gcc base-gcc
-WANTLIB += ${COMPILER_LIBCXX} m
+WANTLIB += ${COMPILER_LIBCXX} m
+COMPILER = base-clang ports-gcc base-gcc
BUILD_DEPENDS =devel/gtest \
math/hdf5
MODULES = devel/cmake
# The documentation requires LaTeX and is a PDF file.
-
CONFIGURE_ARGS += -DUSE_OPENMP=OFF \
-DUSE_MPI=OFF \
-DBUILD_MATLAB_BINDINGS=OFF \
@@ -38,7 +32,6 @@ CONFIGURE_ARGS += -DUSE_OPENMP=OFF \
-DBUILD_TESTS=OFF
# The tests require downloading sample files that don't exist anymore.
-
NO_TEST = Yes
.include
blob - 852246e0cd7d586e0abf4ab10531b821cfa0fd1c
file + math/flann/pkg/PLIST
--- math/flann/pkg/PLIST
+++ math/flann/pkg/PLIST
@@ -57,6 +57,6 @@ include/flann/util/serialization.h
include/flann/util/timer.h
@lib lib/libflann.so.${LIBflann_VERSION}
@lib lib/libflann_cpp.so.${LIBflann_cpp_VERSION}
-lib/libflann_cpp_s.a
-lib/libflann_s.a
+@static-lib lib/libflann_cpp_s.a
+@static-lib lib/libflann_s.a
lib/pkgconfig/flann.pc
Re: NEW: math/ceres-solver (1.14.0)
On 2019/12/25 00:02, Kristaps Dzonsons wrote:
> ceres-solver is a lightweight C++ template library for linear algebra.
>
> It can use either openmp (which I don't think is supported?), tbb, or
> c++11 threads. I go with c++11 because it seems best supported across
> all architectures, though tbb works as tested. Only tested on amd64.
> `make test` sometimes fails as noted. Also installs docs.
>
> This is a requirement for alicevision (upcoming).
Here's a diff that enables the shared library (port Makefile already had
SHARED_LIBS but it was only building the static one), and fixes some
problems - build changing depending on whether tbb was installed which
will cause problems in bulk builds, BUILD+RUN vs LIB_DEPENDS+WANTLIB,
dep on the wrong sphinx (see the comment at the top of textproc/sphinx
Makefile), don't add a runtime dep on Python if it's only needed for
the build.
diff c9e7b0bbef531a18643f6446519edc195c72deb7 /usr/ports/mystuff
blob - 0b7b23d3f22038b0519320f1d3f7d1abb8e21af7
file + math/ceres-solver/Makefile
--- math/ceres-solver/Makefile
+++ math/ceres-solver/Makefile
@@ -1,51 +1,49 @@
# $OpenBSD: Makefile,v 1.10 2019/07/17 14:46:33 danj Exp $
COMMENT = lightweight C++ template library for linear algebra
-VERSION = 1.14.0
-DISTNAME = ceres-solver-${VERSION}
+DISTNAME = ceres-solver-1.14.0
CATEGORIES = math
-HOMEPAGE = http://ceres-solver.org
+HOMEPAGE = http://ceres-solver.org/
SHARED_LIBS += ceres 0.0 # 1.14
-# New BSD license
+# BSD
PERMIT_PACKAGE = Yes
MASTER_SITES = http://ceres-solver.org/
-# c++11
+WANTLIB += ${COMPILER_LIBCXX} amd blas camd ccolamd cholmod colamd
+WANTLIB += cxsparse gflags glog lapack m spqr suitesparseconfig
+
+# C++11
COMPILER = base-clang ports-gcc ports-clang
# We can also pull in TBB, but C++ threads are better supported.
-
-BUILD_DEPENDS =devel/gflags \
+LIB_DEPENDS = devel/gflags \
devel/glog \
math/blas \
math/eigen3 \
math/lapack \
- math/suitesparse \
- textproc/sphinx
+ math/suitesparse
-# Python is for generating the documentation.
+BUILD_DEPENDS =textproc/py-sphinx
MODULES = devel/cmake \
lang/python
+MODPY_RUNDEP = No
-# If this reports "assuming suitesparse is compiled with TBB" (when it's
-# not), it's harmless.
-
CONFIGURE_ARGS = -DOPENMP=OFF \
-DCXX11=ON \
-DCXX11_THREADS=ON \
-DBUILD_EXAMPLES=OFF \
-DBUILD_DOCUMENTATION=ON \
+ -DBUILD_SHARED_LIBS=ON \
-DPYTHON_EXECUTABLE="${MODPY_BIN}"
# Sometimes tests fail because tolerances doesn't pass muster.
# I can only guess that this is due to aberrations in FP?
-
TEST_TARGET = test
.include
blob - /dev/null
file + math/ceres-solver/patches/patch-cmake_FindSuiteSparse_cmake
--- math/ceres-solver/patches/patch-cmake_FindSuiteSparse_cmake
+++ math/ceres-solver/patches/patch-cmake_FindSuiteSparse_cmake
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+If tbb is present while running ceres' configure stage, ceres assumes that
+suitesparse was linked with tbb and therefore the ceres library should also
+be linked with tbb. Prevent picking up tbb to disable this.
+
+Index: cmake/FindSuiteSparse.cmake
+--- cmake/FindSuiteSparse.cmake.orig
cmake/FindSuiteSparse.cmake
+@@ -287,7 +287,7 @@ suitesparse_find_component(CCOLAMD REQUIRED FILES ccol
+ suitesparse_find_component(CHOLMOD REQUIRED FILES cholmod.h LIBRARIES cholmod)
+ suitesparse_find_component(
+ SUITESPARSEQR REQUIRED FILES SuiteSparseQR.hpp LIBRARIES spqr)
+-if (SUITESPARSEQR_FOUND)
++if (0 AND SUITESPARSEQR_FOUND)
+ # SuiteSparseQR may be compiled with Intel Threading Building Blocks,
+ # we assume that if TBB is installed, SuiteSparseQR was compiled with
+ # support for it, this will do no harm if it wasn't.
blob - 654c9431a19ac1e53373a71629aaf63e6cb29918
file + math/ceres-solver/pkg/PLIST
--- math/ceres-solver/pkg/PLIST
+++ math/ceres-solver/pkg/PLIST
@@ -50,7 +50,6 @@ include/ceres/tiny_solver_autodiff_function.h
include/ceres/tiny_solver_cost_function_adapter.h
include/ceres/types.h
include/ceres/version.h
-lib/cmake/
lib/cmake/Ceres/
lib/cmake/Ceres/CeresConfig.cmake
lib/cmake/Ceres/CeresConfigVersion.cmake
@@ -59,7 +58,7 @@ lib/cmake/Ceres/CeresTargets.cmake
lib/cmake/Ceres/FindEigen.cmake
lib/cmake/Ceres/FindGflags.cmake
lib/cmake/Ceres/FindGlog.cmake
-lib/libceres.a
+@lib lib/libceres.so.${LIBceres_VERSION}
share/doc/ceres/
share/doc/ceres/html/
share/doc/ceres/html/.buildinfo
Re: Ruby 2.7.0
On 12/26 11:38, George Koehler wrote: > On Thu, 26 Dec 2019 21:58:36 +0100 > Jeremie Courreges-Anglas wrote: > > > On Wed, Dec 25 2019, Jeremy Evans wrote: > > > Tested on amd64, for about 9 months starting with the first preview > > > release. OK to import? > > > > This fails on sparc64, log attached. It *seems* that the configure > > tests are picky because of APIWARN and libgmp. And indeed the build > > fails similarly on amd64 with USE_LLD=No (only ld.bfd warns about unsafe > > functions, ld.lld does not). > > I built ruby-2.7.0 on macppc/powerpc with the diff below. > > The ld.bfd warning from libgmp broke the configure test for __func__, so > RUBY_FUNCTION_NAME_STRING went missing. This test might have been > broken for a long time, but RUBY_FUNCTION_NAME_STRING was optional until > Nov 17 [1], so it didn't break the build before 2.7.0. Some other tests > in my config.log get the same warning from libgmp, but seem to ignore > the warning. For upstream Ruby, I suggest to check if __func__ can > become an allowed C99 feature [2]. If so, Ruby can remove this > configure test and always use __func__. > > I got another error where coroutine/copy/Context.h included , > so I deleted the include. OpenBSD (except amd64, i386) is the only > system where Ruby enables --with-coroutine=copy by default, so this code > is mostly for OpenBSD, but didn't work on OpenBSD, because we have no > ! I don't check HAVE_ALLOCA_H because the coroutine code > doesn't include the Ruby header for HAVE_ALLOCA_H. > > I have not reported these bugs to https://bugs.ruby-lang.org/ but might > report them tomorrow. --George Thank you very much to both Jeremie for the report and George for the analysis and patch. Jeremie, does the diff below work for sparc64? If so, is it OK to import? I'll fix both issues upstream and mark them for backporting, so they hopefully will be fixed in Ruby 2.7.1. Thanks, Jeremy
games/dmagnetic: Update from 0.18 to 0.19
Hello. Today is the day where I released dMagnetic 0.19. It is now possible to run the original MS-DOS binaries natively on the Interpreter, including the much better looking graphics. Additionally, the random number generator was given an overhaul, which allows for a completely different experience whilst playing. (If desired) A more detailed description (including new screenshots) can be found on my website, please go to http://www.dettus.net/dMagnetic/ to check it out. Attached to this email is the patch that needs to be applied to the games/dmagnetic directory in the ports tree of OpenBSD. Thomas Dettbarn --- Makefile.orig 2019-12-27 21:03:36.953568996 +0100 +++ Makefile 2019-12-27 21:03:36.957569030 +0100 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2019/11/13 06:34:01 rsadowski Exp $ +# $OpenBSD$ V = 0.18 COMMENT = interpreter for Magnetic Scrolls games --- distinfo.orig 2019-12-27 21:03:36.953568996 +0100 +++ distinfo 2019-12-27 21:03:36.957569030 +0100 @@ -1,2 +1,2 @@ -SHA256 (dMagnetic_0.18.tar.gz) = 527cd6dd9140a3ff01c29545f74be140d146b8207bafbccca54a36cb79c3610f -SIZE (dMagnetic_0.18.tar.gz) = 61210 +SHA256 (dMagnetic_0.19.tar.bz2) = 7a57aa1e0dffa6b433bf5d4f33c4aefc01268a9f2680b2c319c102e2e6275fda +SIZE (dMagnetic_0.19.tar.bz2) = 61096
Re: [Update] net/wireguard-tools : Update to 1.0.20191226
On 2019/12/27 19:06, Jason A. Donenfeld wrote:
> On Fri, Dec 27, 2019 at 6:46 PM Klemens Nanni wrote:
> >
> > On Fri, Dec 27, 2019 at 05:38:20PM +0100, Jason A. Donenfeld wrote:
> > > -V = 0.0.20191212
> > > -DISTNAME = WireGuard-$V
> > > +V = 1.0.20191226
> > > +DISTNAME = wireguard-tools-$V
> > > PKGNAME =wireguard-tools-$V
> > Now they're the same, so PKGNAME can go as it defaults to DISTNAME.
>
> Feel free to make this change as you commit it to cvs.
>
Let's wait a bit for port maintainer comments first. The original diff had a
stray space at the end of the sha256 signature so here's a tidied version
with that fixed and merging V/PKGNAME/DISTNAME. Bonus typo in README.
Index: Makefile
===
RCS file: /cvs/ports/net/wireguard-tools/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile14 Dec 2019 14:13:23 - 1.12
+++ Makefile27 Dec 2019 19:58:13 -
@@ -2,9 +2,7 @@
COMMENT = fast and secure VPN
-V =0.0.20191212
-DISTNAME = WireGuard-$V
-PKGNAME = wireguard-tools-$V
+DISTNAME = wireguard-tools-1.0.20191226
EPOCH =0
CATEGORIES = net security
@@ -18,7 +16,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += c
-MASTER_SITES = https://git.zx2c4.com/WireGuard/snapshot/
+MASTER_SITES = https://git.zx2c4.com/wireguard-tools/snapshot/
EXTRACT_SUFX = .tar.xz
@@ -37,7 +35,7 @@ USE_GMAKE = Yes
NO_TEST = Yes
-WRKSRC = ${WRKDIST}/src/tools
+WRKSRC = ${WRKDIST}/src
ALL_TARGET = wg
Index: distinfo
===
RCS file: /cvs/ports/net/wireguard-tools/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo14 Dec 2019 14:13:23 - 1.8
+++ distinfo27 Dec 2019 19:58:13 -
@@ -1,2 +1,2 @@
-SHA256 (WireGuard-0.0.20191212.tar.xz) =
sNcYOA96iCKy8S115GL6Tq+jp3hxACmB82fNT+KhsHE=
-SIZE (WireGuard-0.0.20191212.tar.xz) = 333024
+SHA256 (wireguard-tools-1.0.20191226.tar.xz) =
qorw/cmHLTadjIkKhNvCokZrVXldzNW0dyGy2XZEsE8=
+SIZE (wireguard-tools-1.0.20191226.tar.xz) = 90720
Index: pkg/README
===
RCS file: /cvs/ports/net/wireguard-tools/pkg/README,v
retrieving revision 1.2
diff -u -p -r1.2 README
--- pkg/README 18 Sep 2019 10:59:37 - 1.2
+++ pkg/README 27 Dec 2019 19:58:13 -
@@ -24,7 +24,7 @@ server and client:
Networking setup
-On wg1 a few setting are required:
+On wg1 a few settings are required:
# sysctl net.inet.ip.forwarding=1
# echo 'pass out on egress inet from (tun0:network) nat-to (egress:0)' >>
/etc/pf.conf
Re: [update] security/wycheproof-testvectors to HEAD
On Fri, Dec 27, 2019 at 07:09:51PM +0100, Klemens Nanni wrote: > On Fri, Dec 27, 2019 at 06:55:29PM +0100, Theo Buehler wrote: > > It's easier this way for me to be sure that the port is up-to-date. No > > change in the shipped json files, so no change in the package except for > > its name. > If there is no real change (and you do need this for libcrypto regress > in case I'm not mistaken), Yes, this port only exists to be able to use the Apache 2.0 licensed test vector files from /usr/src/regress/lib/libcrypto/wycheproof/ > then I'd say just go ahead with such update > on such rather unrelevant leave port. ok, will do. Thanks.
Re: [update] security/wycheproof-testvectors to HEAD
On Fri, Dec 27, 2019 at 06:55:29PM +0100, Theo Buehler wrote: > It's easier this way for me to be sure that the port is up-to-date. No > change in the shipped json files, so no change in the package except for > its name. If there is no real change (and you do need this for libcrypto regress in case I'm not mistaken), then I'd say just go ahead with such update on such rather unrelevant leave port. OK kn
Re: [Update] net/wireguard-tools : Update to 1.0.20191226
On Fri, Dec 27, 2019 at 6:46 PM Klemens Nanni wrote: > > On Fri, Dec 27, 2019 at 05:38:20PM +0100, Jason A. Donenfeld wrote: > > -V = 0.0.20191212 > > -DISTNAME = WireGuard-$V > > +V = 1.0.20191226 > > +DISTNAME = wireguard-tools-$V > > PKGNAME =wireguard-tools-$V > Now they're the same, so PKGNAME can go as it defaults to DISTNAME. Feel free to make this change as you commit it to cvs.
[update] security/wycheproof-testvectors to HEAD
It's easier this way for me to be sure that the port is up-to-date. No
change in the shipped json files, so no change in the package except for
its name.
Index: Makefile
===
RCS file: /var/cvs/ports/security/wycheproof-testvectors/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile16 Dec 2019 17:15:49 - 1.6
+++ Makefile19 Dec 2019 20:59:19 -
@@ -3,12 +3,12 @@
COMMENT = test vectors from Project Wycheproof
# No releases
-VERSION = 20191214
+VERSION = 20191219
DISTNAME = wycheproof-testvectors-${VERSION}
GH_ACCOUNT = google
GH_PROJECT = wycheproof
-GH_COMMIT =eb35c25e05d17dc05fdf42f40ff4cbb3a959c096
+GH_COMMIT =2196000605e45d91097147c9c71f26b72af58003
CATEGORIES = security devel
Index: distinfo
===
RCS file: /var/cvs/ports/security/wycheproof-testvectors/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo16 Dec 2019 17:15:49 - 1.5
+++ distinfo19 Dec 2019 20:59:40 -
@@ -1,2 +1,2 @@
-SHA256 (wycheproof-testvectors-20191214-eb35c25e.tar.gz) =
zfdtV9hbd8cT6OqJS2e2rNCy2FO/ipXDgiMTg4MBxYA=
-SIZE (wycheproof-testvectors-20191214-eb35c25e.tar.gz) = 8826265
+SHA256 (wycheproof-testvectors-20191219-21960006.tar.gz) =
H18+tnzM1EmJQLtxxFbAfDhe7+2mRfpJ7yxDK1cjuHU=
+SIZE (wycheproof-testvectors-20191219-21960006.tar.gz) = 8827601
Re: [Update] net/wireguard-tools : Update to 1.0.20191226
On Fri, Dec 27, 2019 at 06:46:47PM +0100, Klemens Nanni wrote: > On Fri, Dec 27, 2019 at 05:38:20PM +0100, Jason A. Donenfeld wrote: > > -V =0.0.20191212 > > -DISTNAME = WireGuard-$V > > +V =1.0.20191226 > > +DISTNAME = wireguard-tools-$V > > PKGNAME = wireguard-tools-$V > Now they're the same, so PKGNAME can go as it defaults to DISTNAME. good catch, with that tweak it is ok gsoares@
Re: [Update] net/wireguard-tools : Update to 1.0.20191226
On Fri, Dec 27, 2019 at 05:38:20PM +0100, Jason A. Donenfeld wrote: > -V = 0.0.20191212 > -DISTNAME = WireGuard-$V > +V = 1.0.20191226 > +DISTNAME = wireguard-tools-$V > PKGNAME =wireguard-tools-$V Now they're the same, so PKGNAME can go as it defaults to DISTNAME. OK kn
Re: [Update] net/wireguard-tools : Update to 1.0.20191226
On Fri, 27 Dec 2019 at 17:38:20 +0100, Jason A. Donenfeld wrote:
> Hi folks,
>
> We recently moved to a new repo for the tools upstream and bumped the
> version number. This patch below adjusts the ports makefile.
>
> Reference:
> https://lists.zx2c4.com/pipermail/wireguard/2019-December/004787.html
>
> I haven't checked that this works on a real OpenBSD machine, though it
> should. If something's broken, Jasper can fix it up and resubmit.
Works here! OK abieber@
>
> Thanks,
> Jason
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/wireguard-tools/Makefile,v
> retrieving revision 1.12
> diff -u -r1.12 Makefile
> --- Makefile 14 Dec 2019 14:13:23 - 1.12
> +++ Makefile 27 Dec 2019 16:33:38 -
> @@ -2,8 +2,8 @@
>
> COMMENT =fast and secure VPN
>
> -V = 0.0.20191212
> -DISTNAME = WireGuard-$V
> +V = 1.0.20191226
> +DISTNAME = wireguard-tools-$V
> PKGNAME =wireguard-tools-$V
> EPOCH = 0
>
> @@ -18,7 +18,7 @@
>
> WANTLIB += c
>
> -MASTER_SITES = https://git.zx2c4.com/WireGuard/snapshot/
> +MASTER_SITES = https://git.zx2c4.com/wireguard-tools/snapshot/
>
> EXTRACT_SUFX = .tar.xz
>
> @@ -37,7 +37,7 @@
>
> NO_TEST =Yes
>
> -WRKSRC = ${WRKDIST}/src/tools
> +WRKSRC = ${WRKDIST}/src
>
> ALL_TARGET = wg
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/wireguard-tools/distinfo,v
> retrieving revision 1.8
> diff -u -r1.8 distinfo
> --- distinfo 14 Dec 2019 14:13:23 - 1.8
> +++ distinfo 27 Dec 2019 16:33:38 -
> @@ -1,2 +1,2 @@
> -SHA256 (WireGuard-0.0.20191212.tar.xz) =
> sNcYOA96iCKy8S115GL6Tq+jp3hxACmB82fNT+KhsHE=
> -SIZE (WireGuard-0.0.20191212.tar.xz) = 333024
> +SHA256 (wireguard-tools-1.0.20191226.tar.xz) =
> qorw/cmHLTadjIkKhNvCokZrVXldzNW0dyGy2XZEsE8=
> +SIZE (wireguard-tools-1.0.20191226.tar.xz) = 90720
>
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
[Update] net/wireguard-tools : Update to 1.0.20191226
Hi folks,
We recently moved to a new repo for the tools upstream and bumped the
version number. This patch below adjusts the ports makefile.
Reference: https://lists.zx2c4.com/pipermail/wireguard/2019-December/004787.html
I haven't checked that this works on a real OpenBSD machine, though it
should. If something's broken, Jasper can fix it up and resubmit.
Thanks,
Jason
Index: Makefile
===
RCS file: /cvs/ports/net/wireguard-tools/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile14 Dec 2019 14:13:23 - 1.12
+++ Makefile27 Dec 2019 16:33:38 -
@@ -2,8 +2,8 @@
COMMENT = fast and secure VPN
-V =0.0.20191212
-DISTNAME = WireGuard-$V
+V =1.0.20191226
+DISTNAME = wireguard-tools-$V
PKGNAME = wireguard-tools-$V
EPOCH =0
@@ -18,7 +18,7 @@
WANTLIB += c
-MASTER_SITES = https://git.zx2c4.com/WireGuard/snapshot/
+MASTER_SITES = https://git.zx2c4.com/wireguard-tools/snapshot/
EXTRACT_SUFX = .tar.xz
@@ -37,7 +37,7 @@
NO_TEST = Yes
-WRKSRC = ${WRKDIST}/src/tools
+WRKSRC = ${WRKDIST}/src
ALL_TARGET = wg
Index: distinfo
===
RCS file: /cvs/ports/net/wireguard-tools/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo14 Dec 2019 14:13:23 - 1.8
+++ distinfo27 Dec 2019 16:33:38 -
@@ -1,2 +1,2 @@
-SHA256 (WireGuard-0.0.20191212.tar.xz) =
sNcYOA96iCKy8S115GL6Tq+jp3hxACmB82fNT+KhsHE=
-SIZE (WireGuard-0.0.20191212.tar.xz) = 333024
+SHA256 (wireguard-tools-1.0.20191226.tar.xz) =
qorw/cmHLTadjIkKhNvCokZrVXldzNW0dyGy2XZEsE8=
+SIZE (wireguard-tools-1.0.20191226.tar.xz) = 90720
Re: update games/eduke32 for ion fury compatibility
On Tue, Dec 24, 2019 at 08:16:22PM +1100, Jonathan Gray wrote: > On Tue, Dec 24, 2019 at 09:22:27AM +0100, Solene Rapenne wrote: > > Le Tue, 24 Dec 2019 10:46:41 +1100, > > Jonathan Gray a écrit : > > > > > On Mon, Dec 23, 2019 at 07:41:32PM +0100, Solene Rapenne wrote: > > > > This patch updates eduke32 to last version and enable playing Ion > > > > Fury > > > > > > > > most of the diff comes from the following thread > > > > https://marc.info/?l=openbsd-misc&m=156907261602397&w=2 > > > > > > > > tested Ion Fury, works fine on an old T400 (smooth if > > > > I disabled sound...) but smooth on a T480, it's really CPU intensive > > > > > > > > duke32 shareware data still works fine out of the box > > > > > > This looks mostly fine but why have you dropped base-clang from > > > COMPILER? > > > > > > > I forgot to explain why I dropped base-clang, this is because eduke32 > > fails with this error: > > > > ===> Building for eduke32-2.0.0.8494 > > mkdir -p obj/duke3d > > c++ -std=gnu++11 -fno-exceptions -fno-rtti -fomit-frame-pointer > > -fno-strict-aliasing -fno-threadsafe-statics -fjump-tables > > -fno-stack-protector -O2 -pipe -W -Wall -Wextra -Wpointer-arith > > -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings -Wuninitialized > > -Wno-attributes -Wno-strict-overflow -Isource/build/include > > -Isource/mact/include -Isource/audiolib/include -Isource/glad/include > > -Isource/voidwrap/include -MP -MMD -funsigned-char -U_FORTIFY_SOURCE > > -D_FORTIFY_SOURCE=0 -DNDEBUG -DNOASM -DRENDERTYPESDL=1 -DSTARTUP_WINDOW > > -DUSE_OPENGL -DPOLYMER -I/usr/local/include -DUSE_LIBVPX -DHAVE_VORBIS > > -DHAVE_FLAC -DHAVE_XMP -DSDL_TARGET=2 -I/usr/local/include > > -I/usr/local/include/SDL2 -I/usr/X11R6/include -D_REENTRANT > > -I/usr/X11R6/include -DHAVE_GTK2 -I/usr/local/include/gtk-2.0 > > -I/usr/local/lib/gtk-2.0/include -I/usr/local/include/pango-1.0 > > -I/usr/local/include/gio-unix-2.0 -I/usr/X11R6/include > > -I/usr/local/include/cairo -I/usr/local/include/atk-1.0 > > -I/usr/local/include/gdk-pixbuf-2.0 -I/usr/local/include -pthread > > -I/usr/local/include/fribidi -I/usr/X11R6/include/pixman-1 > > -I/usr/local/include/libpng16 -I/usr/local/include/harfbuzz > > -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include > > -I/usr/X11R6/include/freetype2 -Isource/duke3d/src -c > > source/duke3d/src/actors.cpp -o obj/duke3d/actors.o > > In file included from source/duke3d/src/actors.cpp:25: > > In file included from source/duke3d/src/duke3d.h:134: > > In file included from source/duke3d/src/game.h:34: > > source/duke3d/src/gamevars.h:254:85: error: fallthrough annotation does not > > directly precede switch label > > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & > > (MAXPLAYERS-1)]; fallthrough__; > > > > ^ > > source/build/include/compat.h:267:25: note: expanded from macro > > 'fallthrough__' > > # define fallthrough__ [[fallthrough]] > > ^ > > 1 error generated. > > gmake: *** [GNUmakefile:1074: obj/duke3d/actors.o] Error 1 > > *** Error 2 in . (/home/ports/infrastructure/mk/bsd.port.mk:2890 > > '/home/ports/pobj/eduke32-2.0.0.8494/.build_done') > > *** Error 1 in /usr/ports/games/eduke32 > > (/home/ports/infrastructure/mk/bsd.port.mk:2556 'all') > > case GAMEVAR_PERACTOR: iptr = &var.pValues[vm.spriteNum & (MAXSPRITES-1)]; > goto jmp; > case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum & (MAXPLAYERS-1)]; > fallthrough__; > jmp: default: *iptr = libdivide_s32_do(*iptr, dptr); break; > > it should be enough to change this to > > default: jmp: ... eduke32 rev 8495 and later has this change.
thunar segfault
Hi, Since few days, I have thunar which segfault reliably on several hosts (all amd64, but not tested on other arch). I have very little ideas to where search for now. So I am including all sorts of elements... any lights from anyone would be welcome :) Regarding base system: Dec 12 07:13:10 mira /bsd: OpenBSD 6.6-current (GENERIC.MP) #520: Wed Dec 11 14:25:35 MST 2019 Dec 25 12:09:01 mira /bsd: OpenBSD 6.6-current (GENERIC.MP) #563: Tue Dec 24 02:24:52 MST 2019 so it should include following changes in xenocara: - Update to xrdb 1.2.0 - Update to libXfont2 2.0.4 - Update to font/util 1.3.2 - Update to font/encodings 1.0.5 The latest packages update included the following changes (others were same_version->same_version): Dec 23 06:31:39 mira pkg_add: Added quirks-3.210->3.212 Dec 23 06:31:47 mira pkg_add: Added libffi-3.2.1p5->3.2.1p6 Dec 23 06:32:03 mira pkg_add: Added python-3.7.5p3->3.7.5p4 Dec 23 06:32:33 mira pkg_add: Added glib2-2.62.3->2.62.4 Dec 23 06:32:41 mira pkg_add: Added fribidi-1.0.7p2->1.0.8 Dec 23 06:32:43 mira pkg_add: Added pango-1.42.4p5->1.44.7 Dec 23 06:33:22 mira pkg_add: Added aom-1.0.0.20190901->1.0.0.20191218 Dec 23 06:33:35 mira pkg_add: Added libunbound-1.9.4->1.9.6 Dec 23 06:34:32 mira pkg_add: Added audacity-2.3.2p0->2.3.2p1 Dec 23 06:34:47 mira pkg_add: Added py3-dateutil-2.8.0p1->2.8.1 Dec 23 06:36:08 mira pkg_add: Added cups-2.3.0p1+cups-filters-1.25.13+cups-libs-2.3.0+ghostscript-9.07p7->cups-2.3.1p0+cups-filters-1.26.0+cups-libs-2.3.1+ghostscript-9.07p7 Dec 23 06:37:15 mira pkg_add: Added evince-3.34.2-light->3.34.2-light Dec 23 06:37:21 mira pkg_add: Added libical+libical-glib-3.0.6->3.0.7 Dec 23 06:38:50 mira pkg_add: Added py-gtk2-2.24.0p6->2.24.0p7 Dec 23 06:39:29 mira pkg_add: Added git-2.24.0p0->2.24.1 Dec 23 06:40:33 mira pkg_add: Added tevent-0.9.39p0->0.9.37v0 Dec 23 06:40:42 mira pkg_add: Added samba-util-4.10.11->4.9.17v0 Dec 23 06:42:06 mira pkg_add: Added libmagic-5.37->5.38 Dec 23 06:42:33 mira pkg_add: Added mariadb-client-10.3.20v1->10.3.21v1 Dec 23 06:43:28 mira pkg_add: Added podofo-0.9.5p1->0.9.5p2 Dec 23 08:14:18 mira pkg_add: Added ldb-1.5.6p0->1.4.8v0 Dec 23 08:15:15 mira pkg_add: Added .libs-ldb-1.5.6p0+samba-4.10.11->samba-4.9.17v0 it means thunar could be influenced by changes in (based on check on any dependency of dependency of ... of thunar): - libffi-3.2.1p5->3.2.1p6 - glib2-2.62.3->2.62.4 - fribidi-1.0.7p2->1.0.8 - pango-1.42.4p5->1.44.7 - libunbound-1.9.4->1.9.6 - cups-libs-2.3.0->-2.3.1 Regarding the crash, I have the following backtrace (thanks to debug packages): Thread 1 received signal SIGSEGV, Segmentation fault. strchr () at /usr/src/lib/libc/arch/amd64/string/strchr.S:60 60 /usr/src/lib/libc/arch/amd64/string/strchr.S: No such file or directory. (gdb) bt #0 strchr () at /usr/src/lib/libc/arch/amd64/string/strchr.S:60 #1 0xe7d14bcd633d2712 in ?? () #2 0x17e8dad850a5 in g_param_spec_pool_lookup (pool=0x17e8be27aca0, param_name=0x4b5 , owner_type=26287860700672, walk_ancestors=1) at ../glib-2.62.4/gobject/gparam.c:1071 #3 0x17e8dad7e962 in g_object_new_valist (object_type=26287860700672, first_property_name=, var_args=0x7f7ee2d0) at ../glib-2.62.4/gobject/gobject.c:2121 #4 0x17e8dad7e61a in g_object_new (object_type=26287860700672, first_property_name=0x3a ) at ../glib-2.62.4/gobject/gobject.c:1670 #5 0x17e5e43b7a6f in thunar_standard_view_init (standard_view=0x17e8b18b9c70) at thunar-standard-view.c:716 #6 0x17e8dad941ea in g_type_create_instance (type=) at ../glib-2.62.4/gobject/gtype.c:1861 #7 0x17e8dad82de5 in g_object_constructor (type=5175435591680, n_construct_properties=2, construct_params=0x17e8a8a22520) at ../glib-2.62.4/gobject/gobject.c:2178 #8 0x17e5e43b7cea in thunar_standard_view_constructor (type=5175435591680, n_construct_properties=58, construct_properties=0x3a3a3a3a3a3a3a3a) at thunar-standard-view.c:763 #9 0x17e8dad7f0ba in g_object_new_with_custom_constructor (class=, params=0x7f7ee4b0, n_params=1) at ../glib-2.62.4/gobject/gobject.c:1745 #10 g_object_new_internal (class=, params=0x7f7ee4b0, n_params=1) at ../glib-2.62.4/gobject/gobject.c:1825 #11 0x17e8dad7ec10 in g_object_new_valist (object_type=26288860026624, first_property_name=, var_args=) at ../glib-2.62.4/gobject/gobject.c:2152 #12 0x17e8dad7e61a in g_object_new (object_type=26288860026624, first_property_name=0x3a ) at ../glib-2.62.4/gobject/gobject.c:1670 #13 0x17e5e43ce94d in thunar_window_notebook_insert (window=0x17e89c4fa270, directory=0x17e815b5c810) at thunar-window.c:1845 #14 0x17e5e43cf4d9 in thunar_window_action_view_changed (action=, current=, window=0x17e89c4fa270) at thunar-window.c:2851 #15 0x17e5e43cf0cd in thunar_window_set_current_directory (window=0x17e89c4fa270, current_directory=0x17e815b5c810) at thunar-window.c:3865 #16 0x17e5e435ee63 in thunar_application_open_window (application=0x17e8cb7840f0, directory
回复: [Update] www/p5-Plack-Middleware-RemoveRedundantBody : Update to 0.09
Revised patch which removed BUILD_DEPENDS = ${RUN_DEPENDS}
wen
发件人: Andrew Hewus Fresh
发送时间: 2019年9月19日 11:27
收件人: wen heping
抄送: ports@openbsd.org
主题: Re: [Update] www/p5-Plack-Middleware-RemoveRedundantBody : Update to 0.09
On Thu, Aug 29, 2019 at 03:13:24AM +, wen heping wrote:
> Hi, ports@:
>
> Here is a patch for www/p5-Plack-Middleware-RemoveRedundantBody:
> i) Update to 0.09
> ii) Remove p5-Plack from TEST_DEPENDS since it is in RUN_DEPENDS
> It build well and passed all tests on amd64-head system.
>
> One port depends on it : p5-Dancer2. With this patch, it build well and
> run well,
> 2 tests failed but this is not caused by this update.
>
> Comments? OK?
> wen
>
This seems to package fine without the BUILD_DEPENDS=${RUN_DEPENDS}, so
with that removed: OK afresh1@
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 12 Jul 2019 20:50:57 - 1.4
> +++ Makefile 29 Aug 2019 02:55:21 -
> @@ -4,9 +4,8 @@ COMMENT = removes body for HTTP respons
>
> MODULES =cpan
> PKG_ARCH = *
> -DISTNAME = Plack-Middleware-RemoveRedundantBody-0.05
> +DISTNAME = Plack-Middleware-RemoveRedundantBody-0.09
> CATEGORIES = www
> -REVISION = 0
>
> # Perl
> PERMIT_PACKAGE = Yes
> @@ -15,7 +14,6 @@ BUILD_DEPENDS = ${RUN_DEPENDS}
>
> RUN_DEPENDS =www/p5-Plack
>
> -TEST_DEPENDS = www/p5-HTTP-Message \
> - www/p5-Plack
> +TEST_DEPENDS = www/p5-HTTP-Message
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/p5-Plack-Middleware-RemoveRedundantBody/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 11 Jan 2015 07:53:08 - 1.1.1.1
> +++ distinfo 29 Aug 2019 02:55:21 -
> @@ -1,2 +1,2 @@
> -SHA256 (Plack-Middleware-RemoveRedundantBody-0.05.tar.gz) =
> oGduHHkr6n8l8dkBvuWQVNNQEtXqjNQlKdM2FD+ofNg=
> -SIZE (Plack-Middleware-RemoveRedundantBody-0.05.tar.gz) = 10387
> +SHA256 (Plack-Middleware-RemoveRedundantBody-0.09.tar.gz) =
> gNRfk9a3KQsL2LPO3YSjf8UBRWzD3sAux6rYHAAYCH4=
> +SIZE (Plack-Middleware-RemoveRedundantBody-0.09.tar.gz) = 10708
--
andrew - http://afresh1.com
Hey, I think I see a barn up ahead.
-- The American Astronaut
Index: Makefile
===
RCS file: /cvs/ports/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile12 Jul 2019 20:50:57 - 1.4
+++ Makefile27 Dec 2019 07:23:26 -
@@ -4,18 +4,14 @@ COMMENT = removes body for HTTP respons
MODULES = cpan
PKG_ARCH = *
-DISTNAME = Plack-Middleware-RemoveRedundantBody-0.05
+DISTNAME = Plack-Middleware-RemoveRedundantBody-0.09
CATEGORIES = www
-REVISION = 0
# Perl
PERMIT_PACKAGE = Yes
-BUILD_DEPENDS =${RUN_DEPENDS}
-
RUN_DEPENDS = www/p5-Plack
-TEST_DEPENDS = www/p5-HTTP-Message \
- www/p5-Plack
+TEST_DEPENDS = www/p5-HTTP-Message
.include
Index: distinfo
===
RCS file: /cvs/ports/www/p5-Plack-Middleware-RemoveRedundantBody/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo11 Jan 2015 07:53:08 - 1.1.1.1
+++ distinfo27 Dec 2019 07:23:26 -
@@ -1,2 +1,2 @@
-SHA256 (Plack-Middleware-RemoveRedundantBody-0.05.tar.gz) =
oGduHHkr6n8l8dkBvuWQVNNQEtXqjNQlKdM2FD+ofNg=
-SIZE (Plack-Middleware-RemoveRedundantBody-0.05.tar.gz) = 10387
+SHA256 (Plack-Middleware-RemoveRedundantBody-0.09.tar.gz) =
gNRfk9a3KQsL2LPO3YSjf8UBRWzD3sAux6rYHAAYCH4=
+SIZE (Plack-Middleware-RemoveRedundantBody-0.09.tar.gz) = 10708
