OpenBSD Mail Box

Friday, April 30, 2021

Re: UPDATE: devel/bison

On Fri, 30 Apr 2021 08:42:03 -0600, "Todd C. Miller" wrote:

> This is due to a change in bison where it now includes the generated
> header file. Using --defines=foo.h instead of just -d fixes that
> problem, though you'd also need to comment out the bit that used
> to move the header file around. With that fixed, devel/cbmc compiles
> for me. The latest cbmc already includes those fixes.

Here's a diff for devel/cbmc to fix compilation with the updated
bison once textstyle is disabled.

- todd

Index: devel/cbmc/Makefile
===================================================================
RCS file: /cvs/ports/devel/cbmc/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- devel/cbmc/Makefile 12 Jul 2019 20:44:05 -0000 1.9
+++ devel/cbmc/Makefile 30 Apr 2021 19:07:43 -0000
@@ -7,7 +7,7 @@ DISTNAME = cbmc-5.5
GH_ACCOUNT = diffblue
GH_PROJECT = cbmc
GH_TAGNAME = cbmc-5.5
-REVISION = 2
+REVISION = 3

CATEGORIES = devel

Index: devel/cbmc/patches/patch-src_ansi-c_Makefile
===================================================================
RCS file: devel/cbmc/patches/patch-src_ansi-c_Makefile
diff -N devel/cbmc/patches/patch-src_ansi-c_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/cbmc/patches/patch-src_ansi-c_Makefile 30 Apr 2021 14:48:07 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+Newer bison includes the defines file in the parser so the name must match.
+
+Index: src/ansi-c/Makefile
+--- src/ansi-c/Makefile.orig
++++ src/ansi-c/Makefile
+@@ -37,11 +37,7 @@ all: ansi-c$(LIBEXT)
+ ###############################################################################
+
+ ansi_c_y.tab.cpp: parser.y
+- $(YACC) $(YFLAGS) $$flags -pyyansi_c -d parser.y -o $@
+-
+-ansi_c_y.tab.h: ansi_c_y.tab.cpp
+- if [ -e ansi_c_y.tab.hpp ] ; then mv ansi_c_y.tab.hpp ansi_c_y.tab.h ; else \
+- mv ansi_c_y.tab.cpp.h ansi_c_y.tab.h ; fi
++ $(YACC) $(YFLAGS) $$flags -pyyansi_c --defines=ansi_c_y.tab.h parser.y -o $@
+
+ ansi_c_lex.yy.cpp: scanner.l
+ $(LEX) -Pyyansi_c -o$@ scanner.l
Index: devel/cbmc/patches/patch-src_jsil_Makefile
===================================================================
RCS file: devel/cbmc/patches/patch-src_jsil_Makefile
diff -N devel/cbmc/patches/patch-src_jsil_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/cbmc/patches/patch-src_jsil_Makefile 30 Apr 2021 14:48:10 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+Newer bison includes the defines file in the parser so the name must match.
+
+Index: src/jsil/Makefile
+--- src/jsil/Makefile.orig
++++ src/jsil/Makefile
+@@ -20,11 +20,7 @@ jsil$(LIBEXT): $(OBJ)
+ $(LINKLIB)
+
+ jsil_y.tab.cpp: parser.y
+- $(YACC) $(YFLAGS) $$flags -pyyjsil -d parser.y -o $@
+-
+-jsil_y.tab.h: jsil_y.tab.cpp
+- if [ -e jsil_y.tab.hpp ] ; then mv jsil_y.tab.hpp jsil_y.tab.h ; else \
+- mv jsil_y.tab.cpp.h jsil_y.tab.h ; fi
++ $(YACC) $(YFLAGS) $$flags -pyyjsil --defines=jsil_y.tab.h parser.y -o $@
+
+ jsil_lex.yy.cpp: scanner.l
+ $(LEX) -Pyyjsil -o$@ scanner.l
Index: devel/cbmc/patches/patch-src_json_Makefile
===================================================================
RCS file: devel/cbmc/patches/patch-src_json_Makefile
diff -N devel/cbmc/patches/patch-src_json_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/cbmc/patches/patch-src_json_Makefile 30 Apr 2021 14:48:12 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+Newer bison includes the defines file in the parser so the name must match.
+
+Index: src/json/Makefile
+--- src/json/Makefile.orig
++++ src/json/Makefile
+@@ -16,11 +16,7 @@ json$(LIBEXT): $(OBJ)
+ $(LINKLIB)
+
+ json_y.tab.cpp: parser.y
+- $(YACC) $(YFLAGS) $$flags -pyyjson -d parser.y -o $@
+-
+-json_y.tab.h: json_y.tab.cpp
+- if [ -e json_y.tab.hpp ] ; then mv json_y.tab.hpp $@ ; else \
+- mv json_y.tab.cpp.h $@ ; fi
++ $(YACC) $(YFLAGS) $$flags -pyyjson --defines=json_y.tab.h parser.y -o $@
+
+ json_lex.yy.cpp: scanner.l
+ $(LEX) -Pyyjson -o$@ scanner.l
Index: devel/cbmc/patches/patch-src_memory-models_Makefile
===================================================================
RCS file: devel/cbmc/patches/patch-src_memory-models_Makefile
diff -N devel/cbmc/patches/patch-src_memory-models_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/cbmc/patches/patch-src_memory-models_Makefile 30 Apr 2021 14:48:14 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+Newer bison includes the defines file in the parser so the name must match.
+
+Index: src/memory-models/Makefile
+--- src/memory-models/Makefile.orig
++++ src/memory-models/Makefile
+@@ -17,11 +17,7 @@ all: mmcc$(EXEEXT)
+ ###############################################################################
+
+ mm_y.tab.cpp: parser.y
+- $(YACC) $(YFLAGS) $$flags -pyymm -d parser.y -o $@
+-
+-mm_y.tab.h: mm_y.tab.cpp
+- if [ -e mm_y.tab.hpp ] ; then mv mm_y.tab.hpp mm_y.tab.h ; else \
+- mv mm_y.tab.cpp.h mm_y.tab.h ; fi
++ $(YACC) $(YFLAGS) $$flags -pyymm --defines=mm_y.tab.h parser.y -o $@
+
+ mm_lex.yy.cpp: scanner.l
+ $(LEX) -Pyymm -o$@ scanner.l
Index: devel/cbmc/patches/patch-src_xmllang_Makefile
===================================================================
RCS file: devel/cbmc/patches/patch-src_xmllang_Makefile
diff -N devel/cbmc/patches/patch-src_xmllang_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/cbmc/patches/patch-src_xmllang_Makefile 30 Apr 2021 14:48:05 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+Newer bison includes the defines file in the parser so the name must match.
+
+Index: src/xmllang/Makefile
+--- src/xmllang/Makefile.orig
++++ src/xmllang/Makefile
+@@ -16,11 +16,7 @@ xmllang$(LIBEXT): $(OBJ)
+ $(LINKLIB)
+
+ xml_y.tab.cpp: parser.y
+- $(YACC) $(YFLAGS) $$flags -pyyxml -d parser.y -o $@
+-
+-xml_y.tab.h: xml_y.tab.cpp
+- if [ -e xml_y.tab.hpp ] ; then mv xml_y.tab.hpp $@ ; else \
+- mv xml_y.tab.cpp.h $@ ; fi
++ $(YACC) $(YFLAGS) $$flags -pyyxml --defines=xml_y.tab.h parser.y -o $@
+
+ xml_lex.yy.cpp: scanner.l
+ $(LEX) -Pyyxml -o$@ scanner.l

