date:20210410

[update] net/usockets 0.7.1, www/uwebsockets 19.1.0, www/purritobin 0.5.2

2021-04-10 Thread Aisha Tammy


Hi,

I've attached update for net/usockets, www/uwebsockets, net/purritobin

uwebsockets has breaking API changes related to pub/sub model behaviour.

purritobin changes
- tiny inbuilt http server (allows setting headers, etc. like hsts and 
CORS attributes)

- adds tests, all non-ssl tests are passing
SSL tests don't work, seems to be a problem with libressl and usockets, 
am going to open bugs for that libressl/usockets
- possibly unbreak for non-clang archs, it no longer needs separate 
filesystem library, but I don't have machines to check this


Would be nice to get this in 6.9.

OK?

Best,
Aisha


diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index a484c23f93a..29a5240aea9 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -3,20 +3,18 @@
 COMMENT=   eventing, networking & crypto for async applications
 CATEGORIES =   net
 
-VERSION =	0.6.0

-REVISION = 1
+VERSION =  0.7.1
 
 DISTNAME =	usockets-${VERSION}

 PKGNAME =  ${DISTNAME:L}
 
-SHARED_LIBS =	usockets 1.0

+SHARED_LIBS =  usockets 1.1
 
 GH_ACCOUNT =	uNetworking

 GH_PROJECT =   uSockets
-#GH_TAGNAME =  v0.6.0
-# cstdlib include error
-GH_COMMIT =7683672d87067cd75b854f4e36b9820f4809a4be
-
+#GH_TAGNAME =  v0.7.1
+# socket read/write error
+GH_COMMIT =5440dbac79bd76444175b76ee95dfcade12a6aac
 
 MAINTAINER =	Aisha Tammy 
 
@@ -30,11 +28,10 @@ COMPILER =	base-clang ports-gcc
 
 LIB_DEPENDS =	devel/libuv
 
-USE_GMAKE =	Yes

-MAKE_FLAGS =   CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-   CC="${CC}" CXX="${CXX}" \
-   LIBusockets_VERSION="${LIBusockets_VERSION}"
+MAKE_ENV = LIBusockets_VERSION="${LIBusockets_VERSION}"
 
 NO_TEST =	Yes
 
+FAKE_FLAGS =	PREFIX=${TRUEPREFIX}

+
 .include 
diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index 964ba508e9e..ed3dd036b68 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (usockets-0.6.0-7683672d.tar.gz) = 
0OooGCHD8ezNIcaB1zDPK6RQLGGYGZJb24Vemjlat7c=
-SIZE (usockets-0.6.0-7683672d.tar.gz) = 57634
+SHA256 (usockets-0.7.1-5440dbac.tar.gz) = 
+pfJ3z/KBnpJ3VNxcIvxpwPuQUsJjxIeODxidvn/G3c=
+SIZE (usockets-0.7.1-5440dbac.tar.gz) = 62372
diff --git a/net/usockets/patches/patch-Makefile 
b/net/usockets/patches/patch-Makefile
index e718b65a265..08e00ebc3da 100644
--- a/net/usockets/patches/patch-Makefile
+++ b/net/usockets/patches/patch-Makefile
@@ -6,7 +6,7 @@ remove -flto -O3
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -1,60 +1,40 @@
+@@ -1,60 +1,39 @@
 -# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
 -# For now we need to link with C++ for OpenSSL support, but should be removed 
with time
 -ifeq ($(WITH_OPENSSL),1)
@@ -30,7 +30,7 @@ Index: Makefile
 -  override CFLAGS += -DLIBUS_USE_LIBUV
 -  override LDFLAGS += -luv
 -endif
-+PREFIX ?= "/usr/local"
++PREFIX ?= /usr/local
 +LIBDIR ?= "$(PREFIX)/lib"
 +INCLUDEDIR ?= "$(PREFIX)/include"
  
@@ -39,19 +39,19 @@ Index: Makefile

 -  override CFLAGS += -DLIBUS_USE_GCD
 -  override LDFLAGS += -framework CoreFoundation
 -endif
-+# OpenBSD specific library version
-+LIBTARGET ?=  libusockets.so.$(LIBusockets_VERSION)
++PKG_CONFIG ?= pkg-config
  
 -# WITH_ASAN builds with sanitizers

 -ifeq ($(WITH_ASAN),1)
 -  override CFLAGS += -fsanitize=address -g
--  override LDFLAGS += -lasan
+-  override LDFLAGS += -fsanitize=address
 -endif
-+PKG_CONFIG ?= pkg-config
++LIBTARGET =   libusockets.so.$(LIBusockets_VERSION)
  
 -override CFLAGS += -std=c11 -Isrc

 -override LDFLAGS += uSockets.a
-+override LDFLAGS +=   -lstdc++ -lcrypto -lssl `$(PKG_CONFIG) --libs libuv`
++REQUIRES =libcrypto libssl libuv
++COMMON_FLAGS =-Isrc -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV 
`$(PKG_CONFIG) --cflags $(REQUIRES)`
  
 -# By default we build the uSockets.a static library

 -default:
@@ -62,37 +62,35 @@ Index: Makefile
 -  $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
 -endif
 -  $(AR) rvs uSockets.a *.o
-+COMMON_FLAGS =-DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -Isrc 
`$(PKG_CONFIG) --cflags libuv`
-+override CFLAGS +=$(COMMON_FLAGS)
-+override CXXFLAGS +=  $(COMMON_FLAGS)
++CFLAGS += -std=c11 $(COMMON_FLAGS)
++CXXFLAGS +=   -std=c++17 $(COMMON_FLAGS)
++LDFLAGS +=`$(PKG_CONFIG) --libs $(REQUIRES)`
  
 -# Builds all examples

 -.PHONY: examples
 -examples: default
 -  for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename "$$f" ".c") 
"$$f" $(LDFLAGS); done
 +all:
-+  $(CC) -std=c11 -fPIC $(CFLAGS) -c src/*.c src/eventing/*.c 
src/crypto/*.c
-+  $(CXX) -std=c++17 -fPIC $(CXXFLAGS) -c src/crypto/*.cpp
++  $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
++  $(CXX) $(CXXFLAGS) -fPIC -c src/crypto/*.cpp
 +  $(AR) rvs libusockets.a *.o
 +  $(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) $(LDFLAGS)
-+  sed -e "s:@PREFIX@:$(PREFIX):" -e "s:@VERSION@:$(LIBusockets_VERSION):" 
\
-+  libu

Re: fix games/barony textures in sdl2-2.0.14

2021-04-10 Thread David CARLIER

I followed the github issue and looked ok from my perspective too.

On Sun, 11 Apr 2021 at 01:47, Bryan Steele  wrote:
>
> On Sat, Apr 10, 2021 at 08:39:07PM -0400, Bryan Steele wrote:
> > On Sat, Apr 10, 2021 at 04:56:55PM -0700, Nam Nguyen wrote:
> > > solene@ reported that games/barony has missing textures.[1] Here is a
> > > diff fixing this sourced from a PR by Sylvain Becker.
> > >
> > > I used hg bisect to track down the revision in sdl2's repository that
> > > introduced this bug.[2] I contacted Sylvain Becker, the author of the sdl2
> > > commit. Sylvain fixed barony's usage of sdl2.
> > >
> > > The bug is with barony's modification of refcount, which is
> > > read-only. The fix uses userdata to stash imgref.
> > >
> > > I tried to understand the fix, but more eyes are welcome.
> > >
> > > Details
> > > ===
> > >
> > > >From /usr/local/include/SDL2/SDL_surface.h, refcount is read-only.
> > >
> > > /** Application data associated with the surface */
> > > void *userdata; /**< Read-write */
> > > /** Reference count -- used when freeing surface */
> > > int refcount;   /**< Read-mostly */
> > >
> > > Important variables:
> > > userdata: used to store imgref (the id) of a surface
> > > imgref: global Uint32 used to index into allsurfaces, an array of
> > >   GL_Surface pointers[3][4]
> > > refcount: read-only field in SDL_Surface used to count how many
> > >   references are made to a GL_Surface. See deleted comments in 1107-1113
> > >   in SDL_pixels.c.[2] It is probably used for some other purpose in the
> > >   implementation now that is deleted.
> > >
> > > Testing
> > > ===
> > >
> > > Textures work now with epic game assets downloaded on September 5,
> > > 2020. Feedback and tests are welcome. OK?
> > >
> > > Footnotes:
> > > [1] https://github.com/TurningWheel/Barony/issues/580
> > > [2] 
> > > https://github.com/libsdl-org/SDL/commit/ebc12a2fd2bb692908884e7db6cc935941a591f2#diff-98a8d948613c29516e252e8134aee43ba14fb7bcd6457d29be3ba99861fd80bcL1107
> > > [3] Barony-3.3.7/src/main.cpp:344:Uint32 imgref = 1
> > > [4] src/init.cpp:354: allsurfaces = (SDL_Surface**) malloc
> >
> > I tested this and can confirm this fixes the texture loading problem
> > and makes Barony 3.3.7 playable again, thanks for working with the
> > upstream SDL2 developers to find and fix this Nam!
> >
> > ok brynet@ at least, but will also need approval by solene@ (maintainer)
> > and also naddy@ because of the upcoming ports tree lock.
> >
> > -Bryan.
>
> Whoops, sorry solene@.
>
> MAINTAINER =David Carlier 
>

