summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2024-07-11 01:57:57 +0200
committerJan Beich <jbeich@FreeBSD.org>2024-07-31 11:15:16 +0200
commit4e3e8ff9f67b065c43955cbaaed45d7c9338ee66 (patch)
treeb6ed00c4dcf061022505379efb5a3f32b33a4a8c
parentx11/shotman: update to 0.4.7 (diff)
multimedia/arcan: update to 0.6.3.2
Changes: https://github.com/letoram/arcan/releases/tag/0.6.3.2 Reported by: portscout (cherry picked from commit acf16f09b52c123a5fed8950a88fe9e3acce3d41)
-rw-r--r--graphics/aloadimage/Makefile2
-rw-r--r--graphics/aloadimage/distinfo6
-rw-r--r--multimedia/arcan/Makefile12
-rw-r--r--multimedia/arcan/distinfo6
-rw-r--r--multimedia/arcan/files/patch-CMakeLists.txt16
-rw-r--r--multimedia/arcan/files/patch-a12_net_a12__helper__discover.c26
-rw-r--r--multimedia/arcan/files/patch-a12_net_dir__supp.c18
-rw-r--r--multimedia/arcan/files/patch-engine_arcan_video.c19
-rw-r--r--multimedia/arcan/pkg-plist5
-rw-r--r--sysutils/acfgfs/Makefile2
-rw-r--r--sysutils/acfgfs/distinfo6
-rw-r--r--x11/aclip/Makefile2
-rw-r--r--x11/aclip/distinfo6
-rw-r--r--x11/arcan-trayicon/Makefile2
-rw-r--r--x11/arcan-trayicon/distinfo6
15 files changed, 67 insertions, 67 deletions
diff --git a/graphics/aloadimage/Makefile b/graphics/aloadimage/Makefile
index e977aa7e3910..c2b4ac89b7c2 100644
--- a/graphics/aloadimage/Makefile
+++ b/graphics/aloadimage/Makefile
@@ -1,5 +1,5 @@
PORTNAME= aloadimage
-DISTVERSION= 0.6.3
+DISTVERSION= 0.6.3.2
CATEGORIES= graphics
MAINTAINER= jbeich@FreeBSD.org
diff --git a/graphics/aloadimage/distinfo b/graphics/aloadimage/distinfo
index 013debde0762..b26c9ea40cb4 100644
--- a/graphics/aloadimage/distinfo
+++ b/graphics/aloadimage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702944834
-SHA256 (letoram-arcan-0.6.3_GH0.tar.gz) = c62ab2471d0c402d36749701a713689638866f8f24352a90ac82ec191f27e387
-SIZE (letoram-arcan-0.6.3_GH0.tar.gz) = 12139719
+TIMESTAMP = 1720655877
+SHA256 (letoram-arcan-0.6.3.2_GH0.tar.gz) = 67f1bcec1b2d26e6a2c8e73058e8db084086ca5a21c0120959379da0d589ec1b
+SIZE (letoram-arcan-0.6.3.2_GH0.tar.gz) = 12949808
diff --git a/multimedia/arcan/Makefile b/multimedia/arcan/Makefile
index 0650a2a7a811..4893f69fc256 100644
--- a/multimedia/arcan/Makefile
+++ b/multimedia/arcan/Makefile
@@ -1,6 +1,5 @@
PORTNAME= arcan
-DISTVERSION= 0.6.3
-PORTREVISION= 1
+DISTVERSION= 0.6.3.2
CATEGORIES= multimedia
MAINTAINER= jbeich@FreeBSD.org
@@ -33,12 +32,13 @@ CMAKE_ARGS= -DDISTR_TAG:STRING="portbld" \
LDFLAGS+= -Wl,--as-needed # bzip2, ffmpeg, librt, libutil, lzma, zlib
LDFLAGS_i386= -Wl,-z,notext
-OPTIONS_DEFINE= ESPEAK FFMPEG LUAJIT MANPAGES SDL SUID TESSERACT UVC VLC VNC WAYLAND
-OPTIONS_DEFAULT=ESPEAK FFMPEG LUAJIT MANPAGES SDL SUID TESSERACT UVC VLC VNC WAYLAND
+OPTIONS_DEFINE= ESPEAK FFMPEG HUNSPELL LUAJIT MANPAGES SDL SUID TESSERACT UVC VLC VNC WAYLAND
+OPTIONS_DEFAULT=ESPEAK FFMPEG HUNSPELL LUAJIT MANPAGES SDL SUID TESSERACT UVC VLC VNC WAYLAND
OPTIONS_SUB= yes
ESPEAK_LIB_DEPENDS= libespeak-ng.so:audio/espeak-ng
FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
+HUNSPELL_LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell
MANPAGES_USES= ruby:build
@@ -102,6 +102,10 @@ post-patch-FFMPEG-off:
${WRKSRC}/frameserver/decode/default/CMakeLists.txt \
${WRKSRC}/frameserver/encode/default/CMakeLists.txt
+post-patch-HUNSPELL-off:
+ @${REINPLACE_CMD} -i.nohunspell '/pkg.*HUNSPELL/d' \
+ ${WRKSRC}/frameserver/decode/default/CMakeLists.txt
+
post-patch-TESSERACT-off:
@${REINPLACE_CMD} -i.notesseract '/pkg.*tesseract/d' \
${WRKSRC}/frameserver/encode/default/CMakeLists.txt
diff --git a/multimedia/arcan/distinfo b/multimedia/arcan/distinfo
index 013debde0762..b26c9ea40cb4 100644
--- a/multimedia/arcan/distinfo
+++ b/multimedia/arcan/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702944834
-SHA256 (letoram-arcan-0.6.3_GH0.tar.gz) = c62ab2471d0c402d36749701a713689638866f8f24352a90ac82ec191f27e387
-SIZE (letoram-arcan-0.6.3_GH0.tar.gz) = 12139719
+TIMESTAMP = 1720655877
+SHA256 (letoram-arcan-0.6.3.2_GH0.tar.gz) = 67f1bcec1b2d26e6a2c8e73058e8db084086ca5a21c0120959379da0d589ec1b
+SIZE (letoram-arcan-0.6.3.2_GH0.tar.gz) = 12949808
diff --git a/multimedia/arcan/files/patch-CMakeLists.txt b/multimedia/arcan/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..1a504ecc0b90
--- /dev/null
+++ b/multimedia/arcan/files/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+$ CFLAGS="... -fno-strict-aliasing" cmake . && cmake --build .
+/usr/bin/cc ... -fno-strict-aliasing;-std=gnu11 ...
+cc: error: no input files
+/bin/sh: -std=gnu11: not found
+
+--- CMakeLists.txt.orig 2024-07-10 23:57:57 UTC
++++ CMakeLists.txt
+@@ -257,7 +257,7 @@ endif()
+ -Wno-macro-redefined
+ )
+ endif()
+-list(APPEND CMAKE_C_FLAGS -std=gnu11)
++set(CMAKE_C_STANDARD 11)
+
+ if (CMAKE_BUILD_TYPE STREQUAL "Profile")
+ amsg("${CL_WHT}------------------*Profile Build*------------------${CL_RST}")
diff --git a/multimedia/arcan/files/patch-a12_net_a12__helper__discover.c b/multimedia/arcan/files/patch-a12_net_a12__helper__discover.c
deleted file mode 100644
index f248704a3cc5..000000000000
--- a/multimedia/arcan/files/patch-a12_net_a12__helper__discover.c
+++ /dev/null
@@ -1,26 +0,0 @@
-src/a12/net/a12_helper_discover.c:211:23: error: variable has incomplete type 'struct sockaddr_in'
- struct sockaddr_in caddr;
- ^
-src/a12/net/a12_helper_discover.c:219:15: error: use of undeclared identifier 'INET6_ADDRSTRLEN'
- char name[INET6_ADDRSTRLEN];
- ^
-src/a12/net/a12_helper_discover.c:304:41: error: use of undeclared identifier 'IPPROTO_UDP'
- int sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
- ^
-src/a12/net/a12_helper_discover.c:312:14: warning: implicit declaration of function 'htons' is invalid in C99 [-Wimplicit-function-declaration]
- .s_addr = htons(INADDR_ANY),
- ^
-src/a12/net/a12_helper_discover.c:312:20: error: use of undeclared identifier 'INADDR_ANY'
- .s_addr = htons(INADDR_ANY),
- ^
-
---- a12/net/a12_helper_discover.c.orig 2023-12-19 00:13:54 UTC
-+++ a12/net/a12_helper_discover.c
-@@ -13,6 +13,7 @@
- #include <inttypes.h>
- #include <sys/wait.h>
- #include <sys/types.h>
-+#include <netinet/in.h>
- #include <sys/socket.h>
- #include <pthread.h>
- #include <semaphore.h>
diff --git a/multimedia/arcan/files/patch-a12_net_dir__supp.c b/multimedia/arcan/files/patch-a12_net_dir__supp.c
deleted file mode 100644
index 0dc303c68d60..000000000000
--- a/multimedia/arcan/files/patch-a12_net_dir__supp.c
+++ /dev/null
@@ -1,18 +0,0 @@
-src/a12/net/dir_supp.c:390:43: error: incompatible function pointer types passing 'int (const FTSENT **, const FTSENT **)' (aka 'int (const struct _ftsent **, const struct _ftsent **)') to parameter of type 'int (*)(const FTSENT *const *, const FTSENT *const *)' (aka 'int (*)(const struct _ftsent *const *, const struct _ftsent *const *)') [-Wincompatible-function-pointer-types]
- 390 | if (!(fts = fts_open(path, FTS_PHYSICAL, comp_alpha)))
- | ^~~~~~~~~~
-/usr/include/fts.h:129:12: note: passing argument to parameter here
- 129 | int (*)(const FTSENT * const *, const FTSENT * const *));
- | ^
-
---- a12/net/dir_supp.c.orig 2023-12-19 00:13:54 UTC
-+++ a12/net/dir_supp.c
-@@ -189,7 +189,7 @@ FILE* file_to_membuf(FILE* applin, char** out, size_t*
- return applbuf;
- }
-
--static int comp_alpha(const FTSENT** a, const FTSENT** b)
-+static int comp_alpha(const FTSENT* const* a, const FTSENT* const* b)
- {
- return strcmp((*a)->fts_name, (*b)->fts_name);
- }
diff --git a/multimedia/arcan/files/patch-engine_arcan_video.c b/multimedia/arcan/files/patch-engine_arcan_video.c
new file mode 100644
index 000000000000..5d727448a2b4
--- /dev/null
+++ b/multimedia/arcan/files/patch-engine_arcan_video.c
@@ -0,0 +1,19 @@
+src/engine/arcan_video.c:1502:12: error: conflicting types for 'arcan_video_readtag'
+ 1502 | arcan_errc arcan_video_readtag(arcan_vobj_id id, const char** tag, const char** alt)
+ | ^
+src/engine/arcan_video.h:900:18: note: previous declaration is here
+ 900 | arcan_errc const arcan_video_readtag(
+ | ^
+
+--- engine/arcan_video.c.orig 2024-07-10 23:57:57 UTC
++++ engine/arcan_video.c
+@@ -1499,7 +1499,8 @@ enum arcan_transform_mask arcan_video_getmask(arcan_vo
+ }
+
+
+-arcan_errc arcan_video_readtag(arcan_vobj_id id, const char** tag, const char** alt)
++arcan_errc const arcan_video_readtag(
++ arcan_vobj_id id, const char** tag, const char** alt)
+ {
+ arcan_vobject* vobj = arcan_video_getobject(id);
+ if (!vobj){
diff --git a/multimedia/arcan/pkg-plist b/multimedia/arcan/pkg-plist
index 55c580353bf0..03ff0ffb0f6a 100644
--- a/multimedia/arcan/pkg-plist
+++ b/multimedia/arcan/pkg-plist
@@ -57,6 +57,10 @@ share/man/man1/arcan_db.1.gz
%%MANPAGES%%share/man/man3/attrtag_model.3.gz
%%MANPAGES%%share/man/man3/audio_buffer_size.3.gz
%%MANPAGES%%share/man/man3/audio_gain.3.gz
+%%MANPAGES%%share/man/man3/audio_listener.3.gz
+%%MANPAGES%%share/man/man3/audio_outputs.3.gz
+%%MANPAGES%%share/man/man3/audio_position.3.gz
+%%MANPAGES%%share/man/man3/audio_reconfigure.3.gz
%%MANPAGES%%share/man/man3/benchmark_data.3.gz
%%MANPAGES%%share/man/man3/benchmark_enable.3.gz
%%MANPAGES%%share/man/man3/benchmark_timestamp.3.gz
@@ -270,6 +274,7 @@ share/man/man1/arcan_db.1.gz
%%MANPAGES%%share/man/man3/target_updatehandler.3.gz
%%MANPAGES%%share/man/man3/target_verbose.3.gz
%%MANPAGES%%share/man/man3/text_dimensions.3.gz
+%%MANPAGES%%share/man/man3/text_surface.3.gz
%%MANPAGES%%share/man/man3/toggle_mouse_grab.3.gz
%%MANPAGES%%share/man/man3/transfer_image_transform.3.gz
%%MANPAGES%%share/man/man3/utf8kind.3.gz
diff --git a/sysutils/acfgfs/Makefile b/sysutils/acfgfs/Makefile
index ff2c89b2799e..58f46a0bbb79 100644
--- a/sysutils/acfgfs/Makefile
+++ b/sysutils/acfgfs/Makefile
@@ -1,5 +1,5 @@
PORTNAME= acfgfs
-DISTVERSION= 0.6.3
+DISTVERSION= 0.6.3.2
CATEGORIES= sysutils
MAINTAINER= jbeich@FreeBSD.org
diff --git a/sysutils/acfgfs/distinfo b/sysutils/acfgfs/distinfo
index 013debde0762..b26c9ea40cb4 100644
--- a/sysutils/acfgfs/distinfo
+++ b/sysutils/acfgfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702944834
-SHA256 (letoram-arcan-0.6.3_GH0.tar.gz) = c62ab2471d0c402d36749701a713689638866f8f24352a90ac82ec191f27e387
-SIZE (letoram-arcan-0.6.3_GH0.tar.gz) = 12139719
+TIMESTAMP = 1720655877
+SHA256 (letoram-arcan-0.6.3.2_GH0.tar.gz) = 67f1bcec1b2d26e6a2c8e73058e8db084086ca5a21c0120959379da0d589ec1b
+SIZE (letoram-arcan-0.6.3.2_GH0.tar.gz) = 12949808
diff --git a/x11/aclip/Makefile b/x11/aclip/Makefile
index 8cfb72eb8138..e7ad3b623f71 100644
--- a/x11/aclip/Makefile
+++ b/x11/aclip/Makefile
@@ -1,5 +1,5 @@
PORTNAME= aclip
-DISTVERSION= 0.6.3
+DISTVERSION= 0.6.3.2
CATEGORIES= x11
MAINTAINER= jbeich@FreeBSD.org
diff --git a/x11/aclip/distinfo b/x11/aclip/distinfo
index 013debde0762..b26c9ea40cb4 100644
--- a/x11/aclip/distinfo
+++ b/x11/aclip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702944834
-SHA256 (letoram-arcan-0.6.3_GH0.tar.gz) = c62ab2471d0c402d36749701a713689638866f8f24352a90ac82ec191f27e387
-SIZE (letoram-arcan-0.6.3_GH0.tar.gz) = 12139719
+TIMESTAMP = 1720655877
+SHA256 (letoram-arcan-0.6.3.2_GH0.tar.gz) = 67f1bcec1b2d26e6a2c8e73058e8db084086ca5a21c0120959379da0d589ec1b
+SIZE (letoram-arcan-0.6.3.2_GH0.tar.gz) = 12949808
diff --git a/x11/arcan-trayicon/Makefile b/x11/arcan-trayicon/Makefile
index 9eb772f038b0..4de1b8a02548 100644
--- a/x11/arcan-trayicon/Makefile
+++ b/x11/arcan-trayicon/Makefile
@@ -1,5 +1,5 @@
PORTNAME= arcan-trayicon
-DISTVERSION= 0.6.3
+DISTVERSION= 0.6.3.2
CATEGORIES= x11
MAINTAINER= jbeich@FreeBSD.org
diff --git a/x11/arcan-trayicon/distinfo b/x11/arcan-trayicon/distinfo
index 013debde0762..b26c9ea40cb4 100644
--- a/x11/arcan-trayicon/distinfo
+++ b/x11/arcan-trayicon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702944834
-SHA256 (letoram-arcan-0.6.3_GH0.tar.gz) = c62ab2471d0c402d36749701a713689638866f8f24352a90ac82ec191f27e387
-SIZE (letoram-arcan-0.6.3_GH0.tar.gz) = 12139719
+TIMESTAMP = 1720655877
+SHA256 (letoram-arcan-0.6.3.2_GH0.tar.gz) = 67f1bcec1b2d26e6a2c8e73058e8db084086ca5a21c0120959379da0d589ec1b
+SIZE (letoram-arcan-0.6.3.2_GH0.tar.gz) = 12949808