diff options
Diffstat (limited to 'multimedia/vlc/patches')
32 files changed, 107 insertions, 798 deletions
diff --git a/multimedia/vlc/patches/patch-bin_override.c b/multimedia/vlc/patches/patch-bin_override.c deleted file mode 100644 index cee66665d18..00000000000 --- a/multimedia/vlc/patches/patch-bin_override.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bin_override.c,v 1.1 2015/10/25 11:00:18 wiz Exp $ - ---- bin/override.c.orig 2014-06-14 15:14:12.000000000 +0000 -+++ bin/override.c -@@ -27,7 +27,7 @@ - - void vlc_enable_override (void); - --#if defined (__GNUC__) \ -+#if 0 && defined (__GNUC__) \ - && (defined (__ELF__) && !defined (__sun__)) - /* Solaris crashes on printf("%s", NULL); which is legal, but annoying. */ - diff --git a/multimedia/vlc/patches/patch-compat_Makefile.am b/multimedia/vlc/patches/patch-compat_Makefile.am index f014555c5f2..883b81a60b1 100644 --- a/multimedia/vlc/patches/patch-compat_Makefile.am +++ b/multimedia/vlc/patches/patch-compat_Makefile.am @@ -1,23 +1,15 @@ -$NetBSD: patch-compat_Makefile.am,v 1.1 2015/10/25 11:00:18 wiz Exp $ +$NetBSD: patch-compat_Makefile.am,v 1.2 2019/07/02 20:52:13 nia Exp $ -Revert upstream commit 78d45cc159a0cf1c44feef11a2b9800d9398048e by -Rémi Denis-Courmont <remi@remlab.net>. Mail asking for that to -be applied upstream was turned down: +libcompat must be prebuilt with PIC properties in order to be linked +into PIC libraries. -The goal is and always was to link the compat library statically into the -VLC plugins. If your OS cannot import symbols from a static library into a -dynamic library, then you are screwed and I cannot help you with that. If -it theoretically can, but libtool fails anyway, then I cannot help you with -that either. - - ---- compat/Makefile.am.orig 2014-06-14 15:14:12.000000000 +0000 +--- compat/Makefile.am.orig 2018-03-14 22:07:38.000000000 +0000 +++ compat/Makefile.am @@ -1,7 +1,7 @@ -pkglib_LTLIBRARIES = libcompat.la +noinst_LTLIBRARIES = libcompat.la libcompat_la_SOURCES = dummy.c - libcompat_la_LIBADD = $(LTLIBOBJS) + libcompat_la_LIBADD = $(LTLIBOBJS) $(LIBRT) $(LIBM) -libcompat_la_LDFLAGS = -no-undefined -static +libcompat_la_LDFLAGS = -no-undefined diff --git a/multimedia/vlc/patches/patch-compat_Makefile.in b/multimedia/vlc/patches/patch-compat_Makefile.in deleted file mode 100644 index 8d34cb7c5a8..00000000000 --- a/multimedia/vlc/patches/patch-compat_Makefile.in +++ /dev/null @@ -1,131 +0,0 @@ -$NetBSD: patch-compat_Makefile.in,v 1.3 2017/05/26 13:26:37 maya Exp $ - -See comment on patch_compat_Makefile.am. - ---- compat/Makefile.in.orig 2017-05-24 12:55:21.000000000 +0000 -+++ compat/Makefile.in -@@ -135,7 +135,7 @@ am__uninstall_files_from_dir = { \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } - am__installdirs = "$(DESTDIR)$(pkglibdir)" --LTLIBRARIES = $(pkglib_LTLIBRARIES) -+LTLIBRARIES = $(noinst_LTLIBRARIES) - libcompat_la_DEPENDENCIES = $(LTLIBOBJS) - am_libcompat_la_OBJECTS = dummy.lo - libcompat_la_OBJECTS = $(am_libcompat_la_OBJECTS) -@@ -995,10 +995,10 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - vlcdatadir = @vlcdatadir@ - vlclibdir = @vlclibdir@ --pkglib_LTLIBRARIES = libcompat.la -+noinst_LTLIBRARIES = libcompat.la - libcompat_la_SOURCES = dummy.c - libcompat_la_LIBADD = $(LTLIBOBJS) --libcompat_la_LDFLAGS = -no-undefined -static -+libcompat_la_LDFLAGS = -no-undefined - BUILT_SOURCES = dummy.c - CLEANFILES = dummy.c - all: $(BUILT_SOURCES) -@@ -1036,33 +1036,9 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $( - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): - --install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ -- list2=; for p in $$list; do \ -- if test -f $$p; then \ -- list2="$$list2 $$p"; \ -- else :; fi; \ -- done; \ -- test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ -- } -- --uninstall-pkglibLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ -- for p in $$list; do \ -- $(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ -- done -- --clean-pkglibLTLIBRARIES: -- -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; \ -+clean-noinstLTLIBRARIES: -+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) -+ @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ -@@ -1072,7 +1048,7 @@ clean-pkglibLTLIBRARIES: - } - - libcompat.la: $(libcompat_la_OBJECTS) $(libcompat_la_DEPENDENCIES) $(EXTRA_libcompat_la_DEPENDENCIES) -- $(AM_V_CCLD)$(libcompat_la_LINK) -rpath $(pkglibdir) $(libcompat_la_OBJECTS) $(libcompat_la_LIBADD) $(LIBS) -+ $(AM_V_CCLD)$(libcompat_la_LINK) $(libcompat_la_OBJECTS) $(libcompat_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -1229,9 +1205,6 @@ check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) - installdirs: -- for dir in "$(DESTDIR)$(pkglibdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -1267,7 +1240,7 @@ maintainer-clean-generic: - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - clean: clean-am - --clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ -+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - - distclean: distclean-am -@@ -1294,7 +1267,7 @@ install-dvi: install-dvi-am - - install-dvi-am: - --install-exec-am: install-pkglibLTLIBRARIES -+install-exec-am: - - install-html: install-html-am - -@@ -1334,24 +1307,23 @@ ps: ps-am - - ps-am: - --uninstall-am: uninstall-pkglibLTLIBRARIES -+uninstall-am: - - .MAKE: all check install install-am install-strip - - .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ -- install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -- uninstall-pkglibLTLIBRARIES -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am - - .PRECIOUS: Makefile - diff --git a/multimedia/vlc/patches/patch-configure b/multimedia/vlc/patches/patch-configure deleted file mode 100644 index 1172c56beb0..00000000000 --- a/multimedia/vlc/patches/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-configure,v 1.8 2017/05/15 11:11:35 jperkin Exp $ - -Remove bogus Solaris exclusion. - ---- configure.orig 2016-05-31 16:56:33.000000000 +0000 -+++ configure -@@ -26281,7 +26281,7 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse_inline" >&5 - $as_echo "$ac_cv_sse_inline" >&6; } - -- if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "solaris"; then : -+ if test "${ac_cv_sse_inline}" != "no"; then : - - - $as_echo "#define CAN_COMPILE_SSE 1" >>confdefs.h -@@ -26324,7 +26324,7 @@ rm -f core conftest.err conftest.$ac_obj - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse2_inline" >&5 - $as_echo "$ac_cv_sse2_inline" >&6; } -- if test "${ac_cv_sse2_inline}" != "no" -a "${SYS}" != "solaris"; then : -+ if test "${ac_cv_sse2_inline}" != "no"; then : - - - $as_echo "#define CAN_COMPILE_SSE2 1" >>confdefs.h diff --git a/multimedia/vlc/patches/patch-configure.ac b/multimedia/vlc/patches/patch-configure.ac new file mode 100644 index 00000000000..903fff0b132 --- /dev/null +++ b/multimedia/vlc/patches/patch-configure.ac @@ -0,0 +1,21 @@ +$NetBSD: patch-configure.ac,v 1.6 2019/07/02 20:52:13 nia Exp $ + +Fix pkg-config'ing for lua. + +--- configure.ac.orig 2019-06-11 14:28:26.000000000 +0000 ++++ configure.ac +@@ -1619,12 +1619,12 @@ AC_ARG_ENABLE(lua, + [disable LUA scripting support (default enabled)])]) + if test "${enable_lua}" != "no" + then +- PKG_CHECK_MODULES(LUA, lua5.2, ++ PKG_CHECK_MODULES(LUA, lua-5.2, + [ have_lua=yes ], + [ + AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead]) + +- PKG_CHECK_MODULES(LUA, lua5.1, ++ PKG_CHECK_MODULES(LUA, lua-5.1, + [ have_lua=yes ], + [ + AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead]) diff --git a/multimedia/vlc/patches/patch-include_vlc__common.h b/multimedia/vlc/patches/patch-include_vlc__common.h deleted file mode 100644 index 562a089fcfb..00000000000 --- a/multimedia/vlc/patches/patch-include_vlc__common.h +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-include_vlc__common.h,v 1.1 2015/10/25 11:00:18 wiz Exp $ - ---- include/vlc_common.h.orig 2014-11-16 18:57:58.000000000 +0000 -+++ include/vlc_common.h -@@ -47,6 +47,9 @@ - #include <stdio.h> - #include <inttypes.h> - #include <stddef.h> -+#ifdef __NetBSD__ -+#include <sys/param.h> -+#endif - - #ifndef __cplusplus - # include <stdbool.h> -@@ -541,6 +544,8 @@ static inline unsigned ctz (unsigned x) - #endif - } - -+#if !defined(__NetBSD_Version__) || (__NetBSD_Version__ < 599001600) -+ - /** Bit weight */ - VLC_USED - static inline unsigned popcount (unsigned x) -@@ -557,6 +562,7 @@ static inline unsigned popcount (unsigne - return count; - #endif - } -+#endif /* NetBSD < 5.99.16 */ - - VLC_USED - static inline unsigned parity (unsigned x) -@@ -576,6 +582,8 @@ static inline unsigned parity (unsigned - # undef bswap64 - #endif - -+#ifndef __NetBSD__ -+ - /** Byte swap (16 bits) */ - VLC_USED - static inline uint16_t bswap16 (uint16_t x) -@@ -624,6 +632,7 @@ static inline uint64_t bswap64 (uint64_t - #endif - } - -+#endif /* NetBSD */ - - /* Free and set set the variable to NULL */ - #define FREENULL(a) do { free( a ); a = NULL; } while(0) diff --git a/multimedia/vlc/patches/patch-include_vlc__fixups.h b/multimedia/vlc/patches/patch-include_vlc__fixups.h deleted file mode 100644 index f6997e2b8e1..00000000000 --- a/multimedia/vlc/patches/patch-include_vlc__fixups.h +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-include_vlc__fixups.h,v 1.3 2016/06/21 17:58:05 joerg Exp $ - -on NetBSD-current, just define "uselocale", nothing else -fixes build - -static_assert: Assume that a compiler in C11 or C++11 frontend mode -has the _Static_assert keyword, but define the macro if it is missing -from the headers. - ---- include/vlc_fixups.h.orig 2015-04-13 19:54:35.000000000 +0000 -+++ include/vlc_fixups.h -@@ -218,16 +218,28 @@ int posix_memalign (void **, size_t, siz - - /* locale.h */ - #ifndef HAVE_USELOCALE -+#ifdef __NetBSD__ -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 699002300 -+/* NetBSD-current has locale_t but no uselocale */ -+#define NetBSD_LOCALE_HACK -+#endif -+#endif -+#ifdef NetBSD_LOCALE_HACK -+#include <locale.h> -+#else - #define LC_ALL_MASK 0 - #define LC_NUMERIC_MASK 0 - #define LC_MESSAGES_MASK 0 - #define LC_GLOBAL_LOCALE ((locale_t)(uintptr_t)1) - typedef void *locale_t; -+#endif - static inline locale_t uselocale(locale_t loc) - { - (void)loc; - return NULL; - } -+#ifndef NetBSD_LOCALE_HACK - static inline void freelocale(locale_t loc) - { - (void)loc; -@@ -238,9 +250,12 @@ static inline locale_t newlocale(int mas - return NULL; - } - #endif -+#endif - --#if !defined (HAVE_STATIC_ASSERT) -+#if !defined (static_assert) -+# if !(__STDC_VERSION__ - 0 >= 201112L || __cplusplus >= 201103L) - # define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) -+# endif - # define static_assert _Static_assert - #endif - diff --git a/multimedia/vlc/patches/patch-include_vlc_atomic.h b/multimedia/vlc/patches/patch-include_vlc_atomic.h deleted file mode 100644 index c7db6d2c3d9..00000000000 --- a/multimedia/vlc/patches/patch-include_vlc_atomic.h +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-include_vlc_atomic.h,v 1.3 2017/05/26 13:26:37 maya Exp $ - -C++11 ships everything we need, just use <atomic> instead -of the vlc_atomic.h #ifdef maze. - ---- include/vlc_atomic.h.orig 2015-02-02 19:42:28.000000000 +0000 -+++ include/vlc_atomic.h -@@ -32,7 +32,14 @@ - /*** Native C11 atomics ***/ - # include <stdatomic.h> - -+#elif defined(__cplusplus) && (__cplusplus >= 201103L) -+#include <atomic> -+using std::atomic_uint_least32_t; -+using std::atomic_uintptr_t; -+using std::atomic_uint; - # else -+#include <sys/types.h> -+#include <stdint.h> - - # define ATOMIC_FLAG_INIT false - diff --git a/multimedia/vlc/patches/patch-lib_core.c b/multimedia/vlc/patches/patch-lib_core.c new file mode 100644 index 00000000000..810aebd9672 --- /dev/null +++ b/multimedia/vlc/patches/patch-lib_core.c @@ -0,0 +1,12 @@ +$NetBSD: patch-lib_core.c,v 1.1 2019/07/02 20:52:13 nia Exp $ + +For unknown reason disable duplicated symbol for vlc_module_name. + +--- lib/core.c.orig 2017-11-24 15:29:17.000000000 +0000 ++++ lib/core.c +@@ -257,4 +257,4 @@ int64_t libvlc_clock(void) + return mdate(); + } + +-const char vlc_module_name[] = "libvlc"; ++// const char vlc_module_name[] = "libvlc"; diff --git a/multimedia/vlc/patches/patch-lib_video.c b/multimedia/vlc/patches/patch-lib_video.c new file mode 100644 index 00000000000..265688d9a5e --- /dev/null +++ b/multimedia/vlc/patches/patch-lib_video.c @@ -0,0 +1,24 @@ +$NetBSD: patch-lib_video.c,v 1.1 2019/07/02 20:52:13 nia Exp $ + +Remove undefined references to missing symbol. + +--- lib/video.c.orig 2017-11-24 15:29:17.000000000 +0000 ++++ lib/video.c +@@ -719,7 +719,7 @@ static int get_filter_str( vlc_object_t + module_t *p_obj = module_find( psz_name ); + if( !p_obj ) + { +- msg_Err( p_parent, "Unable to find filter module \"%s\".", psz_name ); ++// msg_Err( p_parent, "Unable to find filter module \"%s\".", psz_name ); + return VLC_EGENERIC; + } + +@@ -737,7 +737,7 @@ static int get_filter_str( vlc_object_t + } + else + { +- msg_Err( p_parent, "Unknown video filter type." ); ++// msg_Err( p_parent, "Unknown video filter type." ); + return VLC_EGENERIC; + } + diff --git a/multimedia/vlc/patches/patch-m4_dolt.m4 b/multimedia/vlc/patches/patch-m4_dolt.m4 new file mode 100644 index 00000000000..1f7896fedd2 --- /dev/null +++ b/multimedia/vlc/patches/patch-m4_dolt.m4 @@ -0,0 +1,15 @@ +$NetBSD: patch-m4_dolt.m4,v 1.1 2019/07/02 20:52:13 nia Exp $ + +Add NetBSD to dolt.m4. The fallback using libtool does not work +correctly. + +--- m4/dolt.m4.orig 2017-11-24 15:29:17.000000000 +0000 ++++ m4/dolt.m4 +@@ -20,6 +20,7 @@ AS_IF([test x$GCC != xyes], [dolt_suppor + + AS_CASE([$host], + [*-*-linux*|*-*-freebsd*], [pic_options='-fPIC'], ++ [*-*-netbsd*], [pic_options='-fPIC -DPIC'], + [*-apple-darwin*], [pic_options='-fno-common'], + [*mingw*|*nacl*], [pic_options=''] + [*], [dolt_supported=no] diff --git a/multimedia/vlc/patches/patch-modules_access_directory.c b/multimedia/vlc/patches/patch-modules_access_directory.c deleted file mode 100644 index 1594dbef2f8..00000000000 --- a/multimedia/vlc/patches/patch-modules_access_directory.c +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-modules_access_directory.c,v 1.1 2015/10/25 11:00:18 wiz Exp $ - -Mainly due to lack of bits for new fcntl flags, O_DIRECTORY isn't currently -supported by DragonFly's openat. This patch checks which flags are supported -before passing them to vlc_openat. - ---- modules/access/directory.c.orig 2014-11-16 18:57:58.000000000 +0000 -+++ modules/access/directory.c -@@ -316,8 +316,14 @@ block_t *DirBlock (access_t *p_access) - { - DIR *handle; - #ifdef HAVE_OPENAT -- int fd = vlc_openat (dirfd (current->handle), entry, -- O_RDONLY | O_DIRECTORY); -+ int flags = 0; -+#ifdef O_RDONLY -+ flags |= O_RDONLY; -+#endif -+#ifdef O_DIRECTORY -+ flags |= O_DIRECTORY; -+#endif -+ int fd = vlc_openat (dirfd (current->handle), entry, flags); - if (fd == -1) - { - if (errno == ENOTDIR) diff --git a/multimedia/vlc/patches/patch-modules_access_file.c b/multimedia/vlc/patches/patch-modules_access_file.c deleted file mode 100644 index c3cd9b6f8f0..00000000000 --- a/multimedia/vlc/patches/patch-modules_access_file.c +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-modules_access_file.c,v 1.1 2015/10/25 11:00:18 wiz Exp $ - ---- modules/access/file.c.orig 2014-11-16 18:57:58.000000000 +0000 -+++ modules/access/file.c -@@ -42,6 +42,9 @@ - #ifdef HAVE_LINUX_MAGIC_H - # include <sys/vfs.h> - # include <linux/magic.h> -+#elif defined (HAVE_FSTATVFS) -+# include <sys/statvfs.h> -+# include <sys/mount.h> - #endif - - #if defined( _WIN32 ) -@@ -75,7 +78,7 @@ struct access_sys_t - #if !defined (_WIN32) && !defined (__OS2__) - static bool IsRemote (int fd) - { --#if defined (HAVE_FSTATVFS) && defined (MNT_LOCAL) -+#if !defined(__linux__) && defined (HAVE_FSTATVFS) && defined (MNT_LOCAL) - struct statvfs stf; - - if (fstatvfs (fd, &stf)) diff --git a/multimedia/vlc/patches/patch-modules_access_http_Makefile.am b/multimedia/vlc/patches/patch-modules_access_http_Makefile.am new file mode 100644 index 00000000000..fda7d4e275f --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_access_http_Makefile.am @@ -0,0 +1,15 @@ +$NetBSD: patch-modules_access_http_Makefile.am,v 1.1 2019/07/02 20:52:13 nia Exp $ + +Remove doubled symbols in libcompat in the vlc_http module. + +--- modules/access/http/Makefile.am.orig 2017-11-24 15:29:17.000000000 +0000 ++++ modules/access/http/Makefile.am +@@ -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 diff --git a/multimedia/vlc/patches/patch-modules_access_rtp_Makefile.am b/multimedia/vlc/patches/patch-modules_access_rtp_Makefile.am deleted file mode 100644 index 51a3efa70b9..00000000000 --- a/multimedia/vlc/patches/patch-modules_access_rtp_Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-modules_access_rtp_Makefile.am,v 1.1 2015/10/25 11:00:18 wiz Exp $ - ---- modules/access/rtp/Makefile.am.orig 2014-08-14 07:20:03.000000000 +0000 -+++ modules/access/rtp/Makefile.am -@@ -13,7 +13,7 @@ librtp_plugin_la_LIBADD = $(SOCKET_LIBS) - libvlc_srtp_la_SOURCES = access/rtp/srtp.c access/rtp/srtp.h - libvlc_srtp_la_CPPFLAGS = -I$(srcdir)/access/rtp - libvlc_srtp_la_CFLAGS = $(GCRYPT_CFLAGS) --libvlc_srtp_la_LDFLAGS = -static -+libvlc_srtp_la_LDFLAGS = - libvlc_srtp_la_LIBADD = $(GCRYPT_LIBS) $(LIBPTHREAD) - srtp_test_recv_SOURCES = access/rtp/srtp-test-recv.c - srtp_test_recv_LDADD = libvlc_srtp.la diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_components_controller.cpp b/multimedia/vlc/patches/patch-modules_gui_qt4_components_controller.cpp deleted file mode 100644 index e215d51a456..00000000000 --- a/multimedia/vlc/patches/patch-modules_gui_qt4_components_controller.cpp +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-modules_gui_qt4_components_controller.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ - -Qt's MOC doesn't handle int64_t, so introduce a meaningful type name -so that slot/signal/connection macros work properly. - ---- modules/gui/qt4/components/controller.cpp.orig 2015-01-28 16:37:58.000000000 +0000 -+++ modules/gui/qt4/components/controller.cpp -@@ -353,8 +353,8 @@ QWidget *AbstractController::createWidge - slider->setChapters( chapters ); - - /* Update the position when the IM has changed */ -- CONNECT( THEMIM->getIM(), positionUpdated( float, int64_t, int ), -- slider, setPosition( float, int64_t, int ) ); -+ CONNECT( THEMIM->getIM(), positionUpdated( float, putime_t, int ), -+ slider, setPosition( float, putime_t, int ) ); - /* And update the IM, when the position has changed */ - CONNECT( slider, sliderDragged( float ), - THEMIM->getIM(), sliderUpdate( float ) ); diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_components_extended__panels.cpp b/multimedia/vlc/patches/patch-modules_gui_qt4_components_extended__panels.cpp deleted file mode 100644 index 350ef53876d..00000000000 --- a/multimedia/vlc/patches/patch-modules_gui_qt4_components_extended__panels.cpp +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-modules_gui_qt4_components_extended__panels.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ - -Qt's MOC doesn't handle int64_t, so introduce a meaningful type name -so that slot/signal/connection macros work properly. - ---- modules/gui/qt4/components/extended_panels.cpp.orig 2015-04-01 10:47:07.000000000 +0000 -+++ modules/gui/qt4/components/extended_panels.cpp -@@ -1583,7 +1583,7 @@ void SyncControls::update() - { - b_userAction = false; - -- int64_t i_delay; -+ putime_t i_delay; - if( THEMIM->getInput() ) - { - i_delay = var_GetTime( THEMIM->getInput(), "audio-delay" ); -@@ -1600,7 +1600,7 @@ void SyncControls::advanceAudio( double - { - if( THEMIM->getInput() && b_userAction ) - { -- int64_t i_delay = f_advance * 1000000; -+ putime_t i_delay = f_advance * 1000000; - var_SetTime( THEMIM->getInput(), "audio-delay", i_delay ); - } - } -@@ -1609,7 +1609,7 @@ void SyncControls::advanceSubs( double f - { - if( THEMIM->getInput() && b_userAction ) - { -- int64_t i_delay = f_advance * 1000000; -+ putime_t i_delay = f_advance * 1000000; - var_SetTime( THEMIM->getInput(), "spu-delay", i_delay ); - } - } diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.cpp b/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.cpp deleted file mode 100644 index 1f0d012fc1c..00000000000 --- a/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.cpp +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-modules_gui_qt4_components_interface__widgets.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ - -Qt's MOC doesn't handle int64_t, so introduce a meaningful type name -so that slot/signal/connection macros work properly. - ---- modules/gui/qt4/components/interface_widgets.cpp.orig 2015-01-22 14:50:00.000000000 +0000 -+++ modules/gui/qt4/components/interface_widgets.cpp -@@ -759,13 +759,13 @@ TimeLabel::TimeLabel( intf_thread_t *_p_ - } - setAlignment( Qt::AlignRight | Qt::AlignVCenter ); - -- CONNECT( THEMIM->getIM(), positionUpdated( float, int64_t, int ), -- this, setDisplayPosition( float, int64_t, int ) ); -+ CONNECT( THEMIM->getIM(), positionUpdated( float, putime_t, int ), -+ this, setDisplayPosition( float, putime_t, int ) ); - - setStyleSheet( "QLabel { padding-left: 4px; padding-right: 4px; }" ); - } - --void TimeLabel::setDisplayPosition( float pos, int64_t t, int length ) -+void TimeLabel::setDisplayPosition( float pos, putime_t t, int length ) - { - if( pos == -1.f ) - { diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.hpp b/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.hpp deleted file mode 100644 index d583959c488..00000000000 --- a/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.hpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-modules_gui_qt4_components_interface__widgets.hpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ - -Qt's MOC doesn't handle int64_t, so introduce a meaningful type name -so that slot/signal/connection macros work properly. - ---- modules/gui/qt4/components/interface_widgets.hpp.orig 2014-11-16 18:57:59.000000000 +0000 -+++ modules/gui/qt4/components/interface_widgets.hpp -@@ -206,7 +206,7 @@ private: - char psz_time[MSTRTIME_MAX_SIZE]; - void toggleTimeDisplay(); - private slots: -- void setDisplayPosition( float pos, int64_t time, int length ); -+ void setDisplayPosition( float pos, putime_t time, int length ); - void setDisplayPosition( float pos ); - }; - diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_dialogs_messages.cpp b/multimedia/vlc/patches/patch-modules_gui_qt4_dialogs_messages.cpp deleted file mode 100644 index 1107207a541..00000000000 --- a/multimedia/vlc/patches/patch-modules_gui_qt4_dialogs_messages.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-modules_gui_qt4_dialogs_messages.cpp,v 1.1 2015/11/01 20:15:06 tnn Exp $ - -Fix build with clang. &this->verbosity is unsigned. - ---- modules/gui/qt4/dialogs/messages.cpp.orig 2014-11-16 18:57:59.000000000 +0000 -+++ modules/gui/qt4/dialogs/messages.cpp -@@ -143,7 +143,7 @@ MessagesDialog::~MessagesDialog() - - void MessagesDialog::changeVerbosity( int i_verbosity ) - { -- atomic_store( &this->verbosity, i_verbosity ); -+ atomic_store( &this->verbosity, (unsigned int)i_verbosity ); - } - - void MessagesDialog::updateConfig() diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.cpp b/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.cpp deleted file mode 100644 index 15bf09db7dc..00000000000 --- a/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.cpp +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-modules_gui_qt4_input__manager.cpp,v 1.2 2016/05/12 15:56:15 wiz Exp $ - -Qt's MOC doesn't handle int64_t, so introduce a meaningful type name -so that slot/signal/connection macros work properly. - ---- modules/gui/qt4/input_manager.cpp.orig 2016-04-18 11:10:31.000000000 +0000 -+++ modules/gui/qt4/input_manager.cpp -@@ -138,7 +138,7 @@ void InputManager::setInput( input_threa - !var_GetFloat( p_input, "start-time" ) && - !var_GetFloat( p_input, "stop-time" ) ) - { -- emit resumePlayback( (int64_t)i_time * 1000 ); -+ emit resumePlayback( (putime_t)i_time * 1000 ); - } - playlist_Lock( THEPL ); - // Add root items only -@@ -453,7 +453,7 @@ void InputManager::UpdatePosition() - { - /* Update position */ - int i_length; -- int64_t i_time; -+ putime_t i_time; - float f_pos; - i_length = var_GetTime( p_input , "length" ) / CLOCK_FREQ; - i_time = var_GetTime( p_input , "time"); -@@ -995,21 +995,21 @@ void InputManager::setAtoB() - { - timeB = var_GetTime( THEMIM->getInput(), "time" ); - var_SetTime( THEMIM->getInput(), "time" , timeA ); -- CONNECT( this, positionUpdated( float, int64_t, int ), -- this, AtoBLoop( float, int64_t, int ) ); -+ CONNECT( this, positionUpdated( float, putime_t, int ), -+ this, AtoBLoop( float, putime_t, int ) ); - } - else - { - timeA = 0; - timeB = 0; -- disconnect( this, SIGNAL( positionUpdated( float, int64_t, int ) ), -- this, SLOT( AtoBLoop( float, int64_t, int ) ) ); -+ disconnect( this, SIGNAL( positionUpdated( float, putime_t, int ) ), -+ this, SLOT( AtoBLoop( float, putime_t, int ) ) ); - } - emit AtoBchanged( (timeA != 0 ), (timeB != 0 ) ); - } - - /* Function called regularly when in an AtoB loop */ --void InputManager::AtoBLoop( float, int64_t i_time, int ) -+void InputManager::AtoBLoop( float, putime_t i_time, int ) - { - if( timeB && i_time >= timeB ) - var_SetTime( THEMIM->getInput(), "time" , timeA ); diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.hpp b/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.hpp deleted file mode 100644 index 42800a694d8..00000000000 --- a/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.hpp +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-modules_gui_qt4_input__manager.hpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ - -Qt's MOC doesn't handle int64_t, so introduce a meaningful type name -so that slot/signal/connection macros work properly. - ---- modules/gui/qt4/input_manager.hpp.orig 2015-01-26 18:50:20.000000000 +0000 -+++ modules/gui/qt4/input_manager.hpp -@@ -37,6 +37,7 @@ - - #include <QObject> - #include <QEvent> -+typedef int64_t putime_t; - class QSignalMapper; - - enum { NORMAL, /* loop: 0, repeat: 0 */ -@@ -212,11 +213,11 @@ public slots: - void setAtoB(); - - private slots: -- void AtoBLoop( float, int64_t, int ); -+ void AtoBLoop( float, putime_t, int ); - - signals: - /// Send new position, new time and new length -- void positionUpdated( float , int64_t, int ); -+ void positionUpdated( float , putime_t, int ); - void seekRequested( float pos ); - void rateChanged( float ); - void nameChanged( const QString& ); -@@ -225,7 +226,7 @@ signals: - void chapterChanged( bool ); - void inputCanSeek( bool ); - /// You can resume playback -- void resumePlayback( int64_t ); -+ void resumePlayback( putime_t ); - /// Statistics are updated - void statisticsUpdated( input_item_t* ); - void infoChanged( input_item_t* ); diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.cpp b/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.cpp deleted file mode 100644 index 7a9c8fa50eb..00000000000 --- a/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.cpp +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-modules_gui_qt4_main__interface.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ - -Qt's MOC doesn't handle int64_t, so introduce a meaningful type name -so that slot/signal/connection macros work properly. - ---- modules/gui/qt4/main_interface.cpp.orig 2015-02-26 20:21:25.000000000 +0000 -+++ modules/gui/qt4/main_interface.cpp -@@ -399,13 +399,13 @@ void MainInterface::createResumePanel( Q - - CONNECT( resumeTimer, timeout(), this, hideResumePanel() ); - CONNECT( cancel, clicked(), this, hideResumePanel() ); -- CONNECT( THEMIM->getIM(), resumePlayback(int64_t), this, showResumePanel(int64_t) ); -+ CONNECT( THEMIM->getIM(), resumePlayback(putime_t), this, showResumePanel(putime_t) ); - BUTTONACT( ok, resumePlayback() ); - - w->layout()->addWidget( resumePanel ); - } - --void MainInterface::showResumePanel( int64_t _time ) { -+void MainInterface::showResumePanel( putime_t _time ) { - int setting = var_InheritInteger( p_intf, "qt-continue" ); - - if( setting == 0 ) diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.hpp b/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.hpp deleted file mode 100644 index 646bd03ee9b..00000000000 --- a/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.hpp +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-modules_gui_qt4_main__interface.hpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ - -Qt's MOC doesn't handle int64_t, so introduce a meaningful type name -so that slot/signal/connection macros work properly. - ---- modules/gui/qt4/main_interface.hpp.orig 2014-12-17 16:53:33.000000000 +0000 -+++ modules/gui/qt4/main_interface.hpp -@@ -36,6 +36,8 @@ - #include <QSystemTrayIcon> - #include <QStackedWidget> - -+typedef int64_t putime_t; -+ - class QSettings; - class QCloseEvent; - class QKeyEvent; -@@ -261,7 +263,7 @@ private slots: - void setBoss(); - void setRaise(); - -- void showResumePanel( int64_t); -+ void showResumePanel( putime_t ); - void hideResumePanel(); - void resumePlayback(); - diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.cpp b/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.cpp deleted file mode 100644 index 00c01f728fd..00000000000 --- a/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-modules_gui_qt4_util_input__slider.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ - -Qt's MOC doesn't handle int64_t, so introduce a meaningful type name -so that slot/signal/connection macros work properly. - ---- modules/gui/qt4/util/input_slider.cpp.orig 2015-04-12 15:12:46.000000000 +0000 -+++ modules/gui/qt4/util/input_slider.cpp -@@ -164,7 +164,7 @@ void SeekSlider::setChapters( SeekPoints - * \param time Elapsed time. Unused - * \param legnth Duration time. - ***/ --void SeekSlider::setPosition( float pos, int64_t time, int length ) -+void SeekSlider::setPosition( float pos, putime_t time, int length ) - { - VLC_UNUSED(time); - if( pos == -1.0 ) diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.hpp b/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.hpp deleted file mode 100644 index 0750d36376a..00000000000 --- a/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.hpp +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-modules_gui_qt4_util_input__slider.hpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ - -Qt's MOC doesn't handle int64_t, so introduce a meaningful type name -so that slot/signal/connection macros work properly. - ---- modules/gui/qt4/util/input_slider.hpp.orig 2014-11-16 18:57:59.000000000 +0000 -+++ modules/gui/qt4/util/input_slider.hpp -@@ -48,6 +48,8 @@ class QPropertyAnimation; - class QStyleOption; - class QCommonStyle; - -+typedef int64_t putime_t; -+ - /* Input Slider derived from QSlider */ - class SeekSlider : public QSlider - { -@@ -107,7 +109,7 @@ private: - QTimer *hideHandleTimer; - - public slots: -- void setPosition( float, int64_t, int ); -+ void setPosition( float, putime_t, int ); - void setSeekable( bool b ) { b_seekable = b ; } - void updateBuffering( float ); - void hideHandle(); diff --git a/multimedia/vlc/patches/patch-modules_gui_skins2_src_theme__loader.cpp b/multimedia/vlc/patches/patch-modules_gui_skins2_src_theme__loader.cpp deleted file mode 100644 index 5eff404651f..00000000000 --- a/multimedia/vlc/patches/patch-modules_gui_skins2_src_theme__loader.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-modules_gui_skins2_src_theme__loader.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ - ---- modules/gui/skins2/src/theme_loader.cpp.orig 2014-08-14 07:20:04.000000000 +0000 -+++ modules/gui/skins2/src/theme_loader.cpp -@@ -51,6 +51,7 @@ int gzwrite_frontend( int, const void *, - #if defined( HAVE_LIBTAR_H ) - # include <libtar.h> - #else -+#include <limits.h> /* for PATH_MAX */ - typedef gzFile TAR; - int tar_open ( TAR **t, char *pathname, int oflags ); - int tar_extract_all ( TAR *t, char *prefix ); diff --git a/multimedia/vlc/patches/patch-modules_misc_inhibit_xdg.c b/multimedia/vlc/patches/patch-modules_misc_inhibit_xdg.c deleted file mode 100644 index a79ef33e4c8..00000000000 --- a/multimedia/vlc/patches/patch-modules_misc_inhibit_xdg.c +++ /dev/null @@ -1,78 +0,0 @@ -$NetBSD: patch-modules_misc_inhibit_xdg.c,v 1.1 2015/10/25 11:00:18 wiz Exp $ - ---- modules/misc/inhibit/xdg.c.orig 2014-08-14 07:20:04.000000000 +0000 -+++ modules/misc/inhibit/xdg.c -@@ -27,7 +27,9 @@ - #include <vlc_inhibit.h> - #include <assert.h> - #include <signal.h> -+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) - #include <spawn.h> -+#endif - #include <sys/wait.h> - - static int Open (vlc_object_t *); -@@ -45,7 +47,9 @@ vlc_module_end () - struct vlc_inhibit_sys - { - vlc_timer_t timer; -+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) - posix_spawnattr_t attr; -+#endif - }; - - extern char **environ; -@@ -59,8 +63,12 @@ static void Timer (void *data) - }; - pid_t pid; - -+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) - int err = posix_spawnp (&pid, "xdg-screensaver", NULL, &sys->attr, - argv, environ); -+#else -+ int err = EINVAL; -+#endif - if (err == 0) - { - int status; -@@ -88,23 +96,31 @@ static int Open (vlc_object_t *obj) - if (p_sys == NULL) - return VLC_ENOMEM; - -+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) - posix_spawnattr_init (&p_sys->attr); -+#endif - /* Reset signal handlers to default and clear mask in the child process */ - { - sigset_t set; - - sigemptyset (&set); -+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) - posix_spawnattr_setsigmask (&p_sys->attr, &set); -+#endif - sigaddset (&set, SIGPIPE); -+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) - posix_spawnattr_setsigdefault (&p_sys->attr, &set); - posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF - | POSIX_SPAWN_SETSIGMASK); -+#endif - } - - ih->p_sys = p_sys; - if (vlc_timer_create (&p_sys->timer, Timer, ih)) - { -+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) - posix_spawnattr_destroy (&p_sys->attr); -+#endif - free (p_sys); - return VLC_ENOMEM; - } -@@ -119,6 +135,8 @@ static void Close (vlc_object_t *obj) - vlc_inhibit_sys_t *p_sys = ih->p_sys; - - vlc_timer_destroy (p_sys->timer); -+#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) - posix_spawnattr_destroy (&p_sys->attr); -+#endif - free (p_sys); - } diff --git a/multimedia/vlc/patches/patch-modules_services__discovery_mtp.c b/multimedia/vlc/patches/patch-modules_services__discovery_mtp.c deleted file mode 100644 index c73b145a357..00000000000 --- a/multimedia/vlc/patches/patch-modules_services__discovery_mtp.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-modules_services__discovery_mtp.c,v 1.1 2017/05/15 10:26:19 jperkin Exp $ - -Need strings.h for rindex(). - ---- modules/services_discovery/mtp.c.orig 2015-02-02 19:42:29.000000000 +0000 -+++ modules/services_discovery/mtp.c -@@ -24,6 +24,7 @@ - # include "config.h" - #endif - -+#include <strings.h> - #include <vlc_common.h> - #include <vlc_plugin.h> - #include <vlc_services_discovery.h> diff --git a/multimedia/vlc/patches/patch-modules_video__output_sdl.c b/multimedia/vlc/patches/patch-modules_video__output_sdl.c deleted file mode 100644 index 5641d03c9cf..00000000000 --- a/multimedia/vlc/patches/patch-modules_video__output_sdl.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-modules_video__output_sdl.c,v 1.1 2015/10/25 11:00:18 wiz Exp $ - ---- modules/video_output/sdl.c.orig 2014-11-16 18:57:59.000000000 +0000 -+++ modules/video_output/sdl.c -@@ -41,10 +41,9 @@ - #include <SDL.h> - - #if !defined(_WIN32) && !defined(__OS2__) --# ifdef X_DISPLAY_MISSING --# error Xlib required due to XInitThreads --# endif -+# ifdef HAVE_X11_XLIB_H - # include <vlc_xlib.h> -+# endif - #endif - - /***************************************************************************** diff --git a/multimedia/vlc/patches/patch-share_Makefile.am b/multimedia/vlc/patches/patch-share_Makefile.am new file mode 100644 index 00000000000..20b110bd6f9 --- /dev/null +++ b/multimedia/vlc/patches/patch-share_Makefile.am @@ -0,0 +1,15 @@ +$NetBSD: patch-share_Makefile.am,v 1.1 2019/07/02 20:52:13 nia Exp $ + +Remove unportable tar parameters. + +--- share/Makefile.am.orig 2018-02-06 18:41:06.000000000 +0000 ++++ share/Makefile.am +@@ -94,7 +94,7 @@ skins2/default.vlt: $(skins2_default_vlt + $(AM_V_at)rm -f -- skins2/default.vlt.tmp + $(AM_V_GEN)GZIP=--no-name \ + tar cvvzf skins2/default.vlt.tmp \ +- --owner=root --group=root --directory="$(srcdir)/skins2" \ ++ --directory="$(srcdir)/skins2" \ + default/ + $(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt + diff --git a/multimedia/vlc/patches/patch-src_config_file.c b/multimedia/vlc/patches/patch-src_config_file.c deleted file mode 100644 index b96121ce49a..00000000000 --- a/multimedia/vlc/patches/patch-src_config_file.c +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-src_config_file.c,v 1.3 2015/10/25 11:00:18 wiz Exp $ - -Rename strtoi to vlc_strtoi to avoid conflict with NetBSD built-in -function strtoi. - ---- src/config/file.c.orig 2014-08-14 07:20:04.000000000 +0000 -+++ src/config/file.c -@@ -138,7 +138,7 @@ static FILE *config_OpenConfigFile( vlc_ - } - - --static int64_t strtoi (const char *str) -+static int64_t vlc_strtoi (const char *str) - { - char *end; - long long l; -@@ -223,7 +223,7 @@ int config_LoadConfigFile( vlc_object_t - int64_t l; - - errno = 0; -- l = strtoi (psz_option_value); -+ l = vlc_strtoi (psz_option_value); - if ((l > item->max.i) || (l < item->min.i)) - errno = ERANGE; - if (errno) |