Re: audio/hydrogen build failure

2021-04-10 Thread Rafael Sadowski

On Sat Apr 10, 2021 at 01:24:43PM +0100, Stuart Henderson wrote:
> On 2021/04/09 21:32, Christian Weisgerber wrote:
> > audio/hydrogen failed to build in my latest amd64 bulk build.
> > 
> > ===>  Faking installation for hydrogen-1.0.1
> > [0/1] /usr/local/bin/cmake --regenerate-during-build 
> > -S/usr/obj/ports/hydrogen-1.0.1/hydrogen-1.0.1 
> > -B/usr/obj/ports/hydrogen-1.0.1/build-amd64
> > 
> > ... and then it goes off the rails.
> 
> On 2021/04/09 21:35, Christian Weisgerber wrote:
> > net/nextcloudclient failed to build in my latest amd64 bulk build.
> 
> For both it looks like cmake picks up doxygen during configure,
> probably either explicitly disabling it or adding as a build dependency
> would help.
> 

... let's try it.

Index: Makefile
===
RCS file: /cvs/ports/audio/hydrogen/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile27 Feb 2021 15:45:36 -  1.30
+++ Makefile11 Apr 2021 05:26:03 -
@@ -5,6 +5,7 @@ COMMENT=software drum machine
 V= 1.0.1
 DISTNAME=  hydrogen-$V
 CATEGORIES=audio
+REVISION=  0
 
 HOMEPAGE=  http://www.hydrogen-music.org/
 
@@ -48,6 +49,9 @@ CONFIGURE_ARGS=   -DWANT_ALSA=OFF \
-DWANT_PULSEAUDIO=OFF \
-DWANT_RUBBERBAND=ON \
-DWANT_SNDIO=ON
+
+# Disable Doxygen
+CONFIGURE_ARGS +=  -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
 
 post-extract:
cp ${FILESDIR}/Sndio{Audio,Midi}Driver.h \

Re: net/nextcloudclient build failure

2021-04-10 Thread Rafael Sadowski

On Fri Apr 09, 2021 at 09:35:53PM +0200, Christian Weisgerber wrote:
> net/nextcloudclient failed to build in my latest amd64 bulk build.
> 
> ===>  Faking installation for nextcloudclient-3.1.3
> [0/1] /usr/local/bin/cmake --regenerate-during-build 
> -S/usr/obj/ports/nextcloudclient-3.1.3/desktop-3.1.3 
> -B/usr/obj/ports/nextcloudclient-3.1.3/build-amd64
> 
> ... and then it goes off the rails.  Full log attached.
> 
> This looks like it shares the same root cause as the audio/hydrogen
> failure I just sent to ports@.
> 
> -- 
> Christian "naddy" Weisgerber  na...@mips.inka.de

Let's disable doxygen to be safe. No plist changes. Spotted by stehn@.


Index: Makefile
===
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile20 Feb 2021 06:57:51 -  1.15
+++ Makefile11 Apr 2021 05:19:14 -
@@ -4,6 +4,7 @@ COMMENT =   desktop sync client for Nextcl
 
 V =3.1.3
 DISTNAME = nextcloudclient-${V}
+REVISION = 0
 
 GH_ACCOUNT =   nextcloud
 GH_PROJECT =   desktop
@@ -52,6 +53,9 @@ CONFIGURE_ARGS =  -DBUILD_SHELL_INTEGRATI
-DUNIT_TESTING=ON \
-DWITH_CRASHREPORTER=OFF \
-DNO_SHIBBOLETH=ON
+
+# Disable Doxygen
+CONFIGURE_ARGS +=  -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
 
 # Do not install under /etc/Nextcloud
 CONFIGURE_ARGS +=  -DSYSCONF_INSTALL_DIR=${SYSCONFDIR}

Re: [doc] using qemu guest agent on OpenBSD kvm/qemu guests

2021-04-10 Thread Brad Smith


On 4/10/2021 3:05 AM, Landry Breuil wrote:

On Fri, Apr 09, 2021 at 04:53:17PM +0200, Landry Breuil wrote:

On Thu, Apr 08, 2021 at 06:19:58PM +0200, Jeroen Derks wrote:

On 08/04/2021 14:35, Landry Breuil wrote:>

well that's very nice, definitely interested in those freebsd patches !
not 100% sure those will get in 6.9 though as we're slowly moving towards
lock, but send them anyway, and we'll figure out what we can do from
there. I suppose those come from https://github.com/aborche/qemu-guest-agent ?

