work around alephone and openal conflict

The below is a hack that ensures that the prototype with effects
parameter is in scope before the effects macro is defined fixing the
build of the entire marathon suite.

openal should really avoid using variable names in prototypes (or prefix
them with _) and effects.h should use better names for its macros.

Index: patches/patch-Source_Files_GameWorld_effects_h
===================================================================
RCS file: patches/patch-Source_Files_GameWorld_effects_h
diff -N patches/patch-Source_Files_GameWorld_effects_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_Files_GameWorld_effects_h 1 Feb 2025 11:06:27 -0000
@@ -0,0 +1,18 @@
+alext.h has variable names in prototypes (which is a pollution that is
+best avoided even if it hurts readability) and this clashes with the
+effects macro, which is an incredibly short/bad name for a macro in a
+header.
+
+Index: Source_Files/GameWorld/effects.h
+--- Source_Files/GameWorld/effects.h.orig
++++ Source_Files/GameWorld/effects.h
+@@ -40,6 +40,9 @@ Aug 30, 2000 (Loren Petrich):
+ Added stuff for unpacking and packing
+ */
+
++// XXX - avoid conflict between effects macro and variable names in prototypes
++#include <AL/alext.h>
++
+ // LP addition:
+ #include "dynamic_limits.h"
+

UPDATE: net/swirc 3.5.2

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/swirc/Makefile,v
diff -u -p -r1.35 Makefile
--- Makefile 21 Nov 2024 21:58:53 -0000 1.35
+++ Makefile 1 Feb 2025 10:42:58 -0000
@@ -1,5 +1,5 @@
COMMENT = curses icb and irc client
-DISTNAME = swirc-3.5.1
+DISTNAME = swirc-3.5.2
CATEGORIES = net
HOMEPAGE = https://www.nifty-networks.net/swirc/

Index: distinfo
===================================================================
RCS file: /cvs/ports/net/swirc/distinfo,v
diff -u -p -r1.30 distinfo
--- distinfo 21 Nov 2024 21:58:53 -0000 1.30
+++ distinfo 1 Feb 2025 10:42:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (swirc-3.5.1.tgz) = ghY315VFX6PCwHMxgNbkPDz8dmvSEzkiUBvSM3j0q8A=
-SIZE (swirc-3.5.1.tgz) = 381708
+SHA256 (swirc-3.5.2.tgz) = Pe6dd+8kOuHU4eL3BOE3ca4/dkqZdHnYbaEoKKYrihA=
+SIZE (swirc-3.5.2.tgz) = 398274
Hi ports@,

Today I released net/swirc 3.5.2, with the following changes:

## [3.5.2] - 2025-02-01 ##
- **Added** command `/ctcp`
- **Added** command `/ftp`
- **Added** subcommand `ls` to `/dcc` which can be used to list the
  contents of the upload/download directories.
- **Added** the following options:
  - `ctcp_userinfo` (string)
  - `ftp_host` (string)
  - `ftp_port` (integer, defaults to 21)
  - `ftp_user` (string)
  - `ftp_pass` (string)
  - `ftp_upload_dir` (string)
- **Added** the key combination `CTRL+w` (List all windows)
- **Added** the possibility to switch between windows by just entering the
  reference number, i.e. `/1`, `/2`, `/3`...
- **Added** usage of `emplace_back()`. Performance. Multiple occurrences.
- **Changed** `is_valid_filename()` to disallow `..`
- **Changed** the program to beep on certain window activity.
- **Fixed** `-Wshadow` warnings
- **Fixed** a resource leak found by Coverity.
- **Fixed** uncontrolled data used in path expressions.

I attach a diff.

Best regards
Markus

Re: llama.cpp vulkan

On 2025/01/31 20:31, Chris Cappuccio wrote:
> This might be a way to do it. Does anyone have a card to test against?

No idea, descriptions for the vulkan-related ports don't give away much
information about what's supported or how to use them.

Had a thought earlier, it would be quite interesting to have llama.cpp
use pledge (with a no-network set of promises). Looking through nm -s
it seems like it may well be possible. (Not sure if supporting vulkan
would affect that, i.e. whether it needs anything that simply wouldn't
be allowed by any pledge).


> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/misc/llama.cpp/Makefile,v
> retrieving revision 1.1
> diff -u -p -u -r1.1 Makefile
> --- Makefile 30 Jan 2025 22:55:11 -0000 1.1
> +++ Makefile 1 Feb 2025 04:20:02 -0000
> @@ -10,6 +10,7 @@ SHARED_LIBS += ggml-cpu 0.0
> SHARED_LIBS += ggml 0.0
> SHARED_LIBS += llama 0.0
> SHARED_LIBS += llava_shared 0.0
> +SHARED_LIBS += ggml-vulkan 0.0
>
> CATEGORIES = misc
>
> @@ -18,11 +19,15 @@ HOMEPAGE = https://github.com/ggerganov
> # MIT
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += m pthread ${COMPILER_LIBCXX}
> +WANTLIB += m pthread vulkan ${COMPILER_LIBCXX}
>
> MODULES = devel/cmake
>
> +LIB_DEPENDS = graphics/vulkan-loader
> +BUILD_DEPENDS = graphics/shaderc
> +
> CONFIGURE_ARGS = -DGGML_CCACHE=Off \
> - -DGGML_NATIVE=Off
> + -DGGML_NATIVE=Off \
> + -DGGML_VULKAN=On
>
> .include <bsd.port.mk>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/misc/llama.cpp/pkg/PLIST,v
> retrieving revision 1.1
> diff -u -p -u -r1.1 PLIST
> --- pkg/PLIST 30 Jan 2025 22:55:11 -0000 1.1
> +++ pkg/PLIST 1 Feb 2025 04:20:02 -0000
> @@ -58,6 +58,7 @@ bin/convert_hf_to_gguf.py
> @bin bin/test-tokenizer-0
> @bin bin/test-tokenizer-1-bpe
> @bin bin/test-tokenizer-1-spm
> +@bin bin/vulkan-shaders-gen
> include/ggml-alloc.h
> include/ggml-backend.h
> include/ggml-blas.h
> @@ -74,7 +75,6 @@ include/ggml.h
> include/gguf.h
> include/llama-cpp.h
> include/llama.h
> -lib/cmake/
> lib/cmake/ggml/
> lib/cmake/ggml/ggml-config.cmake
> lib/cmake/ggml/ggml-version.cmake
> @@ -83,6 +83,7 @@ lib/cmake/llama/llama-config.cmake
> lib/cmake/llama/llama-version.cmake
> @lib lib/libggml-base.so.${LIBggml-base_VERSION}
> @lib lib/libggml-cpu.so.${LIBggml-cpu_VERSION}
> +@lib lib/libggml-vulkan.so.${LIBggml-vulkan_VERSION}
> @lib lib/libggml.so.${LIBggml_VERSION}
> @lib lib/libllama.so.${LIBllama_VERSION}
> @lib lib/libllava_shared.so.${LIBllava_shared_VERSION}
>