diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile index 08b688d2968..a59a664f59f 100644 --- a/x11/vlc/Makefile +++ b/x11/vlc/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.239 2020/04/20 08:35:41 sthen Exp $ +# $OpenBSD: Makefile,v 1.240 2020/04/21 10:19:25 sthen Exp $ COMMENT-main= VideoLAN client; multimedia player COMMENT-jack= JACK audio output module for VLC V= 3.0.9.2 -REVISION-main= 0 DISTNAME= vlc-${V} PKGNAME-main= ${DISTNAME} PKGNAME-jack= vlc-jack-${V} +REVISION-main= 1 CATEGORIES= x11 MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${V}/ EXTRACT_SUFX= .tar.xz diff --git a/x11/vlc/patches/patch-modules_access_http_Makefile_am b/x11/vlc/patches/patch-modules_access_http_Makefile_am index f0e4108e4ff..dbb3ae57823 100644 --- a/x11/vlc/patches/patch-modules_access_http_Makefile_am +++ b/x11/vlc/patches/patch-modules_access_http_Makefile_am @@ -1,14 +1,16 @@ -$OpenBSD: patch-modules_access_http_Makefile_am,v 1.2 2020/04/20 08:35:41 sthen Exp $ +$OpenBSD: patch-modules_access_http_Makefile_am,v 1.3 2020/04/21 10:19:26 sthen Exp $ Workaround for duplicate symbols from libcompat being linked twice. Index: modules/access/http/Makefile.am --- modules/access/http/Makefile.am.orig +++ modules/access/http/Makefile.am -@@ -1,5 +1,6 @@ - libhttps_plugin_la_SOURCES = access/http/access.c - libhttps_plugin_la_LIBADD = libvlc_http.la -+libhttps_plugin_la_LDFLAGS = -Wl,--allow-multiple-definition -avoid-version -module -export-symbols-regex ^vlc_entry -shrext .so - access_LTLIBRARIES += libhttps_plugin.la - - libvlc_http_la_SOURCES = \ +@@ -16,7 +16,7 @@ libvlc_http_la_SOURCES = \ + access/http/connmgr.c access/http/connmgr.h + libvlc_http_la_CPPFLAGS = -Dneedsomethinghere + libvlc_http_la_LIBADD = \ +- $(LTLIBVLCCORE) ../compat/libcompat.la \ ++ $(LTLIBVLCCORE) \ + $(SOCKET_LIBS) $(LIBPTHREAD) + #libvlc_http_la_LDFLAGS = -no-undefined -export-symbols-regex ^vlc_http_ + #pkglib_LTLIBRARIES += libvlc_http.la