Indeed, here they are (if there's interest I can also send a diff of the patches
compared to the FreeBSD patches to see what I've done):

oh, well that looks nice. A bit rought around the edges imo, and im not
sure we want to maintain a rather large patch like this in the
portstree. according to https://wiki.qemu.org/Contribute/SubmitAPatch i
think it should be pushed upstream, do you have any idea if the original
freebsd patches were proposed there or qemu-devel list ?

i'll let brad decide, but as is this doesnt apply as-is against 6.0 rcs
which we're testing for post-6.9

so i've backported your patch on top of brad's 6.0rc2 qemu update, and
fixed things here and there, removed commented code, and yeah get-vcpus,
get-fsinfo and network-get-interfaces seems to work fine !


Thanks.

I don't mind keeping this or some variation on it around. It is small 
enough.


I would very much hope that there is an attempt to upstream this in some
form.


i'm not sure we want the set user password thing in the patch, as it
wont work on openbsd (uses the pw command which is freebsd ?). It's also
a bit gross to exec df to fetch the mount point list..

im also not sure what to do with the localstatedir thing (the -t flag),
i've added --localstatedir=/tmp/ to CONFIGURE_ARGS but that feels wrong.
qga needs it to store its qga.state file and probably to store temp
files..

to build the 6.0rc2 update with those two attached patches (to drop
under patches/), just add to the port Makefile:

# qemu-ga support for more operations
CFLAGS+=   -DBSD_GUEST_AGENT

Landry

[08:50] c64:~/mystuff/emulators/qemu/ $mkdir /tmp/run
[08:50] c64:~/mystuff/emulators/qemu/ $doas qemu-ga -v
1618037419.280400: debug: disabling command: guest-suspend-disk
1618037419.280439: debug: disabling command: guest-suspend-ram
1618037419.280452: debug: disabling command: guest-suspend-hybrid
1618037419.280463: debug: disabling command: guest-set-vcpus
1618037419.280474: debug: disabling command: guest-get-memory-blocks
1618037419.280485: debug: disabling command: guest-set-memory-blocks
1618037419.280496: debug: disabling command: guest-get-memory-block-size
1618037419.280507: debug: disabling command: guest-get-memory-block-info
1618037419.280519: debug: disabling command: guest-fsfreeze-status
1618037419.280530: debug: disabling command: guest-fsfreeze-freeze
1618037419.280541: debug: disabling command: guest-fsfreeze-freeze-list
1618037419.280551: debug: disabling command: guest-fsfreeze-thaw
1618037419.280564: debug: disabling command: guest-fstrim
1618037419.280578: debug: disabling command: guest-get-devices


root@openbsd-amd64:~# qm agent 100 get-vcpus
[
{
   "logical-id" : 0,
   "online" : true
},
{
...
{
   "logical-id" : 7,
   "online" : true
}
]
...
root@openbsd-amd64:~# qm agent 100 get-fsinfo
[
{
   "disk" : [],
   "mountpoint" : "/build",
   "name" : "/dev/sd1a",
   "total-bytes" : 50195449856,
   "type" : "ffs",
   "used-bytes" : 28191496192
},
{
   "disk" : [],
   "mountpoint" : "/var",
   "name" : "/dev/sd0e",
   "total-bytes" : 4011888640,
   "type" : "ffs",
   "used-bytes" : 3049684992
},
...

root@openbsd-amd64:~# qm agent 100 network-get-interfaces
[
{
   "hardware-address" : "a2:6e:16:9f:42:70",
   "ip-addresses" : [
  {
 "ip-address" : "10.0.3.254",
 "ip-address-type" : "ipv4",
 "prefix" : 24
  }
   ],
   "name" : "vio0"
},
{
   "hardware-address" : "be:10:50:5f:d0:78",
   "ip-addresses" : [
  {
 "ip-address" : "10.0.2.2",
 "ip-address-type" : "ipv4",
 "prefix" : 28
  }
   ],
   "name" : "vio1"
},
...

UPDATE: FFmpeg 4.4

2021-04-10 Thread Brad Smith

Here is an update to FFmpeg 4.4.


Index: graphics/ffmpeg/Makefile
===
RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.208
diff -u -p -u -p -r1.208 Makefile
--- graphics/ffmpeg/Makefile3 Apr 2021 11:15:46 -   1.208
+++ graphics/ffmpeg/Makefile9 Apr 2021 00:03:46 -
@@ -2,22 +2,21 @@
 
 COMMENT=   audio/video converter and streamer
 
-V= 4.3.2
+V= 4.4
 DISTNAME=  ffmpeg-${V}
-REVISION=  0
 EPOCH= 1
 CATEGORIES=graphics multimedia
 MASTER_SITES=  https://ffmpeg.org/releases/
 EXTRACT_SUFX=  .tar.xz
 
-SHARED_LIBS=   avcodec 24.0 \
-   avdevice12.0 \
-   avfilter9.0 \
-   avformat21.0 \
+SHARED_LIBS=   avcodec 25.0 \
+   avdevice13.0 \
+   avfilter10.0 \
+   avformat22.0 \
avresample  2.0 \
-   avutil  14.0 \
-   postproc18.0 \
-   swresample  3.0 \
+   avutil  15.0 \
+   postproc19.0 \
+   swresample  4.0 \
swscale 7.0
 
 HOMEPAGE=  https://ffmpeg.org/
Index: graphics/ffmpeg/distinfo
===
RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.61
diff -u -p -u -p -r1.61 distinfo
--- graphics/ffmpeg/distinfo23 Feb 2021 14:30:05 -  1.61
+++ graphics/ffmpeg/distinfo9 Apr 2021 00:04:02 -
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-4.3.2.tar.xz) = RuTmTx3QIzy8CTS58cDaZ2AIytNHJRE/t/gCz6hMzds=
-SIZE (ffmpeg-4.3.2.tar.xz) = 9391100
+SHA256 (ffmpeg-4.4.tar.xz) = BrEKGDzlNx+RXGuxW3sf/74EboJ1CZyWr/wp4XZF2Qk=
+SIZE (ffmpeg-4.4.tar.xz) = 9557868
Index: graphics/ffmpeg/patches/patch-configure
===
RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-configure,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 patch-configure
--- graphics/ffmpeg/patches/patch-configure 6 Jul 2020 07:14:55 -   
1.65
+++ graphics/ffmpeg/patches/patch-configure 30 Mar 2021 00:27:00 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.65 2020/07
 Index: configure
 --- configure.orig
 +++ configure
-@@ -5339,7 +5339,6 @@ case $target_os in
+@@ -5377,7 +5377,6 @@ case $target_os in
  enable section_data_rel_ro
  striptype=""
  SHFLAGS='-shared'
@@ -11,7 +11,7 @@ Index: configure
  SLIB_INSTALL_LINKS=
  oss_indev_extralibs="-lossaudio"
  oss_outdev_extralibs="-lossaudio"
-@@ -5695,7 +5694,7 @@ set_default libdir
+@@ -5733,7 +5732,7 @@ set_default libdir
  set_default $PATHS_LIST
  set_default nm
  
Index: graphics/ffmpeg/patches/patch-libavutil_cpu_c
===
RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-libavutil_cpu_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-libavutil_cpu_c
--- graphics/ffmpeg/patches/patch-libavutil_cpu_c   3 Apr 2021 11:15:46 
-   1.1
+++ graphics/ffmpeg/patches/patch-libavutil_cpu_c   3 Apr 2021 18:04:07 
-
@@ -3,7 +3,7 @@ $OpenBSD: patch-libavutil_cpu_c,v 1.1 20
 Index: libavutil/cpu.c
 --- libavutil/cpu.c.orig
 +++ libavutil/cpu.c
-@@ -283,6 +283,12 @@ int av_cpu_count(void)
+@@ -291,6 +291,12 @@ int av_cpu_count(void)
  DWORD_PTR proc_aff, sys_aff;
  if (GetProcessAffinityMask(GetCurrentProcess(), &proc_aff, &sys_aff))
  nb_cpus = av_popcount64(proc_aff);
Index: graphics/ffmpeg/pkg/PLIST
===
RCS file: /home/cvs/ports/graphics/ffmpeg/pkg/PLIST,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 PLIST
--- graphics/ffmpeg/pkg/PLIST   18 Jun 2020 07:03:15 -  1.38
+++ graphics/ffmpeg/pkg/PLIST   20 Mar 2021 00:44:45 -
@@ -75,6 +75,7 @@ include/libavutil/eval.h
 include/libavutil/ffversion.h
 include/libavutil/fifo.h
 include/libavutil/file.h
+include/libavutil/film_grain_params.h
 include/libavutil/frame.h
 include/libavutil/hash.h
 include/libavutil/hdr_dynamic_metadata.h
Index: x11/mplayer/Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.312
diff -u -p -u -p -r1.312 Makefile
--- x11/mplayer/Makefile23 Feb 2021 14:30:05 -  1.312
+++ x11/mplayer/Makefile9 Apr 2021 00:04:49 -
@@ -3,9 +3,9 @@
 COMMENT=   movie player supporting many formats
 
 V= 20210124
-FFMPEG_V=  4.3.2
+FFMPEG_V=  4.4
 DISTNAME=  mplayer-${V}
-REVISION=  0
+REVISION=  1
 CATEGORIES=x11 multimedia
 MASTER_SITES=  https://comstyle.com/source/
 EXTRACT_SUFX=  .tar.xz

Re: fix games/barony textures in sdl2-2.0.14

2021-04-10 Thread Bryan Steele

On Sat, Apr 10, 2021 at 08:39:07PM -0400, Bryan Steele wrote:
> On Sat, Apr 10, 2021 at 04:56:55PM -0700, Nam Nguyen wrote:
> > solene@ reported that games/barony has missing textures.[1] Here is a
> > diff fixing this sourced from a PR by Sylvain Becker.
> > 
> > I used hg bisect to track down the revision in sdl2's repository that
> > introduced this bug.[2] I contacted Sylvain Becker, the author of the sdl2
> > commit. Sylvain fixed barony's usage of sdl2.
> > 
> > The bug is with barony's modification of refcount, which is
> > read-only. The fix uses userdata to stash imgref.
> > 
> > I tried to understand the fix, but more eyes are welcome.
> > 
> > Details
> > ===
> > 
> > >From /usr/local/include/SDL2/SDL_surface.h, refcount is read-only.
> > 
> > /** Application data associated with the surface */
> > void *userdata; /**< Read-write */
> > /** Reference count -- used when freeing surface */
> > int refcount;   /**< Read-mostly */
> > 
> > Important variables:
> > userdata: used to store imgref (the id) of a surface
> > imgref: global Uint32 used to index into allsurfaces, an array of
> >   GL_Surface pointers[3][4]
> > refcount: read-only field in SDL_Surface used to count how many
> >   references are made to a GL_Surface. See deleted comments in 1107-1113
> >   in SDL_pixels.c.[2] It is probably used for some other purpose in the
> >   implementation now that is deleted.
> > 
> > Testing
> > ===
> > 
> > Textures work now with epic game assets downloaded on September 5,
> > 2020. Feedback and tests are welcome. OK?
> > 
> > Footnotes:
> > [1] https://github.com/TurningWheel/Barony/issues/580
> > [2] 
> > https://github.com/libsdl-org/SDL/commit/ebc12a2fd2bb692908884e7db6cc935941a591f2#diff-98a8d948613c29516e252e8134aee43ba14fb7bcd6457d29be3ba99861fd80bcL1107
> > [3] Barony-3.3.7/src/main.cpp:344:Uint32 imgref = 1
> > [4] src/init.cpp:354: allsurfaces = (SDL_Surface**) malloc
> 
> I tested this and can confirm this fixes the texture loading problem
> and makes Barony 3.3.7 playable again, thanks for working with the
> upstream SDL2 developers to find and fix this Nam!
> 
> ok brynet@ at least, but will also need approval by solene@ (maintainer)
> and also naddy@ because of the upcoming ports tree lock.
> 
> -Bryan.

Whoops, sorry solene@.

MAINTAINER =David Carlier

Re: fix games/barony textures in sdl2-2.0.14

2021-04-10 Thread Bryan Steele

On Sat, Apr 10, 2021 at 04:56:55PM -0700, Nam Nguyen wrote:
> solene@ reported that games/barony has missing textures.[1] Here is a
> diff fixing this sourced from a PR by Sylvain Becker.
> 
> I used hg bisect to track down the revision in sdl2's repository that
> introduced this bug.[2] I contacted Sylvain Becker, the author of the sdl2
> commit. Sylvain fixed barony's usage of sdl2.
> 
> The bug is with barony's modification of refcount, which is
> read-only. The fix uses userdata to stash imgref.
> 
> I tried to understand the fix, but more eyes are welcome.
> 
> Details
> ===
> 
> >From /usr/local/include/SDL2/SDL_surface.h, refcount is read-only.
> 
> /** Application data associated with the surface */
> void *userdata; /**< Read-write */
> /** Reference count -- used when freeing surface */
> int refcount;   /**< Read-mostly */
> 
> Important variables:
> userdata: used to store imgref (the id) of a surface
> imgref: global Uint32 used to index into allsurfaces, an array of
>   GL_Surface pointers[3][4]
> refcount: read-only field in SDL_Surface used to count how many
>   references are made to a GL_Surface. See deleted comments in 1107-1113
>   in SDL_pixels.c.[2] It is probably used for some other purpose in the
>   implementation now that is deleted.
> 
> Testing
> ===
> 
> Textures work now with epic game assets downloaded on September 5,
> 2020. Feedback and tests are welcome. OK?
> 
> Footnotes:
> [1] https://github.com/TurningWheel/Barony/issues/580
> [2] 
> https://github.com/libsdl-org/SDL/commit/ebc12a2fd2bb692908884e7db6cc935941a591f2#diff-98a8d948613c29516e252e8134aee43ba14fb7bcd6457d29be3ba99861fd80bcL1107
> [3] Barony-3.3.7/src/main.cpp:344:Uint32 imgref = 1
> [4] src/init.cpp:354: allsurfaces = (SDL_Surface**) malloc

I tested this and can confirm this fixes the texture loading problem
and makes Barony 3.3.7 playable again, thanks for working with the
upstream SDL2 developers to find and fix this Nam!

ok brynet@ at least, but will also need approval by solene@ (maintainer)
and also naddy@ because of the upcoming ports tree lock.

-Bryan.

fix games/barony textures in sdl2-2.0.14

2021-04-10 Thread Nam Nguyen

solene@ reported that games/barony has missing textures.[1] Here is a
diff fixing this sourced from a PR by Sylvain Becker.

I used hg bisect to track down the revision in sdl2's repository that
introduced this bug.[2] I contacted Sylvain Becker, the author of the sdl2
commit. Sylvain fixed barony's usage of sdl2.

The bug is with barony's modification of refcount, which is
read-only. The fix uses userdata to stash imgref.

I tried to understand the fix, but more eyes are welcome.

Details
===

>From /usr/local/include/SDL2/SDL_surface.h, refcount is read-only.

/** Application data associated with the surface */
void *userdata; /**< Read-write */
/** Reference count -- used when freeing surface */
int refcount;   /**< Read-mostly */

Important variables:
userdata: used to store imgref (the id) of a surface
imgref: global Uint32 used to index into allsurfaces, an array of
  GL_Surface pointers[3][4]
refcount: read-only field in SDL_Surface used to count how many
  references are made to a GL_Surface. See deleted comments in 1107-1113
  in SDL_pixels.c.[2] It is probably used for some other purpose in the
  implementation now that is deleted.

Testing
===

Textures work now with epic game assets downloaded on September 5,
2020. Feedback and tests are welcome. OK?

Footnotes:
[1] https://github.com/TurningWheel/Barony/issues/580
[2] 
https://github.com/libsdl-org/SDL/commit/ebc12a2fd2bb692908884e7db6cc935941a591f2#diff-98a8d948613c29516e252e8134aee43ba14fb7bcd6457d29be3ba99861fd80bcL1107
[3] Barony-3.3.7/src/main.cpp:344:Uint32 imgref = 1
[4] src/init.cpp:354: allsurfaces = (SDL_Surface**) malloc

Index: Makefile
===
RCS file: /cvs/ports/games/barony/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile4 Oct 2020 11:38:58 -   1.7
+++ Makefile10 Apr 2021 22:39:24 -
@@ -4,6 +4,7 @@ V = 3.3.7
 COMMENT =  3D, first person roguelike
 PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   games x11
+REVISION = 0
 
 GH_ACCOUNT =   TurningWheel
 GH_PROJECT =   Barony
Index: patches/patch-src_draw_cpp
===
RCS file: patches/patch-src_draw_cpp
diff -N patches/patch-src_draw_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_draw_cpp  10 Apr 2021 22:39:24 -
@@ -0,0 +1,109 @@
+$OpenBSD$
+
+Use 'userdata' instead of 'refcount'. 'refcount' is a private SDL_Surface 
field.
+Use 'imgref' and not 'imgref + 1' 
+
+see: https://github.com/TurningWheel/Barony/pull/582
+
+Index: src/draw.cpp
+--- src/draw.cpp.orig
 src/draw.cpp
+@@ -443,7 +443,7 @@ void drawImageRotatedAlpha( SDL_Surface* image, SDL_Re
+   }
+ 
+   // draw a textured quad
+-  glBindTexture(GL_TEXTURE_2D, texid[image->refcount]);
++  glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]);
+   glColor4f(1, 1, 1, alpha / 255.1);
+   glBegin(GL_QUADS);
+   glTexCoord2f(1.0 * ((real_t)src->x / image->w), 1.0 * ((real_t)src->y / 
image->h));
+@@ -492,7 +492,7 @@ void drawImageColor( SDL_Surface* image, SDL_Rect* src
+   }
+ 
+   // draw a textured quad
+-  glBindTexture(GL_TEXTURE_2D, texid[image->refcount]);
++  glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]);
+   real_t r = ((Uint8)(color >> mainsurface->format->Rshift)) / 255.f;
+   real_t g = ((Uint8)(color >> mainsurface->format->Gshift)) / 255.f;
+   real_t b = ((Uint8)(color >> mainsurface->format->Bshift)) / 255.f;
+@@ -546,7 +546,7 @@ void drawImageAlpha( SDL_Surface* image, SDL_Rect* src
+   }
+ 
+   // draw a textured quad
+-  glBindTexture(GL_TEXTURE_2D, texid[image->refcount]);
++  glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]);
+   glColor4f(1, 1, 1, alpha / 255.1);
+   glPushMatrix();
+   glBegin(GL_QUADS);
+@@ -596,7 +596,7 @@ void drawImage( SDL_Surface* image, SDL_Rect* src, SDL
+   }
+ 
+   // draw a textured quad
+-  glBindTexture(GL_TEXTURE_2D, texid[image->refcount]);
++  glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]);
+   glColor4f(1, 1, 1, 1);
+   glPushMatrix();
+   glBegin(GL_QUADS);
+@@ -646,7 +646,7 @@ void drawImageRing(SDL_Surface* image, SDL_Rect* src, 
+   }
+ 
+   // draw a textured quad
+-  glBindTexture(GL_TEXTURE_2D, texid[image->refcount]);
++  glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]);
+   glColor4f(1, 1, 1, alpha / 255.f);
+   glPushMatrix();
+ 
+@@ -771,7 +771,7 @@ void drawImageScaled( SDL_Surface* image, SDL_Rect* sr
+   }
+ 
+   // draw a textured quad
+-  glBindTexture(GL_TEXTURE_2D, texid[image->refcount]);
++  glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]);
+   glColor4f(1, 1, 1, 1);
+   glPushMatrix();
+   glBegin(GL_QUADS);
+@@ -826,7 +826,7 @@ void drawImageScaledPartial(SDL_Surface*

Re: [NEW] x11/notion 4.0.2 (successor to x11/ion) (fixed)

2021-04-10 Thread Stuart Henderson

On 2021/04/10 19:09, Stefan Hagen wrote:
> Stuart Henderson wrote:
> > Sample config usually goes in share/examples rather than under doc/.
> 
> Thank you, attached the next try with sample config in
> share/examples/notion.

oh, I see, that's actually where it loads from, not just installed as sample?

 # Configuration .lua files. Overrideable, as config files are usually
 # not placed under $(PREFIX).
-ETCDIR ?= $(PREFIX)/etc/notion
+ETCDIR ?= $(PREFIX)/share/examples/notion

I think what's wanted here is probably to get rid of that patch and set
MAKE_FLAGS= ETCDIR=${SYSCONFDIR}/notion (used during build to tell the
program where to look for files at runtime ) and then FAKE_FLAGS=
ETCDIR=$(PREFIX)/share/examples/notion so fake-install copies the
sample files there. Then use @sample in the PLIST to have pkg_add
copy the files at install time. This is so that the user can modify the
files if needed without causing conflicts.

> I've tried to bring as much work as possible from patches into the 
> Makefile. The LUA_VERSION is now also configurable and switches
> library/include paths and flags consistently.

good, that's needed.

> What's a good default here? Notion normally tries to use the highest
> lua version it can find. So I've set it to 5.3. But there's no 
> functional loss if we leave it at MODLUA_DEFAULT_VERSION (which 
> is 5.1).

Generally best is to set it to prefer whichever upstream prefers. Make sure
it's forced in some way so that e.g. if they normally check in order for
5.4 5.3 5.2 5.1, it won't start picking up 5.4 when that version gets added
to ports.

Re: [UPDATE] lang/erlang

2021-04-10 Thread niamkik

> For interpreters there's often good reason to have multiple versions
> (see php, python, lua, ruby) and if there's a good reason and
> somebody is willing to maintain then I wouldn't object to that.
> (That latter point is key though, if it's not going to be actively
> maintained then it really wants keeping simple).

It's quite okay for me. I am documenting the process right know to maintain 
each individual version of Erlang for OpenBSD. It should be easier for me in 
few days/weeks.

> Most of the dependencies are either already broken (riak, rabbitmq),
> or can handle at least up to 23 (rebar3, elixir). The others are rebar
> (no longer maintained and only used in ports as a dependency of riak)
> and tsung (no indication whether it will work or not and doesn't exactly
> seem active upstream).
>
> (riak is a bit special anyway, seems they really want it to be built with
> a patched Erlang..)

I started to rework on these ports with previous ported version. I have this 
list:

 - benchmarks/tsung
 - databases/riak
 - devel/rebar
 - devel/rebar3
 - lang/elixir
 - net/rabbitmq

The goal is to also add other Erlang application directly in the ports like 
VerneMQ or Wings3D for example.

Re: [NEW] x11/notion 4.0.2 (successor to x11/ion) (fixed)

2021-04-10 Thread Stefan Hagen

Stuart Henderson wrote:
> Sample config usually goes in share/examples rather than under doc/.

Thank you, attached the next try with sample config in
share/examples/notion.

I've tried to bring as much work as possible from patches into the 
Makefile. The LUA_VERSION is now also configurable and switches
library/include paths and flags consistently.

What's a good default here? Notion normally tries to use the highest
lua version it can find. So I've set it to 5.3. But there's no 
functional loss if we leave it at MODLUA_DEFAULT_VERSION (which 
is 5.1).

Best Regards,
Stefan


notion-4_0_2.tar.gz
Description: application/tar-gz

Re: [UPDATE] lang/erlang

2021-04-10 Thread Greg Steuck

niamkik  writes:

>> For interpreters there's often good reason to have multiple versions
>> (see php, python, lua, ruby) and if there's a good reason and
>> somebody is willing to maintain then I wouldn't object to that.
>> (That latter point is key though, if it's not going to be actively
>> maintained then it really wants keeping simple).
>
> It's quite okay for me. I am documenting the process right know to maintain 
> each individual version of Erlang for OpenBSD. It should be easier for me in 
> few days/weeks.

I would still strive for the minimal number of erlang version to keep.
If all the dependent ports software can be built with a single (most
supported?) version we'll come out ahead with less stuff.

>> Most of the dependencies are either already broken (riak, rabbitmq),
>> or can handle at least up to 23 (rebar3, elixir). The others are rebar
>> (no longer maintained and only used in ports as a dependency of riak)
>> and tsung (no indication whether it will work or not and doesn't exactly
>> seem active upstream).
>>
>> (riak is a bit special anyway, seems they really want it to be built with
>> a patched Erlang..)
>
> I started to rework on these ports with previous ported version. I have this 
> list:
>
>  - benchmarks/tsung
>  - databases/riak
>  - devel/rebar
>  - devel/rebar3
>  - lang/elixir
>  - net/rabbitmq
>
> The goal is to also add other Erlang application directly in the ports like 
> VerneMQ or Wings3D for example.

Let the application requirements guide the set of compilers to support.

Thanks
Greg

comms/gnuradio build failure

2021-04-10 Thread Christian Weisgerber

comms/gnuradio fails every other build or so.
sthen has already run out of patience and marked it BROKEN-i386.

The problem is machine-independent, though.  cmake builds a shared
library with our SHARED_LIBS version, then in the fake stage it
tries to install it with the upstream version.  This happens
quasi-randomly for a number of ports that use cmake.  gnuradio is
just one example, and currently the most frequently affected one.
And it happens across architectures.

Full log attached.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de


gnuradio.log.xz
Description: application/xz

Re: lang/mono for arm64

2021-04-10 Thread Christian Weisgerber

Patrick Wildt:

> sthen, naddy: OK to put it in, or too late?

ok

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: lang/mono for arm64

2021-04-10 Thread Patrick Wildt

i386 builds as well, as expected!

> Move aarch64 to the front of the list.

Sure, will do that.

sthen, naddy: OK to put it in, or too late?

Am Sat, Apr 10, 2021 at 01:18:05AM +0200 schrieb Patrick Wildt:
> Cool, thanks, Robert.
> 
> > sthen | makes sense to have that mono diff, need to be sure it doesn't 
> > break existing working archs (looked good from a quick read but i haven't 
> > tested)
> 
> The changes are all encapsulated in proper arch ifdefs.  To verify that
> is the case I'll compile it on our two mono arches;  amd64 works, and I
> will test i386 tomorrow morning.
> 
> Patrick
> 
> Am Fri, Apr 09, 2021 at 09:00:39PM +0200 schrieb Robert Nagy:
> > Hi
> > 
> > I am okay with this and i do not see why it cannot make release.
> > 
> > On 09/04/21 17:15 +0200, Patrick Wildt wrote:
> > > Hi,
> > > 
> > > to do some release tests with iked we wanted to play^Wtest games/openra
> > > over IPsec.  Turns out that arm64 does not support lang/mono, but I have
> > > gotten it to run.  With the following diff, games/openra builds and I
> > > can even play it.
> > > 
> > > This doesn't need to make release, so no worries.  Would be nice for
> > > others, but I myself run -current anyway.
> > > 
> > > The arch-defines.mk enables all mono-related packages.  In gcconfig.h
> > > OPENBSD needs to be checked so make sure in case it's AArch64, it
> > > doesn't define NOSYS.  Additionally apparently one has to check for
> > > OPENBSD and __aarch64__ to define the mach type.  Then there's another
> > > AARCH64 block where OS-related stuff has to be defined.  I simply used
> > > the AMD64 block, but skipping ELFCLASS.  In boringssl we need to have
> > > the 'find aarch64 crypto accel' code as well.  We don't have a nice API
> > > yet to extract info, so let's for now only use NEON, which we require
> > > on AArch64.  As far as I can see, ucontext is sigcontext, so I provide
> > > the same defines as FreeBSD but with sigcontext context.
> > > 
> > > I can try to get the diffs upstreamed.
> > > 
> > > Patrick
> > > 
> > > diff --git a/infrastructure/mk/arch-defines.mk 
> > > b/infrastructure/mk/arch-defines.mk
> > > index 228c3991f50..965949a964b 100644
> > > --- a/infrastructure/mk/arch-defines.mk
> > > +++ b/infrastructure/mk/arch-defines.mk
> > > @@ -21,7 +21,7 @@ LP64_ARCHS = aarch64 alpha amd64 mips64 mips64el 
> > > powerpc64 sparc64
> > >  GCC4_ARCHS = alpha hppa sh sparc64
> > >  GCC3_ARCHS = m88k
> > >  # XXX easier for ports that depend on mono
> > > -MONO_ARCHS = amd64 i386
> > > +MONO_ARCHS = amd64 i386 aarch64
> > >  OCAML_NATIVE_ARCHS = i386 amd64
> > >  OCAML_NATIVE_DYNLINK_ARCHS = i386 amd64
> > >  GO_ARCHS = aarch64 amd64 arm arm64 armv7 i386
> > > diff --git 
> > > a/lang/mono/patches/patch-external_bdwgc_include_private_gcconfig_h 
> > > b/lang/mono/patches/patch-external_bdwgc_include_private_gcconfig_h
> > > new file mode 100644
> > > index 000..e2d766861a7
> > > --- /dev/null
> > > +++ b/lang/mono/patches/patch-external_bdwgc_include_private_gcconfig_h
> > > @@ -0,0 +1,51 @@
> > > +$OpenBSD$
> > > +
> > > +Index: external/bdwgc/include/private/gcconfig.h
> > > +--- external/bdwgc/include/private/gcconfig.h.orig
> > >  external/bdwgc/include/private/gcconfig.h
> > > +@@ -155,7 +155,7 @@ EXTERN_C_BEGIN
> > > + # if defined(__aarch64__)
> > > + #define AARCH64
> > > + #if !defined(LINUX) && !defined(DARWIN) && !defined(FREEBSD) \
> > > +-&& !defined(NN_BUILD_TARGET_PLATFORM_NX)
> > > ++&& !defined(OPENBSD) && !defined(NN_BUILD_TARGET_PLATFORM_NX)
> > > + #  define NOSYS
> > > + #  define mach_type_known
> > > + #endif
> > > +@@ -348,6 +348,10 @@ EXTERN_C_BEGIN
> > > + #define X86_64
> > > + #define mach_type_known
> > > + # endif
> > > ++# if defined(OPENBSD) && defined(__aarch64__)
> > > ++#   define AARCH64
> > > ++#   define mach_type_known
> > > ++# endif
> > > + # if defined(LINUX) && (defined(i386) || defined(__i386__))
> > > + #define I386
> > > + #define mach_type_known
> > > +@@ -2298,6 +2302,25 @@ EXTERN_C_BEGIN
> > > +   extern char etext[];
> > > + # define DATASTART GC_FreeBSDGetDataStart(0x1000, (ptr_t)etext)
> > > + # define DATASTART_USES_BSDGETDATASTART
> > > ++#   endif
> > > ++#   ifdef OPENBSD
> > > ++# define OS_TYPE "OPENBSD"
> > > ++# ifndef GC_OPENBSD_THREADS
> > > ++EXTERN_C_END
> > > ++#   include 
> > > ++#   include 
> > > ++EXTERN_C_BEGIN
> > > ++#   ifdef USRSTACK
> > > ++# define STACKBOTTOM ((ptr_t)USRSTACK)
> > > ++#   else
> > > ++# define HEURISTIC2
> > > ++#   endif
> > > ++# endif
> > > ++  extern int __data_start[];
> > > ++  extern int _end[];
> > > ++# define DATASTART ((ptr_t)__data_start)
> > > ++# define DATAEND ((ptr_t)(&_end))
> > > ++# define DYNAMIC_LOADING
> > > + #   endif
> > > + #   ifdef NINTENDO_SWITCH
> > > +   static int zero_fd = -1;
> > > diff --git 
> > > a/lang/mono/patches/patch-

Re: audio/hydrogen build failure

2021-04-10 Thread Stuart Henderson

On 2021/04/09 21:32, Christian Weisgerber wrote:
> audio/hydrogen failed to build in my latest amd64 bulk build.
> 
> ===>  Faking installation for hydrogen-1.0.1
> [0/1] /usr/local/bin/cmake --regenerate-during-build 
> -S/usr/obj/ports/hydrogen-1.0.1/hydrogen-1.0.1 
> -B/usr/obj/ports/hydrogen-1.0.1/build-amd64
> 
> ... and then it goes off the rails.

On 2021/04/09 21:35, Christian Weisgerber wrote:
> net/nextcloudclient failed to build in my latest amd64 bulk build.

For both it looks like cmake picks up doxygen during configure,
probably either explicitly disabling it or adding as a build dependency
would help.

Re: net/nextcloudclient build failure

2021-04-10 Thread Christian Weisgerber

Rafael Sadowski:

> To me it looks like the build directory was corrupted after the build
> task and cmake re-run/try the configure task. Also not reproducible
> here.

I think both the hydrogen and the nextcloudclient failure haven't
happened before.  I assume it is some sort of race that will only
show up occasionally.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

[update] nextcloud 19.0.10 for 6.8-stable

2021-04-10 Thread Landry Breuil

hi,

even if 6.8-stable is going to die soon.. works for me !

ok ?
Index: Makefile
===
RCS file: /cvs/ports/www/nextcloud/Makefile,v
retrieving revision 1.56.2.5
diff -u -r1.56.2.5 Makefile
--- Makefile1 Mar 2021 13:17:10 -   1.56.2.5
+++ Makefile10 Apr 2021 08:58:40 -
@@ -2,7 +2,7 @@
 
 COMMENT=   easy and universal access to shared and/or personal 
files
 
-V= 19.0.9
+V= 19.0.10
 DISTNAME=  nextcloud-${V}
 EXTRACT_SUFX=  .tar.bz2
 
Index: distinfo
===
RCS file: /cvs/ports/www/nextcloud/Attic/distinfo,v
retrieving revision 1.40.2.5
diff -u -r1.40.2.5 distinfo
--- distinfo1 Mar 2021 13:17:10 -   1.40.2.5
+++ distinfo10 Apr 2021 08:58:40 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloud-19.0.9.tar.bz2) = 
xs2dM3uR2gbxIQ7+fPN0Z6oyIGzQadvFedTSraiB1CI=
-SIZE (nextcloud-19.0.9.tar.bz2) = 82504506
+SHA256 (nextcloud-19.0.10.tar.bz2) = 
ZMsyberYy5qz+IniD1ETQ26XYq24YnKuTdbA4NoHcCQ=
+SIZE (nextcloud-19.0.10.tar.bz2) = 95762826
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/nextcloud/pkg/Attic/PLIST,v
retrieving revision 1.43.2.5
diff -u -r1.43.2.5 PLIST
--- pkg/PLIST   1 Mar 2021 13:17:10 -   1.43.2.5
+++ pkg/PLIST   10 Apr 2021 08:58:41 -
@@ -7338,6 +7338,8 @@
 nextcloud/apps/dav/l10n/ro.json
 nextcloud/apps/dav/l10n/ru.js
 nextcloud/apps/dav/l10n/ru.json
