pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
vlc: Update to 3.0.7.1 and fix lua support.
Module Name: pkgsrc-wip
Committed By: nia <nia%netbsd.org@localhost>
Pushed By: nee
Date: Tue Jul 2 18:08:01 2019 +0100
Changeset: 8f30ebcded1423fa9ed229ee1b45269740b067c5
Modified Files:
vlc/DESCR
vlc/Makefile
vlc/PLIST
vlc/PLIST.Linux
vlc/distinfo
vlc/options.mk
Added Files:
vlc/patches/patch-configure.ac
Log Message:
vlc: Update to 3.0.7.1 and fix lua support.
Explicitly disable some options, mostly following FreeBSD.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8f30ebcded1423fa9ed229ee1b45269740b067c5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
vlc/DESCR | 13 ++----
vlc/Makefile | 94 +++++++++++++++++++++++++-----------------
vlc/PLIST | 13 +++---
vlc/PLIST.Linux | 2 -
vlc/distinfo | 9 ++--
vlc/options.mk | 47 +++++++++++----------
vlc/patches/patch-configure.ac | 21 ++++++++++
7 files changed, 114 insertions(+), 85 deletions(-)
diffs:
diff --git a/vlc/DESCR b/vlc/DESCR
index 6ea7f1224c..df2a9cc6c1 100644
--- a/vlc/DESCR
+++ b/vlc/DESCR
@@ -1,10 +1,3 @@
-VideoLAN is a project of French students from the Ecole Centrale Paris
-and developers from all over the world. Its main goals is MPEG streaming
-on a network, but it also features a standalone multimedia player. The
-VideoLAN Server can stream video read from a hard disk, a DVD player,
-a satellite card or an MPEG 2 compression card, and unicast or multicast
-it on a network. The VideoLAN Client can read the stream from the network
-and display it. It can also be used to display video read locally on
-the computer : DVDs, VCDs, MPEG and DivX files and from a satellite
-card. It is multi-plaform : Linux, Windows, Mac OS X, BeOS, BSD, Solaris,
-QNX, iPaq... The VideoLAN Client and Server now have a full IPv6 support.
+VLC is a free and open source cross-platform multimedia player and
+framework that plays most multimedia files as well as DVDs, Audio
+CDs, VCDs, and various streaming protocols.
diff --git a/vlc/Makefile b/vlc/Makefile
index f2a1029e6d..1bfcf9832c 100644
--- a/vlc/Makefile
+++ b/vlc/Makefile
@@ -2,20 +2,22 @@
DISTNAME= vlc-${VLC_VERSION}
CATEGORIES= multimedia
-MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
+MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
EXTRACT_SUFX= .tar.xz
-VLC_VERSION= 3.0.6
+VLC_VERSION= 3.0.7.1
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.videolan.org/
+HOMEPAGE= https://www.videolan.org/
COMMENT= VLC media player and streaming server
LICENSE= gnu-gpl-v2
CONFLICTS= vlc07-[0-9]* vlc08-[0-9]*
USE_LIBTOOL= yes
-USE_TOOLS+= gmake perl pkg-config autoreconf autoconf automake bison autopoint realpath msgfmt
+USE_TOOLS+= bash gmake perl pkg-config
+USE_TOOLS+= autoreconf autoconf automake bison
+USE_TOOLS+= autopoint realpath msgfmt msgmerge xgettext
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -30,35 +32,58 @@ PLIST_VARS+= altivec cdrom oss v4l2 x86simd
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0
BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
-CONFIGURE_ARGS+= --enable-dvdread
-CONFIGURE_ARGS+= --enable-flac
-CONFIGURE_ARGS+= --enable-theora
+LUA_VERSIONS_ACCEPTED= 51 52
+
+CONFIGURE_ARGS+= --disable-aribsub
+CONFIGURE_ARGS+= --disable-aribb25
CONFIGURE_ARGS+= --disable-bluray
CONFIGURE_ARGS+= --disable-caca
CONFIGURE_ARGS+= --disable-chromaprint
+CONFIGURE_ARGS+= --disable-chromecast
+CONFIGURE_ARGS+= --disable-dav1d
CONFIGURE_ARGS+= --disable-dc1394
-CONFIGURE_ARGS+= --disable-decklink
CONFIGURE_ARGS+= --disable-dv1394
+CONFIGURE_ARGS+= --disable-decklink
+CONFIGURE_ARGS+= --disable-dsm
CONFIGURE_ARGS+= --disable-freerdp
+CONFIGURE_ARGS+= --disable-fluidlite
CONFIGURE_ARGS+= --disable-goom
CONFIGURE_ARGS+= --disable-gst-decode
+CONFIGURE_ARGS+= --disable-libplacebo
+CONFIGURE_ARGS+= --disable-live555
CONFIGURE_ARGS+= --disable-mfx
+CONFIGURE_ARGS+= --disable-microdns
+CONFIGURE_ARGS+= --disable-mmal
+CONFIGURE_ARGS+= --disable-musepack
+CONFIGURE_ARGS+= --disable-ncurses
+CONFIGURE_ARGS+= --disable-nfs
CONFIGURE_ARGS+= --disable-notify
CONFIGURE_ARGS+= --disable-opencv
CONFIGURE_ARGS+= --disable-projectm
CONFIGURE_ARGS+= --disable-samplerate
+CONFIGURE_ARGS+= --disable-sdl-image
+CONFIGURE_ARGS+= --disable-secret
CONFIGURE_ARGS+= --disable-sftp
CONFIGURE_ARGS+= --disable-shine
CONFIGURE_ARGS+= --disable-sid
CONFIGURE_ARGS+= --disable-smbclient
+CONFIGURE_ARGS+= --disable-sndio
+CONFIGURE_ARGS+= --disable-spatialaudio
+CONFIGURE_ARGS+= --disable-srt
+CONFIGURE_ARGS+= --disable-svg
+CONFIGURE_ARGS+= --disable-svgdec
+CONFIGURE_ARGS+= --disable-tiger
CONFIGURE_ARGS+= --disable-twolame
CONFIGURE_ARGS+= --disable-udev
CONFIGURE_ARGS+= --disable-vnc
CONFIGURE_ARGS+= --disable-vsxu
+CONFIGURE_ARGS+= --disable-x264
+CONFIGURE_ARGS+= --disable-x26410b
+CONFIGURE_ARGS+= --disable-x265
CONFIGURE_ARGS+= --disable-zvbi
# which platforms support OSSv4?
-.if ${MACHINE_PLATFORM:MNetBSD-[789]*-*}
+.if ${MACHINE_PLATFORM:MNetBSD-[789].*}
PLIST.oss= yes
.include "../../mk/oss.buildlink3.mk"
.else
@@ -71,6 +96,7 @@ PLIST.x86simd= yes
CONFIGURE_ARGS+= --enable-mmx \
--enable-sse
.endif
+
.if ${MACHINE_ARCH} == "powerpc"
PLIST.altivec= yes
CONFIGURE_ARGS+= --enable-altivec
@@ -136,60 +162,52 @@ CHECK_WRKREF_SKIP= lib/libvlccore.a \
pre-configure:
${RUN} cd ${WRKSRC} && ${SH} ./bootstrap
+.include "../../archivers/libarchive/buildlink3.mk"
+.include "../../audio/faad2/buildlink3.mk"
.include "../../audio/fluidsynth/buildlink3.mk"
.include "../../audio/flac/buildlink3.mk"
-.include "../../multimedia/libkate/buildlink3.mk"
+.include "../../audio/liba52/buildlink3.mk"
+.include "../../audio/libcddb/buildlink3.mk"
+.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libmodplug/buildlink3.mk"
.include "../../audio/libopus/buildlink3.mk"
.include "../../audio/libshout/buildlink3.mk"
+.include "../../audio/libsoxr/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/liba52/buildlink3.mk"
-.include "../../audio/libcddb/buildlink3.mk"
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/musepack/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
.include "../../audio/speexdsp/buildlink3.mk"
.include "../../audio/taglib/buildlink3.mk"
-.include "../../devel/libmtp/buildlink3.mk"
-.include "../../misc/libcdio/buildlink3.mk"
-.include "../../multimedia/libass/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
-
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
.include "../../converters/fribidi/buildlink3.mk"
-.include "../../devel/libebml/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libebml/buildlink3.mk"
+.include "../../devel/libmtp/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../misc/libcdio/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../multimedia/libass/buildlink3.mk"
.include "../../multimedia/libdvdplay/buildlink3.mk"
.include "../../multimedia/libdvbpsi0/buildlink3.mk"
.include "../../multimedia/libdvdnav/buildlink3.mk"
.include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../multimedia/libkate/buildlink3.mk"
.include "../../multimedia/libmatroska/buildlink3.mk"
.include "../../multimedia/libmpeg2/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../multimedia/libtheora/buildlink3.mk"
.include "../../multimedia/schroedinger/buildlink3.mk"
+.include "../../net/libupnp/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
# libX11 should be built with xcb enabled
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.3.5
.include "../../x11/libX11/buildlink3.mk"
-# needs x264_encoder_delayed_frames
-BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20100201
-.include "../../multimedia/x264-devel/buildlink3.mk"
-#.include "../../lang/lua/buildlink3.mk"
-.include "../../net/libupnp/buildlink3.mk"
-
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.if "${OPSYS}" == "Linux"
-. include "../../audio/alsa-lib/buildlink3.mk"
-.endif
-.include "../../lang/lua52/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/vlc/PLIST b/vlc/PLIST
index c60dbee6c3..e1a91f67b5 100644
--- a/vlc/PLIST
+++ b/vlc/PLIST
@@ -160,6 +160,7 @@ lib/vlc/lua/playlist/vocaroo.luac
lib/vlc/lua/playlist/youtube.luac
lib/vlc/lua/sd/icecast.luac
lib/vlc/lua/sd/jamendo.luac
+${PLIST.alsa}lib/vlc/plugins/access/libaccess_alsa_plugin.la
lib/vlc/plugins/access/libaccess_concat_plugin.la
lib/vlc/plugins/access/libaccess_imem_plugin.la
${PLIST.jack}lib/vlc/plugins/access/libaccess_jack_plugin.la
@@ -177,7 +178,6 @@ lib/vlc/plugins/access/libhttp_plugin.la
lib/vlc/plugins/access/libhttps_plugin.la
lib/vlc/plugins/access/libidummy_plugin.la
lib/vlc/plugins/access/libimem_plugin.la
-${PLIST.live}lib/vlc/plugins/access/liblive555_plugin.la
${PLIST.pulseaudio}lib/vlc/plugins/access/libpulsesrc_plugin.la
lib/vlc/plugins/access/librtp_plugin.la
lib/vlc/plugins/access/libsatip_plugin.la
@@ -212,6 +212,7 @@ lib/vlc/plugins/audio_filter/libremap_plugin.la
lib/vlc/plugins/audio_filter/libscaletempo_pitch_plugin.la
lib/vlc/plugins/audio_filter/libscaletempo_plugin.la
lib/vlc/plugins/audio_filter/libsimple_channel_mixer_plugin.la
+lib/vlc/plugins/audio_filter/libsoxr_plugin.la
lib/vlc/plugins/audio_filter/libspatializer_plugin.la
lib/vlc/plugins/audio_filter/libspeex_resampler_plugin.la
lib/vlc/plugins/audio_filter/libstereo_widen_plugin.la
@@ -222,6 +223,7 @@ lib/vlc/plugins/audio_mixer/libfloat_mixer_plugin.la
lib/vlc/plugins/audio_mixer/libinteger_mixer_plugin.la
lib/vlc/plugins/audio_output/libadummy_plugin.la
lib/vlc/plugins/audio_output/libafile_plugin.la
+${PLIST.alsa}lib/vlc/plugins/audio_output/libalsa_plugin.la
lib/vlc/plugins/audio_output/libamem_plugin.la
${PLIST.jack}lib/vlc/plugins/audio_output/libjack_plugin.la
${PLIST.oss}lib/vlc/plugins/audio_output/liboss_plugin.la
@@ -239,7 +241,7 @@ ${PLIST.dts}lib/vlc/plugins/codec/libdca_plugin.la
lib/vlc/plugins/codec/libddummy_plugin.la
lib/vlc/plugins/codec/libdvbsub_plugin.la
lib/vlc/plugins/codec/libedummy_plugin.la
-${PLIST.faad}lib/vlc/plugins/codec/libfaad_plugin.la
+lib/vlc/plugins/codec/libfaad_plugin.la
lib/vlc/plugins/codec/libflac_plugin.la
lib/vlc/plugins/codec/libfluidsynth_plugin.la
lib/vlc/plugins/codec/libg711_plugin.la
@@ -248,6 +250,7 @@ lib/vlc/plugins/codec/libkate_plugin.la
lib/vlc/plugins/codec/liblibass_plugin.la
lib/vlc/plugins/codec/liblibmpeg2_plugin.la
lib/vlc/plugins/codec/liblpcm_plugin.la
+lib/vlc/plugins/codec/libmpg123_plugin.la
lib/vlc/plugins/codec/liboggspots_plugin.la
lib/vlc/plugins/codec/libopus_plugin.la
lib/vlc/plugins/codec/libpng_plugin.la
@@ -264,7 +267,6 @@ lib/vlc/plugins/codec/libsubsdec_plugin.la
lib/vlc/plugins/codec/libsubstx3g_plugin.la
lib/vlc/plugins/codec/libsubsusf_plugin.la
lib/vlc/plugins/codec/libsvcdsub_plugin.la
-lib/vlc/plugins/codec/libsvgdec_plugin.la
lib/vlc/plugins/codec/libt140_plugin.la
lib/vlc/plugins/codec/libtelx_plugin.la
lib/vlc/plugins/codec/libtextst_plugin.la
@@ -276,8 +278,6 @@ ${PLIST.vaapi}lib/vlc/plugins/codec/libvaapi_plugin.la
lib/vlc/plugins/codec/libvorbis_plugin.la
lib/vlc/plugins/codec/libvpx_plugin.la
lib/vlc/plugins/codec/libwebvtt_plugin.la
-lib/vlc/plugins/codec/libx264_plugin.la
-lib/vlc/plugins/codec/libx26410b_plugin.la
${PLIST.x11}lib/vlc/plugins/codec/libxwd_plugin.la
${PLIST.dbus}lib/vlc/plugins/control/libdbus_plugin.la
lib/vlc/plugins/control/libdummy_plugin.la
@@ -308,7 +308,6 @@ lib/vlc/plugins/demux/libmjpeg_plugin.la
lib/vlc/plugins/demux/libmkv_plugin.la
lib/vlc/plugins/demux/libmod_plugin.la
lib/vlc/plugins/demux/libmp4_plugin.la
-lib/vlc/plugins/demux/libmpc_plugin.la
lib/vlc/plugins/demux/libmpgv_plugin.la
lib/vlc/plugins/demux/libnoseek_plugin.la
lib/vlc/plugins/demux/libnsc_plugin.la
@@ -393,6 +392,7 @@ lib/vlc/plugins/spu/libmosaic_plugin.la
lib/vlc/plugins/spu/libremoteosd_plugin.la
lib/vlc/plugins/spu/librss_plugin.la
lib/vlc/plugins/spu/libsubsdelay_plugin.la
+lib/vlc/plugins/stream_extractor/libarchive_plugin.la
lib/vlc/plugins/stream_filter/libadf_plugin.la
lib/vlc/plugins/stream_filter/libcache_block_plugin.la
lib/vlc/plugins/stream_filter/libcache_read_plugin.la
@@ -421,7 +421,6 @@ lib/vlc/plugins/stream_out/libstream_out_standard_plugin.la
lib/vlc/plugins/stream_out/libstream_out_stats_plugin.la
lib/vlc/plugins/stream_out/libstream_out_transcode_plugin.la
${PLIST.x11}lib/vlc/plugins/text_renderer/libfreetype_plugin.la
-lib/vlc/plugins/text_renderer/libsvg_plugin.la
lib/vlc/plugins/text_renderer/libtdummy_plugin.la
${PLIST.vaapi}lib/vlc/plugins/vaapi/libvaapi_filters_plugin.la
${PLIST.x11}lib/vlc/plugins/vdpau/libvdpau_adjust_plugin.la
diff --git a/vlc/PLIST.Linux b/vlc/PLIST.Linux
index 5e52a0bb42..d8374acd17 100644
--- a/vlc/PLIST.Linux
+++ b/vlc/PLIST.Linux
@@ -1,8 +1,6 @@
@comment $NetBSD: PLIST.Linux,v 1.2 2015/10/25 11:00:18 wiz Exp $
-lib/vlc/plugins/access/libaccess_alsa_plugin.la
lib/vlc/plugins/access/libdtv_plugin.la
lib/vlc/plugins/access/liblinsys_hdsdi_plugin.la
${PLIST.v4l2}lib/vlc/plugins/access/libv4l2_plugin.la
-lib/vlc/plugins/audio_output/libalsa_plugin.la
lib/vlc/plugins/video_filter/libatmo_plugin.la
lib/vlc/plugins/video_output/libfb_plugin.la
diff --git a/vlc/distinfo b/vlc/distinfo
index 992141bc0b..0062f8e0bc 100644
--- a/vlc/distinfo
+++ b/vlc/distinfo
@@ -1,10 +1,11 @@
$NetBSD: distinfo,v 1.74 2017/05/26 13:26:37 maya Exp $
-SHA1 (vlc-3.0.6.tar.xz) = b35168c1811b07844d861311bd0f2194f4bb82ac
-RMD160 (vlc-3.0.6.tar.xz) = 717f81c5ab63d7d5cdb427a198d958e0e418609f
-SHA512 (vlc-3.0.6.tar.xz) = 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
-Size (vlc-3.0.6.tar.xz) = 25699704 bytes
+SHA1 (vlc-3.0.7.1.tar.xz) = 3f6f9e56695eeea662b86602963721f1ac7afd23
+RMD160 (vlc-3.0.7.1.tar.xz) = 9ed6e0f890582efb455c6ff005233cff6c83fcf3
+SHA512 (vlc-3.0.7.1.tar.xz) = 6b99ae0564630a7a7ca9187c3bb954c601e384522ce93460b73f2dbf31787ce5828daca9f31c781b97db77872d76b6a3e871ff3401d70f1b5829fee7c4e847fd
+Size (vlc-3.0.7.1.tar.xz) = 26052372 bytes
SHA1 (patch-compat_Makefile.am) = 1c3e0a7c4610c55c3ec9ba80d66b9959661139b3
+SHA1 (patch-configure.ac) = 99e975954323b4e94daeb75ce2ae439b49c51b0f
SHA1 (patch-lib_core.c) = 8ec5557424e6ddc05cc365aacd1ec847d9a94605
SHA1 (patch-lib_video.c) = 362aaf7977c264bb70a79e98cf18da923ae62e39
SHA1 (patch-m4_dolt.m4) = a1aac0c1021001a489f9b515e218904e065ed659
diff --git a/vlc/options.mk b/vlc/options.mk
index 53817fc6aa..6aba207070 100644
--- a/vlc/options.mk
+++ b/vlc/options.mk
@@ -1,16 +1,13 @@
# $NetBSD: options.mk,v 1.32 2017/05/15 11:07:20 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.vlc
-PKG_SUPPORTED_OPTIONS= dbus debug dts faad jack live pulseaudio
+PKG_SUPPORTED_OPTIONS= alsa avahi dbus debug dts jack pulseaudio
PKG_SUPPORTED_OPTIONS+= vlc-skins x11
PKG_SUGGESTED_OPTIONS= dbus x11
+PKG_SUGGESTED_OPTIONS.Linux+= alsa
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "SunOS"
-PKG_SUGGESTED_OPTIONS+= live
-.endif
-
### Add VAAPI if it is available
.include "../../multimedia/libva/available.mk"
PLIST_VARS+= vaapi
@@ -32,6 +29,26 @@ PKG_SUGGESTED_OPTIONS+= lirc
PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
+## Avahi support
+
+.if !empty(PKG_OPTIONS:Malsa)
+CONFIGURE_ARGS+= --enable-alsa
+.include "../../audio/alsa-lib/buildlink3.mk"
+PLIST.alsa= yes
+.else
+CONFIGURE_ARGS+= --disable-alsa
+.endif
+
+## Avahi support
+
+.if !empty(PKG_OPTIONS:Mavahi)
+CONFIGURE_ARGS+= --enable-avahi
+.include "../../net/avahi/buildlink3.mk"
+PLIST.avahi= yes
+.else
+CONFIGURE_ARGS+= --disable-avahi
+.endif
+
## PulseAudio support
.if !empty(PKG_OPTIONS:Mpulseaudio)
@@ -97,6 +114,7 @@ DEPENDS+= dejavu-ttf>=2.0:../../fonts/dejavu-ttf
.include "../../graphics/glu/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
CONFIGURE_ARGS+= --enable-qt \
--with-x
PLIST.x11= yes
@@ -111,14 +129,6 @@ CONFIGURE_ARGS+= --without-x \
--disable-vdpau
.endif
-.if !empty(PKG_OPTIONS:Mfaad)
-CONFIGURE_ARGS+= --enable-faad
-PLIST.faad= yes
-.include "../../audio/faad2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-faad
-.endif
-
## DTS support (libdca is non-redistributable)
.if !empty(PKG_OPTIONS:Mdts)
@@ -129,17 +139,6 @@ PLIST.dts= yes
CONFIGURE_ARGS+= --enable-dca=no
.endif
-## RTSP support
-
-.if !empty(PKG_OPTIONS:Mlive)
-CONFIGURE_ARGS+= --enable-live555
-PLIST.live= yes
-BUILDLINK_API_DEPENDS.liblive+= liblive>=20111223
-. include "../../net/liblive/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-live555
-.endif
-
## VAAPI support
.if !empty(PKG_OPTIONS:Mvaapi)
CONFIGURE_ARGS+= --enable-libva
diff --git a/vlc/patches/patch-configure.ac b/vlc/patches/patch-configure.ac
new file mode 100644
index 0000000000..55a4e2f3fc
--- /dev/null
+++ b/vlc/patches/patch-configure.ac
@@ -0,0 +1,21 @@
+$NetBSD$
+
+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])
Home |
Main Index |
Thread Index |
Old Index