fs2open update to 23.2.1
Hi,
This diff updates fs2open to the latest version 23.2.1. Using
DIST_TUPLE now simplifies the submodule handling quite a bit. I
enabled vulkan again because it builds with it, though I only get a
test image with a multi-colored triangle when trying to run the game
with '-vulkan'. The vendored libhidapi needs a dependency on libusb1
which is added now. I also found that the vendored imgui tries to
dlopen(3) libGL.so.1 which fails, so patch this to drop the version
suffix.
Tested with a brief play session and planning to commit the update soon
if no issues are raised.
Index: Makefile
===
RCS file: /cvs/ports/games/fs2open/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile26 Sep 2023 17:58:07 - 1.19
+++ Makefile14 Jan 2024 04:52:16 -
@@ -3,11 +3,8 @@ ONLY_FOR_ARCHS = aarch64 amd64 i386
COMMENT = open source game engine based on FreeSpace 2
-V =23.0.0
-DISTNAME = fs2open-${V}
-GH_ACCOUNT = scp-fs2open
-GH_PROJECT = fs2open.github.com
-GH_TAGNAME = release_${V:S/./_/g}
+V =23.2.1
+PKGNAME = fs2open-${V}
CATEGORIES = games
@@ -17,21 +14,18 @@ MAINTAINER =Thomas Frohwein https://github.com/asarium/cmake-modules/archive/
-SITES.b = https://github.com/asarium/libRocket/archive/
-
-DISTFILES.a = ${RPAVLIK_CMAKE_MOD}.tar.gz
-DISTFILES.b = ${LIBROCKET}.tar.gz
-
-DIST_SUBDIR = fs2open-${V}
+DIST_TUPLE += github scp-fs2open fs2open.github.com release_${V:S/./_/g} .
+DIST_TUPLE += github asarium cmake-modules \
+ 7cef9577d6fc35057ea57f46b4986a8a28aeff50 \
+ cmake/external/rpavlik-cmake-modules # Boost License 1.0
+DIST_TUPLE += github asarium libRocket \
+ ecd648a43aff8a9f3daf064d75ca5725237d5b38 \
+ lib/libRocket # MIT
# c++11
COMPILER = base-clang ports-gcc
@@ -39,6 +33,7 @@ MODULES = devel/cmake \
lang/lua
LIB_DEPENDS = audio/openal \
devel/jansson \
+ devel/libusb1 \
devel/sdl2 \
graphics/ffmpeg \
graphics/png \
@@ -47,25 +42,18 @@ LIB_DEPENDS = audio/openal \
CXXFLAGS +=-I${X11BASE}/include -I${LOCALBASE}/include
MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
-# Disable Vulkan because of build failure, since upgrade to 1.3.224.1:
-# code/graphics/vulkan/VulkanRenderer.cpp:794:21: error: no viable overloaded
'='
-# m_graphicsPipeline = m_device->createGraphicsPipelineUnique(nullptr,
pipelineInfo);
CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=${LOCALBASE}/share/fs2open \
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=On \
- -DFSO_BUILD_WITH_VULKAN=Off
+ -DFSO_BUILD_WITH_VULKAN=On
# currently not building; would be ${WRKBUILD}/bin/unittests
NO_TEST = Yes
+WRKDIST = ${WRKDIR}/fs2open.github.com-release_${V:S/./_/g}
+
# remove bundled SDL
post-extract:
rm -rf ${WRKSRC}/lib/libsdl
- rmdir ${WRKSRC}/cmake/external/rpavlik-cmake-modules
- ln -s ${WRKDIR}/cmake-modules-${RPAVLIK_CMAKE_MOD} \
- ${WRKSRC}/cmake/external/rpavlik-cmake-modules
- rmdir ${WRKSRC}/lib/libRocket
- ln -s ${WRKDIR}/libRocket-${LIBROCKET} \
- ${WRKSRC}/lib/libRocket
do-gen:
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
Index: distinfo
===
RCS file: /cvs/ports/games/fs2open/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo22 Feb 2023 06:51:24 - 1.7
+++ distinfo14 Jan 2024 04:52:16 -
@@ -1,6 +1,6 @@
-SHA256 (fs2open-23.0.0/7cef9577d6fc35057ea57f46b4986a8a28aeff50.tar.gz) =
e2kS2gGlbuyljBP4u7B7YSCvjwRyIxZ0fcgTKo7GWso=
-SHA256 (fs2open-23.0.0/ecd648a43aff8a9f3daf064d75ca5725237d5b38.tar.gz) =
JcjDM2xciQqxzt/90Z17tubwjVy+HASUyiAs+5h/Tfc=
-SHA256 (fs2open-23.0.0/fs2open-23.0.0.tar.gz) =
AZok/u73pI+BcPAznFUwEisya9iPtz6ddRW/6eU4Gqg=
-SIZE (fs2open-23.0.0/7cef9577d6fc35057ea57f46b4986a8a28aeff50.tar.gz) = 267464
-SIZE (fs2open-23.0.0/ecd648a43aff8a9f3daf064d75ca5725237d5b38.tar.gz) = 2417905
-SIZE (fs2open-23.0.0/fs2open-23.0.0.tar.gz) = 12210430
+SHA256 (asarium-cmake-modules-7cef9577d6fc35057ea57f46b4986a8a28aeff50.tar.gz)
= e2kS2gGlbuyljBP4u7B7YSCvjwRyIxZ0fcgTKo7GWso=
+SHA256 (asarium-libRocket-ecd648a43aff8a9f3daf064d75ca5725237d5b38.tar.gz) =
JcjDM2xciQqxzt/90Z17tubwjVy+HASUyiAs+5h/Tfc=
+SHA256 (scp-fs2open-fs2open.github.com-release_23_2_1.tar.gz) =
kOF0mdyZk3DmQV+1a0a3VbA7GH8DAUz4qYOjnTrd4Bs=
+SIZE (asarium-cmake-modules-7cef9577d6fc35057ea57f46b4986a8a28aeff50.tar.gz) =
267464
+SIZE (asarium-libRocket-ecd648a43aff8a9f3daf064d75ca5725237d5b38.tar.gz) =
2417905
+SIZE (scp-fs2open-fs2open
net/syncthing: update to 1.27.2
Bugfixes:
• #9041: cli subcommand does not use STHOMEDIR env var
• #9183: Filesystem watching (kqueue) is enabled … with a lot of files
• #9274: Missing lock in DeviceStatistics ("fatal error: concurrent map read
and map write")
Enhancements:
• #7406: Add UPnP support for IPv6
Other issues:
• #9247: Embed binary releases signing key as a file instead of hardcoding a
string
• #9287: quic-go v0.40.1 (CVE-2023-49295)
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/net/syncthing/Makefile,v
diff -u -p -r1.59 Makefile
--- Makefile31 Dec 2023 14:26:22 - 1.59
+++ Makefile13 Jan 2024 16:51:36 -
@@ -1,6 +1,6 @@
COMMENT = open decentralized synchronization utility
-V =1.27.1
+V =1.27.2
DISTNAME = syncthing-${V}
DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /cvs/ports/net/syncthing/distinfo,v
diff -u -p -r1.39 distinfo
--- distinfo31 Dec 2023 14:26:22 - 1.39
+++ distinfo13 Jan 2024 16:51:42 -
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v1.27.1.tar.gz) =
XHsEVuUMii5Ml2dyfEE5VYupVXOidic6FzCpA+CnODQ=
-SIZE (syncthing-source-v1.27.1.tar.gz) = 14964498
+SHA256 (syncthing-source-v1.27.2.tar.gz) =
KmIWVeCf3OileE6g9lxel3O4RK2WZoaRbmhGjL1EgTw=
+SIZE (syncthing-source-v1.27.2.tar.gz) = 14967954
Re: games/tome4: update to 1.7.6 (still SIGILL)
On Sat, Sep 02, 2023 at 09:11:55PM +0200, Solene Rapenne wrote:
> Le samedi 02 septembre 2023 à 17:52 +, Klemens Nanni a écrit :
> > Both packages 1.7.4 and new 1.7.6 fail the same way on my T14 gen3
> > Intel:
> >
> > WebCore config: library(/usr/local/share/libte4-web.so)
> > spawn(/usr/local/share/cef3spawn)
> > Loading WebCore: Failed loading /usr/local/share/libte4-web.so: File
> > not found
> > [CPU] Detected 12 CPUs
> > OpenAL device available: OpenAL Soft (default OpenAL Soft)
> > Available video driver: x11
> > Available video driver: KMSDRM
> > Available video driver: offscreen
> > Available video driver: dummy
> > Illegal instruction (core dumped)
> >
> > #0 0x0593bb884587 in ?? ()
> > [Current thread is 1 (process 336493)]
> > #0 0x0593bb884587 in ?? ()
> > #1 0x0593bb841765 in ?? ()
> > #2 0x0593bb7d1d75 in ?? ()
> > #3 0x0593bb7d2681 in ?? ()
> > #4 0x0593bb74ee72 in ?? ()
> > #5 0x in ?? ()
> >
> >
> > It used to work on my X230 just fine (although long ago),
> > pretty sure it did start on the T14 at some point.
> >
> > Anyone else being able to run this game on their machine?
> >
> isn't this an IBT issue? I tried a month ago and it "worked" if running
> in window mode (there is a white screen issue too)
Yes, thfr "fixed" this.
Same update rebased, starts for me.
OK?
Index: Makefile
===
RCS file: /cvs/ports/games/tome4/Makefile,v
diff -u -p -r1.31 Makefile
--- Makefile13 Jan 2024 02:48:53 - 1.31
+++ Makefile14 Jan 2024 01:35:11 -
@@ -9,10 +9,9 @@ USE_NOBTCFI = Yes
COMMENT-main = graphical sdl rogue-like game
COMMENT-data = data for Tales of Maj'Eyal
-V =1.7.4
+V =1.7.6
PKGNAME = tome4-${V}
CATEGORIES = games x11
-REVISION = 1
SITES =https://te4.org/dl/t-engine/
Index: distinfo
===
RCS file: /cvs/ports/games/tome4/distinfo,v
diff -u -p -r1.12 distinfo
--- distinfo29 Jun 2021 06:45:08 - 1.12
+++ distinfo14 Jan 2024 01:35:20 -
@@ -1,2 +1,2 @@
-SHA256 (t-engine4-src-1.7.4.tar.bz2) =
w1NPM/SMnPAnAl6z9E6Xsj3mEqZtXzFe1IMPmlKr8qQ=
-SIZE (t-engine4-src-1.7.4.tar.bz2) = 486263402
+SHA256 (t-engine4-src-1.7.6.tar.bz2) =
mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw=
+SIZE (t-engine4-src-1.7.6.tar.bz2) = 500085010
Re: graphics/png: update to 1.6.40
Klemens Nanni: > >From june 2023: > http://www.libpng.org/pub/png/src/libpng-1.6.40-README.txt ok naddy@ -- Christian "naddy" Weisgerber na...@mips.inka.de
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Thu Jan 11 05:28:26 MST 2024 finished at Sat Jan 13 16:50:53 MST 2024 lasted 2D11h22m done with kern.version=OpenBSD 7.4-current (GENERIC.MP) #40: Wed Jan 10 02:01:40 MST 2024 built packages:12151 Jan 11:4327 Jan 12:1172 Jan 13:6651 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2024-01-11/summary.log build failures: 2 http://build-failures.rhaalovely.net/aarch64/2024-01-11/lang/ruby/3.3.log http://build-failures.rhaalovely.net/aarch64/2024-01-11/sysutils/ugrep.log recurrent failures failures/lang/ruby/3.3.log new failures +++ ls-failures Sat Jan 13 16:51:05 2024 +failures/sysutils/ugrep.log resolved failures --- ../old/aarch64/last//ls-failuresSun Jan 7 21:30:12 2024 -failures/games/godot4,-editor.log -failures/lang/v.log -failures/x11/gnustep/base.log
UPDATE: doxygen to 1.10.0
Update diff doxygen and doxygen-gui to 1.10.0. I tested alle consumers
and the diff includes those that needs a bump.
This diff does not include the libgphoto2 changes but it re-adds a
lost[1] patch (patches/patch-src_dirdef_cpp) which I deleted a long time
ago with an update. I don't think it will do any good in the ports tree
but never mind.
Objections? Ok?
Rafael
1:
https://cvsweb.openbsd.org/ports/devel/doxygen/patches/Attic/patch-src_dirdef_cpp
Index: devel/doxygen/Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
diff -u -p -r1.66 Makefile
--- devel/doxygen/Makefile 21 Sep 2023 09:49:52 - 1.66
+++ devel/doxygen/Makefile 13 Jan 2024 20:42:48 -
@@ -5,7 +5,7 @@ BROKEN-alpha= .got subsegment exceeds 64
COMMENT= source code documentation generator tool
-VERSION= 1.9.8
+VERSION= 1.10.0
DISTNAME= doxygen-${VERSION}.src
PKGNAME= doxygen-${VERSION}
@@ -23,31 +23,31 @@ WANTLIB += ${COMPILER_LIBCXX} c iconv m
COMPILER = base-clang ports-gcc base-gcc
SITES= https://doxygen.nl/files/
-TAR = ${LOCALBASE}/bin/gtar
-
-BUILD_DEPENDS = archivers/gtar
-
-LIB_DEPENDS= converters/libiconv \
- databases/xapian-core
MODULES= devel/cmake \
lang/python
MODPY_RUNDEP= No
-.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
-CXXFLAGS+= -mxgot
-.endif
+LIB_DEPENDS= converters/libiconv \
+ databases/xapian-core
+
-BUILD_DEPENDS+=devel/bison \
+BUILD_DEPENDS= devel/bison \
devel/git
-RUN_DEPENDS+= print/ghostscript/gnu \
+RUN_DEPENDS= print/ghostscript/gnu \
math/graphviz
-CONFIGURE_ARGS+=-Dbuild_doc=ON \
- -Dbuild_app=ON \
- -Dbuild_search=ON
+CONFIGURE_ARGS=-Dbuild_doc=ON \
+ -Dbuild_app=ON \
+ -Dbuild_search=ON
+
+CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Javacc=ON
+
+.if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
+CXXFLAGS+= -mxgot
+.endif
WRKDIST= ${WRKDIR}/doxygen-${VERSION}
Index: devel/doxygen/distinfo
===
RCS file: /cvs/ports/devel/doxygen/distinfo,v
diff -u -p -r1.25 distinfo
--- devel/doxygen/distinfo 30 Aug 2023 13:51:05 - 1.25
+++ devel/doxygen/distinfo 13 Jan 2024 20:42:48 -
@@ -1,2 +1,2 @@
-SHA256 (doxygen-1.9.8.src.tar.gz) =
BePSKOg4S186+cj9YkbSKASstzGjokzihciYbtfhT2I=
-SIZE (doxygen-1.9.8.src.tar.gz) = 8087770
+SHA256 (doxygen-1.10.0.src.tar.gz) =
3XxVa02Wyl5oJTS8Hxp4pc+rzgxCWxTBuFSYAmhqREI=
+SIZE (doxygen-1.10.0.src.tar.gz) = 8400410
Index: devel/doxygen/patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
diff -u -p -r1.14 patch-doc_CMakeLists_txt
--- devel/doxygen/patches/patch-doc_CMakeLists_txt 30 Aug 2023 13:51:05
- 1.14
+++ devel/doxygen/patches/patch-doc_CMakeLists_txt 13 Jan 2024 20:42:48
-
@@ -14,25 +14,26 @@ Index: doc/CMakeLists.txt
include(GNUInstallDirs)
if (doxygen_BINARY_DIR)
-@@ -160,9 +157,6 @@ endforeach()
+@@ -157,9 +154,6 @@ endforeach()
configure_file(${PROJECT_SOURCE_DIR}/doc/manual.sty
${PROJECT_BINARY_DIR}/doc/manual.sty COPYONLY)
configure_file(${PROJECT_SOURCE_DIR}/doc/doxygen_manual.tex
${PROJECT_BINARY_DIR}/doc/doxygen_manual.tex COPYONLY)
configure_file(${PROJECT_SOURCE_DIR}/doc/doxygen.1
${PROJECT_BINARY_DIR}/man/doxygen.1)
-configure_file(${PROJECT_SOURCE_DIR}/doc/doxywizard.1
${PROJECT_BINARY_DIR}/man/doxywizard.1)
-configure_file(${PROJECT_SOURCE_DIR}/doc/doxysearch.1
${PROJECT_BINARY_DIR}/man/doxysearch.1)
-configure_file(${PROJECT_SOURCE_DIR}/doc/doxyindexer.1
${PROJECT_BINARY_DIR}/man/doxyindexer.1)
+ configure_file(${PROJECT_SOURCE_DIR}/templates/icon/doxygen.ico
${PROJECT_BINARY_DIR}/doc/doxygen.ico COPYONLY)
# Call the main page "Introduction" in LaTeX, which is more appropriate for
that format.
- set(MAINPAGE_TITLE Doxygen)
-@@ -188,42 +182,7 @@ add_custom_command(
+@@ -185,43 +179,7 @@ add_custom_command(
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/
)
- set_source_files_properties(config.doc PROPERTIES GENERATED 1)
-
+ set_source_files_properties(config.dox PROPERTIES GENERATED 1)
+-
-add_custom_target(run_doxygen
-COMMENT "Generating Latex and HTML documentation."
--COMMAND ${CMAKE_COMMAND} -E env VERSION=${VERSION}
INDEX_DOC=index_html.doc GENERATE_HTML=YES GENERATE_LATEX=NO
${DOXYGEN_EXECUTABLE}
--COMMAND ${CMAKE_COMMAND} -E env VERSION=${VERSION}
INDEX_DOC=inde
Remove doxygen from libgphoto-2.5.31
The upcoming doxygen update 1.10.0 fails to generate docs in libgphoto2.
Doxygen is just pain in libgphoto. The following diff stops using
doxygen in libgphoto2.
OK?
Cheers Rafael
Index: Makefile
===
RCS file: /cvs/ports/graphics/libgphoto2/Makefile,v
diff -u -p -u -p -r1.85 Makefile
--- Makefile26 Sep 2023 11:39:07 - 1.85
+++ Makefile13 Jan 2024 20:18:33 -
@@ -3,7 +3,7 @@ COMMENT=digital camera library
VERSION= 2.5.31
DISTNAME= libgphoto2-${VERSION}
PKGNAME= libgphoto-${VERSION}
-REVISION= 0
+REVISION= 1
GPHOTO2_PORT_API= 0.12.2
SUBST_VARS=GPHOTO2_PORT_API VERSION
@@ -27,8 +27,6 @@ WANTLIB += usb usb-1.0 webp xml2 z zstd
SITES= ${SITE_SOURCEFORGE:=gphoto/}
-BUILD_DEPENDS= devel/doxygen
-
LIB_DEPENDS= graphics/gd \
graphics/libexif \
devel/libusb-compat \
@@ -39,7 +37,9 @@ LIB_DEPENDS= graphics/gd \
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- ac_cv_path_DOXYGEN=false
+ DOXYGEN=no \
+ ac_cv_path_DOXYGEN=false \
+ ac_cv_path_DOT=false
CONFIGURE_ARGS=--enable-static \
--without-hal \
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/libgphoto2/pkg/PLIST,v
diff -u -p -u -p -r1.35 PLIST
--- pkg/PLIST 2 Sep 2023 13:31:15 - 1.35
+++ pkg/PLIST 13 Jan 2024 20:18:33 -
@@ -63,7 +63,6 @@ share/doc/libgphoto2/AUTHORS
share/doc/libgphoto2/COPYING
share/doc/libgphoto2/ChangeLog
share/doc/libgphoto2/NEWS
-share/doc/libgphoto2/README.apidocs
share/doc/libgphoto2/README.md
share/doc/libgphoto2/README.packaging
share/doc/libgphoto2/RELEASE-HOWTO.md
@@ -111,569 +110,6 @@ share/doc/libgphoto2/camlibs/README.st22
share/doc/libgphoto2/camlibs/README.st2205-compression
share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
share/doc/libgphoto2/camlibs/README.tp6801
-share/doc/libgphoto2/libgphoto2-api.html/
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c.html
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c.js
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/ahd__bayer_8c__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/annotated.html
-share/doc/libgphoto2/libgphoto2-api.html/annotated_dup.js
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h.html
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h.js
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h__dep__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/bayer-types_8h_source.html
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c.html
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c.js
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8c__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h.html
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h.js
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__dep__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__dep__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__dep__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__incl.map
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__incl.md5
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h__incl.png
-share/doc/libgphoto2/libgphoto2-api.html/bayer_8h_source.html
-share/doc/libgphoto2/libgphoto2-api.html/bc_s.png
-share/doc/libgphoto2/libgphoto2-api.html/bc_sd.png
-share/doc/libgphoto2/libgphoto2-api.html/classes.html
-share/doc/libgphoto2/libgphoto2-api.html/closed.png
-share/doc/libgphoto2/libgphoto2-api.html/compiletime-assert_8h.html
-share/doc/libgphoto2/libgphoto2-api.html/compiletime-assert_8h.js
-share/doc/libgphoto2/libgphoto2-api.html/compiletime-assert_8h_source.html
-share/doc/libgphoto2/libgphoto2-api.html/deprecated.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_01_04.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_03_01.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_03_04.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_05_02.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_06_01.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_06_03.html
-share/doc/libgphoto2/libgphoto2-api.html/dir_0fd050eb813c55dff11104457b8b7bf9.html
-share/doc/lib
Re: UPDATE: net/tailscale
On 1/12/24 08:16, Theo Buehler wrote: Hi! Similar diff here. Could you sort this @comments thing out and land this please? This is the only port in -current that doesn't build with go-1.22rc1. The update will fix this. Updated.
Re: tweak pkg_* footgun messages
On 2024-01-13 18:16 +01, Peter Hessler wrote:
> This change doesn't make a difference. End-Users aren't going to care
> about the difference between "should" and "may". They're just going to
> run it regardless.
I don't think so. People don't read, we know this.
RFC 6919 seems relevant though:
6. MAY WISH TO
The phrase "MAY WISH TO" indicates a behavior that might seem
appealing to some people, but which is regarded as ridiculous or
unnecessary by others.
>
> The problem is that they are being printed during upgrades, when the
> messages are only useful when the package is removed.
>
>
>
> On 2024 Jan 13 (Sat) at 17:06:18 + (+), Klemens Nanni wrote:
> : syncthing-1.27.1->1.27.2: ok
> : Read shared items: ok
> : --- -syncthing-1.27.1 ---
> : You should also run rm -rf /var/syncthing/{.,}*
> :
> :I shall certainly not wipe that directory...
> :
> :Apparently fixing this for good is more involved, but rewording is easy,
> :so perhaps this reads better?
> :
> : You may also run rm -rf /var/syncthing/{.,}*
> :
> :It's not great, but relaxing 'must' into 'may' feels more appropiate.
> :
> :Thoughts?
> :
> :Index: OpenBSD/Delete.pm
> :===
> :RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/Delete.pm,v
> :diff -u -p -r1.169 Delete.pm
> :--- OpenBSD/Delete.pm11 Oct 2023 13:54:43 - 1.169
> :+++ OpenBSD/Delete.pm13 Jan 2024 16:57:26 -
> :@@ -527,7 +527,7 @@ sub delete($self, $state)
> : if ($state->{quick} && $state->{quick} >= 2) {
> : unless ($state->{extra}) {
> : $self->mark_dir($state);
> :-$state->log("You should also #1 #2", $action, $realname
> );
> :+$state->log("You may also #1 #2", $action, $realname );
> : return;
> : }
> : } else {
> :@@ -537,7 +537,7 @@ sub delete($self, $state)
> : } else {
> : unless ($state->{extra}) {
> : $self->mark_dir($state);
> :-$state->log("You should also #1 #2 (which was
> modified)", $action, $realname);
> :+$state->log("You may also #1 #2 (which was
> modified)", $action, $realname);
> : return;
> : }
> : }
> :@@ -607,7 +607,7 @@ sub delete($self, $state)
> : unlink($realname) or
> : $state->say("problem deleting extra file #1: #2",
> $realname, $!);
> : } else {
> :-$state->log("You should also remove #1", $realname);
> :+$state->log("You may also remove #1", $realname);
> : $self->mark_dir($state);
> : }
> : }
> :@@ -622,7 +622,7 @@ sub delete($self, $state)
> : if ($state->{extra}) {
> : $self->SUPER::delete($state);
> : } else {
> :-$state->log("You should also remove the directory #1",
> $realname);
> :+$state->log("You may also remove the directory #1", $realname);
> : $self->mark_dir($state);
> : }
> : }
> :@@ -634,7 +634,7 @@ sub delete($self, $state)
> : if ($state->{extra}) {
> : $self->run($state);
> : } else {
> :-$state->log("You should also run #1", $self->{expanded});
> :+$state->log("You may also run #1", $self->{expanded});
> : }
> : }
> :
> :Index: OpenBSD/SharedItems.pm
> :===
> :RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/SharedItems.pm,v
> :diff -u -p -r1.34 SharedItems.pm
> :--- OpenBSD/SharedItems.pm 13 Jun 2023 09:07:17 - 1.34
> :+++ OpenBSD/SharedItems.pm 13 Jan 2024 16:58:03 -
> :@@ -110,7 +110,7 @@ sub cleanup($recorder, $state)
> : $user);
> : } else {
> : $state->log->set_context('-'.$pkgname);
> :-$state->log("You should also run /usr/sbin/userdel #1",
> $user);
> :+$state->log("You may also run /usr/sbin/userdel #1",
> $user);
> : }
> : $done++;
> : }
> :@@ -122,7 +122,7 @@ sub cleanup($recorder, $state)
> : $group);
> : } else {
> : $state->log->set_context('-'.$pkgname);
> :-$state->log("You should also run /usr/sbin/groupdel
> #1", $group);
> :+$state->log("You may also run /usr/sbin/groupdel #1",
> $group);
> : }
> : $done++;
> : }
> :
>
> --
> At no time is freedom of speech more precious than when a man hits his
> thumb with a hammer.
> -- Marshall Lumsden
>
--
In my defence, I have been left unsupervised.
Re: tweak pkg_* footgun messages
This change doesn't make a difference. End-Users aren't going to care
about the difference between "should" and "may". They're just going to
run it regardless.
The problem is that they are being printed during upgrades, when the
messages are only useful when the package is removed.
On 2024 Jan 13 (Sat) at 17:06:18 + (+), Klemens Nanni wrote:
: syncthing-1.27.1->1.27.2: ok
: Read shared items: ok
: --- -syncthing-1.27.1 ---
: You should also run rm -rf /var/syncthing/{.,}*
:
:I shall certainly not wipe that directory...
:
:Apparently fixing this for good is more involved, but rewording is easy,
:so perhaps this reads better?
:
: You may also run rm -rf /var/syncthing/{.,}*
:
:It's not great, but relaxing 'must' into 'may' feels more appropiate.
:
:Thoughts?
:
:Index: OpenBSD/Delete.pm
:===
:RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/Delete.pm,v
:diff -u -p -r1.169 Delete.pm
:--- OpenBSD/Delete.pm 11 Oct 2023 13:54:43 - 1.169
:+++ OpenBSD/Delete.pm 13 Jan 2024 16:57:26 -
:@@ -527,7 +527,7 @@ sub delete($self, $state)
: if ($state->{quick} && $state->{quick} >= 2) {
: unless ($state->{extra}) {
: $self->mark_dir($state);
:- $state->log("You should also #1 #2", $action, $realname
);
:+ $state->log("You may also #1 #2", $action, $realname );
: return;
: }
: } else {
:@@ -537,7 +537,7 @@ sub delete($self, $state)
: } else {
: unless ($state->{extra}) {
: $self->mark_dir($state);
:- $state->log("You should also #1 #2 (which was
modified)", $action, $realname);
:+ $state->log("You may also #1 #2 (which was
modified)", $action, $realname);
: return;
: }
: }
:@@ -607,7 +607,7 @@ sub delete($self, $state)
: unlink($realname) or
: $state->say("problem deleting extra file #1: #2",
$realname, $!);
: } else {
:- $state->log("You should also remove #1", $realname);
:+ $state->log("You may also remove #1", $realname);
: $self->mark_dir($state);
: }
: }
:@@ -622,7 +622,7 @@ sub delete($self, $state)
: if ($state->{extra}) {
: $self->SUPER::delete($state);
: } else {
:- $state->log("You should also remove the directory #1",
$realname);
:+ $state->log("You may also remove the directory #1", $realname);
: $self->mark_dir($state);
: }
: }
:@@ -634,7 +634,7 @@ sub delete($self, $state)
: if ($state->{extra}) {
: $self->run($state);
: } else {
:- $state->log("You should also run #1", $self->{expanded});
:+ $state->log("You may also run #1", $self->{expanded});
: }
: }
:
:Index: OpenBSD/SharedItems.pm
:===
:RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/SharedItems.pm,v
:diff -u -p -r1.34 SharedItems.pm
:--- OpenBSD/SharedItems.pm 13 Jun 2023 09:07:17 - 1.34
:+++ OpenBSD/SharedItems.pm 13 Jan 2024 16:58:03 -
:@@ -110,7 +110,7 @@ sub cleanup($recorder, $state)
: $user);
: } else {
: $state->log->set_context('-'.$pkgname);
:- $state->log("You should also run /usr/sbin/userdel #1",
$user);
:+ $state->log("You may also run /usr/sbin/userdel #1",
$user);
: }
: $done++;
: }
:@@ -122,7 +122,7 @@ sub cleanup($recorder, $state)
: $group);
: } else {
: $state->log->set_context('-'.$pkgname);
:- $state->log("You should also run /usr/sbin/groupdel
#1", $group);
:+ $state->log("You may also run /usr/sbin/groupdel #1",
$group);
: }
: $done++;
: }
:
--
At no time is freedom of speech more precious than when a man hits his
thumb with a hammer.
-- Marshall Lumsden
tweak pkg_* footgun messages
syncthing-1.27.1->1.27.2: ok
Read shared items: ok
--- -syncthing-1.27.1 ---
You should also run rm -rf /var/syncthing/{.,}*
I shall certainly not wipe that directory...
Apparently fixing this for good is more involved, but rewording is easy,
so perhaps this reads better?
You may also run rm -rf /var/syncthing/{.,}*
It's not great, but relaxing 'must' into 'may' feels more appropiate.
Thoughts?
Index: OpenBSD/Delete.pm
===
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/Delete.pm,v
diff -u -p -r1.169 Delete.pm
--- OpenBSD/Delete.pm 11 Oct 2023 13:54:43 - 1.169
+++ OpenBSD/Delete.pm 13 Jan 2024 16:57:26 -
@@ -527,7 +527,7 @@ sub delete($self, $state)
if ($state->{quick} && $state->{quick} >= 2) {
unless ($state->{extra}) {
$self->mark_dir($state);
- $state->log("You should also #1 #2", $action, $realname
);
+ $state->log("You may also #1 #2", $action, $realname );
return;
}
} else {
@@ -537,7 +537,7 @@ sub delete($self, $state)
} else {
unless ($state->{extra}) {
$self->mark_dir($state);
- $state->log("You should also #1 #2 (which was
modified)", $action, $realname);
+ $state->log("You may also #1 #2 (which was
modified)", $action, $realname);
return;
}
}
@@ -607,7 +607,7 @@ sub delete($self, $state)
unlink($realname) or
$state->say("problem deleting extra file #1: #2",
$realname, $!);
} else {
- $state->log("You should also remove #1", $realname);
+ $state->log("You may also remove #1", $realname);
$self->mark_dir($state);
}
}
@@ -622,7 +622,7 @@ sub delete($self, $state)
if ($state->{extra}) {
$self->SUPER::delete($state);
} else {
- $state->log("You should also remove the directory #1",
$realname);
+ $state->log("You may also remove the directory #1", $realname);
$self->mark_dir($state);
}
}
@@ -634,7 +634,7 @@ sub delete($self, $state)
if ($state->{extra}) {
$self->run($state);
} else {
- $state->log("You should also run #1", $self->{expanded});
+ $state->log("You may also run #1", $self->{expanded});
}
}
Index: OpenBSD/SharedItems.pm
===
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/SharedItems.pm,v
diff -u -p -r1.34 SharedItems.pm
--- OpenBSD/SharedItems.pm 13 Jun 2023 09:07:17 - 1.34
+++ OpenBSD/SharedItems.pm 13 Jan 2024 16:58:03 -
@@ -110,7 +110,7 @@ sub cleanup($recorder, $state)
$user);
} else {
$state->log->set_context('-'.$pkgname);
- $state->log("You should also run /usr/sbin/userdel #1",
$user);
+ $state->log("You may also run /usr/sbin/userdel #1",
$user);
}
$done++;
}
@@ -122,7 +122,7 @@ sub cleanup($recorder, $state)
$group);
} else {
$state->log->set_context('-'.$pkgname);
- $state->log("You should also run /usr/sbin/groupdel
#1", $group);
+ $state->log("You may also run /usr/sbin/groupdel #1",
$group);
}
$done++;
}
[update] net/i2pd-2.50.2
Hello, Here's a very simple patch updating net/i2pd to the latest release (2.50.2). This version brings small bugfixes: https://github.com/PurpleI2P/i2pd/compare/2.50.0...2.50.2 Tested on amd64 since a few days, no problem. Best regards.Index: Makefile === RCS file: /cvs/ports/net/i2pd/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile 20 Dec 2023 22:19:44 - 1.21 +++ Makefile 11 Jan 2024 08:24:51 - @@ -2,7 +2,7 @@ COMMENT = client for the I2P anonymous n GH_ACCOUNT = PurpleI2P GH_PROJECT = i2pd -GH_TAGNAME = 2.50.0 +GH_TAGNAME = 2.50.2 CATEGORIES = net HOMEPAGE = https://i2pd.website Index: distinfo === RCS file: /cvs/ports/net/i2pd/distinfo,v retrieving revision 1.16 diff -u -p -r1.16 distinfo --- distinfo 20 Dec 2023 22:19:44 - 1.16 +++ distinfo 11 Jan 2024 08:24:51 - @@ -1,2 +1,2 @@ -SHA256 (i2pd-2.50.0.tar.gz) = Z8i6XqA7Cf4qhYIPbVswJa1sQwHLyj+kTArM++XH3vc= -SIZE (i2pd-2.50.0.tar.gz) = 660300 +SHA256 (i2pd-2.50.2.tar.gz) = ri7Ecyw4/acbS0jOg2JN2LLgUIPyyUoD0gyvthb2PKU= +SIZE (i2pd-2.50.2.tar.gz) = 663010
Re: NEW: x11/kde-plasma/kpipewire
On Sat Jan 13, 2024 at 02:15:40AM +, Klemens Nanni wrote:
> On Wed, Dec 27, 2023 at 04:55:02PM +0100, Rafael Sadowski wrote:
> > On Wed Dec 27, 2023 at 02:42:20PM +0100, Rafael Sadowski wrote:
> > > Please find attached kpipewire-5.27.10. I have not been able to test it.
> > > I also have no idea how far we are with pipewire. I need it to update
> > > krfb and spectacle. (New dependency since KDE Gear 23.08.x)
> > >
> >
> > and here the mentioned kde ports:
>
> So krfb already uses -DDISABLE_PIPEWIRE=ON and the new version keeps
> building without it. Looks like the r1.15 VERSION pin could have been
> avoided by doing the r1.21 configure switch right away?
>
> If you pull FreeBSD's patch to disable it in spectactle as well, there
> is no need for a new KPipeWire port.
>
> No idea which way is better, just laying out an alternative here.
Thanks for digging so deep. I prefer the KDE build way without patching
it out if there is no impact at run-time.
>
> Both disabled or enabled after import,
> OK kn
>
> > @@ -40,12 +38,12 @@ LIB_DEPENDS = devel/kf5/kauth \
> > devel/kf5/kwallet \
> > devel/kf5/kwidgetsaddons \
> > devel/kf5/kxmlgui \
> > + devel/kf5/kwayland \
>
> Not sorted.
>
> > net/libvncserver \
> > devel/libinotify \
> > + x11/kde-plasma/kpipewire \
> > x11/qt5/qtx11extras
> >
> > CXXFLAGS +=-I${LOCALBASE}/include
> > -
> > -CONFIGURE_ARGS = -DDISABLE_PIPEWIRE=ON
> >
> > .include
>
> [...]
>
> > @@ -38,14 +33,15 @@ LIB_DEPENDS = graphics/kimageannotator>=
> > devel/kf5/ki18n \
> > devel/kf5/kio \
> > devel/kf5/kjobwidgets \
> > - devel/kf5/knewstuff \
> > devel/kf5/knotifications \
> > devel/kf5/kservice \
> > devel/kf5/kwidgetsaddons \
> > devel/kf5/kwindowsystem \
> > devel/kf5/kxmlgui \
> > devel/kf5/purpose \
> > - devel/kf5/kwayland \
> > + devel/kf5/kirigami2 \
> > + x11/qt5/qtquickcontrols2 \
> > + x11/kde-plasma/kpipewire \
>
> Not sorted.
>
> > x11/qt5/qtx11extras
> >
> > post-install:
>
Re: NEW: x11/kde-plasma/kpipewire
On Sat Jan 13, 2024 at 02:00:46AM +, Klemens Nanni wrote: > On Wed, Dec 27, 2023 at 02:42:20PM +0100, Rafael Sadowski wrote: > > Please find attached kpipewire-5.27.10. I have not been able to test it. > > I also have no idea how far we are with pipewire. I need it to update > > krfb and spectacle. (New dependency since KDE Gear 23.08.x) > > https://reviews.freebsd.org/D39978 makes PipeWire optional in spectacle, > the approach looks sane, perhaps that is a viable alternative ( upstream)? Yes I'll check it. I tested all consumers for run-time trouble and could not observe anything. > > OTOH, we have multimedia/pipewire and I assume more (KDE) ports will > require it. > > Also, spectacle uses KPipeWire in src/Platforms/VideoPlatformWayland.cpp > and KPipeWire's DESCR is about video, so my initial concern of lacking a > sndio backend seems to be irrelevant here. > > Do you know of other ports beside the two picking up KPipeWire? I check ArchLinux und FreeBSD. I hope I have them all. > > update-plist zaps a bunch of dirs that initial 'make plist' puts there. I have to re-run update-plist after adding dependencies. Thanks > > OK kn Thanks. > > > > > Comment: > > components relating to pipewire use in Plasma > > > > Required by: > > debug-kpipewire-5.27.10 > > > > Description: > > KPipeWire: offers the main components to connect to and render PipeWire > > KPipeWireRecord: using FFmpeg, helps to record a PipeWire video > > stream into a file. > > > > > > Maintainer: Rafael Sadowski > > > > OK to import? >