+nextcloud/apps/dav/l10n/sc.js
+nextcloud/apps/dav/l10n/sc.json
 nextcloud/apps/dav/l10n/sk.js
 nextcloud/apps/dav/l10n/sk.json
 nextcloud/apps/dav/l10n/sl.js
@@ -11206,6 +11208,8 @@
 nextcloud/apps/logreader/l10n/ko.json
 nextcloud/apps/logreader/l10n/lb.js
 nextcloud/apps/logreader/l10n/lb.json
+nextcloud/apps/logreader/l10n/lo.js
+nextcloud/apps/logreader/l10n/lo.json
 nextcloud/apps/logreader/l10n/lt_LT.js
 nextcloud/apps/logreader/l10n/lt_LT.json
 nextcloud/apps/logreader/l10n/lv.js
@@ -11478,7 +11482,6 @@
 nextcloud/apps/nextcloud_announcements/templates/
 nextcloud/apps/nextcloud_announcements/templates/admin.php
 nextcloud/apps/notifications/
-nextcloud/apps/notifications/.eslintignore
 nextcloud/apps/notifications/COPYING
 nextcloud/apps/notifications/appinfo/
 nextcloud/apps/notifications/appinfo/app.php
@@ -11622,6 +11625,8 @@
 nextcloud/apps/notifications/l10n/ko.json
 nextcloud/apps/notifications/l10n/lb.js
 nextcloud/apps/notifications/l10n/lb.json
