date:20231223

Re: boost futex diff

2023-12-23 Thread Theo Buehler

On Sat, Dec 23, 2023 at 08:44:28PM -0500, Brad Smith wrote:
> On 2023-12-23 4:47 a.m., Theo Buehler wrote:
> > This is based on a diff from Brad who noticed that the diff disabling
> > syscall(2) accidentally disabled futexes altogether. This diff reverts
> > to the state prior to that commit by taking the intended approach:
> > replace syscall(SYS_futex, ...) with a call to futex(2) itself.
> > 
> > The second part of the diff enables futexes for fiber.
> > 
> > I think this is an improvement over the current state. It went through a
> > bulk without fallout. Unless I hear objections, I plan on committing
> > this in a few days.
> 
> A piece of the diff is missing. The fiber/detail/config.hpp part. Without
> that the
> other piece is not built.

Ah yes, forgotten cvs add. I'll commit this, then, including the
PATCHORIG bit pointed out by gkoehler.

Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
diff -u -p -r1.140 Makefile
--- Makefile24 Dec 2023 00:26:12 -  1.140
+++ Makefile24 Dec 2023 04:57:15 -
@@ -11,8 +11,8 @@ COMMENT-md=   machine-dependent libraries 
 VERSION=   1.84.0
 DISTNAME=  boost_${VERSION:S/./_/g}
 PKGNAME=   boost-${VERSION}
-REVISION=  0
-EPOCH =0
+REVISION=  1
+EPOCH= 0
 CATEGORIES=devel
 SITES= 
https://boostorg.jfrog.io/artifactory/main/release/${VERSION}/source/
 EXTRACT_SUFX=  .tar.bz2
