UPDATE: jasper 4.2.1
Here is an update to jasper 4.2.1. 4.2.1 (2024-02-18) == * Fix a build problem for the DJGPP/MS-DOS environment (#372). 4.2.0 (2024-02-05) == * Add the JAS_PACKAGING option to the CMake build in an attempt to allow easier control over rpath settings by packagers of JasPer. * Remove a number of obsolete scripts. * Make some cosmetic changes to the code for the JPC codec in order to improve readability (#371). * Fix a portability bug related to threads/atomics. * Replace some lingering uses of strtok in the JPC coder with jas_strtok, since the use of strtok is problematic in multithreading contexts. Index: Makefile === RCS file: /cvs/ports/graphics/jasper/Makefile,v retrieving revision 1.34 diff -u -p -u -p -r1.34 Makefile --- Makefile19 Jan 2024 07:55:00 - 1.34 +++ Makefile29 Feb 2024 06:03:39 - @@ -1,6 +1,6 @@ COMMENT = reference implementation of JPEG-2000 -V =4.1.2 +V =4.2.1 DISTNAME = jasper-$V SHARED_LIBS = jasper 6.1 Index: distinfo === RCS file: /cvs/ports/graphics/jasper/distinfo,v retrieving revision 1.13 diff -u -p -u -p -r1.13 distinfo --- distinfo19 Jan 2024 07:55:00 - 1.13 +++ distinfo29 Feb 2024 06:03:39 - @@ -1,2 +1,2 @@ -SHA256 (jasper-4.1.2.tar.gz) = IjkuQ5uHx5qvhonseaKGpxR+gRxL7jTt89CyOXmNZys= -SIZE (jasper-4.1.2.tar.gz) = 2104141 +SHA256 (jasper-4.2.1.tar.gz) = LR4h8bNGcJvBdhVhc8bXej5VQzRnZAhdvecyIVEgt5Y= +SIZE (jasper-4.2.1.tar.gz) = 2123323
ipython 8.19.0 -> 8.22.1
See below for an update to latest ipython.
The BDEP on py-mako doens't make much sense to me. If removing it causes
failures again, I'll be happy to investigate any stack trace log that's
provided to me.
ok's welcome, otherwise I'll plan to commit this update in a few days.
Index: Makefile
===
RCS file: /cvs/ports/devel/ipython/Makefile,v
diff -u -p -u -r1.82 Makefile
--- Makefile27 Dec 2023 07:22:52 - 1.82
+++ Makefile29 Feb 2024 05:42:07 -
@@ -1,6 +1,6 @@
COMMENT = enhanced interactive Python shell
-MODPY_EGG_VERSION =8.19.0
+MODPY_EGG_VERSION =8.22.1
DISTNAME = ipython-${MODPY_EGG_VERSION}
PKGNAME = ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
@@ -14,13 +14,12 @@ MAINTAINER =Daniel Dickman =4.3 \
devel/py-prompt_toolkit${MODPY_FLAVOR}>=3.0.41v1,<3.1.0v1 \
devel/py-stack_data${MODPY_FLAVOR} \
- devel/py-traitlets${MODPY_FLAVOR}>=5 \
+ devel/py-traitlets${MODPY_FLAVOR}>=5.13.0 \
graphics/py-matplotlib-inline${MODPY_FLAVOR} \
textproc/py-pygments${MODPY_FLAVOR}>=2.4.0
# Note that if you have pdb++ installed, tests will fail.
TEST_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
+ devel/py-curio${MODPY_FLAVOR} \
devel/py-nbformat${MODPY_FLAVOR} \
devel/py-testpath${MODPY_FLAVOR} \
+ devel/py-test-asyncio${MODPY_FLAVOR}<0.22 \
+ devel/py-trio${MODPY_FLAVOR} \
+ graphics/py-matplotlib${MODPY_FLAVOR} \
math/py-numpy${MODPY_FLAVOR}>=1.23 \
- textproc/py-pygments${MODPY_FLAVOR} \
- www/py-requests${MODPY_FLAVOR}
-
-FLAVORS = python3
-FLAVOR = python3
+ math/py-pandas${MODPY_FLAVOR}
PORTHOME = ${WRKDIR}
Index: distinfo
===
RCS file: /cvs/ports/devel/ipython/distinfo,v
diff -u -p -u -r1.41 distinfo
--- distinfo27 Dec 2023 07:22:52 - 1.41
+++ distinfo29 Feb 2024 05:42:07 -
@@ -1,2 +1,2 @@
-SHA256 (ipython-8.19.0.tar.gz) = rE2k7PAEL7TgzlfGBDDC2zxxn6i9+S+GMda9ileF0fA=
-SIZE (ipython-8.19.0.tar.gz) = 5487746
+SHA256 (ipython-8.22.1.tar.gz) = Ocb578B5+xm/sPF+7pA5eP6aKQsbgtaBlsZBzst26iI=
+SIZE (ipython-8.22.1.tar.gz) = 5490428
Index: patches/patch-IPython_core_tests_test_interactiveshell_py
===
RCS file:
/cvs/ports/devel/ipython/patches/patch-IPython_core_tests_test_interactiveshell_py,v
diff -u -p -u -r1.11 patch-IPython_core_tests_test_interactiveshell_py
--- patches/patch-IPython_core_tests_test_interactiveshell_py 14 Sep 2023
02:20:56 - 1.11
+++ patches/patch-IPython_core_tests_test_interactiveshell_py 29 Feb 2024
05:42:07 -
@@ -1,7 +1,7 @@
Index: IPython/core/tests/test_interactiveshell.py
--- IPython/core/tests/test_interactiveshell.py.orig
+++ IPython/core/tests/test_interactiveshell.py
-@@ -646,7 +646,7 @@ class TestSystemRaw(ExitCodeChecks):
+@@ -650,7 +650,7 @@ class TestSystemRaw(ExitCodeChecks):
def test_1(self):
"""Test system_raw with non-ascii cmd
"""
Index: patches/patch-setupbase_py
===
RCS file: /cvs/ports/devel/ipython/patches/patch-setupbase_py,v
diff -u -p -u -r1.10 patch-setupbase_py
--- patches/patch-setupbase_py 16 Aug 2022 19:30:17 - 1.10
+++ patches/patch-setupbase_py 29 Feb 2024 05:42:07 -
@@ -3,7 +3,7 @@ Put man pages where they belong.
Index: setupbase.py
--- setupbase.py.orig
+++ setupbase.py
-@@ -145,7 +145,7 @@ def find_data_files():
+@@ -106,7 +106,7 @@ def find_data_files():
Just man pages at this point.
"""
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/ipython/pkg/PLIST,v
diff -u -p -u -r1.32 PLIST
--- pkg/PLIST 25 Nov 2023 19:03:43 - 1.32
+++ pkg/PLIST 29 Feb 2024 05:42:07 -
@@ -683,6 +683,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_cli.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_emscripten.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_emscripten.${MODPY_PYC_MAGIC_TAG}pyc
l
UPDATE: SVT-AV1 1.8.0
Here is an update to SVT-AV1 1.8.0.
## [1.8.0] - 2023-12-11
Encoder
- Improve the tradeoffs for the random access mode across presets:
- Speedup CRF presets M6 to M0 by 17-53% while maintaining similar quality
levels
- Re-adjust CRF presets M7 to M13 for better quality with BD-rate gains ranging
from 1-4%
- Improve the quality and speed of the 1-pass VBR mode
- More details on the per preset improvements can be found in MR !2143
- Add API allowing to update bitrate / CRF and Key_frame placement during the
encoding session for CBR lowdelay mode and CRF Random Access mode
- ARM Neon SIMD optimizations for most critical kernels allowing for a 4.5-8x
fps speedup vs the c implementation
Cleanup and bug fixes and documentation
- Various cleanups and functional bug fixes
- Update the documentation for preset options and individual features
## [1.7.0] - 2023-08-23
Encoder
- Improve the tradeoffs for the random access mode across presets MR-M13:
- Quality improvements across all presets and metrics ranging from 0.3% to
4.5% in BD-rate (!2129)
- Spacing between presets [M1-M6] has been adjusted to account for the
tradeoff improvements achieved
- As a user guidance when comparing v1.7 vs v1.6 in a convexhull encoding
setup:
- v1.7.0 M2 is now at similar quality levels as v1.6.0 M1 while being ~50%
faster
- v1.7.0 M3 is now at similar quality levels as v1.6.0 M2 while being ~50%
faster
- v1.7.0 M4 is now at similar quality levels as v1.6.0 M3 while being ~40%
faster
- v1.7.0 M5 is now at similar quality levels as v1.6.0 M4 while being ~30%
faster
- v1.7.0 M6 is now at similar quality levels as v1.6.0 M5 while being ~25%
faster
- Added an experimental tune SSIM mode yielding ~3-4% additional SSIM BD-rate
gains (!2109)
Build, cleanup and bug fixes
- Various cleanups and functional bug fixes
- Fix build conflict with libaom
## [1.6.0] - 2023-06-18
Encoder
- Improve the tradeoffs for the random access mode across presets M1-M13:
- Speeding up the higher quality presets by 30-40%
- Improving the BD-rate by 1-2% for the faster presets
- Improve the tradeoffs for the low delay mode for both scrren content and
non-screen content encoding modes
- Add a toggle to remove the legacy one-frame buffer at the input of the
pipeline alowing the low delay mode to operate at sub-frame processing latencies
- Add a new API allowing the user to specify quantization offsets for a region
of interest per frame
Build, cleanup and bug fixes
- Various cleanups and functional bug fixes
- Fix the startup minigop size BD-rate loss
- Add ability to run the ci-testing offline
Index: Makefile
===
RCS file: /cvs/ports/multimedia/svt-av1/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile27 Sep 2023 10:10:22 - 1.15
+++ Makefile29 Feb 2024 04:05:06 -
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS= ${LP64_ARCHS} i386
COMMENT= scalable AV1 encoder/decoder
-VER= 1.5.0
+VER= 1.8.0
DISTNAME= SVT-AV1-v${VER}
PKGNAME= svt-av1-${VER}
CATEGORIES=multimedia
Index: distinfo
===
RCS file: /cvs/ports/multimedia/svt-av1/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo30 Apr 2023 11:54:30 - 1.12
+++ distinfo29 Feb 2024 04:05:06 -
@@ -1,2 +1,2 @@
-SHA256 (SVT-AV1-v1.5.0.tar.bz2) = pkmwcZBvuEDfGfsOLsl8BP3oLI7WTfuGYvYly4vGJF4=
-SIZE (SVT-AV1-v1.5.0.tar.bz2) = 9490521
+SHA256 (SVT-AV1-v1.8.0.tar.bz2) = QccYO+maLHJlaxX7pABeRsmYzTRkGFA+0pbFq+ZILkc=
+SIZE (SVT-AV1-v1.8.0.tar.bz2) = 9585789
UPDATE: giflib 5.2.2
Here is an update to giflib 5.2.2.
CVE-2022-28506, CVE-2023-48161
Index: Makefile
===
RCS file: /cvs/ports/graphics/giflib/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- Makefile7 Nov 2023 14:19:33 - 1.33
+++ Makefile29 Feb 2024 03:29:19 -
@@ -1,9 +1,8 @@
COMMENT= tools and library routines for working with GIF images
-DISTNAME= giflib-5.2.1
-SHARED_LIBS += gif 9.0 # 7.1
+DISTNAME= giflib-5.2.2
+SHARED_LIBS += gif 9.1 # 7.1
CATEGORIES=graphics
-REVISION= 0
SITES= ${SITE_SOURCEFORGE:=giflib/}
Index: distinfo
===
RCS file: /cvs/ports/graphics/giflib/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo2 Jul 2022 14:13:43 - 1.7
+++ distinfo29 Feb 2024 03:29:19 -
@@ -1,2 +1,2 @@
-SHA256 (giflib-5.2.1.tar.gz) = MdpVYvRMXxXWM0Cgmk/WK0jEViDNMC93ptms8Ad4eb0=
-SIZE (giflib-5.2.1.tar.gz) = 444187
+SHA256 (giflib-5.2.2.tar.gz) = vn/70FfK3r4qoURUL9kMaDjGoIO16KkEi47jtmsp1fs=
+SIZE (giflib-5.2.2.tar.gz) = 447175
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/graphics/giflib/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile 2 Jul 2022 14:13:43 - 1.3
+++ patches/patch-Makefile 29 Feb 2024 03:29:19 -
@@ -1,3 +1,6 @@
+- Correct document page install.
+ 61f375082c80ee479eb8ff03189aea691a6a06aa
+
hunk 1, disable -Wno-format-truncation, not available on some compilers?
hunk 2, move quantize.c back to exported library, it was in the public
@@ -5,7 +8,7 @@ API prior to 5.2 and is used by various
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935088
https://src.fedoraproject.org/rpms/giflib/c/109bf038d703a471b857aba44af673be103d7079?branch=master
-hunk 3-4, library naming
+hunk 5-6, library handling
Index: Makefile
--- Makefile.orig
@@ -33,31 +36,61 @@ Index: Makefile
UHEADERS = getarg.h
UOBJECTS = $(USOURCES:.c=.o)
-@@ -61,13 +61,13 @@ UTILS = $(INSTALLABLE) \
+@@ -63,17 +63,21 @@ UTILS = $(INSTALLABLE) \
LDLIBS=libgif.a -lm
--all: libgif.so libgif.a libutil.so libutil.a $(UTILS)
-+all: libgif.so.${LIBVER} libgif.a libutil.so libutil.a $(UTILS)
- $(MAKE) -C doc
-
- $(UTILS):: libgif.a libutil.a
-
--libgif.so: $(OBJECTS) $(HEADERS)
-- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname
-Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
-+libgif.so.$(LIBVER): $(OBJECTS) $(HEADERS)
-+ $(CC) $(CFLAGS) -shared $(OFLAGS) -o libgif.so.$(LIBVER) $(OBJECTS)
+-MANUAL_PAGES = \
++MANUAL_PAGES_1 = \
+ doc/gif2rgb.xml \
+ doc/gifbuild.xml \
+ doc/gifclrmp.xml \
+ doc/giffix.xml \
+- doc/giflib.xml \
+ doc/giftext.xml \
+ doc/giftool.xml
+
++MANUAL_PAGES_7 = \
++ doc/giflib.xml
++
++MANUAL_PAGES = $(MANUAL_PAGES_1) $(MANUAL_PAGES_7)
++
+ SOEXTENSION = so
+-LIBGIFSO = libgif.$(SOEXTENSION)
++LIBGIFSO = libgif.$(SOEXTENSION).$(LIBVER)
+ LIBGIFSOMAJOR = libgif.$(SOEXTENSION).$(LIBMAJOR)
+ LIBGIFSOVER = libgif.$(SOEXTENSION).$(LIBVER)
+ LIBUTILSO = libutil.$(SOEXTENSION)
+@@ -99,7 +103,7 @@ $(LIBGIFSO): $(OBJECTS) $(HEADERS)
+ ifeq ($(UNAME), Darwin)
+ $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o
$(LIBGIFSO)
+ else
+- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBGIFSOMAJOR) -o
$(LIBGIFSO) $(OBJECTS)
++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -o $(LIBGIFSO) $(OBJECTS)
+ endif
libgif.a: $(OBJECTS) $(HEADERS)
- $(AR) rcs libgif.a $(OBJECTS)
-@@ -99,9 +99,7 @@ install-include:
- install-lib:
+@@ -109,7 +113,7 @@ $(LIBUTILSO): $(UOBJECTS) $(UHEADERS)
+ ifeq ($(UNAME), Darwin)
+ $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o
$(LIBUTILSO)
+ else
+- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o
$(LIBUTILSO) $(UOBJECTS)
++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -o $(LIBUTILSO) $(UOBJECTS)
+ endif
+
+ libutil.a: $(UOBJECTS) $(UHEADERS)
+@@ -145,11 +149,10 @@ install-lib:
$(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
$(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
-- $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
-- ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)"
-- ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so"
-+ $(INSTALL) -m 755 libgif.so.$(LIBVER)
"$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
+ $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)"
+- ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
+- ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
install-man:
- $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
- $
flycast: disable vulkan for now to restore build
flycast build broke with vulkan updates. I suggest we disable vulkan
for now until we can give this a closer look or find an update that
fixes this...
ok?
Index: Makefile
===
RCS file: /cvs/ports/emulators/flycast/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile8 Feb 2024 00:57:55 - 1.6
+++ Makefile28 Feb 2024 03:41:47 -
@@ -8,7 +8,7 @@ COMMENT = emulator for Sega Dreamcast an
V =2.1pl20230303
DISTNAME = flycast-${V}
COMMIT = 27b6bafd0f003c8f8bcd1fb3bfd48a3523b298f5
-REVISION = 2
+REVISION = 3
CATEGORIES = emulators games
@@ -25,8 +25,8 @@ MAINTAINER = Nam Nguyen https://messagemode2.com/source/
@@ -53,12 +53,11 @@ LIB_DEPENDS = archivers/libzip \
audio/pulseaudio \
devel/sdl2 \
emulators/libchdr \
- graphics/glslang \
- graphics/vulkan-loader \
net/curl \
net/miniupnp/miniupnpc \
sysutils/xxhash
+CONFIGURE_ARGS += -DUSE_VULKAN=OFF
do-gen:
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
UPDATE: openimageio 2.4.17.0
Here is an update to OpenImageIO 2.4.17.0.
https://raw.githubusercontent.com/AcademySoftwareFoundation/OpenImageIO/dev-2.4/CHANGES.md
Index: Makefile
===
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 Makefile
--- Makefile1 Sep 2023 15:20:14 - 1.68
+++ Makefile29 Feb 2024 02:06:22 -
@@ -3,21 +3,22 @@
COMMENT = library for reading and writing images
+V =2.4.17.0
+DISTNAME = openimageio-${V}
GH_ACCOUNT = OpenImageIO
GH_PROJECT = oiio
GH_TAGNAME = v$V
-V =2.4.11.0
-DISTNAME = openimageio-${V}
-REVISION = 0
-SHARED_LIBS += OpenImageIO 13.0 # 2.4.10
-SHARED_LIBS += OpenImageIO_Util8.0 # 2.4.10
+WRKDIST = ${WRKDIR}/${GH_ACCOUNT}-${GH_TAGNAME:C/^[vV]([0-9])/\1/}
+
+SHARED_LIBS += OpenImageIO 14.0 # 2.4.10
+SHARED_LIBS += OpenImageIO_Util9.0 # 2.4.10
CATEGORIES = graphics devel
HOMEPAGE = https://sites.google.com/site/openimageio/home
-# BSD
+# Apache 2.0 / BSD
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} GL GLU Iex-3_2 IlmThread-3_2 Imath-3_1
Index: distinfo
===
RCS file: /cvs/ports/graphics/openimageio/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- distinfo14 May 2023 12:40:05 - 1.18
+++ distinfo29 Feb 2024 02:06:22 -
@@ -1,2 +1,2 @@
-SHA256 (openimageio-2.4.11.0.tar.gz) =
UTkLPnIiiS6H65KdInu7W5vp9787RyKakdKxBuv/s/s=
-SIZE (openimageio-2.4.11.0.tar.gz) = 32158503
+SHA256 (openimageio-2.4.17.0.tar.gz) =
f+gdjlvOMMxKIS8CCsPMQ0Tmt8HAhCR146BIUVCZxlw=
+SIZE (openimageio-2.4.17.0.tar.gz) = 47900800
[update] security/osv-scanner to 1.6.2
Hello,
Here's an update for osv-scanner which has been running fine on amd64.
Other tests?
changelog:
https://github.com/google/osv-scanner/releases/tag/v1.6.2
Thanks,
Lucas
diff refs/heads/master refs/heads/osv-scanner
commit - 7613a8cf0b66c00314807995741459338c5bd5d4
commit + 79224448a1d8ffe9f9a5e56791730c8f54ff2836
blob - 7f2a1cac0a859bce9ed72b508f08a8f316386202
blob + 950e8b5dd2048bfb31c626aa2f3abe23466e12d8
--- security/osv-scanner/Makefile
+++ security/osv-scanner/Makefile
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = aarch64 amd64 mips64 riscv64
COMMENT = scan your project's dependencies for vulnerabilities
-V =1.6.1
+V =1.6.2
MODGO_MODNAME =github.com/google/osv-scanner
MODGO_VERSION =v${V}
blob - 93ceb7953126b28476ffd3331f3c8e1387b057ab
blob + b0f572931570f2d0c025cd3b5172433c011344b7
--- security/osv-scanner/distinfo
+++ security/osv-scanner/distinfo
@@ -4,8 +4,13 @@ SHA256 (go_modules/cloud.google.com/go/compute/metadat
SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.zip) =
KShk29Cx3jepaOKF6UmIXlczhIN9gc02lb5c4uI5GIc=
SHA256 (go_modules/dario.cat/mergo/@v/v1.0.0.mod) =
4jxLgDpsbm5FdHlG6H0kcEzXd1bMSEvf0XtXIjvzINY=
SHA256 (go_modules/dario.cat/mergo/@v/v1.0.0.zip) =
Gn7zlnCcWDUha7R7qSGN1ECsUwdYPGnReYzp5FfxMR0=
+SHA256
(go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20231114023923-e40c4d5c34e5.mod) =
h/veE8xDl3AO43RbynyN7nbNERVbVmMCHMmQ07wfiOc=
SHA256
(go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20240109042716-00b51ef52ece.mod) =
h/veE8xDl3AO43RbynyN7nbNERVbVmMCHMmQ07wfiOc=
SHA256
(go_modules/deps.dev/api/v3alpha/@v/v0.0.0-20240109042716-00b51ef52ece.zip) =
6enK6Ws3A9qUndelYdFX5ck9+OLN4POMROhxCHr08sk=
+SHA256
(go_modules/deps.dev/util/resolve/@v/v0.0.0-20240109042716-00b51ef52ece.mod) =
WnpKVdUYRv0AEsYuGl21fqLdd562akWx8o/C+Okbk5Y=
+SHA256
(go_modules/deps.dev/util/resolve/@v/v0.0.0-20240109042716-00b51ef52ece.zip) =
mxvUXKycVMBCaRmgLvHPEmC8WaM6e86FLtPH3LpQFg4=
+SHA256
(go_modules/deps.dev/util/semver/@v/v0.0.0-20240109040450-1e316b822bc4.mod) =
PBARmS9BLys0bWQHHH40BDoAiidH3bPqo/In6id0XXw=
+SHA256
(go_modules/deps.dev/util/semver/@v/v0.0.0-20240109040450-1e316b822bc4.zip) =
9v1Va2QyQ05p9PTdcRwa0sd3llF6wXshSTv0cXdbjaA=
SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.mod) =
JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0=
SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.zip) =
XeJGoMtMJW8/1dDbigihFPWK8MLhk7vwrZASEErbtrI=
SHA256 (go_modules/github.com/!cyclone!d!x/cyclonedx-go/@v/v0.8.0.mod) =
X1TYnaBD7V3Tmb6nIG+3k3AcVSRgAH6nq+sCUVmMX9s=
@@ -42,6 +47,8 @@ SHA256 (go_modules/github.com/cncf/xds/go/@v/v0.0.0-20
SHA256
(go_modules/github.com/cncf/xds/go/@v/v0.0.0-20230607035331-e9ce68804cb4.zip) =
oMbmbq3jV67aTtqp0JYSCFhg3EwLRO34ImV0k5vfYJE=
SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.mod) =
FMOvou9iNVXBtINNH4ixTfd1Sa/uheV1DBkQJGW3iro=
SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.zip) =
cKfmCYCc8qksVTUQTbXrgtdcVL/P7S0iTofdL9lyn2I=
+SHA256 (go_modules/github.com/creack/pty/@v/v1.1.9.mod) =
6rBwW8ShjdMVwnpOPbqPIKnhIwZfogYzlmMytczPdzE=
+SHA256 (go_modules/github.com/creack/pty/@v/v1.1.9.zip) =
IO38wnr9eZF4C8kcpSPSaZnqAl5B9gvF7XG7rADhdeI=
SHA256 (go_modules/github.com/cyphar/filepath-securejoin/@v/v0.2.4.mod) =
3H2HZHOPLSMbofLvWkVzpI/kD2Rby4spHkIGljRXJTc=
SHA256 (go_modules/github.com/cyphar/filepath-securejoin/@v/v0.2.4.zip) =
CvlOtZEz/aaf0ETa/6fWK6Do0nFtT7HEJPPirWNtPjQ=
SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.mod) =
vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw=
@@ -57,6 +64,12 @@ SHA256 (go_modules/github.com/envoyproxy/protoc-gen-va
SHA256 (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v1.0.2.zip) =
p50Z+wZVVLIUSSx2GddguUQFQp58pp7eki6WiSmmb/s=
SHA256 (go_modules/github.com/felixge/fgprof/@v/v0.9.3.mod) =
G4FCpyTwr69dOnTq+HyFVk1QzegJwKNNz6AmZH+ucx4=
SHA256 (go_modules/github.com/felixge/fgprof/@v/v0.9.3.zip) =
LIMmgIes+Ldnvmnbw3wJn6hYVnY8Loj7mWN9Rutqwjw=
+SHA256 (go_modules/github.com/gkampitakis/ciinfo/@v/v0.3.0.mod) =
cxFqOWZ0gqB4QqNn1Ze7DFk05gNRPicBwCRh2PdqSe8=
+SHA256 (go_modules/github.com/gkampitakis/ciinfo/@v/v0.3.0.zip) =
bz2w1Z/F4ggHP2wgCkhz/J1FFU2/fZKtqPxp5bvGYV4=
+SHA256 (go_modules/github.com/gkampitakis/go-diff/@v/v1.3.2.mod) =
qTKf7D6TiBiejVKKZSqPGMG528Fd1zjkXuHPZKJgMKI=
+SHA256 (go_modules/github.com/gkampitakis/go-diff/@v/v1.3.2.zip) =
R0q2xm5qvE+ll5s/tIvCUf2yN+UtnwoodGy0ws1cAoY=
+SHA256 (go_modules/github.com/gkampitakis/go-snaps/@v/v0.4.12.mod) =
bkEHDHL8uKlTFntlUY8ObX02kEtalqLjYlSnpmYz044=
+SHA256 (go_modules/github.com/gkampitakis/go-snaps/@v/v0.4.12.zip) =
OQAkNiUsiKLxWcuTK3cyvakxnaGMhX/nVS0IVM/Z4Qk=
SHA256 (go_modules/github.com/gliderlabs/ssh/@v/v0.3.5.mod) =
e58vOhQap3SYfxqH3pDCYmF1qKUCULu557Sbxvv9Kf8=
SHA256 (go_modules/github.com/gliderlabs/ssh/@v/v0.3.5.zip) =
fJ36VBTamJYPw9nSBdJ3SNzGPTFIJqTUdF9IhrWpfx8=
SHA256
(go_modules/github.com/go-git/gcfg/@v/v1.5.1-0.20230307220236-3a3c6141e376.mod)
= L
[update] sysutils/grafana to 10.3.3
Hello,
Here's an update for grafana up to the latest which has been working
fine over the past couple weeks. Other tests/feedback?
changelogs:
https://github.com/grafana/grafana/releases/tag/v10.3.0
https://github.com/grafana/grafana/releases/tag/v10.3.3
Thanks,
Lucas
diff refs/heads/master refs/heads/grafana
commit - 54cb2a4f83df52b994a6e6ff7cf85a6ca8732981
commit + 6e9bd92e14f44e1bec62a996dd4de4493c84b1d3
blob - e543090ea768a4891d65faf928d863aa2773f34a
blob + 771e7a7c9a697359ef333c5b83b056ff1953f8b1
--- sysutils/grafana/Makefile
+++ sysutils/grafana/Makefile
@@ -1,6 +1,6 @@
COMMENT = monitoring and metric analytics dashboards
-V =10.2.3
+V =10.3.3
DISTNAME = grafana+vendor-$V
WRKDIST = ${WRKDIR}/grafana-$V
EXTRACT_SUFX = .tar.zst
blob - e42c468ab597fc8b570abd5f4f68837b7aaed5df
blob + a53de024e08309062e908fc2ccc1df7e90158c4b
--- sysutils/grafana/distinfo
+++ sysutils/grafana/distinfo
@@ -1,4 +1,4 @@
-SHA256 (grafana+vendor-10.2.3.tar.zst) =
99fU5WKLjrMCaZSFmmSUKRzfdXeJAS7krqM3v+oPWnw=
-SHA256 (grafana-10.2.3.linux-amd64.tar.gz) =
xoZgaml1SB9PEI3kTE3zRlJR5O4tog58bua2blvc8to=
-SIZE (grafana+vendor-10.2.3.tar.zst) = 73143111
-SIZE (grafana-10.2.3.linux-amd64.tar.gz) = 108993853
+SHA256 (grafana+vendor-10.3.3.tar.zst) =
rZAymRMvVTjzc8srdhmXOO0u/b7N07H+zim1mcmquh8=
+SHA256 (grafana-10.3.3.linux-amd64.tar.gz) =
fgYB9tDleRxiDa9i0t85bXR3dcVnV6AvWxvT+CbV66I=
+SIZE (grafana+vendor-10.3.3.tar.zst) = 73907319
+SIZE (grafana-10.3.3.linux-amd64.tar.gz) = 76835
blob - 497e6d0c2c3ae87f5de5bebebfab3ac48d38e456
blob + e10bcc78aa15e5c20ee7d18760490b45128550a7
--- sysutils/grafana/patches/patch-conf_sample_ini
+++ sysutils/grafana/patches/patch-conf_sample_ini
@@ -37,13 +37,13 @@ Index: conf/sample.ini
@@ -254,7 +254,7 @@
# in some UI views to notify that a grafana update exists.
# This option does not cause any auto updates, nor send any information
- # only a GET request to
https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the
latest version.
+ # only a GET request to https://grafana.com/api/grafana/versions/stable to
get the latest version.
-;check_for_updates = true
+check_for_updates = false
# Set to false to disable all checks to https://grafana.com
# for new versions of plugins. The check is used
-@@ -896,7 +896,7 @@
+@@ -905,7 +905,7 @@
[log]
# Either "console", "file", "syslog". Default is console and file
# Use space to separate multiple modes, e.g. "console file"
blob - 86591a4d4b9a84c39c963cd664ef14a924e2bc4e
blob + e124b42de00e7b445d3d19ae077790bee7262b91
--- sysutils/grafana/pkg/PLIST
+++ sysutils/grafana/pkg/PLIST
@@ -243,6 +243,8 @@ share/grafana/public/app/core/components/AppNotificati
share/grafana/public/app/core/components/AppNotifications/AppNotificationItem.tsx
share/grafana/public/app/core/components/AppNotifications/AppNotificationList.tsx
share/grafana/public/app/core/components/AppNotifications/StoredNotificationItem.tsx
+share/grafana/public/app/core/components/BouncingLoader/
+share/grafana/public/app/core/components/BouncingLoader/BouncingLoader.tsx
share/grafana/public/app/core/components/Branding/
share/grafana/public/app/core/components/Branding/Branding.tsx
share/grafana/public/app/core/components/Branding/types.ts
@@ -276,6 +278,8 @@ share/grafana/public/app/core/components/ForgottenPass
share/grafana/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx
share/grafana/public/app/core/components/ForgottenPassword/SendResetMailPage.test.tsx
share/grafana/public/app/core/components/ForgottenPassword/SendResetMailPage.tsx
+share/grafana/public/app/core/components/FormPrompt/
+share/grafana/public/app/core/components/FormPrompt/FormPrompt.tsx
share/grafana/public/app/core/components/GraphNG/
share/grafana/public/app/core/components/GraphNG/GraphNG.tsx
share/grafana/public/app/core/components/GraphNG/__snapshots__/
@@ -542,6 +546,8 @@ share/grafana/public/app/core/services/FetchQueueWorke
share/grafana/public/app/core/services/FetchQueueWorker.ts
share/grafana/public/app/core/services/KeybindingSet.ts
share/grafana/public/app/core/services/ModalManager.ts
+share/grafana/public/app/core/services/NewFrontendAssetsChecker.test.ts
+share/grafana/public/app/core/services/NewFrontendAssetsChecker.ts
share/grafana/public/app/core/services/PreferencesService.ts
share/grafana/public/app/core/services/ResponseQueue.test.ts
share/grafana/public/app/core/services/ResponseQueue.ts
@@ -710,15 +716,18 @@ share/grafana/public/app/features/alerting/Notificatio
share/grafana/public/app/features/alerting/StateHistory.tsx
share/grafana/public/app/features/alerting/TestRuleResult.test.tsx
share/grafana/public/app/features/alerting/TestRuleResult.tsx
+share/grafana/public/app/features/alerting/Upgrade.tsx
share/grafana/public/app/features/alerting/components/
share/grafana/public/app/features/alerting/components/BasicSettings.tsx
share/grafana/public/app/features/alerting/com
Re: libdv: missing ENDBR64
> Date: Wed, 28 Feb 2024 20:10:58 +0100 > From: Theo Buehler > > This is straightforward. There doesn't seem to be a possibility of > shortcuts via a macro, so just add endbr64 to the four functions in this > file. I could not find code that actually uses these, but it's probably > better to be safe than sorry. > > The code is too old to have arm64 assembly. ok kettenis@ > Index: Makefile > === > RCS file: /cvs/ports/multimedia/libdv/Makefile,v > diff -u -p -r1.28 Makefile > --- Makefile 7 Nov 2023 14:19:39 - 1.28 > +++ Makefile 28 Feb 2024 19:01:33 - > @@ -1,7 +1,7 @@ > COMMENT= Quasar DV codec > > DISTNAME=libdv-1.0.0 > -REVISION=4 > +REVISION=5 > > CATEGORIES= multimedia > > Index: patches/patch-libdv_vlc_x86_64_S > === > RCS file: patches/patch-libdv_vlc_x86_64_S > diff -N patches/patch-libdv_vlc_x86_64_S > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-libdv_vlc_x86_64_S 28 Feb 2024 19:00:50 - > @@ -0,0 +1,35 @@ > +Index: libdv/vlc_x86_64.S > +--- libdv/vlc_x86_64.S.orig > libdv/vlc_x86_64.S > +@@ -6,6 +6,7 @@ > + .globl dv_decode_vlc > + .typedv_decode_vlc,@function > + dv_decode_vlc: > ++endbr64 > + push %rbx > + push %rbp > + > +@@ -102,6 +103,7 @@ void __dv_decode_vlc(int bits, dv_vlc_t *result) > + .globl __dv_decode_vlc > + .type__dv_decode_vlc,@function > + __dv_decode_vlc: > ++endbr64 > + push %rbx > + push %rbp > + > +@@ -174,6 +176,7 @@ void dv_parse_ac_coeffs_pass0(bitstream_t *bs, > + .type dv_parse_ac_coeffs_pass0,@function > + > + dv_parse_ac_coeffs_pass0: > ++endbr64 > + > + /* Args are at rdi=bs, rsi=mb, rdx=bl */ > + push%r12 > +@@ -427,6 +430,7 @@ gint dv_parse_video_segment(dv_videosegment_t *seg, gu > + .globl dv_parse_video_segment > + .type dv_parse_video_segment,@function > + dv_parse_video_segment: > ++endbr64 > + > + /* Args are at rdi=seg, rsi=quality */ > + push%r12 >
Re: missing endbr64
On 2024/02/28 22:49, Theo Buehler wrote:
> PORTS_PRIVSEP should catch such things. (The CMakeLists file also has
> a tls vs tsl typo)
Plus pf.conf rules to block network access from _pbuild e.g. something
along these lines (the first one is optional but helps with some tests
that otherwise fail)
pass quick proto {tcp udp} to 127.0.0.1 user _pbuild
block return quick proto {tcp udp} user _pbuild
Re: missing endbr64
On Wed, Feb 28, 2024 at 10:44:27PM +0100, Sebastian Reitenbach wrote: > Hi, > On Wednesday, February 28, 2024 21:13 CET, Theo Buehler > wrote: > > > On Sun, Feb 25, 2024 at 10:13:44PM +0100, Sebastian Reitenbach wrote: > > > On Sunday, February 25, 2024 16:44 CET, Mark Kettenis > > > wrote: > > > > > > > > x11/gnustep/libobjc2.log > > > > > ld: warning: __objc_block_trampoline_sret: missing endbr64 > > > > > ld: warning: __objc_block_trampoline: missing endbr64 > > > > > ld: warning: objc_msgSend: missing endbr64 > > > > > ld: warning: objc_msgSend_fpret: missing endbr64 > > > > > ld: warning: objc_msgSend_stret: missing endbr64 > > > > > > > > I guess this is very similay to devel/objfw. Just add endbr64 to > > > > those functions like we did there. No aarch64 support here by the > > > > looks of it. > > > > > > Above version of libobjc2 is old, but due to build errors, and runtime > > > errors, I was > > > unable to upgrade. However, a new version was released just a few days > > > ago, and that one even builds > > > and doesn't show runtime errors so far. > > > I updated one test box, to get these new ld warnings, there are only > > > these left on amd64: > > > > > > ld: warning: objc_msgSend: missing endbr64 > > > ld: warning: objc_msgSend_fpret: missing endbr64 > > > ld: warning: objc_msgSend_stret: missing endbr64 > > > > > > Which are all the platforms, that need such fix? I see objc_msgSend_fpret > > > for aarch64, arm, > > > amd64, i386, mips and riscv64. > > > > > > Attached patch to update to the new 2.2 release, without any fixes for > > > the missing endbr64. > > > > > > Sebastian > > > > Not sure what to do for riscv64. > > > > The diff below on top of what you committed a few minutes ago should do > > the trick. However, the port needs fixing because of this: > > > > [1/9] Performing download step (git clone) for 'robinmap-populate' > > Cloning into 'robinmap-src'... > > fatal: unable to access 'https://github.com/Tessil/robin-map/': Could not > > resolve host: github.com > > Cloning into 'robinmap-src'... > > fatal: unable to access 'https://github.com/Tessil/robin-map/': Could not > > resolve host: github.com > > Cloning into 'robinmap-src'... > > fatal: unable to access 'https://github.com/Tessil/robin-map/': Could not > > resolve host: github.com > > -- Had to git clone more than once: 3 times. > > CMake Error at > > robinmap-subbuild/robinmap-populate-prefix/tmp/robinmap-populate-gitclone.cmake:39 > > (message): > > Failed to clone repository: 'https://github.com/Tessil/robin-map/' > > > do you have robin-map-1.2.1 installed, or some older version? Yes I saw it on two machines with 1.2.1 installed. > I haven't seen that here, but can trash that downloading with a patch if > necessary. PORTS_PRIVSEP should catch such things. (The CMakeLists file also has a tls vs tsl typo) > > I was just working on it (without having any clue what I'm doing here) > It got rid of the warnings, but looks differently to what you have. > I'll try your patch below Tomorrow > > cheers, > Sebastian > > > > > Index: patches/patch-block_trampolines_S > > === > > RCS file: patches/patch-block_trampolines_S > > diff -N patches/patch-block_trampolines_S > > --- /dev/null 1 Jan 1970 00:00:00 - > > +++ patches/patch-block_trampolines_S 28 Feb 2024 20:08:24 - > > @@ -0,0 +1,19 @@ > > +Index: block_trampolines.S > > +--- block_trampolines.S.orig > > block_trampolines.S > > +@@ -22,6 +22,7 @@ > > + // x86-64 trampoline > > + > > > > + .macro trampoline arg0, arg1 > > ++ endbr64 > > + mov -0x1007(%rip), \arg1 # Load the block pointer into the second > > argument > > + xchg \arg1, \arg0 # Swap the first and second arguments > > + jmp *-0x1008(%rip) # Call the block function > > +@@ -121,6 +122,7 @@ > > + // AArch64 (ARM64) trampoline > > + > > > > + .macro trampoline arg0, arg1 > > ++ bti c > > + adr x17, #-4096 > > + mov \arg1, \arg0 > > + ldp \arg0, x17, [x17] > > Index: patches/patch-objc_msgSend_aarch64_S > > === > > RCS file: patches/patch-objc_msgSend_aarch64_S > > diff -N patches/patch-objc_msgSend_aarch64_S > > --- /dev/null 1 Jan 1970 00:00:00 - > > +++ patches/patch-objc_msgSend_aarch64_S28 Feb 2024 20:08:24 - > > @@ -0,0 +1,12 @@ > > +Index: objc_msgSend.aarch64.S > > +--- objc_msgSend.aarch64.S.orig > > objc_msgSend.aarch64.S > > +@@ -47,7 +47,7 @@ > > + # define EH_NOP .seh_nop > > + #else > > + // Marks the real start and end of the function > > +-# define EH_START .cfi_startproc > > ++# define EH_START .cfi_startproc; bti c > > + # define EH_END .cfi_endproc > > + > > + // The following
Re: libdv: missing ENDBR64
On 2024/02/28 20:10, Theo Buehler wrote: > This is straightforward. There doesn't seem to be a possibility of > shortcuts via a macro, so just add endbr64 to the four functions in this > file. I could not find code that actually uses these, but it's probably > better to be safe than sorry. > > The code is too old to have arm64 assembly. I found a test file at https://downloads.sourceforge.net/project/libdv/examples/examples/pond.dv) Not really sure how to test properly; mplayer depends on it but actually uses libavformat to play them (and works on a build without USE_NOBTCFI). Anyway LGTM, OK sthen@. > Index: Makefile > === > RCS file: /cvs/ports/multimedia/libdv/Makefile,v > diff -u -p -r1.28 Makefile > --- Makefile 7 Nov 2023 14:19:39 - 1.28 > +++ Makefile 28 Feb 2024 19:01:33 - > @@ -1,7 +1,7 @@ > COMMENT= Quasar DV codec > > DISTNAME=libdv-1.0.0 > -REVISION=4 > +REVISION=5 > > CATEGORIES= multimedia > > Index: patches/patch-libdv_vlc_x86_64_S > === > RCS file: patches/patch-libdv_vlc_x86_64_S > diff -N patches/patch-libdv_vlc_x86_64_S > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-libdv_vlc_x86_64_S 28 Feb 2024 19:00:50 - > @@ -0,0 +1,35 @@ > +Index: libdv/vlc_x86_64.S > +--- libdv/vlc_x86_64.S.orig > libdv/vlc_x86_64.S > +@@ -6,6 +6,7 @@ > + .globl dv_decode_vlc > + .typedv_decode_vlc,@function > + dv_decode_vlc: > ++endbr64 > + push %rbx > + push %rbp > + > +@@ -102,6 +103,7 @@ void __dv_decode_vlc(int bits, dv_vlc_t *result) > + .globl __dv_decode_vlc > + .type__dv_decode_vlc,@function > + __dv_decode_vlc: > ++endbr64 > + push %rbx > + push %rbp > + > +@@ -174,6 +176,7 @@ void dv_parse_ac_coeffs_pass0(bitstream_t *bs, > + .type dv_parse_ac_coeffs_pass0,@function > + > + dv_parse_ac_coeffs_pass0: > ++endbr64 > + > + /* Args are at rdi=bs, rsi=mb, rdx=bl */ > + push%r12 > +@@ -427,6 +430,7 @@ gint dv_parse_video_segment(dv_videosegment_t *seg, gu > + .globl dv_parse_video_segment > + .type dv_parse_video_segment,@function > + dv_parse_video_segment: > ++endbr64 > + > + /* Args are at rdi=seg, rsi=quality */ > + push%r12 >
Re: missing endbr64
Hi, On Wednesday, February 28, 2024 21:13 CET, Theo Buehler wrote: > On Sun, Feb 25, 2024 at 10:13:44PM +0100, Sebastian Reitenbach wrote: > > On Sunday, February 25, 2024 16:44 CET, Mark Kettenis > > wrote: > > > > > > x11/gnustep/libobjc2.log > > > > ld: warning: __objc_block_trampoline_sret: missing endbr64 > > > > ld: warning: __objc_block_trampoline: missing endbr64 > > > > ld: warning: objc_msgSend: missing endbr64 > > > > ld: warning: objc_msgSend_fpret: missing endbr64 > > > > ld: warning: objc_msgSend_stret: missing endbr64 > > > > > > I guess this is very similay to devel/objfw. Just add endbr64 to > > > those functions like we did there. No aarch64 support here by the > > > looks of it. > > > > Above version of libobjc2 is old, but due to build errors, and runtime > > errors, I was > > unable to upgrade. However, a new version was released just a few days ago, > > and that one even builds > > and doesn't show runtime errors so far. > > I updated one test box, to get these new ld warnings, there are only these > > left on amd64: > > > > ld: warning: objc_msgSend: missing endbr64 > > ld: warning: objc_msgSend_fpret: missing endbr64 > > ld: warning: objc_msgSend_stret: missing endbr64 > > > > Which are all the platforms, that need such fix? I see objc_msgSend_fpret > > for aarch64, arm, > > amd64, i386, mips and riscv64. > > > > Attached patch to update to the new 2.2 release, without any fixes for the > > missing endbr64. > > > > Sebastian > > Not sure what to do for riscv64. > > The diff below on top of what you committed a few minutes ago should do > the trick. However, the port needs fixing because of this: > > [1/9] Performing download step (git clone) for 'robinmap-populate' > Cloning into 'robinmap-src'... > fatal: unable to access 'https://github.com/Tessil/robin-map/': Could not > resolve host: github.com > Cloning into 'robinmap-src'... > fatal: unable to access 'https://github.com/Tessil/robin-map/': Could not > resolve host: github.com > Cloning into 'robinmap-src'... > fatal: unable to access 'https://github.com/Tessil/robin-map/': Could not > resolve host: github.com > -- Had to git clone more than once: 3 times. > CMake Error at > robinmap-subbuild/robinmap-populate-prefix/tmp/robinmap-populate-gitclone.cmake:39 > (message): > Failed to clone repository: 'https://github.com/Tessil/robin-map/' > do you have robin-map-1.2.1 installed, or some older version? I haven't seen that here, but can trash that downloading with a patch if necessary. I was just working on it (without having any clue what I'm doing here) It got rid of the warnings, but looks differently to what you have. I'll try your patch below Tomorrow cheers, Sebastian > > Index: patches/patch-block_trampolines_S > === > RCS file: patches/patch-block_trampolines_S > diff -N patches/patch-block_trampolines_S > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-block_trampolines_S 28 Feb 2024 20:08:24 - > @@ -0,0 +1,19 @@ > +Index: block_trampolines.S > +--- block_trampolines.S.orig > block_trampolines.S > +@@ -22,6 +22,7 @@ > + // x86-64 trampoline > + > > + .macro trampoline arg0, arg1 > ++endbr64 > + mov -0x1007(%rip), \arg1 # Load the block pointer into the second > argument > + xchg \arg1, \arg0 # Swap the first and second arguments > + jmp *-0x1008(%rip) # Call the block function > +@@ -121,6 +122,7 @@ > + // AArch64 (ARM64) trampoline > + > > + .macro trampoline arg0, arg1 > ++bti c > + adr x17, #-4096 > + mov \arg1, \arg0 > + ldp \arg0, x17, [x17] > Index: patches/patch-objc_msgSend_aarch64_S > === > RCS file: patches/patch-objc_msgSend_aarch64_S > diff -N patches/patch-objc_msgSend_aarch64_S > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-objc_msgSend_aarch64_S 28 Feb 2024 20:08:24 - > @@ -0,0 +1,12 @@ > +Index: objc_msgSend.aarch64.S > +--- objc_msgSend.aarch64.S.orig > objc_msgSend.aarch64.S > +@@ -47,7 +47,7 @@ > + # define EH_NOP .seh_nop > + #else > + // Marks the real start and end of the function > +-# define EH_START .cfi_startproc > ++# define EH_START .cfi_startproc; bti c > + # define EH_END .cfi_endproc > + > + // The following directives are either not > Index: patches/patch-objc_msgSend_x86-64_S > === > RCS file: patches/patch-objc_msgSend_x86-64_S > diff -N patches/patch-objc_msgSend_x86-64_S > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-objc_msgSend_x86-64_S 28 Feb 2024 20:08:24 - > @@ -0,0 +1,12 @@ > +Index: objc_msgSend.x86-64.S > +--- objc_msgSend.x86-64.S.orig > objc_msgSe
Re: missing endbr64
On Sun, Feb 25, 2024 at 10:13:44PM +0100, Sebastian Reitenbach wrote: > On Sunday, February 25, 2024 16:44 CET, Mark Kettenis > wrote: > > > > x11/gnustep/libobjc2.log > > > ld: warning: __objc_block_trampoline_sret: missing endbr64 > > > ld: warning: __objc_block_trampoline: missing endbr64 > > > ld: warning: objc_msgSend: missing endbr64 > > > ld: warning: objc_msgSend_fpret: missing endbr64 > > > ld: warning: objc_msgSend_stret: missing endbr64 > > > > I guess this is very similay to devel/objfw. Just add endbr64 to > > those functions like we did there. No aarch64 support here by the > > looks of it. > > Above version of libobjc2 is old, but due to build errors, and runtime > errors, I was > unable to upgrade. However, a new version was released just a few days ago, > and that one even builds > and doesn't show runtime errors so far. > I updated one test box, to get these new ld warnings, there are only these > left on amd64: > > ld: warning: objc_msgSend: missing endbr64 > ld: warning: objc_msgSend_fpret: missing endbr64 > ld: warning: objc_msgSend_stret: missing endbr64 > > Which are all the platforms, that need such fix? I see objc_msgSend_fpret for > aarch64, arm, > amd64, i386, mips and riscv64. > > Attached patch to update to the new 2.2 release, without any fixes for the > missing endbr64. > > Sebastian Not sure what to do for riscv64. The diff below on top of what you committed a few minutes ago should do the trick. However, the port needs fixing because of this: [1/9] Performing download step (git clone) for 'robinmap-populate' Cloning into 'robinmap-src'... fatal: unable to access 'https://github.com/Tessil/robin-map/': Could not resolve host: github.com Cloning into 'robinmap-src'... fatal: unable to access 'https://github.com/Tessil/robin-map/': Could not resolve host: github.com Cloning into 'robinmap-src'... fatal: unable to access 'https://github.com/Tessil/robin-map/': Could not resolve host: github.com -- Had to git clone more than once: 3 times. CMake Error at robinmap-subbuild/robinmap-populate-prefix/tmp/robinmap-populate-gitclone.cmake:39 (message): Failed to clone repository: 'https://github.com/Tessil/robin-map/' Index: patches/patch-block_trampolines_S === RCS file: patches/patch-block_trampolines_S diff -N patches/patch-block_trampolines_S --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-block_trampolines_S 28 Feb 2024 20:08:24 - @@ -0,0 +1,19 @@ +Index: block_trampolines.S +--- block_trampolines.S.orig block_trampolines.S +@@ -22,6 +22,7 @@ + // x86-64 trampoline + + .macro trampoline arg0, arg1 ++ endbr64 + mov -0x1007(%rip), \arg1 # Load the block pointer into the second argument + xchg \arg1, \arg0 # Swap the first and second arguments + jmp *-0x1008(%rip) # Call the block function +@@ -121,6 +122,7 @@ + // AArch64 (ARM64) trampoline + + .macro trampoline arg0, arg1 ++ bti c + adr x17, #-4096 + mov \arg1, \arg0 + ldp \arg0, x17, [x17] Index: patches/patch-objc_msgSend_aarch64_S === RCS file: patches/patch-objc_msgSend_aarch64_S diff -N patches/patch-objc_msgSend_aarch64_S --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-objc_msgSend_aarch64_S28 Feb 2024 20:08:24 - @@ -0,0 +1,12 @@ +Index: objc_msgSend.aarch64.S +--- objc_msgSend.aarch64.S.orig objc_msgSend.aarch64.S +@@ -47,7 +47,7 @@ + # define EH_NOP .seh_nop + #else + // Marks the real start and end of the function +-# define EH_START .cfi_startproc ++# define EH_START .cfi_startproc; bti c + # define EH_END .cfi_endproc + + // The following directives are either not Index: patches/patch-objc_msgSend_x86-64_S === RCS file: patches/patch-objc_msgSend_x86-64_S diff -N patches/patch-objc_msgSend_x86-64_S --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-objc_msgSend_x86-64_S 28 Feb 2024 20:08:24 - @@ -0,0 +1,12 @@ +Index: objc_msgSend.x86-64.S +--- objc_msgSend.x86-64.S.orig objc_msgSend.x86-64.S +@@ -8,7 +8,7 @@ + # define SECOND_ARGUMENT %rdx + # define THIRD_ARGUMENT %r8 + #else +-# define START_PROC(x) .cfi_startproc ++# define START_PROC(x) .cfi_startproc; endbr64 + # define END_PROC(x) .cfi_endproc + # define FRAME_OFFSET(x) .cfi_adjust_cfa_offset x + # define FIRST_ARGUMENT_STR "%rdi"
WIP: update net/kismet
Hi, that old Kismet bugged me quite a long time, but their completely rewritten code-base has prevented an update so far. Eventually found time to implement some simple OpenBSD WiFi support. It just detects all WiFi devices in the "wlan" group. Trying to use more than one WiFi device, brings my host to a grinding halt, don't know why. Last but not least, only tested with 2.4GHz Wifi devices, lacking a proper 5 GHz device. Besides WiFi, also tested and known to work: BT LE sniffing with Adafruit LE Friend with Sniffer firmware, as well as ADSR plane spotting, with a RTL-SDR BLOG. This is just a snapshot, more or less waiting for their next release, otherwise could also update to this here. Comments on the port, test reports etc. welcome. cheers, Sebastian kismet-wip.diff Description: Binary data
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Mon Feb 26 02:40:27 MST 2024 finished at Wed Feb 28 12:52:36 MST 2024 lasted 2D10h12m done with kern.version=OpenBSD 7.5-beta (GENERIC.MP) #107: Sun Feb 25 22:24:14 MST 2024 built packages:12381 Feb 26:4094 Feb 27:2694 Feb 28:5592 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2024-02-26/summary.log build failures: 6 http://build-failures.rhaalovely.net/aarch64/2024-02-26/audio/ocp.log http://build-failures.rhaalovely.net/aarch64/2024-02-26/emulators/snes9x.log http://build-failures.rhaalovely.net/aarch64/2024-02-26/games/godot4.log http://build-failures.rhaalovely.net/aarch64/2024-02-26/graphics/shaderc.log http://build-failures.rhaalovely.net/aarch64/2024-02-26/www/chromium.log http://build-failures.rhaalovely.net/aarch64/2024-02-26/www/ungoogled-chromium.log recurrent failures new failures +++ ls-failures Wed Feb 28 12:52:47 2024 +failures/audio/ocp.log +failures/emulators/snes9x.log +failures/games/godot4.log +failures/graphics/shaderc.log +failures/www/chromium.log +failures/www/ungoogled-chromium.log resolved failures --- ../old/aarch64/last//ls-failuresSat Feb 24 18:06:48 2024 -failures/sysutils/crust.log
Re: libreddit -> redlib transition?
On Wed, Feb 28, 2024 at 10:38:25AM +, Stuart Henderson wrote:
> On 2024/02/24 13:45, Lucas Raab wrote:
> > Hello,
> >
> > libreddit has been more or less abandoned after the API debacle and work
> > has been shifted to a new fork named redlib.
> >
> > libreddit has its own user which seems to make this a bit tricky. I'm
> > not sure what is best between updating in place with a different package
> > name or rm libreddit and add redlib. The latter seems the most
> > straightforward, but any feedback would be appreciated. In that vein,
> > I've attached a new port and added diffs for user.list and quirks.
> >
> > In any event, helpfully pointed out by tb@, this update would remove
> > another dependent of rust-ring.
>
> I really would like to avoid burning another uid just for this. Nobody
> can agree on another range to move into, we absolutely can't bump into
> 1000, and some people work backwards from 1000 for special users so
> we're probably already going to get into trouble at 990 or maybe a bit
> less.
>
> Can it stay as user "_libreddit"?
That's fine with me. I'll drop the uid and just change the port name.
>
> > tested on amd64
> >
> > Thoughts?
> >
> > Thanks,
> > Lucas
>
> > diff /usr/ports
> > commit - ce957624eb33e999eae6e2e4bf0583c4d69b9efc
> > path + /usr/ports
> > blob - 65d9d4225a78195c4f06502c359118f0dffbfed9
> > file + devel/quirks/files/Quirks.pm
> > --- devel/quirks/files/Quirks.pm
> > +++ devel/quirks/files/Quirks.pm
> > @@ -809,6 +809,7 @@ my $stem_extensions = {
> > 'py-analyzemft' => 'py3-analyzemft',
> > 'llama' => 'walk',
> > 'py-setuptools-git' => 'py3-setuptools-git',
> > + 'libreddit' => 'redlib',
> > };
> >
> > my $obsolete_reason = {};
>
> > diff /usr/ports
> > commit - ce957624eb33e999eae6e2e4bf0583c4d69b9efc
> > path + /usr/ports
> > blob - b42938f202aa5f3563a1fbbd9b4e89d5e7a3d49a
> > file + infrastructure/db/user.list
> > --- infrastructure/db/user.list
> > +++ infrastructure/db/user.list
> > @@ -60,7 +60,7 @@ id user group port
> > 549 _netplan _netplanmisc/plan
> > 550 _nagios_nagios net/nagios
> > 551 _gpsd misc/gpsd
> > -552 _libreddit _libreddit www/libreddit
> > +#552 _libreddit_libreddit www/libreddit
> > 553 _saned _saned graphics/sane-backends
> > 554 _avenger mail/avenger
> > #555 _akpop3dmail/akpop3d
> > @@ -405,3 +405,4 @@ id usergroup port
> > 894 _gonic _gonic audio/gonic
> > 895 _soju _soju net/soju
> > 896 _certspotter _certspottersecurity/certspotter
> > +897 _redlib_redlib www/redlib
>
>
diff /usr/ports
commit - d2efd882f684b169fd82da225057dd5f27fd693f
path + /usr/ports
blob - b42938f202aa5f3563a1fbbd9b4e89d5e7a3d49a
file + infrastructure/db/user.list
--- infrastructure/db/user.list
+++ infrastructure/db/user.list
@@ -60,7 +60,7 @@ id user group port
549 _netplan _netplanmisc/plan
550 _nagios_nagios net/nagios
551 _gpsd misc/gpsd
-552 _libreddit _libreddit www/libreddit
+552 _libreddit _libreddit www/redlib
553 _saned _saned graphics/sane-backends
554 _avenger mail/avenger
#555 _akpop3dmail/akpop3d
Re: [new] devel/sbt 1.9.8
Stuart, thanks for review. All comments should be addressed. I've also discovered an issue that this port doesn't work withou exported JAVA_HOME which I've fixed. Regarding testing: I use that port for last week or two, and it works. -- wbr, Kirill sbt-1.9.9p0.tgz Description: application/gzip
libdv: missing ENDBR64
This is straightforward. There doesn't seem to be a possibility of shortcuts via a macro, so just add endbr64 to the four functions in this file. I could not find code that actually uses these, but it's probably better to be safe than sorry. The code is too old to have arm64 assembly. Index: Makefile === RCS file: /cvs/ports/multimedia/libdv/Makefile,v diff -u -p -r1.28 Makefile --- Makefile7 Nov 2023 14:19:39 - 1.28 +++ Makefile28 Feb 2024 19:01:33 - @@ -1,7 +1,7 @@ COMMENT= Quasar DV codec DISTNAME= libdv-1.0.0 -REVISION= 4 +REVISION= 5 CATEGORIES=multimedia Index: patches/patch-libdv_vlc_x86_64_S === RCS file: patches/patch-libdv_vlc_x86_64_S diff -N patches/patch-libdv_vlc_x86_64_S --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-libdv_vlc_x86_64_S28 Feb 2024 19:00:50 - @@ -0,0 +1,35 @@ +Index: libdv/vlc_x86_64.S +--- libdv/vlc_x86_64.S.orig libdv/vlc_x86_64.S +@@ -6,6 +6,7 @@ + .globl dv_decode_vlc + .typedv_decode_vlc,@function + dv_decode_vlc: ++ endbr64 + push %rbx + push %rbp + +@@ -102,6 +103,7 @@ void __dv_decode_vlc(int bits, dv_vlc_t *result) + .globl __dv_decode_vlc + .type__dv_decode_vlc,@function + __dv_decode_vlc: ++ endbr64 + push %rbx + push %rbp + +@@ -174,6 +176,7 @@ void dv_parse_ac_coeffs_pass0(bitstream_t *bs, + .type dv_parse_ac_coeffs_pass0,@function + + dv_parse_ac_coeffs_pass0: ++ endbr64 + + /* Args are at rdi=bs, rsi=mb, rdx=bl */ + push%r12 +@@ -427,6 +430,7 @@ gint dv_parse_video_segment(dv_videosegment_t *seg, gu + .globl dv_parse_video_segment + .type dv_parse_video_segment,@function + dv_parse_video_segment: ++ endbr64 + + /* Args are at rdi=seg, rsi=quality */ + push%r12
Re: [new] devel/sbt 1.9.8
On 2024/02/24 23:38, Kirill A. Korinsky wrote:
> Greetings,
>
> A new version of sbt was released, and I've updated port file.
>
> If someone can review it, I'll be appricieted.
>
> --
> wbr, Kirill
quick comments:
COMMENT=sbt, the interactive build tool
- don't repeat "sbt", it's in PKGNAME anyway which is displayed next to
this. suggest e.g. "interactive build tool for Scala"
REVISION= 0
- new port, doesn't need REVISION
${SUBST_CMD} -m 755 -c ${FILESDIR}/sbt ${PREFIX}/bin/sbt
- there's a specialist thing for that
${SUBST_PROGRAM} ${FILESDIR}/sbt ${PREFIX}/bin/sbt
"For general documentation, see https://www.scala-sbt.org/.";
- in the generated file in the package this is followed immediately
by "WWW: https://scala-sbt.org"; from HOMEPAGE i.e. dup info
@comment libexec/sbt/bin/sbt.beforesubst
- might as well add this to the find ... -delete
otherwise reads ok (untested)
Re: UPDATE: aom 3.8.1
On 2024/02/28 17:28, Jan Beich wrote:
> Brad Smith writes:
>
> > GH_ACCOUNT=jbeich
> > GH_PROJECT=aom
> > -GH_TAGNAME=v3.6.1
> > +GH_TAGNAME=v3.8.1
>
> If you don't use snapshots or RCs better migrate off my GitHub mirror.
> According to Repology the download link would be
>
> https://storage.googleapis.com/aom-releases/libaom-3.8.1.tar.gz
>
Updated for that. No difference in the contents of the tars after
extracting.
Index: Makefile
===
RCS file: /cvs/ports/multimedia/aom/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile29 May 2023 17:52:01 - 1.20
+++ Makefile28 Feb 2024 16:39:18 -
@@ -1,13 +1,14 @@
COMMENT= Alliance for Open Media AV1 video codec
-GH_ACCOUNT=jbeich
-GH_PROJECT=aom
-GH_TAGNAME=v3.6.1
+V= 3.8.1
+DISTNAME= libaom-$V
+PKGNAME= aom-$V
CATEGORIES=multimedia
-SHARED_LIBS= aom 4.0
+SHARED_LIBS= aom 4.1
HOMEPAGE= https://aomedia.org/
+SITES= https://storage.googleapis.com/aom-releases/
MAINTAINER=Brad Smith
Index: distinfo
===
RCS file: /cvs/ports/multimedia/aom/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo29 May 2023 17:52:01 - 1.17
+++ distinfo28 Feb 2024 16:39:18 -
@@ -1,2 +1,2 @@
-SHA256 (aom-3.6.1.tar.gz) = Z5xBtBpQucWo+qG6kZ4MI5quf+hXUl4iP/IMVpl/EZ8=
-SIZE (aom-3.6.1.tar.gz) = 5269397
+SHA256 (libaom-3.8.1.tar.gz) = 3txlBggSp9+AHAJwov6L13PGuwtgHyFE7PvGLcD2cco=
+SIZE (libaom-3.8.1.tar.gz) = 5450909
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/multimedia/aom/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt9 Apr 2023 06:17:17 - 1.5
+++ patches/patch-CMakeLists_txt28 Feb 2024 16:39:18 -
@@ -1,12 +1,13 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -824,7 +824,7 @@ if(ENABLE_EXAMPLES AND "${CMAKE_GENERATOR}" MATCHES "M
- endif()
-
- if(BUILD_SHARED_LIBS)
-- if(NOT WIN32 AND NOT APPLE)
-+ if(NOT WIN32 AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+@@ -828,7 +828,8 @@ if(BUILD_SHARED_LIBS)
+ # https://clang.llvm.org/docs/AddressSanitizer.html#usage.
+ if(NOT WIN32
+ AND NOT APPLE
+- AND NOT (CMAKE_C_COMPILER_ID MATCHES "Clang" AND SANITIZE))
++ AND NOT (CMAKE_C_COMPILER_ID MATCHES "Clang" AND SANITIZE)
++ AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
# The -z defs linker option reports unresolved symbol references from
object
# files when building a shared library.
if("${CMAKE_VERSION}" VERSION_LESS "3.13")
Index: patches/patch-aom_ports_aarch32_cpudetect_c
===
RCS file: patches/patch-aom_ports_aarch32_cpudetect_c
diff -N patches/patch-aom_ports_aarch32_cpudetect_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-aom_ports_aarch32_cpudetect_c 28 Feb 2024 16:39:18 -
@@ -0,0 +1,23 @@
+Allow ARM CPU runtime detection code to build on OpenBSD.
+
+Index: aom_ports/aarch32_cpudetect.c
+--- aom_ports/aarch32_cpudetect.c.orig
aom_ports/aarch32_cpudetect.c
+@@ -12,7 +12,7 @@
+
+ #include "arm_cpudetect.h"
+
+-#if !CONFIG_RUNTIME_CPU_DETECT
++#if !CONFIG_RUNTIME_CPU_DETECT || defined(__OpenBSD__)
+
+ static int arm_get_cpu_caps(void) {
+ // This function should actually be a no-op. There is no way to adjust any
of
+@@ -25,7 +25,7 @@ static int arm_get_cpu_caps(void) {
+ return flags;
+ }
+
+-#elif defined(_MSC_VER) // end !CONFIG_RUNTIME_CPU_DETECT
++#elif defined(_MSC_VER) // end !CONFIG_RUNTIME_CPU_DETECT || __OpenBSD__
+
+ static int arm_get_cpu_caps(void) {
+ int flags = 0;
Index: patches/patch-aom_ports_aarch64_cpudetect_c
===
RCS file: patches/patch-aom_ports_aarch64_cpudetect_c
diff -N patches/patch-aom_ports_aarch64_cpudetect_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-aom_ports_aarch64_cpudetect_c 28 Feb 2024 16:39:18 -
@@ -0,0 +1,23 @@
+Allow ARM CPU runtime detection code to build on OpenBSD.
+
+Index: aom_ports/aarch64_cpudetect.c
+--- aom_ports/aarch64_cpudetect.c.orig
aom_ports/aarch64_cpudetect.c
+@@ -15,7 +15,7 @@
+ #include
+ #endif
+
+-#if !CONFIG_RUNTIME_CPU_DETECT
++#if !CONFIG_RUNTIME_CPU_DETECT || defined(__OpenBSD__)
+
+ static int arm_get_cpu_caps(void) {
+ // This function should actually be a no-op. There is no way to adjust any
of
+@@ -28,7 +28,7 @@ static int arm_get_cpu_caps(void) {
+ return flags;
+ }
+
+-#elif defined(__APPLE__) // end !CONFIG_RUNTIME_CPU_DETECT
++#elif defined(__APPLE__) // end !CONFIG_RUNTIME_CPU_DETECT || __OpenBSD__
+
+ // sysctlbyname() paramet
Re: UPDATE: aom 3.8.1
> Date: Wed, 28 Feb 2024 16:17:54 +
> From: Stuart Henderson
>
> +cc kettenis for the IBT patch
Looks good to me.
> On 2024/02/28 16:15, Stuart Henderson wrote:
> > On 2024/02/23 17:19, Brad Smith wrote:
> > > Here is an update to aom 3.8.1.
> > >
> > > https://aomedia.googlesource.com/aom/+/refs/heads/main/CHANGELOG
> >
> > Here's a tweaked version adding yasm-compatible endbr64 magic to
> > x86inc.asm. Similar to what I added to audio/deadbeef but the
> > definitions in aom_config.asm use a different label (and setting to
> > 0 or 1 rather than checking for presence/absence).
> >
> > Still builds on i386.
> >
> > With this I can encode from one of the xiph.org test YUV4MPEG files
> > at https://media.xiph.org/video/derf/ on 11th gen intel without crashing,
> > which I couldn't do before.
> >
> > $ aomenc -o test.webm -w 352 -h 288 --limit=100 --cpu-used=4 akiyo_cif.y4m
> >
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/multimedia/aom/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- Makefile 29 May 2023 17:52:01 - 1.20
> +++ Makefile 28 Feb 2024 16:06:36 -
> @@ -2,10 +2,10 @@ COMMENT=Alliance for Open Media AV1 vid
>
> GH_ACCOUNT= jbeich
> GH_PROJECT= aom
> -GH_TAGNAME= v3.6.1
> +GH_TAGNAME= v3.8.1
> CATEGORIES= multimedia
>
> -SHARED_LIBS= aom 4.0
> +SHARED_LIBS= aom 4.1
>
> HOMEPAGE=https://aomedia.org/
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/multimedia/aom/distinfo,v
> retrieving revision 1.17
> diff -u -p -r1.17 distinfo
> --- distinfo 29 May 2023 17:52:01 - 1.17
> +++ distinfo 28 Feb 2024 16:06:36 -
> @@ -1,2 +1,2 @@
> -SHA256 (aom-3.6.1.tar.gz) = Z5xBtBpQucWo+qG6kZ4MI5quf+hXUl4iP/IMVpl/EZ8=
> -SIZE (aom-3.6.1.tar.gz) = 5269397
> +SHA256 (aom-3.8.1.tar.gz) = Yp0PvVhlQWfSjz78LN/w5wjWgoCqWzD4F0Tn4YGo2FE=
> +SIZE (aom-3.8.1.tar.gz) = 5461300
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/multimedia/aom/patches/patch-CMakeLists_txt,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 9 Apr 2023 06:17:17 - 1.5
> +++ patches/patch-CMakeLists_txt 28 Feb 2024 16:06:36 -
> @@ -1,12 +1,13 @@
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -824,7 +824,7 @@ if(ENABLE_EXAMPLES AND "${CMAKE_GENERATOR}" MATCHES "M
> - endif()
> -
> - if(BUILD_SHARED_LIBS)
> -- if(NOT WIN32 AND NOT APPLE)
> -+ if(NOT WIN32 AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
> +@@ -828,7 +828,8 @@ if(BUILD_SHARED_LIBS)
> + # https://clang.llvm.org/docs/AddressSanitizer.html#usage.
> + if(NOT WIN32
> + AND NOT APPLE
> +- AND NOT (CMAKE_C_COMPILER_ID MATCHES "Clang" AND SANITIZE))
> ++ AND NOT (CMAKE_C_COMPILER_ID MATCHES "Clang" AND SANITIZE)
> ++ AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
> # The -z defs linker option reports unresolved symbol references from
> object
> # files when building a shared library.
> if("${CMAKE_VERSION}" VERSION_LESS "3.13")
> Index: patches/patch-aom_ports_aarch32_cpudetect_c
> ===
> RCS file: patches/patch-aom_ports_aarch32_cpudetect_c
> diff -N patches/patch-aom_ports_aarch32_cpudetect_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-aom_ports_aarch32_cpudetect_c 28 Feb 2024 16:06:36
> -
> @@ -0,0 +1,23 @@
> +Allow ARM CPU runtime detection code to build on OpenBSD.
> +
> +Index: aom_ports/aarch32_cpudetect.c
> +--- aom_ports/aarch32_cpudetect.c.orig
> aom_ports/aarch32_cpudetect.c
> +@@ -12,7 +12,7 @@
> +
> + #include "arm_cpudetect.h"
> +
> +-#if !CONFIG_RUNTIME_CPU_DETECT
> ++#if !CONFIG_RUNTIME_CPU_DETECT || defined(__OpenBSD__)
> +
> + static int arm_get_cpu_caps(void) {
> + // This function should actually be a no-op. There is no way to adjust
> any of
> +@@ -25,7 +25,7 @@ static int arm_get_cpu_caps(void) {
> + return flags;
> + }
> +
> +-#elif defined(_MSC_VER) // end !CONFIG_RUNTIME_CPU_DETECT
> ++#elif defined(_MSC_VER) // end !CONFIG_RUNTIME_CPU_DETECT || __OpenBSD__
> +
> + static int arm_get_cpu_caps(void) {
> + int flags = 0;
> Index: patches/patch-aom_ports_aarch64_cpudetect_c
> ===
> RCS file: patches/patch-aom_ports_aarch64_cpudetect_c
> diff -N patches/patch-aom_ports_aarch64_cpudetect_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-aom_ports_aarch64_cpudetect_c 28 Feb 2024 16:06:36
> -
> @@ -0,0 +1,23 @@
> +Allow ARM CPU runtime detection code to build on OpenBSD.
> +
> +Index: aom_ports/aarch64_cpudetect.c
> +--- aom_ports/aarch64_cpudetect.c.orig
> aom_ports/aarch64_cpudetect.c
> +@@ -15,7 +15,7 @@
> + #inc
Re: UPDATE: aom 3.8.1
Brad Smith writes: > GH_ACCOUNT= jbeich > GH_PROJECT= aom > -GH_TAGNAME= v3.6.1 > +GH_TAGNAME= v3.8.1 If you don't use snapshots or RCs better migrate off my GitHub mirror. According to Repology the download link would be https://storage.googleapis.com/aom-releases/libaom-3.8.1.tar.gz
Re: update/clarify influxdb python client ports
On 2024/02/28 15:10, Martin Reindl wrote: > - clarify the ports description and make it clear which on is for InfluxDB 1.x > and 2.x (there is also a separate 3.x client already) > - update the 2.x port to the latest release 1.40.0 > - take maintainer for the 2.x port > > OK? nits below, please refer to packages rather than ports; people reading DESCR often won't have a ports tree installed. otherwise ok. > --- py-influxdb/pkg/DESCR 17 Sep 2018 21:15:10 - 1.1.1.1 > +++ py-influxdb/pkg/DESCR 28 Feb 2024 14:01:37 - > @@ -1 +1,3 @@ > -InfluxDB-Python is a client for interacting with InfluxDB. > +InfluxDB-Python is a client for interacting with InfluxDB 1.x. For > +connecting to InfluxDB 2.x instances, use the > +databases/py-influxdb_client port. +connecting to InfluxDB 2.x instances, install py3-influxdb_client. > diff -u -p -r1.1.1.1 DESCR > --- py-influxdb_client/pkg/DESCR 29 Jun 2022 01:35:45 - 1.1.1.1 > +++ py-influxdb_client/pkg/DESCR 28 Feb 2024 14:01:37 - > @@ -1,3 +1,2 @@ > -Python client library for the InfluxDB 1.8, 2.0+, and InfluxDB > -Cloud. To connect to InfluxDB 1.7 or earlier instances, use the > -databases/py-influxdb port. > +Python client library for use with InfluxDB 2.x and Flux. To connect > +to InfluxDB 1.x instances, use the databases/py-influxdb port. +to InfluxDB 1.x instances, install py3-influxdb.
Re: UPDATE: aom 3.8.1
+cc kettenis for the IBT patch
On 2024/02/28 16:15, Stuart Henderson wrote:
> On 2024/02/23 17:19, Brad Smith wrote:
> > Here is an update to aom 3.8.1.
> >
> > https://aomedia.googlesource.com/aom/+/refs/heads/main/CHANGELOG
>
> Here's a tweaked version adding yasm-compatible endbr64 magic to
> x86inc.asm. Similar to what I added to audio/deadbeef but the
> definitions in aom_config.asm use a different label (and setting to
> 0 or 1 rather than checking for presence/absence).
>
> Still builds on i386.
>
> With this I can encode from one of the xiph.org test YUV4MPEG files
> at https://media.xiph.org/video/derf/ on 11th gen intel without crashing,
> which I couldn't do before.
>
> $ aomenc -o test.webm -w 352 -h 288 --limit=100 --cpu-used=4 akiyo_cif.y4m
>
Index: Makefile
===
RCS file: /cvs/ports/multimedia/aom/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile29 May 2023 17:52:01 - 1.20
+++ Makefile28 Feb 2024 16:06:36 -
@@ -2,10 +2,10 @@ COMMENT= Alliance for Open Media AV1 vid
GH_ACCOUNT=jbeich
GH_PROJECT=aom
-GH_TAGNAME=v3.6.1
+GH_TAGNAME=v3.8.1
CATEGORIES=multimedia
-SHARED_LIBS= aom 4.0
+SHARED_LIBS= aom 4.1
HOMEPAGE= https://aomedia.org/
Index: distinfo
===
RCS file: /cvs/ports/multimedia/aom/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo29 May 2023 17:52:01 - 1.17
+++ distinfo28 Feb 2024 16:06:36 -
@@ -1,2 +1,2 @@
-SHA256 (aom-3.6.1.tar.gz) = Z5xBtBpQucWo+qG6kZ4MI5quf+hXUl4iP/IMVpl/EZ8=
-SIZE (aom-3.6.1.tar.gz) = 5269397
+SHA256 (aom-3.8.1.tar.gz) = Yp0PvVhlQWfSjz78LN/w5wjWgoCqWzD4F0Tn4YGo2FE=
+SIZE (aom-3.8.1.tar.gz) = 5461300
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/multimedia/aom/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt9 Apr 2023 06:17:17 - 1.5
+++ patches/patch-CMakeLists_txt28 Feb 2024 16:06:36 -
@@ -1,12 +1,13 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -824,7 +824,7 @@ if(ENABLE_EXAMPLES AND "${CMAKE_GENERATOR}" MATCHES "M
- endif()
-
- if(BUILD_SHARED_LIBS)
-- if(NOT WIN32 AND NOT APPLE)
-+ if(NOT WIN32 AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+@@ -828,7 +828,8 @@ if(BUILD_SHARED_LIBS)
+ # https://clang.llvm.org/docs/AddressSanitizer.html#usage.
+ if(NOT WIN32
+ AND NOT APPLE
+- AND NOT (CMAKE_C_COMPILER_ID MATCHES "Clang" AND SANITIZE))
++ AND NOT (CMAKE_C_COMPILER_ID MATCHES "Clang" AND SANITIZE)
++ AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
# The -z defs linker option reports unresolved symbol references from
object
# files when building a shared library.
if("${CMAKE_VERSION}" VERSION_LESS "3.13")
Index: patches/patch-aom_ports_aarch32_cpudetect_c
===
RCS file: patches/patch-aom_ports_aarch32_cpudetect_c
diff -N patches/patch-aom_ports_aarch32_cpudetect_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-aom_ports_aarch32_cpudetect_c 28 Feb 2024 16:06:36 -
@@ -0,0 +1,23 @@
+Allow ARM CPU runtime detection code to build on OpenBSD.
+
+Index: aom_ports/aarch32_cpudetect.c
+--- aom_ports/aarch32_cpudetect.c.orig
aom_ports/aarch32_cpudetect.c
+@@ -12,7 +12,7 @@
+
+ #include "arm_cpudetect.h"
+
+-#if !CONFIG_RUNTIME_CPU_DETECT
++#if !CONFIG_RUNTIME_CPU_DETECT || defined(__OpenBSD__)
+
+ static int arm_get_cpu_caps(void) {
+ // This function should actually be a no-op. There is no way to adjust any
of
+@@ -25,7 +25,7 @@ static int arm_get_cpu_caps(void) {
+ return flags;
+ }
+
+-#elif defined(_MSC_VER) // end !CONFIG_RUNTIME_CPU_DETECT
++#elif defined(_MSC_VER) // end !CONFIG_RUNTIME_CPU_DETECT || __OpenBSD__
+
+ static int arm_get_cpu_caps(void) {
+ int flags = 0;
Index: patches/patch-aom_ports_aarch64_cpudetect_c
===
RCS file: patches/patch-aom_ports_aarch64_cpudetect_c
diff -N patches/patch-aom_ports_aarch64_cpudetect_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-aom_ports_aarch64_cpudetect_c 28 Feb 2024 16:06:36 -
@@ -0,0 +1,23 @@
+Allow ARM CPU runtime detection code to build on OpenBSD.
+
+Index: aom_ports/aarch64_cpudetect.c
+--- aom_ports/aarch64_cpudetect.c.orig
aom_ports/aarch64_cpudetect.c
+@@ -15,7 +15,7 @@
+ #include
+ #endif
+
+-#if !CONFIG_RUNTIME_CPU_DETECT
++#if !CONFIG_RUNTIME_CPU_DETECT || defined(__OpenBSD__)
+
+ static int arm_get_cpu_caps(void) {
+ // This function should actually be a no-op. There is no way to adjust any
of
+@@ -28,7 +28,7 @@ static int arm_get_cpu_caps(void) {
+ return flags;
+ }
+
+-#elif defi
Re: UPDATE: aom 3.8.1
On 2024/02/23 17:19, Brad Smith wrote:
> Here is an update to aom 3.8.1.
>
> https://aomedia.googlesource.com/aom/+/refs/heads/main/CHANGELOG
Here's a tweaked version adding yasm-compatible endbr64 magic to
x86inc.asm. Similar to what I added to audio/deadbeef but the
definitions in aom_config.asm use a different label (and setting to
0 or 1 rather than checking for presence/absence).
Still builds on i386.
With this I can encode from one of the xiph.org test YUV4MPEG files
at https://media.xiph.org/video/derf/ on 11th gen intel without crashing,
which I couldn't do before.
$ aomenc -o test.webm -w 352 -h 288 --limit=100 --cpu-used=4 akiyo_cif.y4m
Index: Makefile
===
RCS file: /cvs/ports/multimedia/aom/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile29 May 2023 17:52:01 - 1.20
+++ Makefile28 Feb 2024 16:06:36 -
@@ -2,10 +2,10 @@ COMMENT= Alliance for Open Media AV1 vid
GH_ACCOUNT=jbeich
GH_PROJECT=aom
-GH_TAGNAME=v3.6.1
+GH_TAGNAME=v3.8.1
CATEGORIES=multimedia
-SHARED_LIBS= aom 4.0
+SHARED_LIBS= aom 4.1
HOMEPAGE= https://aomedia.org/
Index: distinfo
===
RCS file: /cvs/ports/multimedia/aom/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo29 May 2023 17:52:01 - 1.17
+++ distinfo28 Feb 2024 16:06:36 -
@@ -1,2 +1,2 @@
-SHA256 (aom-3.6.1.tar.gz) = Z5xBtBpQucWo+qG6kZ4MI5quf+hXUl4iP/IMVpl/EZ8=
-SIZE (aom-3.6.1.tar.gz) = 5269397
+SHA256 (aom-3.8.1.tar.gz) = Yp0PvVhlQWfSjz78LN/w5wjWgoCqWzD4F0Tn4YGo2FE=
+SIZE (aom-3.8.1.tar.gz) = 5461300
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/multimedia/aom/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt9 Apr 2023 06:17:17 - 1.5
+++ patches/patch-CMakeLists_txt28 Feb 2024 16:06:36 -
@@ -1,12 +1,13 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -824,7 +824,7 @@ if(ENABLE_EXAMPLES AND "${CMAKE_GENERATOR}" MATCHES "M
- endif()
-
- if(BUILD_SHARED_LIBS)
-- if(NOT WIN32 AND NOT APPLE)
-+ if(NOT WIN32 AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+@@ -828,7 +828,8 @@ if(BUILD_SHARED_LIBS)
+ # https://clang.llvm.org/docs/AddressSanitizer.html#usage.
+ if(NOT WIN32
+ AND NOT APPLE
+- AND NOT (CMAKE_C_COMPILER_ID MATCHES "Clang" AND SANITIZE))
++ AND NOT (CMAKE_C_COMPILER_ID MATCHES "Clang" AND SANITIZE)
++ AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
# The -z defs linker option reports unresolved symbol references from
object
# files when building a shared library.
if("${CMAKE_VERSION}" VERSION_LESS "3.13")
Index: patches/patch-aom_ports_aarch32_cpudetect_c
===
RCS file: patches/patch-aom_ports_aarch32_cpudetect_c
diff -N patches/patch-aom_ports_aarch32_cpudetect_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-aom_ports_aarch32_cpudetect_c 28 Feb 2024 16:06:36 -
@@ -0,0 +1,23 @@
+Allow ARM CPU runtime detection code to build on OpenBSD.
+
+Index: aom_ports/aarch32_cpudetect.c
+--- aom_ports/aarch32_cpudetect.c.orig
aom_ports/aarch32_cpudetect.c
+@@ -12,7 +12,7 @@
+
+ #include "arm_cpudetect.h"
+
+-#if !CONFIG_RUNTIME_CPU_DETECT
++#if !CONFIG_RUNTIME_CPU_DETECT || defined(__OpenBSD__)
+
+ static int arm_get_cpu_caps(void) {
+ // This function should actually be a no-op. There is no way to adjust any
of
+@@ -25,7 +25,7 @@ static int arm_get_cpu_caps(void) {
+ return flags;
+ }
+
+-#elif defined(_MSC_VER) // end !CONFIG_RUNTIME_CPU_DETECT
++#elif defined(_MSC_VER) // end !CONFIG_RUNTIME_CPU_DETECT || __OpenBSD__
+
+ static int arm_get_cpu_caps(void) {
+ int flags = 0;
Index: patches/patch-aom_ports_aarch64_cpudetect_c
===
RCS file: patches/patch-aom_ports_aarch64_cpudetect_c
diff -N patches/patch-aom_ports_aarch64_cpudetect_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-aom_ports_aarch64_cpudetect_c 28 Feb 2024 16:06:36 -
@@ -0,0 +1,23 @@
+Allow ARM CPU runtime detection code to build on OpenBSD.
+
+Index: aom_ports/aarch64_cpudetect.c
+--- aom_ports/aarch64_cpudetect.c.orig
aom_ports/aarch64_cpudetect.c
+@@ -15,7 +15,7 @@
+ #include
+ #endif
+
+-#if !CONFIG_RUNTIME_CPU_DETECT
++#if !CONFIG_RUNTIME_CPU_DETECT || defined(__OpenBSD__)
+
+ static int arm_get_cpu_caps(void) {
+ // This function should actually be a no-op. There is no way to adjust any
of
+@@ -28,7 +28,7 @@ static int arm_get_cpu_caps(void) {
+ return flags;
+ }
+
+-#elif defined(__APPLE__) // end !CONFIG_RUNTIME_CPU_DETECT
++#elif defined(__APPLE__) // end !CONFIG_RUNTIME_CPU_DETECT |
Re: update games/wrath to 1.0
On 28/02/2024 12:11, Jonathan Gray wrote: Wrath left early access and the old repo was removed. Build tested only. game runs, but crash at the end of the tutorial when loading next area "Mourningvale", i was able to repeat the issue twice, I didn't try another time. (fortunately the game makes a save ~30s before the loading area if someone wants to debug) Memory pool 0x591a2a38b60 has sprung a leak totalling 44905033 bytes (42.825MB)! Listing contents... 44905033 bytes allocated at ../../../fs.c:3194 Quake Error: Mem_Alloc: out of memory (alloc at ../../../model_shared.c:1046) Client "player" dropped pthread_mutex_destroy on mutex with waiters!
Re: multimedia/libvpx: ENDBR64
> Date: Wed, 28 Feb 2024 12:43:05 +0100 > From: Robert Nagy > > It seems that we need more here. This makes all the regression > tests pass. I suspect there will be still more needed, but we > need something to uncover those. Not entirely clear to me why the linker doesn't issue warnings here, these are indeed used in function pointers. ok kettenis@ > Index: Makefile > === > RCS file: /cvs/ports/multimedia/libvpx/Makefile,v > diff -u -p -u -r1.55 Makefile > --- Makefile 24 Feb 2024 17:39:07 - 1.55 > +++ Makefile 28 Feb 2024 11:40:27 - > @@ -6,7 +6,7 @@ GH_TAGNAME= v1.13.1 > EPOCH= 0 > CATEGORIES= multimedia > > -REVISION=2 > +REVISION=3 > > SHARED_LIBS= vpx 16.0 > > Index: patches/patch-vp8_common_x86_subpixel_ssse3_asm > === > RCS file: patches/patch-vp8_common_x86_subpixel_ssse3_asm > diff -N patches/patch-vp8_common_x86_subpixel_ssse3_asm > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-vp8_common_x86_subpixel_ssse3_asm 28 Feb 2024 11:40:27 > - > @@ -0,0 +1,67 @@ > +Index: vp8/common/x86/subpixel_ssse3.asm > +--- vp8/common/x86/subpixel_ssse3.asm.orig > vp8/common/x86/subpixel_ssse3.asm > +@@ -37,6 +37,7 @@ SECTION .text > + ;) > + globalsym(vp8_filter_block1d8_h6_ssse3) > + sym(vp8_filter_block1d8_h6_ssse3): > ++_endbr64 > + pushrbp > + mov rbp, rsp > + SHADOW_ARGS_TO_STACK 6 > +@@ -180,6 +181,7 @@ vp8_filter_block1d8_h4_ssse3: > + ;) > + globalsym(vp8_filter_block1d16_h6_ssse3) > + sym(vp8_filter_block1d16_h6_ssse3): > ++_endbr64 > + pushrbp > + mov rbp, rsp > + SHADOW_ARGS_TO_STACK 6 > +@@ -287,6 +289,7 @@ sym(vp8_filter_block1d16_h6_ssse3): > + ;) > + globalsym(vp8_filter_block1d4_h6_ssse3) > + sym(vp8_filter_block1d4_h6_ssse3): > ++_endbr64 > + pushrbp > + mov rbp, rsp > + SHADOW_ARGS_TO_STACK 6 > +@@ -417,6 +420,7 @@ sym(vp8_filter_block1d4_h6_ssse3): > + ;) > + globalsym(vp8_filter_block1d16_v6_ssse3) > + sym(vp8_filter_block1d16_v6_ssse3): > ++_endbr64 > + pushrbp > + mov rbp, rsp > + SHADOW_ARGS_TO_STACK 6 > +@@ -605,6 +609,7 @@ sym(vp8_filter_block1d16_v6_ssse3): > + ;) > + globalsym(vp8_filter_block1d8_v6_ssse3) > + sym(vp8_filter_block1d8_v6_ssse3): > ++_endbr64 > + pushrbp > + mov rbp, rsp > + SHADOW_ARGS_TO_STACK 6 > +@@ -745,6 +750,7 @@ sym(vp8_filter_block1d8_v6_ssse3): > + ;) > + globalsym(vp8_filter_block1d4_v6_ssse3) > + sym(vp8_filter_block1d4_v6_ssse3): > ++_endbr64 > + pushrbp > + mov rbp, rsp > + SHADOW_ARGS_TO_STACK 6 > +@@ -884,6 +890,7 @@ sym(vp8_filter_block1d4_v6_ssse3): > + ;) > + globalsym(vp8_bilinear_predict16x16_ssse3) > + sym(vp8_bilinear_predict16x16_ssse3): > ++_endbr64 > + pushrbp > + mov rbp, rsp > + SHADOW_ARGS_TO_STACK 6 > +@@ -1147,6 +1154,7 @@ sym(vp8_bilinear_predict16x16_ssse3): > + ;) > + globalsym(vp8_bilinear_predict8x8_ssse3) > + sym(vp8_bilinear_predict8x8_ssse3): > ++_endbr64 > + pushrbp > + mov rbp, rsp > + SHADOW_ARGS_TO_STACK 6 > Index: patches/patch-vp8_encoder_x86_copy_sse3_asm > === > RCS file: patches/patch-vp8_encoder_x86_copy_sse3_asm > diff -N patches/patch-vp8_encoder_x86_copy_sse3_asm > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-vp8_encoder_x86_copy_sse3_asm 28 Feb 2024 11:40:27 > - > @@ -0,0 +1,12 @@ > +Index: vp8/encoder/x86/copy_sse3.asm > +--- vp8/encoder/x86/copy_sse3.asm.orig > vp8/encoder/x86/copy_sse3.asm > +@@ -94,6 +94,8 @@ SECTION .text > + globalsym(vp8_copy32xn_sse3) > + sym(vp8_copy32xn_sse3): > + > ++_endbr64 > ++ > + STACK_FRAME_CREATE_X3 > + > + .block_copy_sse3_loopx4: > Index: patches/patch-vp8_encoder_x86_dct_sse2_asm > === > RCS file: patches/patch-vp8_encoder_x86_dct_sse2_asm > diff -N patches/patch-vp8_encoder_x86_dct_sse2_asm > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-vp8_encoder_x86_dct_sse2_asm28 Feb 2024 11:40:27 > - > @@ -0,0 +1,21 @@ > +Index: vp8/encoder/x86/dct_sse2.asm > +--- vp8/encoder/x86/dct_sse2.asm.orig > vp8/encoder/x86/dct_sse2.asm > +@@ -66,6 +66,8 @@ SECTION .text > + globalsym(vp8_short_fdct4x4_sse2) > + sym(vp8_short_fdct4x4_sse2): > + > ++_endbr64 > ++ > + STACK_FRAME_CREATE > + > + movqxmm0, MMWORD PTR[input] ;03 02 01 00 > +@@ -170,6 +172,8 @@ sym(vp8_short_fdct4x4_sse2): > + ;void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch) > + globalsym(vp8_short_fdct8x4_sse2) > + sym(vp8_short_fdct8x4_sse2): > ++ > ++_endbr64 > + > + STACK_FRAME_CREATE > + > Index: patches/patch-vp8_encoder
Re: [maintainer update] sysutils/fzf 0.46.1
On Wed, 28 Feb 2024 08:54:52 +0100 (CET), Laurent Cheylus wrote: > Hi, > > update for sysutils/fzf port version 0.46.1 > Changelog for the majour release 0.46.0: > https://github.com/junegunn/fzf/releases/tag/0.46.0 > > - update Makefile, distinfo and modules.inc for this version > - remove a patch to add tmppath for pledge (merged upstream) > > Build and tests OK on current/amd64 with Go 1.22.0 > > Comments/tests welcome and please commit if OK. Committed, thanks!
Re: UPDATE: vultr-cli-3.0.1
On Tue, 27 Feb 2024 15:46:34 -0400, Adriano Barbosa
wrote:
> Hi.
> Update for sysutils/vultr-cli-3.0.1
> Changelog: https://github.com/vultr/vultr-cli/releases/tag/v3.0.1
> - Add correct usage for firewall rules (#414)
> - Add kubernetes enable-firewall flag on create (#413)
> - Build metadata paging from struct and add nil struct checks (#410)
> - Bump github.com/vultr/govultr/v3 from 3.6.1 to 3.6.2 (#407)
> - Make regions and plans printers consistent (#412)
> - Release v3.0.1 #patch
> - Remove shorthand flag output on kubernetes (#406)
> - Update README go get example to use v3 (#405)
Committed, thanks!
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/vultr-cli/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- Makefile 17 Feb 2024 15:35:08 - 1.20
> +++ Makefile 27 Feb 2024 19:42:57 -
> @@ -1,7 +1,7 @@
> COMMENT =Vultr Command Line Interface
>
> MODGO_MODNAME = github.com/vultr/vultr-cli/v3
> -MODGO_VERSION = v3.0.0
> +MODGO_VERSION = v3.0.1
>
> DISTNAME = vultr-cli-${MODGO_VERSION}
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/vultr-cli/distinfo,v
> retrieving revision 1.17
> diff -u -p -r1.17 distinfo
> --- distinfo 17 Feb 2024 15:35:08 - 1.17
> +++ distinfo 27 Feb 2024 19:42:57 -
> @@ -158,8 +158,8 @@ SHA256 (go_modules/github.com/stretchr/t
> SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.4.zip) =
> 4gbart4L0D3gYL3765hKwsSbgwWHU//8k/4MIg6odTI= SHA256
> (go_modules/github.com/subosito/gotenv/@v/v1.6.0.mod) =
> iy2Lx4td7xBjYIZ6gq2CxaTp3pNULwogcIe7ODhPVb8= SHA256
> (go_modules/github.com/subosito/gotenv/@v/v1.6.0.zip) =
> FC2z3SMo50TBV+hc8ykdAnATt5+SpFmE+GD+OLwPH40= -SHA256
> (go_modules/github.com/vultr/govultr/v3/@v/v3.6.1.mod) =
> Btztb1e1OWlrAp+aP+hNBpwS5h5xIQO/9EKGVmwB5f0= -SHA256
> (go_modules/github.com/vultr/govultr/v3/@v/v3.6.1.zip) =
> 05pnYuSX0j2dsstS1dzyYCKNt4GRU8KYqLEr4t/dRTQ= +SHA256
> (go_modules/github.com/vultr/govultr/v3/@v/v3.6.2.mod) =
> Btztb1e1OWlrAp+aP+hNBpwS5h5xIQO/9EKGVmwB5f0= +SHA256
> (go_modules/github.com/vultr/govultr/v3/@v/v3.6.2.zip) =
> SjPQFV9MtmuGTfAUaSD6HgEbrlaXVpttK9sfzp871OE= SHA256
> (go_modules/go.etcd.io/etcd/api/v3/@v/v3.5.10.mod) =
> BdgLHNyTTdrAmRX4IqQFDoj9pkajbymego6kjjP/Yfc= SHA256
> (go_modules/go.etcd.io/etcd/api/v3/@v/v3.5.10.zip) =
> 0F1Bvq5D3HXwpueBWkR8DnBM/flIQelrpmHgsdvEoQw= SHA256
> (go_modules/go.etcd.io/etcd/client/pkg/v3/@v/v3.5.10.mod) =
> +IjWF2shNMhy6adJ/bfazsGGXsk8BIPE1plnbVVRHqo= @@ -244,7 +244,7 @@
> SHA256 (go_modules/gopkg.in/ini.v1/@v/v1 SHA256
> (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod)
> = IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk= SHA256
> (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.mod) =
> IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk= SHA256
> (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.zip) =
> qrj7xOYwDqCOav4crqGKIckMefSJ9SxT4vIEMfGpoBU= -SHA256
> (vultr-cli-v3.0.0.zip) = EWRrg8rN7GaBP4yv8xljLSsT7X41+fNRQ754JfGbvMo=
> +SHA256 (vultr-cli-v3.0.1.zip) =
> 0qYp2mdVyE6aFXswG+dQt3QjTVa/LRjw1mTvb2dvEsc= SIZE
> (go_modules/cloud.google.com/go/@v/v0.110.10.mod) = 1349 SIZE
> (go_modules/cloud.google.com/go/@v/v0.110.10.zip) = 309004 SIZE
> (go_modules/cloud.google.com/go/compute/@v/v1.20.1.mod) = 1093 @@
> -405,8 +405,8 @@ SIZE (go_modules/github.com/stretchr/tes SIZE
> (go_modules/github.com/stretchr/testify/@v/v1.8.4.zip) = 120537 SIZE
> (go_modules/github.com/subosito/gotenv/@v/v1.6.0.mod) = 266 SIZE
> (go_modules/github.com/subosito/gotenv/@v/v1.6.0.zip) = 17070 -SIZE
> (go_modules/github.com/vultr/govultr/v3/@v/v3.6.1.mod) = 256 -SIZE
> (go_modules/github.com/vultr/govultr/v3/@v/v3.6.1.zip) = 118356 +SIZE
> (go_modules/github.com/vultr/govultr/v3/@v/v3.6.2.mod) = 256 +SIZE
> (go_modules/github.com/vultr/govultr/v3/@v/v3.6.2.zip) = 118464 SIZE
> (go_modules/go.etcd.io/etcd/api/v3/@v/v3.5.10.mod) = 1050 SIZE
> (go_modules/go.etcd.io/etcd/api/v3/@v/v3.5.10.zip) = 117146 SIZE
> (go_modules/go.etcd.io/etcd/client/pkg/v3/@v/v3.5.10.mod) = 442 @@
> -491,4 +491,4 @@ SIZE (go_modules/gopkg.in/ini.v1/@v/v1.6 SIZE
> (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod)
> = 95 SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.mod) = 95 SIZE
> (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.zip) = 104623 -SIZE
> (vultr-cli-v3.0.0.zip) = 153388 +SIZE (vultr-cli-v3.0.1.zip) = 153331
> Index: modules.inc
> ===
> RCS file: /cvs/ports/sysutils/vultr-cli/modules.inc,v retrieving
> revision 1.18 diff -u -p -r1.18 modules.inc --- modules.inc 17
> Feb 2024 15:35:08 - 1.18 +++ modules.inc27 Feb
> 2024 19:42:57 - @@ -68,7 +68,7 @@ MODGO_MODULES = \
> github.com/stretchr/objx v0.5.0 \
> github.com/stretchr/testifyv1.8.4 \
> github.com/subosito/gotenv
Re: multimedia/libvpx: ENDBR64
It seems that we need more here. This makes all the regression tests pass. I suspect there will be still more needed, but we need something to uncover those. Index: Makefile === RCS file: /cvs/ports/multimedia/libvpx/Makefile,v diff -u -p -u -r1.55 Makefile --- Makefile24 Feb 2024 17:39:07 - 1.55 +++ Makefile28 Feb 2024 11:40:27 - @@ -6,7 +6,7 @@ GH_TAGNAME= v1.13.1 EPOCH= 0 CATEGORIES=multimedia -REVISION= 2 +REVISION= 3 SHARED_LIBS= vpx 16.0 Index: patches/patch-vp8_common_x86_subpixel_ssse3_asm === RCS file: patches/patch-vp8_common_x86_subpixel_ssse3_asm diff -N patches/patch-vp8_common_x86_subpixel_ssse3_asm --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-vp8_common_x86_subpixel_ssse3_asm 28 Feb 2024 11:40:27 - @@ -0,0 +1,67 @@ +Index: vp8/common/x86/subpixel_ssse3.asm +--- vp8/common/x86/subpixel_ssse3.asm.orig vp8/common/x86/subpixel_ssse3.asm +@@ -37,6 +37,7 @@ SECTION .text + ;) + globalsym(vp8_filter_block1d8_h6_ssse3) + sym(vp8_filter_block1d8_h6_ssse3): ++_endbr64 + pushrbp + mov rbp, rsp + SHADOW_ARGS_TO_STACK 6 +@@ -180,6 +181,7 @@ vp8_filter_block1d8_h4_ssse3: + ;) + globalsym(vp8_filter_block1d16_h6_ssse3) + sym(vp8_filter_block1d16_h6_ssse3): ++_endbr64 + pushrbp + mov rbp, rsp + SHADOW_ARGS_TO_STACK 6 +@@ -287,6 +289,7 @@ sym(vp8_filter_block1d16_h6_ssse3): + ;) + globalsym(vp8_filter_block1d4_h6_ssse3) + sym(vp8_filter_block1d4_h6_ssse3): ++_endbr64 + pushrbp + mov rbp, rsp + SHADOW_ARGS_TO_STACK 6 +@@ -417,6 +420,7 @@ sym(vp8_filter_block1d4_h6_ssse3): + ;) + globalsym(vp8_filter_block1d16_v6_ssse3) + sym(vp8_filter_block1d16_v6_ssse3): ++_endbr64 + pushrbp + mov rbp, rsp + SHADOW_ARGS_TO_STACK 6 +@@ -605,6 +609,7 @@ sym(vp8_filter_block1d16_v6_ssse3): + ;) + globalsym(vp8_filter_block1d8_v6_ssse3) + sym(vp8_filter_block1d8_v6_ssse3): ++_endbr64 + pushrbp + mov rbp, rsp + SHADOW_ARGS_TO_STACK 6 +@@ -745,6 +750,7 @@ sym(vp8_filter_block1d8_v6_ssse3): + ;) + globalsym(vp8_filter_block1d4_v6_ssse3) + sym(vp8_filter_block1d4_v6_ssse3): ++_endbr64 + pushrbp + mov rbp, rsp + SHADOW_ARGS_TO_STACK 6 +@@ -884,6 +890,7 @@ sym(vp8_filter_block1d4_v6_ssse3): + ;) + globalsym(vp8_bilinear_predict16x16_ssse3) + sym(vp8_bilinear_predict16x16_ssse3): ++_endbr64 + pushrbp + mov rbp, rsp + SHADOW_ARGS_TO_STACK 6 +@@ -1147,6 +1154,7 @@ sym(vp8_bilinear_predict16x16_ssse3): + ;) + globalsym(vp8_bilinear_predict8x8_ssse3) + sym(vp8_bilinear_predict8x8_ssse3): ++_endbr64 + pushrbp + mov rbp, rsp + SHADOW_ARGS_TO_STACK 6 Index: patches/patch-vp8_encoder_x86_copy_sse3_asm === RCS file: patches/patch-vp8_encoder_x86_copy_sse3_asm diff -N patches/patch-vp8_encoder_x86_copy_sse3_asm --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-vp8_encoder_x86_copy_sse3_asm 28 Feb 2024 11:40:27 - @@ -0,0 +1,12 @@ +Index: vp8/encoder/x86/copy_sse3.asm +--- vp8/encoder/x86/copy_sse3.asm.orig vp8/encoder/x86/copy_sse3.asm +@@ -94,6 +94,8 @@ SECTION .text + globalsym(vp8_copy32xn_sse3) + sym(vp8_copy32xn_sse3): + ++_endbr64 ++ + STACK_FRAME_CREATE_X3 + + .block_copy_sse3_loopx4: Index: patches/patch-vp8_encoder_x86_dct_sse2_asm === RCS file: patches/patch-vp8_encoder_x86_dct_sse2_asm diff -N patches/patch-vp8_encoder_x86_dct_sse2_asm --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-vp8_encoder_x86_dct_sse2_asm 28 Feb 2024 11:40:27 - @@ -0,0 +1,21 @@ +Index: vp8/encoder/x86/dct_sse2.asm +--- vp8/encoder/x86/dct_sse2.asm.orig vp8/encoder/x86/dct_sse2.asm +@@ -66,6 +66,8 @@ SECTION .text + globalsym(vp8_short_fdct4x4_sse2) + sym(vp8_short_fdct4x4_sse2): + ++_endbr64 ++ + STACK_FRAME_CREATE + + movqxmm0, MMWORD PTR[input] ;03 02 01 00 +@@ -170,6 +172,8 @@ sym(vp8_short_fdct4x4_sse2): + ;void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch) + globalsym(vp8_short_fdct8x4_sse2) + sym(vp8_short_fdct8x4_sse2): ++ ++_endbr64 + + STACK_FRAME_CREATE + Index: patches/patch-vp8_encoder_x86_fwalsh_sse2_asm === RCS file: patches/patch-vp8_encoder_x86_fwalsh_sse2_asm diff -N patches/patch-vp8_encoder_x86_fwalsh_sse2_asm --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-vp8_encoder_x86_fwalsh_sse2_asm 28 Feb 2024 11:40:27 - @@ -0,0 +1,11 @@ +Index: vp8/encoder/x86/fwalsh_sse2.asm +--- vp8/encoder/x86/fwalsh_sse2.asm.orig vp8/encoder/x86/fwalsh_sse2.asm +@@ -16,6 +16,7
update games/wrath to 1.0
Wrath left early access and the old repo was removed.
Build tested only.
Index: Makefile
===
RCS file: /cvs/ports/games/wrath/Makefile,v
diff -u -p -r1.6 Makefile
--- Makefile15 Nov 2023 12:59:32 - 1.6
+++ Makefile28 Feb 2024 10:44:57 -
@@ -1,10 +1,10 @@
COMMENT = client of wrath-darkplaces engine
-DISTNAME = wrath-0.0.0.20210608
+DISTNAME = wrath-1.0
-GH_ACCOUNT = KillPixelGames
+GH_ACCOUNT = Official3DRealms
GH_PROJECT = wrath-darkplaces
-GH_COMMIT =e0770286b39bb137f3457b05acbd4c6a46044488
+GH_COMMIT =d7a494fbe76f45a84d1df0c7360c0c4848042e45
CATEGORIES = games
@@ -33,6 +33,6 @@ MAKE_FILE = makefile
ALL_TARGET = sdl2-release
do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/darkplaces-sdl ${PREFIX}/bin/wrath
+ ${INSTALL_PROGRAM} ${WRKBUILD}/wrath-sdl ${PREFIX}/bin/wrath
.include
Index: distinfo
===
RCS file: /cvs/ports/games/wrath/distinfo,v
diff -u -p -r1.4 distinfo
--- distinfo15 Nov 2023 12:59:32 - 1.4
+++ distinfo28 Feb 2024 10:41:46 -
@@ -1,2 +1,2 @@
-SHA256 (wrath-0.0.0.20210608-e0770286.tar.gz) =
GEGpfWWKoA/fg3AEe2jGQKCfp36KHutfmfdNG6xrpc0=
-SIZE (wrath-0.0.0.20210608-e0770286.tar.gz) = 2688056
+SHA256 (wrath-1.0-d7a494fb.tar.gz) =
gl5B8+tVp0cZN4MEQ/DOJHgVFKM8x5eCy7E03F4ZnU8=
+SIZE (wrath-1.0-d7a494fb.tar.gz) = 2710199
Re: libreddit -> redlib transition?
On 2024/02/24 13:45, Lucas Raab wrote:
> Hello,
>
> libreddit has been more or less abandoned after the API debacle and work
> has been shifted to a new fork named redlib.
>
> libreddit has its own user which seems to make this a bit tricky. I'm
> not sure what is best between updating in place with a different package
> name or rm libreddit and add redlib. The latter seems the most
> straightforward, but any feedback would be appreciated. In that vein,
> I've attached a new port and added diffs for user.list and quirks.
>
> In any event, helpfully pointed out by tb@, this update would remove
> another dependent of rust-ring.
I really would like to avoid burning another uid just for this. Nobody
can agree on another range to move into, we absolutely can't bump into
1000, and some people work backwards from 1000 for special users so
we're probably already going to get into trouble at 990 or maybe a bit
less.
Can it stay as user "_libreddit"?
> tested on amd64
>
> Thoughts?
>
> Thanks,
> Lucas
> diff /usr/ports
> commit - ce957624eb33e999eae6e2e4bf0583c4d69b9efc
> path + /usr/ports
> blob - 65d9d4225a78195c4f06502c359118f0dffbfed9
> file + devel/quirks/files/Quirks.pm
> --- devel/quirks/files/Quirks.pm
> +++ devel/quirks/files/Quirks.pm
> @@ -809,6 +809,7 @@ my $stem_extensions = {
> 'py-analyzemft' => 'py3-analyzemft',
> 'llama' => 'walk',
> 'py-setuptools-git' => 'py3-setuptools-git',
> + 'libreddit' => 'redlib',
> };
>
> my $obsolete_reason = {};
> diff /usr/ports
> commit - ce957624eb33e999eae6e2e4bf0583c4d69b9efc
> path + /usr/ports
> blob - b42938f202aa5f3563a1fbbd9b4e89d5e7a3d49a
> file + infrastructure/db/user.list
> --- infrastructure/db/user.list
> +++ infrastructure/db/user.list
> @@ -60,7 +60,7 @@ id usergroup port
> 549 _netplan _netplanmisc/plan
> 550 _nagios _nagios net/nagios
> 551 _gpsdmisc/gpsd
> -552 _libreddit _libreddit www/libreddit
> +#552 _libreddit _libreddit www/libreddit
> 553 _saned _saned graphics/sane-backends
> 554 _avenger mail/avenger
> #555 _akpop3dmail/akpop3d
> @@ -405,3 +405,4 @@ id user group port
> 894 _gonic _gonic audio/gonic
> 895 _soju_soju net/soju
> 896 _certspotter _certspottersecurity/certspotter
> +897 _redlib _redlib www/redlib
Re: Go default LDFLAGS behavior
On Wed, Feb 28, 2024 at 09:12:04AM +, Stuart Henderson wrote:
> On 2024/02/27 17:53, Igor Zornik wrote:
> > Hello,
> >
> > How are default LDFLAGS for Go ports applied considering they are set
> > after they're included into the build command? I don't see those options
> > in the output when running make and the resulting binary is in its
> > standard size. However when I relocate the flag settings into the upper
> > part of the script as in the provided diff, it works as expected and I
> > get greeted with a shrunk binary. I think the default settings are
> > skipped on the official build server too, because Go binaries on mirrors
> > are similarly large.
> >
> > Could anyone clue me in if this behavior is still correct and I'm just
> > misunderstanding something?
>
> I think your diff is correct.
>
> In ports we're fairly used to being able to add to variables at various
> points in the Makefile and have them still take effect because they're
> often not referenced until bsd.port.mk or bsd.port.arch.mk is included,
> but obviously that's not the case here, so I think this was a bug
> introduced when MODGO_LDFLAGS was introduced and -s -w was split
> off from MODGO_FLAGS.
I agree.
> Unless there are objections I'll commit it, with a _MODGO_SYSTEM_VERSION
> bump to make sure that users get updated to new package versions when
> they use pkg_add -u (to avoid bumping REVISION separately in all go
> ports).
ok tb
>
> > Index: go.port.mk
> > ===
> > RCS file: /cvs/ports/lang/go/go.port.mk,v
> > retrieving revision 1.66
> > diff -u -p -r1.66 go.port.mk
> > --- go.port.mk 21 Feb 2024 12:28:57 - 1.66
> > +++ go.port.mk 27 Feb 2024 15:23:27 -
> > @@ -58,6 +58,11 @@ MODGO_LIST_CMD = ${MODGO_CMD} list ${MOD
> > MODGO_TEST_CMD = ${MODGO_CMD} test ${MODGO_FLAGS} ${MODGO_TEST_FLAGS}
> > MODGO_BINDIR ?=bin
> > +.if empty(DEBUG)
> > +# by default omit symbol table, debug information and DWARF symbol table
> > +MODGO_LDFLAGS += -s -w
> > +.endif
> > +
> > .if ! empty(MODGO_LDFLAGS)
> > MODGO_BUILD_CMD += -ldflags="${MODGO_LDFLAGS}"
> > MODGO_LIST_CMD += -ldflags="${MODGO_LDFLAGS}"
> > @@ -111,10 +116,7 @@ CATEGORIES += lang/go
> > MODGO_BUILD_TARGET = ${MODGO_BUILD_CMD} ${ALL_TARGET}
> > MODGO_FLAGS += -v -buildvcs=false -p=${MAKE_JOBS}
> > -.if empty(DEBUG)
> > -# by default omit symbol table, debug information and DWARF symbol table
> > -MODGO_LDFLAGS += -s -w
> > -.else
> > +.if ! empty(DEBUG)
> > MODGO_FLAGS += -x
> > .endif
> >
>
Re: Go default LDFLAGS behavior
On 2024/02/27 17:53, Igor Zornik wrote:
> Hello,
>
> How are default LDFLAGS for Go ports applied considering they are set
> after they're included into the build command? I don't see those options
> in the output when running make and the resulting binary is in its
> standard size. However when I relocate the flag settings into the upper
> part of the script as in the provided diff, it works as expected and I
> get greeted with a shrunk binary. I think the default settings are
> skipped on the official build server too, because Go binaries on mirrors
> are similarly large.
>
> Could anyone clue me in if this behavior is still correct and I'm just
> misunderstanding something?
I think your diff is correct.
In ports we're fairly used to being able to add to variables at various
points in the Makefile and have them still take effect because they're
often not referenced until bsd.port.mk or bsd.port.arch.mk is included,
but obviously that's not the case here, so I think this was a bug
introduced when MODGO_LDFLAGS was introduced and -s -w was split
off from MODGO_FLAGS.
Unless there are objections I'll commit it, with a _MODGO_SYSTEM_VERSION
bump to make sure that users get updated to new package versions when
they use pkg_add -u (to avoid bumping REVISION separately in all go
ports).
> Index: go.port.mk
> ===
> RCS file: /cvs/ports/lang/go/go.port.mk,v
> retrieving revision 1.66
> diff -u -p -r1.66 go.port.mk
> --- go.port.mk21 Feb 2024 12:28:57 - 1.66
> +++ go.port.mk27 Feb 2024 15:23:27 -
> @@ -58,6 +58,11 @@ MODGO_LIST_CMD = ${MODGO_CMD} list ${MOD
> MODGO_TEST_CMD = ${MODGO_CMD} test ${MODGO_FLAGS} ${MODGO_TEST_FLAGS}
> MODGO_BINDIR ?= bin
> +.if empty(DEBUG)
> +# by default omit symbol table, debug information and DWARF symbol table
> +MODGO_LDFLAGS += -s -w
> +.endif
> +
> .if ! empty(MODGO_LDFLAGS)
> MODGO_BUILD_CMD += -ldflags="${MODGO_LDFLAGS}"
> MODGO_LIST_CMD +=-ldflags="${MODGO_LDFLAGS}"
> @@ -111,10 +116,7 @@ CATEGORIES +=lang/go
> MODGO_BUILD_TARGET = ${MODGO_BUILD_CMD} ${ALL_TARGET}
> MODGO_FLAGS += -v -buildvcs=false -p=${MAKE_JOBS}
> -.if empty(DEBUG)
> -# by default omit symbol table, debug information and DWARF symbol table
> -MODGO_LDFLAGS += -s -w
> -.else
> +.if ! empty(DEBUG)
> MODGO_FLAGS += -x
> .endif
>