+nextcloud/apps/notifications/l10n/lo.js
+nextcloud/apps/notifications/l10n/lo.json
 nextcloud/apps/notifications/l10n/lt_LT.js
 nextcloud/apps/notifications/l10n/lt_LT.json
 nextcloud/apps/notifications/l10n/lv.js
@@ -12328,7 +12333,6 @@
 nextcloud/apps/photos/templates/
 nextcloud/apps/photos/templates/main.php
 nextcloud/apps/privacy/
-nextcloud/apps/privacy/.eslintignore
 nextcloud/apps/privacy/.stylelintrc.js
 nextcloud/apps/privacy/COPYING
 nextcloud/apps/privacy/appinfo/
@@ -12593,6 +12597,8 @@
 nextcloud/apps/recommendations/l10n/nb.json
 nextcloud/apps/recommendations/l10n/nl.js
 nextcloud/apps/recommendations/l10n/nl.json
+nextcloud/apps/recommendations/l10n/oc.js
+nextcloud/apps/recommendations/l10n/oc.json
 nextcloud/apps/recommendations/l10n/pl.js
 nextcloud/apps/recommendations/l10n/pl.json
 nextcloud/apps/recommendations/l10n/ps.js
@@ -12617,6 +12623,8 @@
 nextcloud/apps/recommendations/l10n/tr.json
 nextcloud/apps/recommendations/l10n/uk.js
 nextcloud/apps/recommendations/l10n/uk.json