@@ -151,7 +151,7 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/boost
${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
cd ${WRKSRC}/boost && \
-   pax -rw -s ':^.*\.orig$$::' . ${PREFIX}/include/boost
+   pax -rw -s ':^.*${PATCHORIG}$$::' . ${PREFIX}/include/boost
find ${PREFIX}/include/boost -type d -exec chmod ${DIRMODE} {} +
find ${PREFIX}/include/boost -type f -exec chmod ${SHAREMODE} {} +
# boost-build:
@@ -159,11 +159,11 @@ do-install:
${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/b2
@cd ${WRKSRC}/tools/build/src && \
-   pax -r -w -p pm -s ':^./engine.*$$::' -s ':^.*\.orig$$::' . \
+   pax -r -w -p pm -s ':^./engine.*$$::' -s ':^.*${PATCHORIG}$$::' 
. \
${PREFIX}/share/b2
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/b2
@cd ${WRKSRC}/tools/build/example && \
-   pax -r -w -p pm -s ':^.*\.orig$$::' . \
+   pax -r -w -p pm -s ':^.*${PATCHORIG}$$::' . \
${PREFIX}/share/examples/b2
 
 .include 
Index: patches/patch-boost_atomic_detail_futex_hpp
===
RCS file: /cvs/ports/devel/boost/patches/patch-boost_atomic_detail_futex_hpp,v
diff -u -p -r1.1 patch-boost_atomic_detail_futex_hpp
--- patches/patch-boost_atomic_detail_futex_hpp 28 Oct 2023 14:03:31 -  
1.1
+++ patches/patch-boost_atomic_detail_futex_hpp 21 Dec 2023 13:01:02 -
@@ -1,44 +1,44 @@
 Index: boost/atomic/detail/futex.hpp
 --- boost/atomic/detail/futex.hpp.orig
 +++ boost/atomic/detail/futex.hpp
-@@ -23,7 +23,7 @@
- #pragma once
- #endif
+@@ -25,6 +25,7 @@
  
--#if defined(__linux__) || defined(__OpenBSD__) || defined(__NETBSD__) || 
defined(__NetBSD__)
-+#if defined(__linux__) || defined(__NETBSD__) || defined(__NetBSD__)
+ #if defined(__linux__) || defined(__OpenBSD__) || defined(__NETBSD__) || 
defined(__NetBSD__)
  
++#ifndef __OpenBSD__
  #include 
  
-@@ -45,8 +45,9 @@
+ #if defined(SYS_futex)
+@@ -44,9 +45,10 @@
+ #define BOOST_ATOMIC_DETAIL_SYS_FUTEX SYS___futex
  #define BOOST_ATOMIC_DETAIL_NETBSD_FUTEX
  #endif
++#endif
  
 -#if defined(BOOST_ATOMIC_DETAIL_SYS_FUTEX)
  
 +#if defined(BOOST_ATOMIC_DETAIL_SYS_FUTEX) || defined(__OpenBSD__)
-+
  #include 
  #if defined(__linux__)
  #include 
-@@ -74,7 +75,9 @@ namespace detail {
+@@ -74,7 +76,9 @@ namespace detail {
  //! Invokes an operation on the futex
  BOOST_FORCEINLINE int futex_invoke(void* addr1, int op, unsigned int val1, 
const void* timeout = NULL, void* addr2 = NULL, unsigned int val3 = 0) 
BOOST_NOEXCEPT
  {
 -#if !defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
 +#if defined(__OpenBSD__)
-+return ::futex(addr1, op, val1, timeout, addr2, 0u, val3);
++return ::futex(static_cast < volatile uint32_t * >(addr1), op, val1, 
static_cast < const struct timespec * >(timeout), static_cast < volatile 
uint32_t * >(addr2));
 +#elif !defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
  return ::syscall(BOOST_ATOMIC_DETAIL_SYS_FUTEX, addr1, op, val1, timeout, 
addr2, val3);
  #else
  // Pass 0 in val2.
-@@ -85,7 +88,9 @@ BOOST_FORCEINLINE int futex_invoke(void* addr1, int op
+@@ -85,7 +89,9 @@ BOOST_FORCEINLINE int futex_invoke(void* addr1, int op
  //! Invokes an operation on the futex
  BOOST_FORCEINLINE int futex_invoke(void* addr1, int op, unsigned int val1, 
unsigned int val2, void* addr2 = NULL, unsigned int val3 = 0) BOOST_NOEXCEPT

Re: unbreak boost for powerpc, powerpc64

2023-12-23 Thread Brad Smith


On 2023-12-23 7:52 p.m., George Koehler wrote:

On Sat, 23 Dec 2023 23:46:33 +0100
Theo Buehler  wrote:


Please go ahead, I can cope.

I committed it.  Now if anyone runs update-plist, my commit adds
cpu_relax.hpp.orig.port to this warning,

Warning: entries NOT added to boost-1.84.0p0v0:
  include/boost/atomic/detail/futex.hpp.orig.port (.orig.port suffix ?)
  include/boost/fiber/detail/cpu_relax.hpp.orig.port (.orig.port suffix ?)
  include/boost/fiber/detail/futex.hpp.orig.port (.orig.port suffix ?)
  share/b2/tools/gcc.jam.orig.port (.orig.port suffix ?)

do-install runs pax -s ':^.*\.orig$$::' to skip .orig files, but
we changed PATCHORIG to .orig.port some time ago, so
-s ':^.*\.orig\.port$$::' might be better.


Yes. That should be updated to do as intended. Thanks.OK with me.

Re: boost futex diff

2023-12-23 Thread Brad Smith


On 2023-12-23 4:47 a.m., Theo Buehler wrote:

This is based on a diff from Brad who noticed that the diff disabling
syscall(2) accidentally disabled futexes altogether. This diff reverts
to the state prior to that commit by taking the intended approach:
replace syscall(SYS_futex, ...) with a call to futex(2) itself.

The second part of the diff enables futexes for fiber.

I think this is an improvement over the current state. It went through a
bulk without fallout. Unless I hear objections, I plan on committing
this in a few days.


A piece of the diff is missing. The fiber/detail/config.hpp part. 
Without that the

other piece is not built.



Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
diff -u -p -r1.139 Makefile
--- Makefile19 Dec 2023 06:14:25 -  1.139
+++ Makefile21 Dec 2023 06:43:23 -
@@ -11,7 +11,8 @@ COMMENT-md=   machine-dependent libraries
  VERSION=  1.84.0
  DISTNAME= boost_${VERSION:S/./_/g}
  PKGNAME=  boost-${VERSION}
-EPOCH =0
+REVISION=  0
+EPOCH= 0
  CATEGORIES=   devel
  SITES=
https://boostorg.jfrog.io/artifactory/main/release/${VERSION}/source/
  EXTRACT_SUFX= .tar.bz2
Index: patches/patch-boost_atomic_detail_futex_hpp
===
RCS file: /cvs/ports/devel/boost/patches/patch-boost_atomic_detail_futex_hpp,v
diff -u -p -r1.1 patch-boost_atomic_detail_futex_hpp
--- patches/patch-boost_atomic_detail_futex_hpp 28 Oct 2023 14:03:31 -  
1.1
+++ patches/patch-boost_atomic_detail_futex_hpp 21 Dec 2023 07:22:52 -
@@ -1,44 +1,44 @@
  Index: boost/atomic/detail/futex.hpp
  --- boost/atomic/detail/futex.hpp.orig
  +++ boost/atomic/detail/futex.hpp
-@@ -23,7 +23,7 @@
- #pragma once
- #endif
+@@ -25,6 +25,7 @@
   
--#if defined(__linux__) || defined(__OpenBSD__) || defined(__NETBSD__) || defined(__NetBSD__)

-+#if defined(__linux__) || defined(__NETBSD__) || defined(__NetBSD__)
+ #if defined(__linux__) || defined(__OpenBSD__) || defined(__NETBSD__) || 
defined(__NetBSD__)
   
++#ifndef __OpenBSD__

   #include 
   
-@@ -45,8 +45,9 @@

+ #if defined(SYS_futex)
+@@ -44,9 +45,10 @@
+ #define BOOST_ATOMIC_DETAIL_SYS_FUTEX SYS___futex
   #define BOOST_ATOMIC_DETAIL_NETBSD_FUTEX
   #endif
++#endif
   
  -#if defined(BOOST_ATOMIC_DETAIL_SYS_FUTEX)
   
  +#if defined(BOOST_ATOMIC_DETAIL_SYS_FUTEX) || defined(__OpenBSD__)

-+
   #include 
   #if defined(__linux__)
   #include 
-@@ -74,7 +75,9 @@ namespace detail {
+@@ -74,7 +76,9 @@ namespace detail {
   //! Invokes an operation on the futex
   BOOST_FORCEINLINE int futex_invoke(void* addr1, int op, unsigned int val1, 
const void* timeout = NULL, void* addr2 = NULL, unsigned int val3 = 0) 
BOOST_NOEXCEPT
   {
  -#if !defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
  +#if defined(__OpenBSD__)
-+return ::futex(addr1, op, val1, timeout, addr2, 0u, val3);
++return ::futex(static_cast < volatile uint32_t * >(addr1), op, val1, static_cast < 
const struct timespec * >(timeout), static_cast < volatile uint32_t * >(addr2));
  +#elif !defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
   return ::syscall(BOOST_ATOMIC_DETAIL_SYS_FUTEX, addr1, op, val1, 
timeout, addr2, val3);
   #else
   // Pass 0 in val2.
-@@ -85,7 +88,9 @@ BOOST_FORCEINLINE int futex_invoke(void* addr1, int op
+@@ -85,7 +89,9 @@ BOOST_FORCEINLINE int futex_invoke(void* addr1, int op
   //! Invokes an operation on the futex
   BOOST_FORCEINLINE int futex_invoke(void* addr1, int op, unsigned int val1, 
unsigned int val2, void* addr2 = NULL, unsigned int val3 = 0) BOOST_NOEXCEPT
   {
  -#if !defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
  +#if defined(__OpenBSD__)
-+return futex(addr1, op, val1, static_cast< void* >(NULL), addr2, val2, 
val3);
++return futex(static_cast < volatile uint32_t * >(addr1), op, val1, nullptr, 
static_cast < volatile uint32_t * >(addr2));
  +#elif !defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
   return ::syscall(BOOST_ATOMIC_DETAIL_SYS_FUTEX, addr1, op, val1, 
static_cast< atomics::detail::uintptr_t >(val2), addr2, val3);
   #else
Index: patches/patch-boost_fiber_detail_futex_hpp
===
RCS file: /cvs/ports/devel/boost/patches/patch-boost_fiber_detail_futex_hpp,v
diff -u -p -r1.1 patch-boost_fiber_detail_futex_hpp
--- patches/patch-boost_fiber_detail_futex_hpp  28 Oct 2023 14:03:31 -  
1.1
+++ patches/patch-boost_fiber_detail_futex_hpp  21 Dec 2023 07:28:14 -
@@ -1,12 +1,27 @@
  Index: boost/fiber/detail/futex.hpp
  --- boost/fiber/detail/futex.hpp.orig
  +++ boost/fiber/detail/futex.hpp
-@@ -32,7 +32,11 @@ namespace detail {
- #if BOOST_OS_LINUX
+@@ -21,6 +21,10 @@ extern "C" {
+ #include 
+ #include 
+ }
++#elif BOOST_OS_BSD_OPEN
++extern "C" {
++#include 
++}
+ #elif BOOST_OS_WINDOWS
+ #include 
+ #endif
+@@ -29,10 +33,14 @@ namespace boost {
+ namespace fibers {
+

Re: unbreak boost for powerpc, powerpc64

2023-12-23 Thread George Koehler

On Sat, 23 Dec 2023 23:46:33 +0100
Theo Buehler  wrote:

> Please go ahead, I can cope.

I committed it.  Now if anyone runs update-plist, my commit adds
cpu_relax.hpp.orig.port to this warning,

Warning: entries NOT added to boost-1.84.0p0v0:
 include/boost/atomic/detail/futex.hpp.orig.port (.orig.port suffix ?)
 include/boost/fiber/detail/cpu_relax.hpp.orig.port (.orig.port suffix ?)
 include/boost/fiber/detail/futex.hpp.orig.port (.orig.port suffix ?)
 share/b2/tools/gcc.jam.orig.port (.orig.port suffix ?)

do-install runs pax -s ':^.*\.orig$$::' to skip .orig files, but
we changed PATCHORIG to .orig.port some time ago, so
-s ':^.*\.orig\.port$$::' might be better.

Re: Link x11/kde-plasma and add kde-plasma and kde-plasma-extras meta package

2023-12-23 Thread Rafael Sadowski

Klemens, Thanks for the review!

On Sat Dec 23, 2023 at 10:12:17PM +, Klemens Nanni wrote:
> On Fri, Dec 22, 2023 at 12:42:45AM +0100, Rafael Sadowski wrote:
> > Hi ports@
> > 
> > I would like to link kde-plasma to the build and introduce two new meta
> > packages. The meta package kde-plasma comes with a README. I tried to
> > add a handful useful information.
> > 
> > I use KDE Plasma as my daily desktop environment and apart from the KWin
> > compression it works great for me.
> > 
> > I welcome any feedback especially for the README-plasma, it can
> > certainly be improved.
> > 
> > OK?
> 
> PLIST-main changed without REVISION-main.

Added.

> Do you keep -plasma out of RUN_DEPENDS-main intentionally (for now)?

No, I'm thinking of kde-full for this purpose. But not yet.

> 
> > 
> > Index: meta/kde/Makefile
> > ===
> > RCS file: /cvs/ports/meta/kde/Makefile,v
> > diff -u -p -r1.13 Makefile
> > --- meta/kde/Makefile   28 Oct 2023 07:47:33 -  1.13
> > +++ meta/kde/Makefile   21 Dec 2023 23:26:01 -
> > @@ -12,6 +12,9 @@ COMMENT-pim = KDE PIM personal informat
> >  COMMENT-development =  KDE development applications
> > +WANTLIB-plasma =
> > +LIB_DEPENDS-plasma =
> > +RUN_DEPENDS-plasma += \
> 
> First assignment could be just =.

What do you mine by that? What is wrong with this pattern " += \"?

> 
> > +   x11/kde-plasma/breeze \
> > +   x11/kde-plasma/breeze-gtk \
> > +   x11/kde-plasma/kactivitymanagerd \
> > +   x11/kde-plasma/kde-cli-tools \
> > +   x11/kde-plasma/kde-gtk-config \
> > +# extra apps
> > +RUN_DEPENDS-plasma-extras += \
> > +   STEM-=${PLASMA_VERSION}:${BASE_PKGPATH},-plasma \
> 
> What about net/kdeconnect-kde?

Good point, added.

> 
> > +   x11/kde-applications/ark \
> > +   x11/kde-applications/gwenview \
> > +   x11/kde-applications/kate \
> > +   x11/kde-applications/kcalc \
> > +   x11/kde-applications/merkuro \
> > +   x11/kde-applications/okular \
> > +   x11/kde-applications/spectacle
> >  
> >  .include 
> > Index: meta/kde/pkg/DESCR-plasma
> > ===
> > RCS file: meta/kde/pkg/DESCR-plasma
> > diff -N meta/kde/pkg/DESCR-plasma
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ meta/kde/pkg/DESCR-plasma   21 Dec 2023 23:26:01 -
> > @@ -0,0 +1,5 @@
> > +The KDE Plasma Desktop Environment, base installation. Contains core KDE 
> > Plasma
> > +plus:
> 
> Perhaps start "Contains ..." on its own line?

Chanced.

> 
> > + * Dolphin - file manager
> > + * Konsole - terminal emulator
> > + * Kmix - sound channel mixer and volume control
> > Index: meta/kde/pkg/DESCR-plasma-extras
> > ===
> > RCS file: meta/kde/pkg/DESCR-plasma-extras
> > diff -N meta/kde/pkg/DESCR-plasma-extras
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ meta/kde/pkg/DESCR-plasma-extras21 Dec 2023 23:26:01 -
> > @@ -0,0 +1,9 @@
> > +The KDE Plasma Desktop Environment, extras installation. Contains core KDE 
> > Plasma
> > +plus:
> 
> Same.

Chanced.

> 
> > + * Okular - universal Document Viewer
> > + * Kate- text editor
> > + * gwenview - image viewer
> > + * spectacle- screenshot capture utility
> > + * kcalc - calculator
> > + * ark - file compression/decompression utility
> > +X11 Startup
> > +===
> > +KDE Plasma desktop environment is launched through the 'startplasma-x11'
> > +executable. Simply add '${LOCALBASE}/bin/startplasma-x11' to your .xinitrc
> 
> Missing "or" at the end.

Fixed.

> 
> > +.xsession script if you use startx(1) or xenodm(1), respectively. You can 
> > find
> > +an example below. The 'XDG_RUNTIME_DIR' should be present before calling
> > +'startplasma-x11'
> > +
> > +
> > +It is also possible to use a window manager other than KWin with Plasma.
> > +
> > +export KDEWM=${LOCALBASE}/bin/picom
> > +
> > +Desktop  search
> > +===
> 
> Extra space.

Fixed.

> 
> > +Baloo file indexer is disabled by default on OpenBSD. To enable it go to
> > +"Search" -> "File Search in system settings or execute:
> > +- When using ck-launch-session with keepassxc, the browser connection don't
> > +  work properly.
> 
> This issue is not specific to KDE/Plasma, I have the same problem under Xfce:
> 
>   # XXX consolekit2 breaks keepassxc browser addon, something dbus...
>   exec startxfce4 #--with-ck-launch

Removed. This issue nuts me.

> 
> > +- The sound mixer Kmix works only on the main channel.
> > +
> > +
> > +You can also dump all error/info messages by starting `startplasma-x11`
> > +with the following options
> 
> Duplicate sentence.

Ops, I removed the first one.

> 
> > + You can also output all error/info messages by starting `startplasma-x11` 
> > with
> > +the following options and provide a full

CVS: cvs.openbsd.org: ports

2023-12-23 Thread George Koehler

CVSROOT:/cvs
Module name:ports
Changes by: gkoeh...@cvs.openbsd.org2023/12/23 17:26:12

Modified files:
devel/boost: Makefile 
Added files:
devel/boost/patches: patch-boost_fiber_detail_cpu_relax_hpp 

Log message:
Unbreak devel/boost on powerpc, powerpc64

 was picking the wrong syntax for
PowerPC asm.

ok tb@

Re: unbreak boost for powerpc, powerpc64

2023-12-23 Thread Brad Smith


On 2023-12-23 5:44 p.m., George Koehler wrote:

devel/boost is broken on powerpc and powerpc64, because
 picks the wrong asm syntax.
This patch fixes it, ok?

The REVISION bump conflicts with tb's "boost futex diff";
I will do REVISION= 1 if tb commits before me.
--gkoehler


https://github.com/boostorg/fiber/commit/2bd8eb02f81ab8297aa89b8cb29b0f3867b9fafe

OK.

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Matthias Kilian

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/12/23 15:48:33

Modified files:
lang/ghc   : Makefile distinfo 

Log message:
Use the new ghc bootstrap.

Re: unbreak boost for powerpc, powerpc64

2023-12-23 Thread Theo Buehler

On Sat, Dec 23, 2023 at 05:44:43PM -0500, George Koehler wrote:
> devel/boost is broken on powerpc and powerpc64, because
>  picks the wrong asm syntax.
> This patch fixes it, ok?

ok

> The REVISION bump conflicts with tb's "boost futex diff";
> I will do REVISION= 1 if tb commits before me.
> --gkoehler

Please go ahead, I can cope.

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/boost/Makefile,v
> retrieving revision 1.139
> diff -u -p -r1.139 Makefile
> --- Makefile  19 Dec 2023 06:14:25 -  1.139
> +++ Makefile  23 Dec 2023 18:33:03 -
> @@ -11,6 +11,7 @@ COMMENT-md= machine-dependent libraries 
>  VERSION= 1.84.0
>  DISTNAME=boost_${VERSION:S/./_/g}
>  PKGNAME= boost-${VERSION}
> +REVISION=0
>  EPOCH =  0
>  CATEGORIES=  devel
>  SITES=   
> https://boostorg.jfrog.io/artifactory/main/release/${VERSION}/source/
> Index: patches/patch-boost_fiber_detail_cpu_relax_hpp
> ===
> RCS file: patches/patch-boost_fiber_detail_cpu_relax_hpp
> diff -N patches/patch-boost_fiber_detail_cpu_relax_hpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-boost_fiber_detail_cpu_relax_hpp23 Dec 2023 18:33:03 
> -
> @@ -0,0 +1,15 @@
> +Fix powerpc and powerpc64, where clang defines __POWERPC__ but rejects
> +Darwin's "r27" syntax with "error: invalid operand for instruction".
> +
> +Index: boost/fiber/detail/cpu_relax.hpp
> +--- boost/fiber/detail/cpu_relax.hpp.orig
>  boost/fiber/detail/cpu_relax.hpp
> +@@ -59,7 +59,7 @@ namespace detail {
> + //   processors
> + // extended mnemonics (available with POWER7)
> + // yield   ==   or 27, 27, 27
> +-# if defined(__POWERPC__) // Darwin PPC
> ++# if defined(__APPLE__) // Darwin PPC
> + # define cpu_relax() asm volatile ("or r27,r27,r27" ::: "memory");
> + # else
> + # define cpu_relax() asm volatile ("or 27,27,27" ::: "memory");

unbreak boost for powerpc, powerpc64

2023-12-23 Thread George Koehler

devel/boost is broken on powerpc and powerpc64, because
 picks the wrong asm syntax.
This patch fixes it, ok?

The REVISION bump conflicts with tb's "boost futex diff";
I will do REVISION= 1 if tb commits before me.
--gkoehler

Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.139
diff -u -p -r1.139 Makefile
--- Makefile19 Dec 2023 06:14:25 -  1.139
+++ Makefile23 Dec 2023 18:33:03 -
@@ -11,6 +11,7 @@ COMMENT-md=   machine-dependent libraries 
 VERSION=   1.84.0
 DISTNAME=  boost_${VERSION:S/./_/g}
 PKGNAME=   boost-${VERSION}
+REVISION=  0
 EPOCH =0
 CATEGORIES=devel
 SITES= 
https://boostorg.jfrog.io/artifactory/main/release/${VERSION}/source/
Index: patches/patch-boost_fiber_detail_cpu_relax_hpp
===
RCS file: patches/patch-boost_fiber_detail_cpu_relax_hpp
diff -N patches/patch-boost_fiber_detail_cpu_relax_hpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-boost_fiber_detail_cpu_relax_hpp  23 Dec 2023 18:33:03 
-
@@ -0,0 +1,15 @@
+Fix powerpc and powerpc64, where clang defines __POWERPC__ but rejects
+Darwin's "r27" syntax with "error: invalid operand for instruction".
+
+Index: boost/fiber/detail/cpu_relax.hpp
+--- boost/fiber/detail/cpu_relax.hpp.orig
 boost/fiber/detail/cpu_relax.hpp
+@@ -59,7 +59,7 @@ namespace detail {
+ //   processors
+ // extended mnemonics (available with POWER7)
+ // yield   ==   or 27, 27, 27
+-# if defined(__POWERPC__) // Darwin PPC
++# if defined(__APPLE__) // Darwin PPC
+ # define cpu_relax() asm volatile ("or r27,r27,r27" ::: "memory");
+ # else
+ # define cpu_relax() asm volatile ("or 27,27,27" ::: "memory");

Re: Link x11/kde-plasma and add kde-plasma and kde-plasma-extras meta package

2023-12-23 Thread Klemens Nanni

On Fri, Dec 22, 2023 at 12:42:45AM +0100, Rafael Sadowski wrote:
> Hi ports@
> 
> I would like to link kde-plasma to the build and introduce two new meta
> packages. The meta package kde-plasma comes with a README. I tried to
> add a handful useful information.
> 
> I use KDE Plasma as my daily desktop environment and apart from the KWin
> compression it works great for me.
> 
> I welcome any feedback especially for the README-plasma, it can
> certainly be improved.
> 
> OK?

PLIST-main changed without REVISION-main.
Do you keep -plasma out of RUN_DEPENDS-main intentionally (for now)?

> 
> Index: meta/kde/Makefile
> ===
> RCS file: /cvs/ports/meta/kde/Makefile,v
> diff -u -p -r1.13 Makefile
> --- meta/kde/Makefile 28 Oct 2023 07:47:33 -  1.13
> +++ meta/kde/Makefile 21 Dec 2023 23:26:01 -
> @@ -12,6 +12,9 @@ COMMENT-pim =   KDE PIM personal informat
>  COMMENT-development =KDE development applications
>  COMMENT-utils =  KDE utilities
>  
> +COMMENT-plasma = KDE Plasma desktop meta-package (base installation)
> +COMMENT-plasma-extras =  KDE Plasma desktop meta-package (full 
> installation)
> +
>  PKGNAME-accessibility =  kde-accessibility-${MODKDE_VERSION}
>  PKGNAME-admin =  kde-admin-${MODKDE_VERSION}
>  PKGNAME-education =  kde-education-${MODKDE_VERSION}
> @@ -24,6 +27,10 @@ PKGNAME-pim =  kde-pim-${MODKDE_VERSION}
>  PKGNAME-development =kde-development-${MODKDE_VERSION}
>  PKGNAME-utils =  kde-utils-${MODKDE_VERSION}
>  
> +PLASMA_VERSION = 5.27.10
> +PKGNAME-plasma = kde-plasma-${PLASMA_VERSION}
> +PKGNAME-plasma-extras =  kde-plasma-extras-${PLASMA_VERSION}
> +
>  MULTI_PACKAGES +=-main \
>   -games \
>   -admin \
> @@ -36,6 +43,9 @@ MULTI_PACKAGES +=   -main \
>   -development \
>   -utils
>  
> +MULTI_PACKAGES +=-plasma \
> + -plasma-extras
> +
>  HOMEPAGE =   https://kde.org
>  
>  MODULES =x11/kde-applications
> @@ -336,5 +346,63 @@ RUN_DEPENDS-main = \
>   ${BUILD_PKGPATH},-network=${MODKDE_VERSION} \
>   ${BUILD_PKGPATH},-pim=${MODKDE_VERSION} \
>   ${BUILD_PKGPATH},-utils=${MODKDE_VERSION}
> +
> +WANTLIB-plasma =
> +LIB_DEPENDS-plasma =
> +RUN_DEPENDS-plasma += \

First assignment could be just =.

> + x11/kde-plasma/breeze \
> + x11/kde-plasma/breeze-gtk \
> + x11/kde-plasma/kactivitymanagerd \
> + x11/kde-plasma/kde-cli-tools \
> + x11/kde-plasma/kde-gtk-config \
> + x11/kde-plasma/kdecoration \
> + x11/kde-plasma/kdeplasma-addons \
> + x11/kde-plasma/kgamma5 \
> + x11/kde-plasma/khotkeys \
> + x11/kde-plasma/kinfocenter \
> + x11/kde-plasma/kmenuedit \
> + x11/kde-plasma/kscreen \
> + x11/kde-plasma/kscreenlocker \
> + x11/kde-plasma/ksshaskpass \
> + x11/kde-plasma/ksysguard \
> + x11/kde-plasma/ksystemstats \
> + x11/kde-plasma/kwayland-integration \
> + x11/kde-plasma/kwin \
> + x11/kde-plasma/kwrited \
> + x11/kde-plasma/layer-shell-qt \
> + x11/kde-plasma/libkscreen \
> + x11/kde-plasma/libksysguard \
> + x11/kde-plasma/milou \
> + x11/kde-plasma/oxygen \
> + x11/kde-plasma/oxygen-sounds \
> + x11/kde-plasma/plasma-browser-integration \
> + x11/kde-plasma/plasma-desktop \
> + x11/kde-plasma/plasma-nano \
> + x11/kde-plasma/plasma-pa \
> + x11/kde-plasma/plasma-sdk \
> + x11/kde-plasma/plasma-workspace \
> + x11/kde-plasma/plasma-workspace-wallpapers \
> + x11/kde-plasma/polkit-kde-agent-1 \
> + x11/kde-plasma/powerdevil \
> + x11/kde-plasma/qqc2-breeze-style \
> + x11/kde-plasma/systemsettings \
> + x11/kde-plasma/xdg-desktop-portal-kde
> +
> +RUN_DEPENDS-plasma += \
> + x11/kde-applications/dolphin \
> + x11/kde-applications/kdesdk-thumbnailers \
> + x11/kde-applications/kmix \
> + x11/kde-applications/konsole
> +
> +# extra apps
> +RUN_DEPENDS-plasma-extras += \
> + STEM-=${PLASMA_VERSION}:${BASE_PKGPATH},-plasma \

What about net/kdeconnect-kde?

> + x11/kde-applications/ark \
> + x11/kde-applications/gwenview \
> + x11/kde-applications/kate \
> + x11/kde-applications/kcalc \
> + x11/kde-applications/merkuro \
> + x11/kde-applications/okular \
> + x11/kde-applications/spectacle
>  
>  .include 
> Index: meta/kde/pkg/DESCR-plasma
> ===
> RCS

Re: New: games/serioussam-vk

2023-12-23 Thread Alexander Pavlov

Hello. Today I installed OpenBSD on a computer with a KAVERI APU (A10-7800)
with an integrated  R7 graphics core supporting Vulkan. I had to take a
bite out of Gentoo and install OpenBSD in the free space. Unfortunately,
only the Radeon driver worked for me on this APU. It works well, with all
the accelerations, but without Vulkan support, unlike Gentoo, where the
AMDGPU driver with Vulkan support works. Therefore, I can’t check the
functionality of the game on Vulkan. I think one available "serioussam"
port on OpenBSD is enough.

Happy Christmas and New Year everyone!
Best Regards. Alexander.

пт, 15 дек. 2023 г. в 09:49, Alexander Pavlov :

> Hello.
> I closed the pull request. When I have the opportunity, I'll test it on
> real hardware.
>
> Best Regards.
> Alexander.
>
> чт, 14 дек. 2023 г. в 10:07, Alexander Pavlov :
>
>> Yes, I noticed this now. My mistake. The sam_iGfxAPI variable is
>> responsible for this. By default it is equal to one and the vulkan starts.
>> If the vulkan is not detected when the game starts, then it switches to
>> OpenGL. This variable can be set to zero in the configuration files, then
>> the OpenGL render will be the default. This variable can be set to zero in
>> the configuration file
>> (~/.local/share/Serious-Engine/serioussam/Scripts/PersistentSymbols.ini)
>> then the OpenGL render will be the default. This file is generated on first
>> launch. You need to change the sam_iGfxAPI value to zero or write the line:
>> persistent extern INDEX sam_iGfxAPI=(INDEX)0;
>>
>> чт, 14 дек. 2023 г. в 02:56, Thomas Frohwein :
>>
>>> On Wed, Dec 13, 2023 at 10:34:01AM +0300, Alexander Pavlov wrote:
>>> > Hello
>>> > You can attach the game log.
>>> > ~.local/share/Serious-Engine/serioussam/SeriousSam.log
>>> >
>>> > It looks like I was in a hurry to add this port to OpenBSD without
>>> testing
>>> > it on real hardware with Vulkan support. Or Serious Sam has no luck
>>> with
>>> > integrated Intel graphics. This is already the second case. The first
>>> one
>>> > had graphic artifacts on the OpenGL renderer.
>>>
>>> How do you run with opengl? I can't find anything about this in the man
>>> page or the README.
>>>
>>> > I have a video card with Vulkan support on one computer. When I have
>>> the
>>> > opportunity, I’ll try to test it on it, but for now it’s probably
>>> better
>>> > for me to close the pull request, because without testing on real
>>> hardware
>>> > it’s difficult to understand the problem.
>>> >
>>> > ср, 13 дек. 2023 г. в 00:35, Kirill Bychkov :
>>> >
>>> > > On Tue, December 12, 2023 22:36, Thomas Frohwein wrote:
>>> > > > On Mon, Dec 11, 2023 at 10:52:58PM +0300, Alexander Pavlov wrote:
>>> > > >> Hello!
>>> > > >> Thanks @Kirill for approved the pull request.
>>> > > >>
>>> > > >> This is my other ever port for OpenBSD. It's the open source
>>> Serious Sam
>>> > > >> Classic engine with vulkan support. The port has two renders
>>> OpenGL and
>>> > > >> Vulkan. Render switches to the game menu.
>>> > > >>
>>> > > >> Tested using the OpenGL renderer, since I do not have the
>>> opportunity to
>>> > > >> test the Vulkan renderer on OpenBSD. On the computer where
>>> OpenBSD is
>>> > > >> installed, the Radeon HD3000 does not support Vulkan.
>>> > > >>
>>> > > >> I wish to get this added to the official ports tree, so please
>>> leave
>>> > > >> any feedback or suggestions on what can be improved. Thank you!
>>> > > >>
>>> > > >> Source on Github:
>>> > > >> https://github.com/tx00100xt/SeriousSamClassic-VK
>>> > > >
>>> > > > Thanks for submitting this:
>>> > > >
>>> > > >> @conflict serioussam-*
>>> > > >
>>> > > > Is this needed? We don't have any other serioussam ports as far as
>>> I
>>> > > > know.
>>> > >
>>> > > Yep, if we import both ports - serioussam and serioussam-vk
>>> > >
>>> > > >
>>> > > > DESCR should be formatted, typically with fmt -w 80...
>>> > > > README also should be formatted similarly. This means that the line
>>> > > > with "directories:" should be pulled up, even if you're going with
>>> > > > fmt -w 72 only.
>>> > > >
>>> > > > Looks like SamTFE/Sources/CMakeLists.txt and
>>> > > > SamTSE/Sources/CMakeLists.txt add their own -O2 and -pipe which is
>>> > > > better left to our ports build system.
>>> > > >
>>> > > > I'm getting a segfault in vulkan when trying to launch:
>>> > > >
>>> > > > $ serioussam
>>> > > > STUBBED: load window icon in
>>> > > >
>>> > >
>>> /usr/ports/pobj/serioussam-vk-1.10.6c/SeriousSamClassic-VK-1.10.6c/SamTFE/Sources/SeriousSam/MainWindow.cpp,
>>> > > > line 176.
>>> > > > STUBBED: Need SDL invisible window or something in
>>> > > >
>>> > >
>>> /usr/ports/pobj/serioussam-vk-1.10.6c/SeriousSamClassic-VK-1.10.6c/SamTFE/Sources/SeriousSam/MainWindow.cpp,
>>> > > > line 357.
>>> > > > STUBBED: !!! FIXME: get the code back in from Ryan's original
>>> port. in
>>> > > >
>>> > >
>>> /usr/ports/pobj/serioussam-vk-1.10.6c/SeriousSamClassic-VK-1.10.6c/SamTFE/Sources/Engine/Base/Stream.cpp,
>>> > > > line 995.
>>> > > >

Re: devel/highway: update to 1.0.5

2023-12-23 Thread Klemens Nanni

On Sat, Dec 23, 2023 at 09:11:14AM +0100, Landry Breuil wrote:
> Le Fri, Dec 22, 2023 at 12:12:43AM +, Klemens Nanni a écrit :
> > Newer graphics/libvips requires highway>=1.0.5.
> > I haven't tested other consumers yet.  amd64 regress:
> 
> can we update to 1.0.7 ? graphics/libjxl 0.9.0 requires it since
> https://github.com/libjxl/libjxl/pull/2765.
> 
> -- Could NOT find HWY: Found unsuitable version "1.0.3", but required is at 
> least "1.0.7" (found /usr/local/lib/libhwy.so.0.0)
> 

Sure!


Index: Makefile
===
RCS file: /cvs/ports/devel/highway/Makefile,v
diff -u -p -r1.3 Makefile
--- Makefile9 Apr 2023 07:53:53 -   1.3
+++ Makefile23 Dec 2023 19:52:16 -
@@ -2,14 +2,13 @@ COMMENT = length-agnostic SIMD with runt
 
 GH_ACCOUNT =   google
 GH_PROJECT =   highway
-GH_TAGNAME =   1.0.3
-REVISION = 0
+GH_TAGNAME =   1.0.7
 
 CATEGORIES =   devel
 
-SHARED_LIBS += hwy 0.0 # 0.0
-SHARED_LIBS += hwy_contrib 0.0 # 0.0
-SHARED_LIBS += hwy_test0.0 # 0.0
+SHARED_LIBS += hwy 0.1 # 0.0
+SHARED_LIBS += hwy_contrib 0.1 # 0.0
+SHARED_LIBS += hwy_test0.1 # 0.0
 
 # Apache-2.0
 PERMIT_PACKAGE =   Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/highway/distinfo,v
diff -u -p -r1.1.1.1 distinfo
--- distinfo4 Mar 2023 07:52:35 -   1.1.1.1
+++ distinfo23 Dec 2023 19:45:26 -
@@ -1,2 +1,2 @@
-SHA256 (highway-1.0.3.tar.gz) = Vm/HcxWHhHPZpr2BX33njHNzSs3LdFw93oV5VgrFRA4=
-SIZE (highway-1.0.3.tar.gz) = 1770704
+SHA256 (highway-1.0.7.tar.gz) = VDRIgQgYbBcKXi/KXjybbvWaHKpNUgsAipuL5rir5sU=
+SIZE (highway-1.0.7.tar.gz) = 2055819
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/devel/highway/patches/patch-CMakeLists_txt,v
diff -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt9 Apr 2023 07:53:53 -   1.1
+++ patches/patch-CMakeLists_txt21 Dec 2023 23:23:42 -
@@ -4,13 +4,11 @@ supported by clang 13 nor by our kernel.
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -241,8 +241,8 @@ else()
-   # Not yet supported by GCC. When runtime dispatch is supported and
-   # implemented, we will remove v from the required flags. Until then, 
using
-   # clang for RISC-V will require the CPU to support the V extension 
(1.0).
--  list(APPEND HWY_FLAGS -march=rv64gcv1p0)
+@@ -262,7 +262,7 @@ else()
+ # either compiler) to support V.
+ list(APPEND HWY_FLAGS -march=rv64gcv1p0)
+ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
 -  list(APPEND HWY_FLAGS -menable-experimental-extensions)
-+  #list(APPEND HWY_FLAGS -march=rv64gcv1p0)
 +  #list(APPEND HWY_FLAGS -menable-experimental-extensions)
  endif()
endif()
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/highway/pkg/PLIST,v
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   4 Mar 2023 07:52:35 -   1.1.1.1
+++ pkg/PLIST   21 Dec 2023 23:43:56 -
@@ -14,12 +14,15 @@ include/hwy/contrib/image/image.h
 include/hwy/contrib/math/
 include/hwy/contrib/math/math-inl.h
 include/hwy/contrib/sort/
+include/hwy/contrib/sort/order.h
 include/hwy/contrib/sort/shared-inl.h
 include/hwy/contrib/sort/sorting_networks-inl.h
 include/hwy/contrib/sort/traits-inl.h
 include/hwy/contrib/sort/traits128-inl.h
 include/hwy/contrib/sort/vqsort-inl.h
 include/hwy/contrib/sort/vqsort.h
+include/hwy/contrib/unroller/
+include/hwy/contrib/unroller/unroller-inl.h
 include/hwy/detect_compiler_arch.h
 include/hwy/detect_targets.h
 include/hwy/foreach_target.h
@@ -31,10 +34,12 @@ include/hwy/ops/arm_neon-inl.h
 include/hwy/ops/arm_sve-inl.h
 include/hwy/ops/emu128-inl.h
 include/hwy/ops/generic_ops-inl.h
+include/hwy/ops/ppc_vsx-inl.h
 include/hwy/ops/rvv-inl.h
 include/hwy/ops/scalar-inl.h
 include/hwy/ops/set_macros-inl.h
 include/hwy/ops/shared-inl.h
+include/hwy/ops/tuple-inl.h
 include/hwy/ops/wasm_128-inl.h
 include/hwy/ops/x86_128-inl.h
 include/hwy/ops/x86_256-inl.h
@@ -42,11 +47,19 @@ include/hwy/ops/x86_512-inl.h
 include/hwy/per_target.h
 include/hwy/print-inl.h
 include/hwy/print.h
+include/hwy/robust_statistics.h
 include/hwy/targets.h
 include/hwy/tests/
 include/hwy/tests/hwy_gtest.h
 include/hwy/tests/test_util-inl.h
 include/hwy/tests/test_util.h
+include/hwy/timer-inl.h
+include/hwy/timer.h
+lib/cmake/
+lib/cmake/hwy/
+lib/cmake/hwy/hwy-config${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/hwy/hwy-config-version.cmake
+lib/cmake/hwy/hwy-config.cmake
 @lib lib/libhwy.so.${LIBhwy_VERSION}
 @lib lib/libhwy_contrib.so.${LIBhwy_contrib_VERSION}
 @lib lib/libhwy_test.so.${LIBhwy_test_VERSION}

Re: Bugfix: lang/deno

2023-12-23 Thread Antoine Jacoutot

Thanks. Looks good with a bump. 

—
Antoine

> On Dec 23, 2023, at 19:55, Volker Schlecht  wrote:
> 
> On 2023-12-23 17:21, Antoine Jacoutot wrote:
>> I would prefer to clean it up right away.
> 
> If that's what it takes ... new diff attached.
>

Re: Bugfix: lang/deno

2023-12-23 Thread Volker Schlecht


On 2023-12-23 17:21, Antoine Jacoutot wrote:

I would prefer to clean it up right away.


If that's what it takes ... new diff attached.
Index: patch-cli_build_rs
===
RCS file: /cvs/ports/lang/deno/patches/patch-cli_build_rs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cli_build_rs
--- patch-cli_build_rs  15 Jul 2023 20:30:41 -  1.2
+++ patch-cli_build_rs  23 Dec 2023 18:52:16 -
@@ -1,7 +1,7 @@
 Index: cli/build.rs
 --- cli/build.rs.orig
 +++ cli/build.rs
-@@ -435,6 +435,13 @@ fn main() {
+@@ -424,6 +424,13 @@ fn main() {
  symbols_path.display()
);
  
@@ -14,4 +14,4 @@ Index: cli/build.rs
 +
#[cfg(target_os = "linux")]
{
- let ver = glibc_version::get_version().unwrap();
+ // If a custom compiler is set, the glibc version is not reliable.
Index: patch-cli_main_rs
===
RCS file: /cvs/ports/lang/deno/patches/patch-cli_main_rs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cli_main_rs
--- patch-cli_main_rs   7 Sep 2023 05:45:25 -   1.2
+++ patch-cli_main_rs   23 Dec 2023 18:52:16 -
@@ -7,7 +7,7 @@ Index: cli/main.rs
let future = async move {
 -let current_exe_path = current_exe()?;
 +let current_exe_path = current_exe()
-+  .unwrap_or(PathBuf::from("${LOCALBASE}/bin/deno"));
++  .unwrap_or(PathBuf::from("${PREFIX}/bin/deno"));
  let standalone_res =
match standalone::extract_standalone(_exe_path, args.clone())
  .await
Index: patch-cli_standalone_binary_rs
===
RCS file: /cvs/ports/lang/deno/patches/patch-cli_standalone_binary_rs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cli_standalone_binary_rs
--- patch-cli_standalone_binary_rs  7 Sep 2023 05:45:25 -   1.2
+++ patch-cli_standalone_binary_rs  23 Dec 2023 18:52:16 -
@@ -7,7 +7,7 @@ Index: cli/standalone/binary.rs
  pub fn load_npm_vfs(root_dir_path: PathBuf) -> Result {
 -  let file_path = current_exe().unwrap();
 +  let file_path =
-+current_exe().unwrap_or(PathBuf::from("${LOCALBASE}/bin/deno"));
++current_exe().unwrap_or(PathBuf::from("${PREFIX}/bin/deno"));
let mut file = std::fs::File::open(file_path)?;
file.seek(SeekFrom::End(-(TRAILER_SIZE as i64)))?;
let mut trailer = [0; TRAILER_SIZE];
@@ -16,7 +16,7 @@ Index: cli/standalone/binary.rs
) -> Result, AnyError> {
  if compile_flags.target.is_none() {
 -  let path = std::env::current_exe()?;
-+  let path = PathBuf::from("${LOCALBASE}/bin/deno");
++  let path = PathBuf::from("${PREFIX}/bin/deno");
return Ok(std::fs::read(path)?);
  }
  
Index: patch-cli_standalone_mod_rs
===
RCS file: /cvs/ports/lang/deno/patches/patch-cli_standalone_mod_rs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cli_standalone_mod_rs
--- patch-cli_standalone_mod_rs 7 Sep 2023 05:45:25 -   1.2
+++ patch-cli_standalone_mod_rs 23 Dec 2023 18:52:16 -
@@ -15,7 +15,7 @@ Index: cli/standalone/mod.rs
let main_module = 
 -  let current_exe_path = std::env::current_exe().unwrap();
 +  let current_exe_path =
-+std::env::current_exe().unwrap_or(PathBuf::from("${LOCALBASE}/bin/deno"));
++std::env::current_exe().unwrap_or(PathBuf::from("${PREFIX}/bin/deno"));
let current_exe_name =
  current_exe_path.file_name().unwrap().to_string_lossy();
let deno_dir_provider = Arc::new(DenoDirProvider::new(None));
Index: 
patch-modcargo-crates_deno_task_shell-0_11_0_src_shell_commands_executable_rs
===
RCS file: 
/cvs/ports/lang/deno/patches/patch-modcargo-crates_deno_task_shell-0_11_0_src_shell_commands_executable_rs,v
retrieving revision 1.3
diff -u -p -r1.3 
patch-modcargo-crates_deno_task_shell-0_11_0_src_shell_commands_executable_rs
--- 
patch-modcargo-crates_deno_task_shell-0_11_0_src_shell_commands_executable_rs   
7 Sep 2023 05:45:25 -   1.3
+++ 
patch-modcargo-crates_deno_task_shell-0_11_0_src_shell_commands_executable_rs   
23 Dec 2023 18:52:16 -
@@ -15,7 +15,7 @@ Index: modcargo-crates/deno_task_shell-0
 -return ExecuteResult::Continue(1, Vec::new(), Vec::new());
 -  }
 -};
-+  let command_path = "${LOCALBASE}/bin/deno";
++  let command_path = "${PREFIX}/bin/deno";
  
let mut sub_command = tokio::process::Command::new(_path);
let child = sub_command
@@ -24,7 +24,7 @@ Index: modcargo-crates/deno_task_shell-0
let file_stem = exe_path.file_stem().map(|s| s.to_string_lossy());
if file_stem.map(|s| s.to_string()) == Some("deno".to_string()) {
 -return Ok(exe_path);
-+return Ok(PathBuf::from("${LOCALBASE}/bin/deno"));
++return Ok(PathBuf::from("${PREFIX}/bin/deno"));
}
  }
}
@@ -33,10 +33,10 @@ Index:

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Theo Buehler

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2023/12/23 11:22:18

Modified files:
security/rbw   : Tag: OPENBSD_7_4 Makefile 
Added files:
security/rbw/patches: Tag: OPENBSD_7_4 patch-src_api_rs 

Log message:
MFC: security/rbw: unbreak

Apparently the API now requires a User-Agent header and would otherwise
return a 400 in some circumstances.

>From Raf Czlonka
https://github.com/doy/rbw/pull/151

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Theo Buehler

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2023/12/23 11:18:33

Modified files:
security/rbw   : Makefile 
Added files:
security/rbw/patches: patch-src_api_rs 

Log message:
security/rbw: unbreak

Apparently the API now requires a User-Agent header and would otherwise
return a 400 in some circumstances.

>From Raf Czlonka
https://github.com/doy/rbw/pull/151

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/12/23 10:42:46

Modified files:
wayland/wf-config: Makefile 

Log message:
Missing BDEP on wayland/libinput-openbsd.

Re: Bugfix: lang/deno

2023-12-23 Thread Antoine Jacoutot

I would prefer to clean it up right away. 

—
Antoine

> On Dec 23, 2023, at 17:17, Volker Schlecht  wrote:
> 
> On 2023-12-23 16:50, Antoine Jacoutot wrote:
>>> On Sat, Dec 23, 2023 at 04:46:40PM +0100, Volker Schlecht wrote:
>>> + fn op_exec_path(state:  OpState) -> Result {
>>> +   let current_exe = env::current_exe().unwrap();
>>> ++  let current_exe =
>>> ++
>>> std::env::current_exe().unwrap_or(PathBuf::from("${LOCALBASE}/bin/deno"));
>> 
>> You probably want PREFIX or TRUEPREFIX here.
> 
> In hindsight: Probably yes.
> However I'm already using LOCALBASE in 4 other patches for the same purpose
> in lang/deno. So for now, I would prefer consistency. I can clean this up with
> the next version upgrade (WIP).
> 
> ok for now?
>

Re: Bugfix: lang/deno

2023-12-23 Thread Volker Schlecht


On 2023-12-23 16:50, Antoine Jacoutot wrote:

On Sat, Dec 23, 2023 at 04:46:40PM +0100, Volker Schlecht wrote:

+ fn op_exec_path(state:  OpState) -> Result {
+   let current_exe = env::current_exe().unwrap();
++  let current_exe =
++std::env::current_exe().unwrap_or(PathBuf::from("${LOCALBASE}/bin/deno"));


You probably want PREFIX or TRUEPREFIX here.


In hindsight: Probably yes.
However I'm already using LOCALBASE in 4 other patches for the same purpose
in lang/deno. So for now, I would prefer consistency. I can clean this up with
the next version upgrade (WIP).

ok for now?

Re: Bugfix: lang/deno

2023-12-23 Thread Antoine Jacoutot

On Sat, Dec 23, 2023 at 04:46:40PM +0100, Volker Schlecht wrote:
> This adds a patch to lang/deno to fix an issue reported by someone on github:
> https://github.com/denoland/deno/issues/8012#issuecomment-1867982872
> 
> In addition, update-patches brought up an update to one of the existing 
> patches
> that I must have missed before.
> 
> Tested on amd64, fixes the reported bug, should not have any repercussions for
> other platforms.
> 
> ok?

> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/deno/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile  19 Sep 2023 22:05:54 -  1.9
> +++ Makefile  23 Dec 2023 15:39:48 -
> @@ -8,6 +8,7 @@ USE_WXNEEDED =Yes
>  
>  VERSION =1.36.4
>  HOMEPAGE =   https://deno.com/runtime
> +REVISION =   0
>  
>  DISTNAME =   deno-${VERSION}
>  DISTFILES =  ${DISTNAME}{deno_src}${EXTRACT_SUFX}
> Index: patches/patch-cli_build_rs
> ===
> RCS file: /cvs/ports/lang/deno/patches/patch-cli_build_rs,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-cli_build_rs
> --- patches/patch-cli_build_rs15 Jul 2023 20:30:41 -  1.2
> +++ patches/patch-cli_build_rs23 Dec 2023 15:39:48 -
> @@ -1,7 +1,7 @@
>  Index: cli/build.rs
>  --- cli/build.rs.orig
>  +++ cli/build.rs
> -@@ -435,6 +435,13 @@ fn main() {
> +@@ -424,6 +424,13 @@ fn main() {
>   symbols_path.display()
> );
>   
> @@ -14,4 +14,4 @@ Index: cli/build.rs
>  +
> #[cfg(target_os = "linux")]
> {
> - let ver = glibc_version::get_version().unwrap();
> + // If a custom compiler is set, the glibc version is not reliable.
> Index: patches/patch-runtime_ops_os_mod_rs
> ===
> RCS file: patches/patch-runtime_ops_os_mod_rs
> diff -N patches/patch-runtime_ops_os_mod_rs
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-runtime_ops_os_mod_rs   23 Dec 2023 15:39:48 -
> @@ -0,0 +1,20 @@
> +Index: runtime/ops/os/mod.rs
> +--- runtime/ops/os/mod.rs.orig
>  runtime/ops/os/mod.rs
> +@@ -14,6 +14,7 @@ use deno_node::NODE_ENV_VAR_ALLOWLIST;
> + use serde::Serialize;
> + use std::collections::HashMap;
> + use std::env;
> ++use std::path::PathBuf;
> + 
> + mod sys_info;
> + 
> +@@ -64,6 +65,8 @@ deno_core::extension!(
> + #[op]
> + fn op_exec_path(state:  OpState) -> Result {
> +   let current_exe = env::current_exe().unwrap();
> ++  let current_exe =
> ++
> std::env::current_exe().unwrap_or(PathBuf::from("${LOCALBASE}/bin/deno"));

You probably want PREFIX or TRUEPREFIX here.


> +   state
> + .borrow_mut::()
> + .check_read_blind(_exe, "exec_path", "Deno.execPath()")?;


-- 
Antoine

Bugfix: lang/deno

2023-12-23 Thread Volker Schlecht


This adds a patch to lang/deno to fix an issue reported by someone on github:
https://github.com/denoland/deno/issues/8012#issuecomment-1867982872

In addition, update-patches brought up an update to one of the existing patches
that I must have missed before.

Tested on amd64, fixes the reported bug, should not have any repercussions for
other platforms.

ok?
Index: Makefile
===
RCS file: /cvs/ports/lang/deno/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile19 Sep 2023 22:05:54 -  1.9
+++ Makefile23 Dec 2023 15:39:48 -
@@ -8,6 +8,7 @@ USE_WXNEEDED =  Yes
 
 VERSION =  1.36.4
 HOMEPAGE = https://deno.com/runtime
+REVISION = 0
 
 DISTNAME = deno-${VERSION}
 DISTFILES =${DISTNAME}{deno_src}${EXTRACT_SUFX}
Index: patches/patch-cli_build_rs
===
RCS file: /cvs/ports/lang/deno/patches/patch-cli_build_rs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cli_build_rs
--- patches/patch-cli_build_rs  15 Jul 2023 20:30:41 -  1.2
+++ patches/patch-cli_build_rs  23 Dec 2023 15:39:48 -
@@ -1,7 +1,7 @@
 Index: cli/build.rs
 --- cli/build.rs.orig
 +++ cli/build.rs
-@@ -435,6 +435,13 @@ fn main() {
+@@ -424,6 +424,13 @@ fn main() {
  symbols_path.display()
);
  
@@ -14,4 +14,4 @@ Index: cli/build.rs
 +
#[cfg(target_os = "linux")]
{
- let ver = glibc_version::get_version().unwrap();
+ // If a custom compiler is set, the glibc version is not reliable.
Index: patches/patch-runtime_ops_os_mod_rs
===
RCS file: patches/patch-runtime_ops_os_mod_rs
diff -N patches/patch-runtime_ops_os_mod_rs
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-runtime_ops_os_mod_rs 23 Dec 2023 15:39:48 -
@@ -0,0 +1,20 @@
+Index: runtime/ops/os/mod.rs
+--- runtime/ops/os/mod.rs.orig
 runtime/ops/os/mod.rs
+@@ -14,6 +14,7 @@ use deno_node::NODE_ENV_VAR_ALLOWLIST;
+ use serde::Serialize;
+ use std::collections::HashMap;
+ use std::env;
++use std::path::PathBuf;
+ 
+ mod sys_info;
+ 
+@@ -64,6 +65,8 @@ deno_core::extension!(
+ #[op]
+ fn op_exec_path(state:  OpState) -> Result {
+   let current_exe = env::current_exe().unwrap();
++  let current_exe =
++std::env::current_exe().unwrap_or(PathBuf::from("${LOCALBASE}/bin/deno"));
+   state
+ .borrow_mut::()
+ .check_read_blind(_exe, "exec_path", "Deno.execPath()")?;

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/12/23 08:40:03

Modified files:
astro/stellarium: Makefile distinfo 
astro/stellarium/pkg: PLIST 

Log message:
Update to stellarium-23.4.

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/12/23 08:13:35

Modified files:
sysutils/deja-dup: Makefile distinfo 
Removed files:
sysutils/deja-dup/patches: patch-app_RestoreFileTester_vala 

Log message:
Update to deja-dup-45.2.

Re: sccache lifetime & ports infrastructure ?

2023-12-23 Thread Caspar Schutijser

On Sat, Dec 23, 2023 at 09:07:24AM +0100, Landry Breuil wrote:
> hi,
> 
> sending to ports@ for more ideas, devel/sccache works pretty great here,
> but for now its client/server model has some issues. from my
> understanding, a server is spawned at the first invocation of sccache,
> and it runs forever

The running forever should only happen if SCCACHE_IDLE_TIMEOUT is
set to 0, as far as I understand. Source:
https://github.com/mozilla/sccache/blob/main/docs/Configuration.md

> , or until it had nothing to do and
> SCCACHE_IDLE_TIMEOUT expired.
> 
> i've seen at occasion the make process 'waiting' at the end of the
> build, from my understanding because sccache was used and thus a server
> was spawned, and the server was still running.  manually killing the
> server process allows make build to finish and proceed with make fake.

Does make wait indefinitely or does it succesfully finish after some
time?

And when you see this problematic behavior, did you set a custom value
for SCCACHE_IDLE_TIMEOUT? Did you use any other SCCACHE-related
environment variables? I can't remember seeing this behavior myself
and I haven't changed SCCACHE_IDLE_TIMEOUT. So I wonder what the
relevant difference is between our setups.

Caspar

> not a big deal when you do something else, but annoying when you need a
> package *now* :)
> 
> looking at the processes, the sccache process is reparented to init...
> so why is make waiting at the end ?
> 
> root 1  0.0  0.0952   480 ??  I  Thu08AM0:00.02 /sbin/init
> landry   15309  6.3  0.1 133596 39540 ??  S   8:59AM0:17.13 
> -/usr/local/bin/sccache
> 
> some ideas:
> - call sccache --stop-server at the end of make build ?
> - have some magic during the invocation so the make process doesnt wait for 
> it ?
> - have sccache run as an rc.d daemon so that make doesnt need to start one ?
> 
> Landry

[UPDATE] mail/imapfilter

2023-12-23 Thread Christopher Zimmermann


Hi,

this is a simple update dropping an obsolete patch and warning users of 
a configuration change. OK?



Christopher



Index: Makefile
===
RCS file: /cvs/ports/mail/imapfilter/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile17 Jul 2022 19:23:39 -  1.27
+++ Makefile23 Dec 2023 12:58:30 -
@@ -1,6 +1,6 @@
 COMMENT=   remote IMAP filtering utility
 
-V=			2.7.5

+V= 2.8.1
 DISTNAME=  imapfilter-${V}
 
 GH_TAGNAME=		v${V}

Index: distinfo
===
RCS file: /cvs/ports/mail/imapfilter/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo17 Jul 2022 19:23:39 -  1.15
+++ distinfo23 Dec 2023 12:58:30 -
@@ -1,2 +1,2 @@
-SHA256 (imapfilter-2.7.5.tar.gz) = qxn4QHEuaVHlHCnkTEOzsvpC6TaT+Y+Jacx2Ok+tVr8=
-SIZE (imapfilter-2.7.5.tar.gz) = 59441
+SHA256 (imapfilter-2.8.1.tar.gz) = dYoPeK/zCTWRZCbIeNLMgDvc0xx0mC+/zSNy5nRCYsw=
+SIZE (imapfilter-2.8.1.tar.gz) = 58382
Index: patches/patch-src_auth_c
===
RCS file: patches/patch-src_auth_c
diff -N patches/patch-src_auth_c
--- patches/patch-src_auth_c11 Mar 2022 19:34:38 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-Fix build with opaque HMAC_CTX in LibreSSL 3.5.
-
-Index: src/auth.c
 src/auth.c.orig
-+++ src/auth.c
-@@ -20,7 +20,7 @@ auth_cram_md5(const char *user, const char *pass, unsi
-   unsigned char *resp, *buf, *out;
-   unsigned char md[EVP_MAX_MD_SIZE], mdhex[EVP_MAX_MD_SIZE * 2 + 1];
-   unsigned int mdlen;
--#if OPENSSL_VERSION_NUMBER >= 0x101fL && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x101fL
-   HMAC_CTX *ctx;
- #else
-   HMAC_CTX ctx;
-@@ -32,7 +32,7 @@ auth_cram_md5(const char *user, const char *pass, unsi
- 
- 	EVP_DecodeBlock(resp, chal, strlen((char *)(chal)));
- 
--#if OPENSSL_VERSION_NUMBER >= 0x101fL && !defined(LIBRESSL_VERSION_NUMBER)

-+#if OPENSSL_VERSION_NUMBER >= 0x101fL
-   ctx = HMAC_CTX_new();
-   HMAC_Init_ex(ctx, (const unsigned char *)pass, strlen(pass),
-   EVP_md5(), NULL);
Index: pkg/MESSAGE
===
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/MESSAGE 23 Dec 2023 12:58:30 -
@@ -0,0 +1,4 @@
+Since imapfilter 2.8 the implicit error recovery mechanism has been 
+dropped in favour of a more robust mechanism requiring explicit 
+configuration by using the new recover(commands, retries) function.

+Please update your configuration as necessary.

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Volker Schlecht

CVSROOT:/cvs
Module name:ports
Changes by: vol...@cvs.openbsd.org  2023/12/23 05:24:02

Modified files:
textproc/hexyl : Makefile crates.inc distinfo 

Log message:
textproc/hexyl: Update to 0.14.0

ok sthen@

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/12/23 04:47:07

Modified files:
sysutils/awscli: Makefile distinfo 
sysutils/awscli/pkg: PLIST 

Log message:
Update to awscli-1.32.7.

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/12/23 04:46:45

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.34.7.

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/12/23 04:46:37

Modified files:
net/py-botocore: Makefile distinfo 
net/py-botocore/pkg: PLIST 

Log message:
Update to py3-botocore-1.34.7.

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/12/23 04:46:29

Modified files:
sysutils/terragrunt: Makefile distinfo 

Log message:
Update to terragrunt-0.54.10.

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/12/23 04:27:51

Modified files:
x11/gnome/settings-daemon: Makefile distinfo 

Log message:
Update to gnome-settings-daemon-45.1.

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/12/23 03:53:37

Modified files:
wayland/wf-shell: Makefile 

Log message:
Missing BDEP on wayland/wayland-protocols.

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Landry Breuil

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2023/12/23 03:12:29

Modified files:
wayland: Makefile 

Log message:
+wayland/wlr-randr

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Landry Breuil

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2023/12/23 03:11:55

Log message:
import wayland/wlr-randr 0.3.1.

Utility to manage outputs of a Wayland compositor, like xrandr for Xorg.

ok tb@

Status:

Vendor Tag: landry
Release Tags:   landry_20231223

N ports/wayland/wlr-randr/Makefile
N ports/wayland/wlr-randr/distinfo
N ports/wayland/wlr-randr/pkg/PLIST
N ports/wayland/wlr-randr/pkg/DESCR

No conflicts created by this import

Re: [new] wlr-randr, xrandr-like for wayland

2023-12-23 Thread Theo Buehler

On Sat, Dec 23, 2023 at 11:04:23AM +0100, Landry Breuil wrote:
> hi,
> 
> new port for wlr-randr, works fine here within wayfire, on my x1c3 where
> i need to set dpi scale to 1.5 it gives me this output:

looks good portswise.

ok tb

[new] wlr-randr, xrandr-like for wayland

2023-12-23 Thread Landry Breuil

hi,

new port for wlr-randr, works fine here within wayfire, on my x1c3 where
i need to set dpi scale to 1.5 it gives me this output:

$wlr-randr
eDP-1 "LG Display 0x0418 (eDP-1)"
  Make: LG Display
  Model: 0x0418
  Serial: (null)
  Physical size: 310x170 mm
  Enabled: yes
  Modes:
2560x1440 px, 60.004002 Hz (preferred, current)
  Position: 0,0
  Transform: normal
  Scale: 1.50
  Adaptive Sync: disabled

ok ?


wl-randr.tgz
Description: application/tar-gz

Re: stdargs/locale breakage and cmake precompiled headers

2023-12-23 Thread Theo Buehler

On Sat, Dec 23, 2023 at 04:09:35AM +0100, Rafael Sadowski wrote:
> On Sat Dec 23, 2023 at 03:54:11AM +0100, Rafael Sadowski wrote:
> > On Sat Dec 23, 2023 at 12:27:05AM +0100, Theo Buehler wrote:
> > > emulators/citra was broken with the update to boost 1.84. net/nheko
> > > broke with the llvm 16 update (in fact it broke with llvm 15 when kn
> > > updated mtxclient and nheko in February). Most recently, libquotient
> > > broke on aarch64. The symptom is always the same cryptic message:
> > > 
> > > /usr/include/c++/v1/__bsd_locale_fallbacks.h:110:5: error: non-const 
> > > lvalue reference to type '__builtin_va_list' cannot bind to a value of 
> > > unrelated type 'va_list' (aka 'std::__va_list')
> > > va_start(__va, __format);
> > > ^~~~
> > > /usr/include/stdarg.h:34:47: note: expanded from macro 'va_start'
> > > #define va_start(ap, last)  __builtin_va_start((ap), last)
> > > 
> > > http://build-failures.rhaalovely.net/aarch64/2023-12-20/x11/libquotient.log
> > > 
> > > In all three ports, a line such as
> > > 
> > > -Xclang -include-pch -Xclang 
> > > /usr/ports/pobj/nheko-0.11.3/build-amd64/CMakeFiles/nheko.dir/cmake_pch.hxx.pch
> > > 
> > > appears. And indeed, the diff below (which is a workaround at best)
> > > makes all three ports build.
> > > 
> > > There are a few questions that should probably be answered:
> > > 
> > > - why did citra break with the boost update?
> > > - is this a cmake bug or a clang bug?
> > 
> > I don't think it's a cmake bug. IMO It's an pre compiled header issue.

Yes. What I was trying to get at is that ideally we figure out the root
cause for the breakage. Otherwise we'll just paper over the underlying
issue with workarounds and at some point they will no longer work and we
will be none the wiser.

So far I have only found where to look, which is one step, but there's
more to be done. Why can an update to boost trigger this? Why can I
build libquotient on my amd64 laptop but not on arm64, both with
up-to-date ports and an up-to-date ports tree? What recent change caused
this? Was this the boost update?

> > 
> > > 
> > > But maybe it gives someone a clue what the right fix might be.
> > > 
> > > Index: emulators/citra/Makefile
> > > ===
> > > RCS file: /cvs/ports/emulators/citra/Makefile,v
> > > diff -u -p -r1.29 Makefile
> > > --- emulators/citra/Makefile  19 Dec 2023 06:18:03 -  1.29
> > > +++ emulators/citra/Makefile  22 Dec 2023 23:15:14 -
> > > @@ -1,6 +1,3 @@
> > > -# broken with boost 1.84
> > > -BROKEN=  cannot initialize '__va_list_tag *' with 'va_list'
> > > -
> > >  # ships a dynarmic copy, and dynarmic only supports x86-64 and AArch64
> > >  ONLY_FOR_ARCHS = amd64 arm64
> > >  
> > > @@ -56,7 +53,8 @@ CONFIGURE_ARGS =-DENABLE_CUBEB=OFF \
> > >   -DUSE_SYSTEM_SDL2=ON \
> > >   -DENABLE_FFMPEG_AUDIO_DECODER=ON \
> > >   -DENABLE_FFMPEG_VIDEO_DUMPER=ON \
> > > - -DCITRA_USE_PRECOMPILED_HEADERS=OFF
> > 
> > This was not complete . There is a second option:
> > DYNARMIC_USE_PRECOMPILED_HEADERS.
> > 
> > I think CMAKE_DISABLE_PRECOMPILE_HEADERS is the big hummer to disabled
> > all pre complied header even if there are hand-made options.
> > 
> > https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_PRECOMPILE_HEADERS.html
> > 
> > The following diff compiles without issues:

This does sound like the better workaround. But why were precompiled
headers disabled in this port and why do they need harder disabling now?

> > > Index: x11/libquotient/Makefile
> > > ===
> > > RCS file: /cvs/ports/x11/libquotient/Makefile,v
> > > diff -u -p -r1.6 Makefile
> > > --- x11/libquotient/Makefile  11 Oct 2023 18:40:14 -  1.6
> > > +++ x11/libquotient/Makefile  22 Dec 2023 23:02:46 -
> > > @@ -27,7 +27,8 @@ LIB_DEPENDS =   devel/olm \
> > >  CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=ON \
> > >   -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON \
> > >   -DQuotient_ENABLE_E2EE=ON \
> > > - -DQuotient_INSTALL_TESTS=OFF
> > > + -DQuotient_INSTALL_TESTS=OFF \
> > > + -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
> 
> Maybe GCC is happy. Again, I think it's a PCH issue ;)

But surely gcc isn't an option. We can't mix multiple c++ standard
libraries in a port.

> 
> libQuotient-0.8.1.2/CMakeLists.txt:
> 
>  310 # Don't use PCH w/GCC 
> (https://bugzilla.redhat.com/show_bug.cgi?id=1721553#c34)
>  311 if (NOT CMAKE_CXX_COMPILER_ID STREQUAL GNU)
>  312 target_precompile_headers(${QUOTIENT_LIB_NAME} PRIVATE 
> Quotient/converters.h)
>  313 endif ()
> 
> > >  
> > >  # XXX C++20 vs. libstd++ in quotest.cpp
> > >  CONFIGURE_ARGS +=-DBUILD_TESTING=OFF
> > 
> > Which brings me to a more common questions. Does PCH make sense in the
> > ports? I

boost futex diff

2023-12-23 Thread Theo Buehler

This is based on a diff from Brad who noticed that the diff disabling
syscall(2) accidentally disabled futexes altogether. This diff reverts
to the state prior to that commit by taking the intended approach:
replace syscall(SYS_futex, ...) with a call to futex(2) itself.

The second part of the diff enables futexes for fiber.

I think this is an improvement over the current state. It went through a
bulk without fallout. Unless I hear objections, I plan on committing
this in a few days.

Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
diff -u -p -r1.139 Makefile
--- Makefile19 Dec 2023 06:14:25 -  1.139
+++ Makefile21 Dec 2023 06:43:23 -
@@ -11,7 +11,8 @@ COMMENT-md=   machine-dependent libraries 
 VERSION=   1.84.0
 DISTNAME=  boost_${VERSION:S/./_/g}
 PKGNAME=   boost-${VERSION}
-EPOCH =0
+REVISION=  0
+EPOCH= 0
 CATEGORIES=devel
 SITES= 
https://boostorg.jfrog.io/artifactory/main/release/${VERSION}/source/
 EXTRACT_SUFX=  .tar.bz2
Index: patches/patch-boost_atomic_detail_futex_hpp
===
RCS file: /cvs/ports/devel/boost/patches/patch-boost_atomic_detail_futex_hpp,v
diff -u -p -r1.1 patch-boost_atomic_detail_futex_hpp
--- patches/patch-boost_atomic_detail_futex_hpp 28 Oct 2023 14:03:31 -  
1.1
+++ patches/patch-boost_atomic_detail_futex_hpp 21 Dec 2023 07:22:52 -
@@ -1,44 +1,44 @@
 Index: boost/atomic/detail/futex.hpp
 --- boost/atomic/detail/futex.hpp.orig
 +++ boost/atomic/detail/futex.hpp
-@@ -23,7 +23,7 @@
- #pragma once
- #endif
+@@ -25,6 +25,7 @@
  
--#if defined(__linux__) || defined(__OpenBSD__) || defined(__NETBSD__) || 
defined(__NetBSD__)
-+#if defined(__linux__) || defined(__NETBSD__) || defined(__NetBSD__)
+ #if defined(__linux__) || defined(__OpenBSD__) || defined(__NETBSD__) || 
defined(__NetBSD__)
  
++#ifndef __OpenBSD__
  #include 
  
-@@ -45,8 +45,9 @@
+ #if defined(SYS_futex)
+@@ -44,9 +45,10 @@
+ #define BOOST_ATOMIC_DETAIL_SYS_FUTEX SYS___futex
  #define BOOST_ATOMIC_DETAIL_NETBSD_FUTEX
  #endif
++#endif
  
 -#if defined(BOOST_ATOMIC_DETAIL_SYS_FUTEX)
  
 +#if defined(BOOST_ATOMIC_DETAIL_SYS_FUTEX) || defined(__OpenBSD__)
-+
  #include 
  #if defined(__linux__)
  #include 
-@@ -74,7 +75,9 @@ namespace detail {
+@@ -74,7 +76,9 @@ namespace detail {
  //! Invokes an operation on the futex
  BOOST_FORCEINLINE int futex_invoke(void* addr1, int op, unsigned int val1, 
const void* timeout = NULL, void* addr2 = NULL, unsigned int val3 = 0) 
BOOST_NOEXCEPT
  {
 -#if !defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
 +#if defined(__OpenBSD__)
-+return ::futex(addr1, op, val1, timeout, addr2, 0u, val3);
++return ::futex(static_cast < volatile uint32_t * >(addr1), op, val1, 
static_cast < const struct timespec * >(timeout), static_cast < volatile 
uint32_t * >(addr2));
 +#elif !defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
  return ::syscall(BOOST_ATOMIC_DETAIL_SYS_FUTEX, addr1, op, val1, timeout, 
addr2, val3);
  #else
  // Pass 0 in val2.
-@@ -85,7 +88,9 @@ BOOST_FORCEINLINE int futex_invoke(void* addr1, int op
+@@ -85,7 +89,9 @@ BOOST_FORCEINLINE int futex_invoke(void* addr1, int op
  //! Invokes an operation on the futex
  BOOST_FORCEINLINE int futex_invoke(void* addr1, int op, unsigned int val1, 
unsigned int val2, void* addr2 = NULL, unsigned int val3 = 0) BOOST_NOEXCEPT
  {
 -#if !defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
 +#if defined(__OpenBSD__)
-+return futex(addr1, op, val1, static_cast< void* >(NULL), addr2, val2, 
val3);
++return futex(static_cast < volatile uint32_t * >(addr1), op, val1, 
nullptr, static_cast < volatile uint32_t * >(addr2));
 +#elif !defined(BOOST_ATOMIC_DETAIL_NETBSD_FUTEX)
  return ::syscall(BOOST_ATOMIC_DETAIL_SYS_FUTEX, addr1, op, val1, 
static_cast< atomics::detail::uintptr_t >(val2), addr2, val3);
  #else
Index: patches/patch-boost_fiber_detail_futex_hpp
===
RCS file: /cvs/ports/devel/boost/patches/patch-boost_fiber_detail_futex_hpp,v
diff -u -p -r1.1 patch-boost_fiber_detail_futex_hpp
--- patches/patch-boost_fiber_detail_futex_hpp  28 Oct 2023 14:03:31 -  
1.1
+++ patches/patch-boost_fiber_detail_futex_hpp  21 Dec 2023 07:28:14 -
@@ -1,12 +1,27 @@
 Index: boost/fiber/detail/futex.hpp
 --- boost/fiber/detail/futex.hpp.orig
 +++ boost/fiber/detail/futex.hpp
-@@ -32,7 +32,11 @@ namespace detail {
- #if BOOST_OS_LINUX
+@@ -21,6 +21,10 @@ extern "C" {
+ #include 
+ #include 
+ }
++#elif BOOST_OS_BSD_OPEN
++extern "C" {
++#include 
++}
+ #elif BOOST_OS_WINDOWS
+ #include 
+ #endif
+@@ -29,10 +33,14 @@ namespace boost {
+ namespace fibers {
+ namespace detail {
+ 
+-#if BOOST_OS_LINUX
++#if BOOST_OS_LINUX || BOOST_OS_BSD_OPEN
  BOOST_FORCEINLINE
  int sys_futex( void * addr, std::int32_t op, std::int32_t x) {
-+if defined(__OpenBSD__)
-+return

CVS: cvs.openbsd.org: ports

2023-12-23 Thread Theo Buehler

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2023/12/23 01:33:12

Modified files:
security/rust-openssl-tests: Makefile crates.inc distinfo 

Log message:
Update to rust-openssl-tests 20231222

Re: devel/highway: update to 1.0.5

2023-12-23 Thread Landry Breuil

Le Fri, Dec 22, 2023 at 12:12:43AM +, Klemens Nanni a écrit :
> Newer graphics/libvips requires highway>=1.0.5.
> I haven't tested other consumers yet.  amd64 regress:

can we update to 1.0.7 ? graphics/libjxl 0.9.0 requires it since
https://github.com/libjxl/libjxl/pull/2765.

-- Could NOT find HWY: Found unsuitable version "1.0.3", but required is at 
least "1.0.7" (found /usr/local/lib/libhwy.so.0.0)

sccache lifetime & ports infrastructure ?

2023-12-23 Thread Landry Breuil

hi,

sending to ports@ for more ideas, devel/sccache works pretty great here,
but for now its client/server model has some issues. from my
understanding, a server is spawned at the first invocation of sccache,
and it runs forever, or until it had nothing to do and
SCCACHE_IDLE_TIMEOUT expired.

i've seen at occasion the make process 'waiting' at the end of the
build, from my understanding because sccache was used and thus a server
was spawned, and the server was still running.  manually killing the
server process allows make build to finish and proceed with make fake.

not a big deal when you do something else, but annoying when you need a
package *now* :)

looking at the processes, the sccache process is reparented to init...
so why is make waiting at the end ?

root 1  0.0  0.0952   480 ??  I  Thu08AM0:00.02 /sbin/init
landry   15309  6.3  0.1 133596 39540 ??  S   8:59AM0:17.13 
-/usr/local/bin/sccache

some ideas:
- call sccache --stop-server at the end of make build ?
- have some magic during the invocation so the make process doesnt wait for it ?
- have sccache run as an rc.d daemon so that make doesnt need to start one ?

Landry

42 matches

Mail list logo