UPDATE: VLC 3.0.13

Here is an update to VLC 3.0.13.

Changes between 3.0.12.1 and 3.0.13:
----------------------------------

Demux:
* Adaptive: fix artefacts in HLS streams with wrong profiles/levels
* Fix regression on some MP4 files for the audio track
* Fix MPGA and ADTS probing in TS files
* Fix Flac inside AVI files
* Fix VP9/Webm artefacts when seeking

Codec:
* Support SSA text scaling
* Fix rotation on Android rotation
* Fix WebVTT subtitles that start at 00:00

Access:
* Update libnfs to support NFSv4
* Improve SMB2 integration
* Fix Blu-ray files using Unicode names on Windows
* Disable mcast lookups on Android for RTSP playback

Video Output:
* Rework the D3D11 rendering wait, to fix choppiness on display

Interfaces:
* Fix VLC getting stuck on close on X11 (#21875)
* Improve RTL on preferences on macOS
* Add mousewheel horizontal axis control
* Fix crash on exit on macOS
* Fix sizing of the fullscreen controls on macOS

Windows:
* Fix subtitles/OSD under Windows XP

Misc:
* Update translations
* Improve MIDI fonts search on Linux
* Update Soundcloud, Youtube, liveleak
* Fix compilation with GCC11
* Fix input-slave option for subtitles

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/x11/vlc/Makefile,v
retrieving revision 1.248
diff -u -p -u -p -r1.248 Makefile
--- Makefile 3 Apr 2021 11:15:46 -0000 1.248
+++ Makefile 30 Apr 2021 18:33:22 -0000
@@ -3,11 +3,10 @@
COMMENT-main= VideoLAN client; multimedia player
COMMENT-jack= JACK audio output module for VLC

-V= 3.0.12
+V= 3.0.13
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-jack= vlc-jack-${V}
-REVISION-main= 0
CATEGORIES= x11
MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${V}/
EXTRACT_SUFX= .tar.xz
@@ -34,13 +33,13 @@ WANTLIB-main= EGL GL ICE Qt5Core Qt5Gui
ffi fontconfig freetype fribidi gbm gcrypt gdk-3 gdk_pixbuf-2.0 \
gio-2.0 glapi glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0 \
gpg-error graphite2 gsm gthread-2.0 gtk-3 harfbuzz \
- hogweed icudata icui18n icuio icuuc idn2 jpeg lcms2 \
- lz4 lzma matroska mp3lame nettle nfs notify ogg opus \
- p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
- pcre2-16 pixman-1 placebo png postproc protobuf-lite \
- rsvg-2 smb2 sndio soxr speex speexdsp ssl swresample \
- swscale tag tar tasn1 theoradec theoraenc tiff unistring \
- usbhid vorbis vorbisenc vpx webp x264 x265 xcb xcb-composite \
+ hogweed icudata icui18n icuuc idn2 jpeg lcms2 lz4 lzma \
+ matroska mp3lame nettle nfs notify ogg opus p11-kit \
+ pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pcre2-16 \
+ pixman-1 placebo png postproc protobuf-lite rsvg-2 \
+ smb2 sndio soxr speex speexdsp ssl swresample swscale \
+ tag tar tasn1 theoradec theoraenc tiff unistring usbhid \
+ vorbis vorbisenc vpx webp x264 x265 xcb xcb-composite \
xcb-dri2 xcb-dri3 xcb-glx xcb-keysyms xcb-present xcb-randr \
xcb-render xcb-shm xcb-sync xcb-xfixes xcb-xv xml2 \
xshmfence xvidcore z zstd ${WANTLIB-common}
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/x11/vlc/distinfo,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 distinfo
--- distinfo 23 Jan 2021 09:50:09 -0000 1.44
+++ distinfo 29 Apr 2021 15:35:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (vlc-3.0.12.tar.xz) = 7/RY84qSEmCU9E8iY8K/LHze8nG0gZLQ/nsXJjiM+Hk=
-SIZE (vlc-3.0.12.tar.xz) = 25997468
+SHA256 (vlc-3.0.13.tar.xz) = 1bQ6o1Tb5A8oCZmV4De894iWqptghisXxbehlBm+HOU=
+SIZE (vlc-3.0.13.tar.xz) = 26254428
Index: patches/patch-modules_access_smb2_c
===================================================================
RCS file: patches/patch-modules_access_smb2_c
diff -N patches/patch-modules_access_smb2_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_access_smb2_c 30 Apr 2021 18:29:47 -0000
@@ -0,0 +1,44 @@
+$OpenBSD$
+
+smb2: fix build with libsmb2 3.0.0
+
+https://code.videolan.org/videolan/vlc/-/issues/25680
+
+Index: modules/access/smb2.c
+--- modules/access/smb2.c.orig
++++ modules/access/smb2.c
+@@ -133,6 +133,34 @@ smb2_set_error(stream_t *access, const char *psz_func,
+
+ #define VLC_SMB2_STATUS_DENIED(x) (x == -ECONNREFUSED || x == -EACCES)
+
++#if defined (__ELF__) || defined (__MACH__) /* weak support */
++/* There is no way to know if libsmb2 has these new symbols and we don't want
++ * to increase the version requirement on VLC 3.0, therefore implement a weak
++ * compat version. */
++const t_socket *
++smb2_get_fds(struct smb2_context *smb2, size_t *fd_count, int *timeout);
++int
++smb2_service_fd(struct smb2_context *smb2, int fd, int revents);
++
++__attribute__((weak)) const t_socket *
++smb2_get_fds(struct smb2_context *smb2, size_t *fd_count, int *timeout)
++{
++ (void) timeout;
++ static thread_local t_socket fd;
++
++ *fd_count = 1;
++ fd = smb2_get_fd(smb2);
++ return &fd;
++}
++
++__attribute__((weak)) int
++smb2_service_fd(struct smb2_context *smb2, int fd, int revents)
++{
++ (void) fd;
++ return smb2_service(smb2, revents);
++}
++