+nextcloud/apps/recommendations/l10n/vi.js
+nextcloud/apps/recommendations/l10n/vi.json
 nextcloud/apps/recommendations/l10n/zh_CN.js
 nextcloud/apps/recommendations/l10n/zh_CN.json
 nextcloud/apps/recommendations/l10n/zh_HK.js
@@ -13056,6 +13064,8 @@
 nextcloud/apps/settings/l10n/ro.json
 nextcloud/apps/settings/l10n/ru.js
 nextcloud/apps/settings/l10n/ru.json
+nextcloud/apps/settings/l10n/sc.js
+nextcloud/apps/settings/l10n/sc.json
 nextcloud/apps/settings/l10n/sk.js
 nextcloud/apps/settings/l10n/sk.json
 nextcloud/apps/settings/l10n/sl.js
@@ -13817,7 +13827,6 @@
 nextcloud/apps/systemtags/templates/admin.php
 nextcloud/apps/systemtags/templates/list.php
 nextcloud/apps/text/
-nextcloud/apps/text/.eslintignore
 nextcloud/apps/text/.stylelintrc.js
 nextcloud/apps/text/CHANGELOG.md
 nextcloud/apps/text/COPYING
@@ -14383,6 +14392,8 @@
 nextcloud/apps/text/l10n/nb.json
 nextcloud/apps/text/l10n/nl.js
 nextcloud/apps/text/l10n/nl.json
