pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/vlc vlc: Update to 3.0.7.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/d937f01c9d02
branches: trunk
changeset: 335925:d937f01c9d02
user: nia <nia%pkgsrc.org@localhost>
date: Tue Jul 02 20:52:12 2019 +0000
description:
vlc: Update to 3.0.7.1
Based on work in pkgsrc-wip.
I've had the opportunity to test this in a NetBSD-8 bulk build - it seems
the package is now fixed. Hopefully.
The 3.0.x release series is considered for long-term support by upstream.
Notably for pkgsrc, this means it will be the last release series that
supports older compilers.
Note that VLC now depends on Qt5 instead of Qt4. Various config flags have
been tweaked (enabled/disabled) to match what other vendors (mainly FreeBSD)
are doing. I have also added an alsa package option.
The full list of upstream changes is probably too long to list.
diffstat:
multimedia/vlc/DESCR | 13 +-
multimedia/vlc/Makefile | 110 +-
multimedia/vlc/PLIST | 391 +++++----
multimedia/vlc/PLIST.Linux | 4 +-
multimedia/vlc/buildlink3.mk | 4 +-
multimedia/vlc/distinfo | 43 +-
multimedia/vlc/options.mk | 92 +-
multimedia/vlc/patches/patch-bin_override.c | 13 -
multimedia/vlc/patches/patch-compat_Makefile.am | 18 +-
multimedia/vlc/patches/patch-compat_Makefile.in | 131 ---
multimedia/vlc/patches/patch-configure | 24 -
multimedia/vlc/patches/patch-configure.ac | 21 +
multimedia/vlc/patches/patch-include_vlc__common.h | 48 -
multimedia/vlc/patches/patch-include_vlc__fixups.h | 54 -
multimedia/vlc/patches/patch-include_vlc_atomic.h | 22 -
multimedia/vlc/patches/patch-lib_core.c | 12 +
multimedia/vlc/patches/patch-lib_video.c | 24 +
multimedia/vlc/patches/patch-m4_dolt.m4 | 15 +
multimedia/vlc/patches/patch-modules_access_directory.c | 25 -
multimedia/vlc/patches/patch-modules_access_file.c | 23 -
multimedia/vlc/patches/patch-modules_access_http_Makefile.am | 15 +
multimedia/vlc/patches/patch-modules_access_rtp_Makefile.am | 13 -
multimedia/vlc/patches/patch-modules_gui_qt4_components_controller.cpp | 18 -
multimedia/vlc/patches/patch-modules_gui_qt4_components_extended__panels.cpp | 34 -
multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.cpp | 24 -
multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.hpp | 16 -
multimedia/vlc/patches/patch-modules_gui_qt4_dialogs_messages.cpp | 15 -
multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.cpp | 52 -
multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.hpp | 38 -
multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.cpp | 23 -
multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.hpp | 25 -
multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.cpp | 16 -
multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.hpp | 25 -
multimedia/vlc/patches/patch-modules_gui_skins2_src_theme__loader.cpp | 12 -
multimedia/vlc/patches/patch-modules_misc_inhibit_xdg.c | 78 -
multimedia/vlc/patches/patch-modules_services__discovery_mtp.c | 14 -
multimedia/vlc/patches/patch-modules_video__output_sdl.c | 17 -
multimedia/vlc/patches/patch-share_Makefile.am | 15 +
multimedia/vlc/patches/patch-src_config_file.c | 25 -
39 files changed, 449 insertions(+), 1113 deletions(-)
diffs (truncated from 2205 to 300 lines):
diff -r fc3c9cdb1ee3 -r d937f01c9d02 multimedia/vlc/DESCR
--- a/multimedia/vlc/DESCR Tue Jul 02 19:56:45 2019 +0000
+++ b/multimedia/vlc/DESCR Tue Jul 02 20:52:12 2019 +0000
@@ -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 -r fc3c9cdb1ee3 -r d937f01c9d02 multimedia/vlc/Makefile
--- a/multimedia/vlc/Makefile Tue Jul 02 19:56:45 2019 +0000
+++ b/multimedia/vlc/Makefile Tue Jul 02 20:52:12 2019 +0000
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.218 2018/11/27 18:28:48 maya Exp $
+# $NetBSD: Makefile,v 1.219 2019/07/02 20:52:12 nia Exp $
-# (Intended to be upgraded to vlc3 when dependencies resolved)
DISTNAME= vlc-${VLC_VERSION}
-PKGREVISION= 12
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/}
-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= 2.2.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
+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
@@ -31,42 +30,59 @@
.include "options.mk"
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-bonjour
CONFIGURE_ARGS+= --disable-caca
CONFIGURE_ARGS+= --disable-chromaprint
+CONFIGURE_ARGS+= --disable-chromecast
+CONFIGURE_ARGS+= --disable-dav1d
CONFIGURE_ARGS+= --disable-dc1394
+CONFIGURE_ARGS+= --disable-dv1394
CONFIGURE_ARGS+= --disable-decklink
-CONFIGURE_ARGS+= --disable-dv1394
+CONFIGURE_ARGS+= --disable-dsm
CONFIGURE_ARGS+= --disable-freerdp
+CONFIGURE_ARGS+= --disable-fluidlite
CONFIGURE_ARGS+= --disable-goom
CONFIGURE_ARGS+= --disable-gst-decode
-CONFIGURE_ARGS+= --disable-lua
+CONFIGURE_ARGS+= --disable-libplacebo
+CONFIGURE_ARGS+= --disable-live555
CONFIGURE_ARGS+= --disable-mfx
-CONFIGURE_ARGS+= --disable-mmal-codec
+CONFIGURE_ARGS+= --disable-microdns
+CONFIGURE_ARGS+= --disable-mmal
+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
-CFLAGS+= -fPIC
-CXXFLAGS+= -fPIC
-
# which platforms support OSSv4?
-.if ${MACHINE_PLATFORM:MNetBSD-*-*}
+.if ${OPSYS} == "NetBSD"
PLIST.oss= yes
.include "../../mk/oss.buildlink3.mk"
.else
@@ -79,6 +95,7 @@
CONFIGURE_ARGS+= --enable-mmx \
--enable-sse
.endif
+
.if ${MACHINE_ARCH} == "powerpc"
PLIST.altivec= yes
CONFIGURE_ARGS+= --enable-altivec
@@ -141,59 +158,56 @@
CHECK_WRKREF_SKIP= lib/libvlccore.a \
lib/libvlccore.so*
+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/mpg123/buildlink3.mk"
.include "../../audio/musepack/buildlink3.mk"
.include "../../audio/speexdsp/buildlink3.mk"
.include "../../audio/taglib/buildlink3.mk"
+.include "../../converters/fribidi/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libebml/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 "../../devel/pcre/buildlink3.mk"
+.include "../../devel/zlib/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/pcre/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-
-.include "../../multimedia/ffmpeg2/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 "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r fc3c9cdb1ee3 -r d937f01c9d02 multimedia/vlc/PLIST
--- a/multimedia/vlc/PLIST Tue Jul 02 19:56:45 2019 +0000
+++ b/multimedia/vlc/PLIST Tue Jul 02 20:52:12 2019 +0000
@@ -1,12 +1,27 @@
-@comment $NetBSD: PLIST,v 1.61 2018/01/01 22:29:45 rillig Exp $
+@comment $NetBSD: PLIST,v 1.62 2019/07/02 20:52:12 nia Exp $
+@pkgdir share/vlc/http/dialogs
+@pkgdir share/vlc/http/images
+@pkgdir share/vlc/http/js
+@pkgdir share/vlc/http/old/admin
+@pkgdir share/vlc/http/old/vlm
+@pkgdir share/vlc/http/requests
+@pkgdir share/vlc/osdmenu/default/selected
+@pkgdir share/vlc/osdmenu/default/selection
+@pkgdir share/vlc/osdmenu/default/volume
+@pkgdir share/vlc/osdmenu/dvd/selected
+@pkgdir share/vlc/osdmenu/dvd/selection
+@pkgdir share/vlc/osdmenu/dvd/unselect
+@pkgdir share/vlc/osdmenu/dvd/volume
+@pkgdir share/vlc/skins2/fonts
bin/cvlc
-${PLIST.x11}bin/qvlc
+${PLIST.qt5}bin/qvlc
bin/rvlc
${PLIST.vlc-skins}bin/svlc
bin/vlc
bin/vlc-wrapper
include/vlc/deprecated.h
include/vlc/libvlc.h
+include/vlc/libvlc_dialog.h
include/vlc/libvlc_events.h
include/vlc/libvlc_media.h
include/vlc/libvlc_media_discoverer.h
@@ -14,11 +29,12 @@
include/vlc/libvlc_media_list.h
include/vlc/libvlc_media_list_player.h
include/vlc/libvlc_media_player.h
-include/vlc/libvlc_structures.h
+include/vlc/libvlc_renderer_discoverer.h
include/vlc/libvlc_version.h
include/vlc/libvlc_vlm.h
include/vlc/plugins/vlc_about.h
include/vlc/plugins/vlc_access.h
+include/vlc/plugins/vlc_actions.h
include/vlc/plugins/vlc_addons.h
include/vlc/plugins/vlc_aout.h
include/vlc/plugins/vlc_aout_volume.h
@@ -28,6 +44,7 @@
include/vlc/plugins/vlc_bits.h
include/vlc/plugins/vlc_block.h
include/vlc/plugins/vlc_block_helper.h
+include/vlc/plugins/vlc_boxes.h
include/vlc/plugins/vlc_charset.h
include/vlc/plugins/vlc_codec.h
include/vlc/plugins/vlc_common.h
@@ -52,10 +69,13 @@
include/vlc/plugins/vlc_inhibit.h
include/vlc/plugins/vlc_input.h
include/vlc/plugins/vlc_input_item.h
-include/vlc/plugins/vlc_keys.h
+include/vlc/plugins/vlc_interface.h
+include/vlc/plugins/vlc_interrupt.h
+include/vlc/plugins/vlc_keystore.h
include/vlc/plugins/vlc_main.h
include/vlc/plugins/vlc_md5.h
include/vlc/plugins/vlc_media_library.h
+include/vlc/plugins/vlc_memstream.h
include/vlc/plugins/vlc_messages.h
include/vlc/plugins/vlc_meta.h
include/vlc/plugins/vlc_meta_fetcher.h
@@ -73,18 +93,22 @@
include/vlc/plugins/vlc_plugin.h
include/vlc/plugins/vlc_probe.h
include/vlc/plugins/vlc_rand.h
+include/vlc/plugins/vlc_renderer_discovery.h
include/vlc/plugins/vlc_services_discovery.h
include/vlc/plugins/vlc_sout.h
include/vlc/plugins/vlc_spu.h
include/vlc/plugins/vlc_stream.h
+include/vlc/plugins/vlc_stream_extractor.h
include/vlc/plugins/vlc_strings.h
include/vlc/plugins/vlc_subpicture.h
include/vlc/plugins/vlc_text_style.h
Home |
Main Index |
Thread Index |
Old Index