aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Sun Feb 4 04:37:28 MST 2024 finished at Tue Feb 6 22:44:08 MST 2024 lasted 2D18h06m done with kern.version=OpenBSD 7.4-current (GENERIC.MP) #72: Sat Feb 3 22:27:21 MST 2024 built packages:12279 Feb 4:4438 Feb 5:311 Feb 6:7529 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2024-02-04/summary.log build failures: 0
Re: sysutils/docker-cli: update to 25.0.3
Hi, I gave this a very quick spin and I think there is something missing: buildx isn't used anymore, and a `docker build` is greeted with DEPRECATED: The legacy builder is deprecated and will be removed in a future release. Install the buildx component to build images with BuildKit: https://docs.docker.com/go/buildx/ There are some differences between Dockerfile handling between the two, which also breaks stuff that currently works (`COPY . .` works with buildx, while it bails out with "When using COPY with more than one source file, the destination must be a directory and end with a /" without it). I might take a further look during the week. Lucas On Wed, Feb 07, 2024 at 03:21:42AM +0100, Kirill A. Korinsky wrote: > Tested with remote podman. > > All patches aren't required anymore. > > -- > wbr, Kirill
sysutils/docker-cli: update to 25.0.3
Tested with remote podman.
All patches aren't required anymore.
--
wbr, Kirill
Index: Makefile
===
RCS file: /cvs/ports/sysutils/docker-cli/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- Makefile20 Nov 2022 16:14:43 - 1.9
+++ Makefile7 Feb 2024 02:15:08 -
@@ -1,6 +1,6 @@
COMMENT = command-line tool for controlling Docker
-V =20.10.21
+V =25.0.3
GH_ACCOUNT = docker
GH_PROJECT = cli
Index: distinfo
===
RCS file: /cvs/ports/sysutils/docker-cli/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo20 Nov 2022 16:14:43 - 1.5
+++ distinfo7 Feb 2024 02:15:08 -
@@ -1,2 +1,2 @@
-SHA256 (cli-20.10.21.tar.gz) = 8PYsocgOj9W54UDKZO8+ddx896KAQLPRCyYDBxKJRug=
-SIZE (cli-20.10.21.tar.gz) = 7633967
+SHA256 (cli-25.0.3.tar.gz) = BK0M6pkqZdsgyxsNv20c4yxwXOh53lGyIJX+jSgDCBU=
+SIZE (cli-25.0.3.tar.gz) = 6864551
Index:
patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go
===
RCS file:
patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go
diff -N
patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go
---
patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go
11 Mar 2022 19:57:21 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-Index: vendor/github.com/containerd/containerd/content/local/store_unix.go
vendor/github.com/containerd/containerd/content/local/store_unix.go.orig
-+++ vendor/github.com/containerd/containerd/content/local/store_unix.go
-@@ -1,4 +1,4 @@
--// +build linux solaris darwin freebsd netbsd
-+// +build linux solaris darwin freebsd netbsd openbsd
-
- /*
-Copyright The containerd Authors.
Index: patches/patch-vendor_github_com_containerd_continuity_fs_stat_openbsd_go
===
RCS file:
patches/patch-vendor_github_com_containerd_continuity_fs_stat_openbsd_go
diff -N patches/patch-vendor_github_com_containerd_continuity_fs_stat_openbsd_go
--- patches/patch-vendor_github_com_containerd_continuity_fs_stat_openbsd_go
11 Mar 2022 19:57:21 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,48 +0,0 @@
-Index: vendor/github.com/containerd/containerd/sys/stat_openbsd.go
vendor/github.com/containerd/containerd/sys/stat_openbsd.go.orig
-+++ vendor/github.com/containerd/containerd/sys/stat_openbsd.go
-@@ -0,0 +1,44 @@
-+// +build openbsd
-+/*
-+ Copyright The containerd Authors.
-+
-+ Licensed under the Apache License, Version 2.0 (the "License");
-+ you may not use this file except in compliance with the License.
-+ You may obtain a copy of the License at
-+
-+ http://www.apache.org/licenses/LICENSE-2.0
-+
-+ Unless required by applicable law or agreed to in writing, software
-+ distributed under the License is distributed on an "AS IS" BASIS,
-+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ See the License for the specific language governing permissions and
-+ limitations under the License.
-+*/
-+
-+package sys
-+
-+import (
-+ "syscall"
-+ "time"
-+)
-+
-+// StatAtime returns the Atim
-+func StatAtime(st *syscall.Stat_t) syscall.Timespec {
-+ return st.Atim
-+}
-+
-+// StatCtime returns the Ctim
-+func StatCtime(st *syscall.Stat_t) syscall.Timespec {
-+ return st.Ctim
-+}
-+
-+// StatMtime returns the Mtim
-+func StatMtime(st *syscall.Stat_t) syscall.Timespec {
-+ return st.Mtim
-+}
-+
-+// StatATimeAsTime returns st.Atim as a time.Time
-+func StatATimeAsTime(st *syscall.Stat_t) time.Time {
-+ // The int64 conversions ensure the line compiles for 32-bit systems as
well.
-+ return time.Unix(int64(st.Atim.Sec), int64(st.Atim.Nsec)) // nolint:
unconvert
-+}
Index: patches/patch-vendor_github_com_moby_sys_mount_mounter_bsd_go
===
RCS file: patches/patch-vendor_github_com_moby_sys_mount_mounter_bsd_go
diff -N patches/patch-vendor_github_com_moby_sys_mount_mounter_bsd_go
--- patches/patch-vendor_github_com_moby_sys_mount_mounter_bsd_go 11 Mar
2022 19:57:21 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-Index: vendor/github.com/moby/sys/mount/mounter_bsd.go
vendor/github.com/moby/sys/mount/mounter_bsd.go.orig
-+++ vendor/github.com/moby/sys/mount/mounter_bsd.go
-@@ -1,4 +1,4 @@
--// +build freebsd,cgo openbsd,cgo
-+// +build freebsd,cgo
-
- package mount
-
Index: patches/patch-vendor_github_com_moby_sys_mount_mounter_openbsd_go
===
RCS file:
Re: [NEW] textproc/py-bashlex
On 2024/02/06 21:58, Корякин Артём wrote: > So here would be bashlex port attached in application/x-tar format. Makefile in the tar.gz is not the actual Makefile, but a tar.gz of the other files.
powerpc bulk build report
Bulk build on macppc-0.ports.openbsd.org Started : Sun Jan 14 16:57:49 MST 2024 Finished: Tue Feb 6 13:46:11 MST 2024 Duration: 22 Days 20 hours 48 minutes Built using OpenBSD 7.4-current (GENERIC) #200: Thu Jan 11 09:52:56 MST 2024 Built 10103 packages Number of packages built each day: Jan 14: 628 Jan 15: 504 Jan 16: 519 Jan 17: 239 Jan 18: 1 Jan 19: 478 Jan 20: 370 Jan 21: 220 Jan 22: 371 Jan 23: 216 Jan 24: 246 Jan 25: 238 Jan 26: 211 Jan 27: 124 Jan 28: 204 Jan 29: 447 Jan 30: 350 Jan 31: 313 Feb 1: 294 Feb 2: 296 Feb 3: 276 Feb 4: 383 Feb 5: 411 Feb 6: 2764 Critical path missing pkgs: http://build-failures.rhaalovely.net/powerpc/2024-01-14/summary.log Build failures: 28 http://build-failures.rhaalovely.net/powerpc/2024-01-14/databases/galera.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/devel/appstream.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/devel/py-thrift,python3.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/devel/py-unicorn,python3.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/devel/qcoro.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/emulators/desmume.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/emulators/retroarch.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/games/cataclysm-dda,no_x11.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/games/gnukem.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/games/hyperrogue.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/games/nblood.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/games/widelands.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/graphics/gegl04.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/graphics/openimageio.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/lang/compcert.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/lang/gambit.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/lang/racket-minimal.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/lang/seed7.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/math/lean.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/security/distorm3.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/sysutils/u-boot/rk356x.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/sysutils/u-boot/rk3588.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/wayland/swayimg.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/www/kiwix/libkiwix.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/www/sogo.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/www/webkitgtk4,webkitgtk41.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/x11/jgmenu.log http://build-failures.rhaalovely.net/powerpc/2024-01-14/x11/qt6/qtquick3dphysics.log Recurrent failures: failures/databases/galera.log failures/devel/appstream.log failures/devel/py-thrift,python3.log failures/games/hyperrogue.log failures/games/nblood.log failures/games/widelands.log failures/graphics/gegl04.log failures/graphics/openimageio.log failures/lang/compcert.log failures/lang/gambit.log failures/lang/racket-minimal.log failures/lang/seed7.log failures/math/lean.log failures/sysutils/u-boot/rk3588.log failures/wayland/swayimg.log failures/www/kiwix/libkiwix.log failures/www/webkitgtk4,webkitgtk41.log failures/x11/jgmenu.log failures/x11/qt6/qtquick3dphysics.log New failures: +failures/www/sogo.log Resolved failures: -failures/audio/musique.log -failures/geo/osm2pgsql.log -failures/lang/mruby.log Packages newly built: +audio/musique +audio/ruby-taglib,ruby33 +audio/ruby-vorbis_comment,ruby33 +databases/ruby-amalgalite,ruby33 +databases/ruby-hiera-eyaml,ruby33 +databases/ruby-hiera-eyaml-gpg,ruby33 +databases/ruby-hiera-file,ruby33 +databases/ruby-hiera3,ruby33 +databases/ruby-ldap,ruby33 +databases/ruby-mysql2,ruby33 +databases/ruby-pg,ruby33 +databases/ruby-sequel,ruby33 +databases/ruby-sequel_pg,ruby33 +databases/ruby-sqlite3,ruby33 +databases/ruby-tiny_tds,ruby33 +databases/ruby-trilogy,ruby33 +databases/updatedb +devel/pecl-xdebug,php83 +devel/py-jupyter_packaging,python3 +devel/py-openbsd,python3 +devel/ruby-arrayfields,ruby33 +devel/ruby-cicphash,ruby33 +devel/ruby-daemons,ruby33 +devel/ruby-deep_merge,ruby33 +devel/ruby-ffi,ruby33 +devel/ruby-ffi-compiler,ruby33 +devel/ruby-highline,ruby33 +devel/ruby-idn,ruby33 +devel/ruby-kgio,ruby33 +devel/ruby-mini_portile2,ruby33 +devel/ruby-narray,ruby33 +devel/ruby-ncurses,ruby33 +devel/ruby-nio4r,ruby33 +devel/ruby-optimist,ruby33 +devel/ruby-pkg-config,ruby33 +devel/ruby-prof,ruby33 +devel/ruby-rb_sys +devel/ruby-rb_sys,ruby31 +devel/ruby-rb_sys,ruby32 +devel/ruby-rb_sys,ruby33 +devel/ruby-rbtree,ruby33 +devel/ruby-regexp_parser,ruby33 +devel/ruby-subset_sum,ruby33 +devel/ruby-yajl,ruby33 +graphics/ruby-rmagick,ruby33 +lang/mruby +lang/ruby/3.3 +lang/ruby/3.3,-main +lang/ruby/3.3,-ri_docs
Re: audio/shairport-sync: use pledge
Hi Klemens,
After some challenges building the port (all on me) this seems to work
well for me / my setup. I appreciate you adding pledge to this code...
Thanks,
Paul
On Mon, Feb 05, 2024 at 12:20:31PM +, Klemens Nanni wrote:
| There are three pledges:
| - at the start
| - after daemon(3) to drop "proc exec" unless scripts are used
| - after sio_open(3) to drop "cpath dpath" unless metadata is used
|
| Our port has libdaemon and metadata disabled, so it always ends up with
| "stdio rpath wpath inet unix dns [proc exec] audio", but the diff does
| account for them, such that enabling them does the right thing.
|
| One might be able to drop more and/or use unveil(2), but that needs
| careful hoisting and consideration of other features our port currently
| does not enable.
|
| Feedback? Objection? OK?
|
| Index: Makefile
| ===
| RCS file: /cvs/ports/audio/shairport-sync/Makefile,v
| diff -u -p -r1.7 Makefile
| --- Makefile 31 Jan 2024 08:47:23 - 1.7
| +++ Makefile 5 Feb 2024 11:45:53 -
| @@ -1,7 +1,7 @@
| COMMENT =AirPlay audio player
|
| DIST_TUPLE = github mikebrady shairport-sync 4.3.2 .
| -REVISION = 0
| +REVISION = 1
|
| CATEGORIES = audio net
|
| Index: patches/patch-shairport_c
| ===
| RCS file: patches/patch-shairport_c
| diff -N patches/patch-shairport_c
| --- /dev/null 1 Jan 1970 00:00:00 -
| +++ patches/patch-shairport_c 5 Feb 2024 12:04:21 -
| @@ -0,0 +1,75 @@
| +Index: shairport.c
| +--- shairport.c.orig
| shairport.c
| +@@ -1929,6 +1929,12 @@ void _display_config(const char *filename, const int l
| + #define display_config(argc, argv) _display_config(__FILE__, __LINE__,
argc, argv)
| +
| + int main(int argc, char **argv) {
| ++#if defined(__OpenBSD__)
| ++ /* Start with the superset of all potentially required promises. */
| ++ if (pledge("stdio rpath wpath cpath dpath inet unix dns proc exec audio",
NULL) == -1)
| ++die("pledge: %s", strerror(errno));
| ++#endif
| ++
| + memset(, 0, sizeof(config)); // also clears all strings, BTW
| + /* Check if we are called with -V or --version parameter */
| + if (argc >= 2 && ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1],
"--version") == 0))) {
| +@@ -2102,6 +2108,16 @@ int main(int argc, char **argv) {
| + // parse arguments into config -- needed to locate pid_dir
| + int audio_arg = parse_options(argc, argv);
| +
| ++#if defined(__OpenBSD__)
| ++ /* Any command to be executed at runtime? */
| ++ int run_cmds =
| ++config.cmd_active_start != NULL ||
| ++config.cmd_active_stop != NULL ||
| ++config.cmd_set_volume != NULL ||
| ++config.cmd_start != NULL ||
| ++config.cmd_stop != NULL;
| ++#endif
| ++
| + // mDNS supports maximum of 63-character names (we append 13).
| + if (strlen(config.service_name) > 50) {
| + warn("The service name \"%s\" is too long (max 50 characters) and has
been truncated.",
| +@@ -2237,6 +2253,16 @@ int main(int argc, char **argv) {
| +
| + #endif
| +
| ++#if defined(__OpenBSD__)
| ++ /* Past daemon(3)'s double fork(2). */
| ++
| ++ /* Only user-defined commands are executed. */
| ++ if (!run_cmds)
| ++/* Drop "proc exec". */
| ++if (pledge("stdio rpath wpath cpath dpath inet unix dns audio", NULL)
== -1)
| ++ die("pledge: %s", strerror(errno));
| ++#endif
| ++
| + #ifdef CONFIG_AIRPLAY_2
| +
| + if (has_fltp_capable_aac_decoder() == 0) {
| +@@ -2351,6 +2377,24 @@ int main(int argc, char **argv) {
| + config.output_name == NULL ? "" : config.output_name);
| + }
| + config.output->init(argc - audio_arg, argv + audio_arg);
| ++
| ++#if defined(__OpenBSD__)
| ++ /* Past first and last sio_open(3), sndio(7) only needs "audio". */
| ++
| ++# ifdef CONFIG_METADATA
| ++ /* Only coverart cache is created.
| ++ * Only metadata pipe is special. */
| ++ if (!config.metadata_enabled)
| ++# endif
| ++/* Drop "cpath dpath". */
| ++if (run_cmds) {
| ++ if (pledge("stdio rpath wpath inet unix dns proc exec audio", NULL)
== -1)
| ++die("pledge: %s", strerror(errno));
| ++} else {
| ++ if (pledge("stdio rpath wpath inet unix dns audio", NULL) == -1)
| ++die("pledge: %s", strerror(errno));
| ++}
| ++#endif
| +
| + // pthread_cleanup_push(main_cleanup_handler, NULL);
| +
--
>[<++>-]<+++.>+++[<-->-]<.>+++[<+
+++>-]<.>++[<>-]<+.--.[-]
http://www.weirdnet.nl/
[NEW] textproc/py-bashlex
I want to have IDE-like capabilites in text editor. To have this in C I use clangd language server. This language server require me to have compilation database. Build systems like BSD make or GNU make would not create it by default. So, to create it I need a python script called compiledb[1]. Compiledb core dependence is bash parser written in python called bashlex[2]. So I want at first to create a port for bashlex. Bashlex seems to be an interesting package, also used in explainshell[3]. I want to submit full port of compiledb later. So here would be bashlex port attached in application/x-tar format. Best regards, Artsiom. bashlex.tar.gz Description: bashlex.tar.gz archive [1]: https://github.com/nickdiego/compiledb [2]: https://github.com/idank/bashlex [3]: https://www.explainshell.com/
Re: UPDATE: devel/cmake (bulk wanted)
> Can someone put this through a bulk, please? Done. Only graphics/blender broke for which you have a PCH disabling fix.
php 8.X sparc64 support
Since I like my sparc64 server and I like it to run roundcube lets bring
modern php to sparc64.
I sat down and implemented the necessary fiber ASM which could also be
used in boost-context (but that code needs an additional ontop_fcontext()
function).
I built 8.1, 8.2 and 8.3 with this diff and ran make test (for 8.2 and
8.1). All fiber related tests pass so I think this could be good enough.
sparc64 is a funky arch since the register windows hide all callee saved
registers (if you save and restore in the jump function). So the
implementation of jump_fcontext() is trivial. Also no FPU context needs to
be saved (again all registers are volatile accross function calls).
I'm not 100% sure about %g2, %g3, %g6 and %g7 from my understanding those
are either scratch regs (and therefor volatile) or must not be changed by
userland code (e.g. %g7 for TLS). From my understanding only %g7 has a
special meaning on OpenBSD but this information about the ABI is very
vague.
In make_fcontext() I need an extra trampoline since stackghost does not
allow me to alter / fake the return address of the function called.
Does someone know of some PHP code that heavily depends on fiber?
--
:wq Claudio
Index: 8.1/Makefile
===
RCS file: /cvs/ports/lang/php/8.1/Makefile,v
diff -u -p -r1.45 Makefile
--- 8.1/Makefile22 Dec 2023 13:30:56 - 1.45
+++ 8.1/Makefile6 Feb 2024 16:32:11 -
@@ -1,5 +1,3 @@
-BROKEN-sparc64=fibers requires either ucontext or asm code (not
present for sparc64)
-
PHP_VERSION= 8.1.27
PHP_PKGSPEC= >=8.1,<8.2
Index: 8.1/patches/patch-Zend_asm_jump_sparc64_sysv_elf_gas_S
===
RCS file: 8.1/patches/patch-Zend_asm_jump_sparc64_sysv_elf_gas_S
diff -N 8.1/patches/patch-Zend_asm_jump_sparc64_sysv_elf_gas_S
--- /dev/null 1 Jan 1970 00:00:00 -
+++ 8.1/patches/patch-Zend_asm_jump_sparc64_sysv_elf_gas_S 6 Feb 2024
16:32:11 -
@@ -0,0 +1,55 @@
+Index: Zend/asm/jump_sparc64_sysv_elf_gas.S
+--- Zend/asm/jump_sparc64_sysv_elf_gas.S.orig
Zend/asm/jump_sparc64_sysv_elf_gas.S
+@@ -0,0 +1,51 @@
++/*
++ Copyright Claudio Jeker 2024
++ Distributed under the Boost Software License, Version 1.0.
++ (See accompanying file LICENSE_1_0.txt or copy at
++ http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++/*
++ * typedef struct {
++ *void *handle;
++ *zend_fiber_transfer *transfer;
++ * } boost_context_data;
++ *
++ * boost_context_data jump_fcontext(void *to, zend_fiber_transfer *transfer);
++ */
++#define FRAMESIZE 176
++#define BIAS 2047
++#define SP 128
++#define I7 136
++
++.file "jump_sparc64_sysv_elf_gas.S"
++.text
++.align 4
++.global jump_fcontext
++.type jump_fcontext, %function
++jump_fcontext:
++ # prepare stack
++ save%sp, -FRAMESIZE, %sp
++
++ # store framepointer and return address in slots reserved
++ # for arguments
++ stx %fp, [%sp + BIAS + SP]
++ stx %i7, [%sp + BIAS + I7]
++ mov %sp, %o0
++ # force flush register windows to stack and with that save context
++ flushw
++ # get SP (pointing to new context-data) from %i0 param
++ mov %i0, %sp
++ # load framepointer and return address from context
++ ldx [%sp + BIAS + SP], %fp
++ ldx [%sp + BIAS + I7], %i7
++
++ # store old %sp (pointing to old context-data) in %i0 as return
++ # *data stored in %i1 is unmodified
++ mov %o0, %i0
++
++ ret
++ restore
++.size jump_fcontext,.-jump_fcontext
++# Mark that we don't need executable stack.
++.section .note.GNU-stack,"",%progbits
Index: 8.1/patches/patch-Zend_asm_make_sparc64_sysv_elf_gas_S
===
RCS file: 8.1/patches/patch-Zend_asm_make_sparc64_sysv_elf_gas_S
diff -N 8.1/patches/patch-Zend_asm_make_sparc64_sysv_elf_gas_S
--- /dev/null 1 Jan 1970 00:00:00 -
+++ 8.1/patches/patch-Zend_asm_make_sparc64_sysv_elf_gas_S 6 Feb 2024
16:32:11 -
@@ -0,0 +1,73 @@
+Index: Zend/asm/make_sparc64_sysv_elf_gas.S
+--- Zend/asm/make_sparc64_sysv_elf_gas.S.orig
Zend/asm/make_sparc64_sysv_elf_gas.S
+@@ -0,0 +1,69 @@
++/*
++ Copyright Claudio Jeker 2024
++ Distributed under the Boost Software License, Version 1.0.
++ (See accompanying file LICENSE_1_0.txt or copy at
++ http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++/*
++ * void *make_fcontext(void *sp, size_t size, void (*fn)(boost_context_data));
++ */
++#define FRAMESIZE 176
++#define BIAS 2047
++#define FP 112
++#define SP 128
++#define I7 136
++
++.file "make_sparc64_sysv_elf_gas.S"
++.text
++.align 4
++.global make_fcontext
++.type make_fcontext, %function
++make_fcontext:
++ save%sp, -FRAMESIZE, %sp
++
++ # shift address in %i0 (allocated stack) to lower 16 byte boundary
++ and %i0, -0xf, %i0
++
++ # reserve space for two frames on the stack
++
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: to...@cvs.openbsd.org 2024/02/06 05:49:37 Modified files: games/yquake2 : Makefile Log message: games/yquake2: Enable build for all archs. Upstream has indicated they are going to officially try to support all possible archs. Testing has shown it works on macppc, so there is a good chance other archs work too. ok kn@
Re: UPDATE: cad/prusaslicer
2/6/24 13:33, Ian Darwin пишет: > Given that there's a PR that *might* be accepted, let's leave it for now. > If the PR is rejected, we can switch to your PR; if accepted, you can remove > those patches. > > I'll commit this version later today if no further churn. Sounds good, thanks.
Re: UPDATE: cad/prusaslicer
On Mon, Feb 05, 2024 at 08:52:58PM -0800, Renato Aguiar wrote: > On Tue, Feb 06 2024, Klemens Nanni wrote: > > That's a lot of patches, do you intend to upstream those? > > If you do that on GitHub, you might as well switch GH_* to your fork and > > thus reduce patches/ -- just a suggestion, whatever works best for you. > > There is already a PR (from someone else) for adding support to Catch2 v3: > https://github.com/prusa3d/PrusaSlicer/pull/11576 > > Once that is merged, most patches will be removed :) > > I already keep a fork in GitHub, so I can update the port to use it in the > meantime if that is preferred. Given that there's a PR that *might* be accepted, let's leave it for now. If the PR is rejected, we can switch to your PR; if accepted, you can remove those patches. I'll commit this version later today if no further churn.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2024/02/06 05:00:59 Modified files: www/chromium : Makefile www/chromium/patches: patch-base_BUILD_gn patch-base_compiler_specific_h patch-chrome_browser_chrome_content_browser_client_cc www/ungoogled-chromium: Makefile www/ungoogled-chromium/patches: patch-base_BUILD_gn patch-base_compiler_specific_h patch-chrome_browser_chrome_content_browser_client_cc Added files: www/chromium/patches: patch-third_party_perfetto_src_trace_processor_db_column_h www/ungoogled-chromium/patches: patch-third_party_perfetto_src_trace_processor_db_column_h Log message: unbreak on i386 and remove change-stack-guard-on-fork flag which is unused on OpenBSD
devel/geany: Update to 2.0
This diff simply replaces the DISTNAME version and adjust
the few tweaks to build the port:
- remove --enable-gtk3 from CONFIGURE_ARGS as it doesn't
seem to exist anymore.
- refresh the only patches/ entry (simply c++ namespace change).
- update WANTLIB accrording to what "make port-lib-depends-check"
suggests. It's unclear to me if the ${COMPILER_LIBCXX} entry
is new or was missing.
With these minimal changes geany 2.0 builds and runs. Tested on
amd64 only.
Thoughts? OKs?
Index: Makefile
===
RCS file: /cvs/ports/devel/geany/Makefile,v
diff -u -p -u -p -r1.71 Makefile
--- Makefile13 Oct 2023 05:15:01 - 1.71
+++ Makefile6 Feb 2024 11:25:33 -
@@ -1,6 +1,6 @@
COMMENT= small and lightweight IDE
-DISTNAME = geany-1.38
+DISTNAME = geany-2.0
SHARED_LIBS += geany 0.0 # 0.0
CATEGORIES=devel
@@ -21,21 +21,20 @@ MODULES=textproc/intltool
USE_GMAKE= Yes
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0
-WANTLIB += c cairo cairo-gobject epoxy expat ffi fontconfig
-WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl m
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
-WANTLIB += png pthread ${COMPILER_LIBCXX} xcb xcb-render xcb-shm
-WANTLIB += z fribidi Xau Xdmcp execinfo jpeg
-WANTLIB += atspi dbus-1
+WANTLIB += ${COMPILER_LIBCXX} X11 Xau Xcomposite Xcursor Xdamage
+WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
+WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject dbus-1 epoll-shim
+WANTLIB += epoxy execinfo expat ffi fontconfig freetype fribidi
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl jpeg
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
+WANTLIB += png wayland-client wayland-cursor wayland-egl xcb xcb-render
+WANTLIB += xcb-shm xkbcommon z
LIB_DEPENDS= x11/gtk+3
RUN_DEPENDS= devel/desktop-file-utils \
devel/vte3 \
x11/gtk+4,-guic
-
FAKE_FLAGS=doc_DATA="${WRKSRC}/README"
LIBTOOL_FLAGS =--tag=disable-static
@@ -44,7 +43,7 @@ CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--enable-html-docs=no \
--enable-pdf-docs=no \
--enable-api-docs=no \
- --enable-gtk3=yes
+ --enable-gtkdoc-header=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: distinfo
===
RCS file: /cvs/ports/devel/geany/distinfo,v
diff -u -p -u -p -r1.21 distinfo
--- distinfo13 Oct 2023 05:15:01 - 1.21
+++ distinfo6 Feb 2024 11:25:33 -
@@ -1,2 +1,2 @@
-SHA256 (geany-1.38.tar.bz2) = q/8Xbk1IvqNe5TA3xJyC+QttTCPmmu1uSlyozNOq1UY=
-SIZE (geany-1.38.tar.bz2) = 4860717
+SHA256 (geany-2.0.tar.bz2) = VltM0vAxHB46Fn7HHEoy26ZC4P5VSuW7a4F3t6dMzJI=
+SIZE (geany-2.0.tar.bz2) = 6836300
Index: patches/patch-scintilla_src_RunStyles_cxx
===
RCS file: /cvs/ports/devel/geany/patches/patch-scintilla_src_RunStyles_cxx,v
diff -u -p -u -p -r1.2 patch-scintilla_src_RunStyles_cxx
--- patches/patch-scintilla_src_RunStyles_cxx 11 Mar 2022 18:50:04 -
1.2
+++ patches/patch-scintilla_src_RunStyles_cxx 6 Feb 2024 11:25:33 -
@@ -4,13 +4,13 @@ i386/powerpc fix for
Index: scintilla/src/RunStyles.cxx
--- scintilla/src/RunStyles.cxx.orig
+++ scintilla/src/RunStyles.cxx
-@@ -308,7 +308,8 @@ void RunStyles::Check() const {
+@@ -307,7 +307,8 @@ void RunStyles::Check() const {
- template class Scintilla::RunStyles;
- template class Scintilla::RunStyles;
--#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU
-+#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU || \
+ template class Scintilla::Internal::RunStyles;
+ template class Scintilla::Internal::RunStyles;
+-#if (PTRDIFF_MAX != INT_MAX) || defined(__HAIKU__)
++#if (PTRDIFF_MAX != INT_MAX) || defined(__HAIKU__) || \
+( defined(__OpenBSD__) && defined(_ILP32) )
- template class Scintilla::RunStyles;
- template class Scintilla::RunStyles;
+ template class Scintilla::Internal::RunStyles;
+ template class Scintilla::Internal::RunStyles;
#endif
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/geany/pkg/PLIST,v
diff -u -p -u -p -r1.31 PLIST
--- pkg/PLIST 13 Oct 2023 05:15:01 - 1.31
+++ pkg/PLIST 6 Feb 2024 11:25:33 -
@@ -22,7 +22,6 @@ include/geany/pluginutils.h
include/geany/prefs.h
include/geany/project.h
include/geany/scintilla/
-include/geany/scintilla/Compat.h
include/geany/scintilla/SciLexer.h
include/geany/scintilla/Sci_Position.h
include/geany/scintilla/Scintilla.h
@@ -56,11 +55,13 @@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/02/06 04:01:24 Modified files: sysutils/terragrunt: Makefile distinfo modules.inc Log message: Update to terragrunt-0.55.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/02/06 04:01:14 Modified files: wayland/libei : Makefile distinfo Log message: Update to libei-1.2.1.
Re: games/yquake2: enable macppc
On Tue, Feb 06, 2024 at 11:00:07AM +0100, Tobias Heider wrote: > On Tue, Feb 06, 2024 at 01:54:26AM +, Klemens Nanni wrote: > > On Tue, Feb 06, 2024 at 02:48:32AM +0100, Tobias Heider wrote: > > > I wouldn't mind enabling it for all archs either. Not sure which arch it > > > doesn't work on so NOT_FOR_ARCHS doesn't seem very useful. > > > I guess if it works on 32 bit BE macppc there is a good chance that most > > > others work too. > > > > Remove ONLY_FOR_ARCHS and find out through bulks? > > Iff that's a bad idea or I'm missing something, your diff is certainly > > OK kn, given your tests. > > I think I'll do that then if no one sees a problem with it. > Does updating archs need a REVISION bump? I guess I'd do one > just to be sure. It does not need a bupm. It does not change the package on architectures where it built and where it didn't build, well, it didn't build.
Re: games/yquake2: enable macppc
On Tue, Feb 06, 2024 at 01:54:26AM +, Klemens Nanni wrote: > On Tue, Feb 06, 2024 at 02:48:32AM +0100, Tobias Heider wrote: > > I wouldn't mind enabling it for all archs either. Not sure which arch it > > doesn't work on so NOT_FOR_ARCHS doesn't seem very useful. > > I guess if it works on 32 bit BE macppc there is a good chance that most > > others work too. > > Remove ONLY_FOR_ARCHS and find out through bulks? > Iff that's a bad idea or I'm missing something, your diff is certainly > OK kn, given your tests. I think I'll do that then if no one sees a problem with it. Does updating archs need a REVISION bump? I guess I'd do one just to be sure.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org 2024/02/06 02:56:10
Modified files:
www/webkitgtk4 : Makefile distinfo
www/webkitgtk4/patches:
patch-Source_JavaScriptCore_assembler_ARMv7Assembler_h
Log message:
Update to webkitgtk{40,41,60}-2.42.5.