+nextcloud/apps/text/l10n/oc.js
+nextcloud/apps/text/l10n/oc.json
 nextcloud/apps/text/l10n/pl.js
 nextcloud/apps/text/l10n/pl.json
 nextcloud/apps/text/l10n/pt_BR.js
@@ -14413,6 +14424,8 @@
 nextcloud/apps/text/l10n/tr.json
 nextcloud/apps/text/l10n/uk.js
 nextcloud/apps/text/l10n/uk.json
+nextcloud/apps/text/l10n/vi.js
+nextcloud/apps/text/l10n/vi.json
 nextcloud/apps/text/l10n/zh_CN.js
 nextcloud/apps/text/l10n/zh_CN.json
 nextcloud/apps/text/l10n/zh_HK.js
@@ -15564,6 +15577,8 @@

Re: [doc] using qemu guest agent on OpenBSD kvm/qemu guests

2021-04-10 Thread Landry Breuil

On Fri, Apr 09, 2021 at 04:53:17PM +0200, Landry Breuil wrote:
> On Thu, Apr 08, 2021 at 06:19:58PM +0200, Jeroen Derks wrote:
> > On 08/04/2021 14:35, Landry Breuil wrote:>
> > > well that's very nice, definitely interested in those freebsd patches !
> > > not 100% sure those will get in 6.9 though as we're slowly moving towards
> > > lock, but send them anyway, and we'll figure out what we can do from
> > > there. I suppose those come from 
> > > https://github.com/aborche/qemu-guest-agent ?
> > 
> > Indeed, here they are (if there's interest I can also send a diff of the 
> > patches
> > compared to the FreeBSD patches to see what I've done):
> 
> oh, well that looks nice. A bit rought around the edges imo, and im not
> sure we want to maintain a rather large patch like this in the
> portstree. according to https://wiki.qemu.org/Contribute/SubmitAPatch i
> think it should be pushed upstream, do you have any idea if the original
> freebsd patches were proposed there or qemu-devel list ?
> 
> i'll let brad decide, but as is this doesnt apply as-is against 6.0 rcs
> which we're testing for post-6.9

so i've backported your patch on top of brad's 6.0rc2 qemu update, and
fixed things here and there, removed commented code, and yeah get-vcpus,
get-fsinfo and network-get-interfaces seems to work fine !

i'm not sure we want the set user password thing in the patch, as it
wont work on openbsd (uses the pw command which is freebsd ?). It's also
a bit gross to exec df to fetch the mount point list..

im also not sure what to do with the localstatedir thing (the -t flag),
i've added --localstatedir=/tmp/ to CONFIGURE_ARGS but that feels wrong.
qga needs it to store its qga.state file and probably to store temp
files..

to build the 6.0rc2 update with those two attached patches (to drop
under patches/), just add to the port Makefile:

# qemu-ga support for more operations
CFLAGS+=   -DBSD_GUEST_AGENT

Landry

[08:50] c64:~/mystuff/emulators/qemu/ $mkdir /tmp/run
[08:50] c64:~/mystuff/emulators/qemu/ $doas qemu-ga -v 
1618037419.280400: debug: disabling command: guest-suspend-disk
1618037419.280439: debug: disabling command: guest-suspend-ram
1618037419.280452: debug: disabling command: guest-suspend-hybrid
1618037419.280463: debug: disabling command: guest-set-vcpus
1618037419.280474: debug: disabling command: guest-get-memory-blocks
1618037419.280485: debug: disabling command: guest-set-memory-blocks
1618037419.280496: debug: disabling command: guest-get-memory-block-size
1618037419.280507: debug: disabling command: guest-get-memory-block-info
1618037419.280519: debug: disabling command: guest-fsfreeze-status
1618037419.280530: debug: disabling command: guest-fsfreeze-freeze
1618037419.280541: debug: disabling command: guest-fsfreeze-freeze-list
1618037419.280551: debug: disabling command: guest-fsfreeze-thaw
1618037419.280564: debug: disabling command: guest-fstrim
1618037419.280578: debug: disabling command: guest-get-devices


root@openbsd-amd64:~# qm agent 100 get-vcpus
[
   {
  "logical-id" : 0,
  "online" : true
   },
   {
...
   {
  "logical-id" : 7,
  "online" : true
   }
]
...
root@openbsd-amd64:~# qm agent 100 get-fsinfo
[
   {
  "disk" : [],
  "mountpoint" : "/build",
  "name" : "/dev/sd1a",
  "total-bytes" : 50195449856,
  "type" : "ffs",
  "used-bytes" : 28191496192
   },
   {
  "disk" : [],
  "mountpoint" : "/var",
  "name" : "/dev/sd0e",
  "total-bytes" : 4011888640,
  "type" : "ffs",
  "used-bytes" : 3049684992
   },
...

root@openbsd-amd64:~# qm agent 100 network-get-interfaces
[
   {
  "hardware-address" : "a2:6e:16:9f:42:70",
  "ip-addresses" : [
 {
"ip-address" : "10.0.3.254",
"ip-address-type" : "ipv4",
"prefix" : 24
 }
  ],
  "name" : "vio0"
   },
   {
  "hardware-address" : "be:10:50:5f:d0:78",
  "ip-addresses" : [
 {
"ip-address" : "10.0.2.2",
"ip-address-type" : "ipv4",
"prefix" : 28
 }
  ],
  "name" : "vio1"
   },
...
$OpenBSD$

Index: qga/main.c
--- qga/main.c.orig
+++ qga/main.c
@@ -46,9 +46,15 @@
 #endif
 
 #ifndef _WIN32
+#ifdef BSD_GUEST_AGENT
+#define QGA_VIRTIO_PATH_DEFAULT "/dev/vtcon/org.qemu.guest_agent.0"
+#define QGA_STATE_RELATIVE_DIR  "run"
+#define QGA_SERIAL_PATH_DEFAULT "/dev/cua01"
+#else
 #define QGA_VIRTIO_PATH_DEFAULT "/dev/virtio-ports/org.qemu.guest_agent.0"
 #define QGA_STATE_RELATIVE_DIR  "run"
 #define QGA_SERIAL_PATH_DEFAULT "/dev/ttyS0"
+#endif
 #else
 #define QGA_VIRTIO_PATH_DEFAULT ".\\Global\\org.qemu.guest_agent.0"
 #define QGA_STATE_RELATIVE_DIR  "qemu-ga"
@@ -1471,7 +1477,11 @@ int main(int argc, char **argv)
 }
 
 if (config->method == NULL) {
+#ifdef BSD_GUEST_AGENT
+config->method = g_strdup("isa-serial");
+#else
 config->method = g_strdup("virtio-serial");
+#endif
 }
 
 socket_activation = check_socket_activ

[update] net/usockets 0.7.1, www/uwebsockets 19.1.0, www/purritobin 0.5.2

Re: fix games/barony textures in sdl2-2.0.14

Re: audio/hydrogen build failure

Re: net/nextcloudclient build failure

Re: [doc] using qemu guest agent on OpenBSD kvm/qemu guests

UPDATE: FFmpeg 4.4

Re: fix games/barony textures in sdl2-2.0.14

Re: fix games/barony textures in sdl2-2.0.14

fix games/barony textures in sdl2-2.0.14

Re: [NEW] x11/notion 4.0.2 (successor to x11/ion) (fixed)

Re: [UPDATE] lang/erlang

Re: [NEW] x11/notion 4.0.2 (successor to x11/ion) (fixed)

Re: [UPDATE] lang/erlang

comms/gnuradio build failure

Re: lang/mono for arm64

Re: lang/mono for arm64

Re: audio/hydrogen build failure

Re: net/nextcloudclient build failure

[update] nextcloud 19.0.10 for 6.8-stable

Re: [doc] using qemu guest agent on OpenBSD kvm/qemu guests

20 matches

Site Navigation

Mail list logo

Footer information