[arch-commits] Commit in vlc/repos (6 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Jul 5 13:18:13 UTC 2018
Date: Thursday, July 5, 2018 @ 13:18:13
Author: foutrelis
Revision: 327993
archrelease: copy trunk to staging-x86_64
Added:
vlc/repos/staging-x86_64/
vlc/repos/staging-x86_64/PKGBUILD
(from rev 327992, vlc/trunk/PKGBUILD)
vlc/repos/staging-x86_64/aom-remove-unsupported-pixel-formats.patch
(from rev 327992, vlc/trunk/aom-remove-unsupported-pixel-formats.patch)
vlc/repos/staging-x86_64/lua53_compat.patch
(from rev 327992, vlc/trunk/lua53_compat.patch)
vlc/repos/staging-x86_64/update-vlc-plugin-cache.hook
(from rev 327992, vlc/trunk/update-vlc-plugin-cache.hook)
vlc/repos/staging-x86_64/vlc-qt5.11.patch
(from rev 327992, vlc/trunk/vlc-qt5.11.patch)
--------------------------------------------+
PKGBUILD | 232 +++++++++++++++++++++++++++
aom-remove-unsupported-pixel-formats.patch | 37 ++++
lua53_compat.patch | 30 +++
update-vlc-plugin-cache.hook | 11 +
vlc-qt5.11.patch | 10 +
5 files changed, 320 insertions(+)
Copied: vlc/repos/staging-x86_64/PKGBUILD (from rev 327992, vlc/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-07-05 13:18:13 UTC (rev 327993)
@@ -0,0 +1,232 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
+
+pkgname=vlc
+pkgver=3.0.3
+pkgrel=2
+pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
+url='https://www.videolan.org/vlc/'
+arch=('x86_64')
+license=('LGPL2.1' 'GPL2')
+depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua'
+ 'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libmad'
+ 'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret'
+ 'libarchive' 'qt5-base' 'qt5-x11extras' 'qt5-svg' 'freetype2'
+ 'fribidi' 'harfbuzz' 'fontconfig' 'libxml2' 'gnutls' 'libplacebo'
+ 'wayland-protocols')
+makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
+ 'flac' 'kdelibs' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
+ 'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'libsystemd'
+ 'libmtp' 'libupnp' 'libmicrodns' 'libdvdcss' 'smbclient'
+ 'vcdimager' 'libssh2' 'mesa' 'protobuf' 'libnfs' 'mpg123'
+ 'libdvdread' 'libdvdnav' 'libogg' 'libshout' 'libmodplug' 'libvpx'
+ 'libvorbis' 'speex' 'opus' 'libtheora' 'libpng' 'libjpeg-turbo'
+ 'libx265.so' 'libx264.so' 'zvbi' 'libass' 'libkate' 'libtiger'
+ 'sdl_image' 'libpulse' 'alsa-lib' 'jack' 'libsamplerate' 'libsoxr'
+ 'lirc' 'libgoom2' 'projectm' 'chromaprint')
+optdepends=('avahi: service discovery using bonjour protocol'
+ 'gst-plugins-base-libs: for libgst plugins'
+ 'libdvdcss: decoding encrypted DVDs'
+ 'libavc1394: devices using the 1394ta AV/C'
+ 'libdc1394: IEEE 1394 access plugin'
+ 'kdelibs: KDE Solid hardware integration'
+ 'kwallet: kwallet keystore'
+ 'libva-vdpau-driver: vdpau backend nvidia'
+ 'libva-intel-driver: video backend intel'
+ 'libbluray: Blu-Ray video input'
+ 'flac: Free Lossless Audio Codec plugin'
+ 'twolame: TwoLAME mpeg2 encoder plugin'
+ 'libgme: Game Music Emu plugin'
+ 'vcdimager: navigate VCD with libvcdinfo'
+ 'libmtp: MTP devices discovery'
+ 'libsystemd: udev services discovery'
+ 'smbclient: SMB access plugin'
+ 'libcdio: audio CD playback'
+ 'ttf-freefont: subtitle font '
+ 'ttf-dejavu: subtitle font'
+ 'libssh2: sftp access'
+ 'libnfs: NFS access'
+ 'mpg123: mpg123 codec'
+ 'protobuf: chromecast streaming'
+ 'libmicrodns: mDNS services discovery (chromecast etc)'
+ 'lua-socket: http interface'
+ 'live-media: RTSP input'
+ 'libdvdread: DVD input module'
+ 'libdvdnav: DVD with navigation input module'
+ 'libogg: Ogg and OggSpots codec'
+ 'libshout: shoutcast/icecast output plugin'
+ 'libmodplug: MOD output plugin'
+ 'libvpx: VP8 and VP9 codec'
+ 'libvorbis: Vorbis decoder/encoder'
+ 'speex: Speex codec'
+ 'opus: opus codec'
+ 'libtheora: theora codec'
+ 'libpng: PNG support'
+ 'libjpeg-turbo: JPEG support'
+ 'librsvg: SVG plugin'
+ 'libx264: H264 encoding'
+ 'x265: HEVC/H.265 encoder'
+ 'zvbi: VBI/Teletext decoding'
+ 'libass: Subtitle support'
+ 'libkate: Kate codec'
+ 'libtiger: Tiger rendering for Kate streams'
+ 'sdl_image: SDL image support'
+ 'aalib: ASCII art video output'
+ 'libcaca: colored ASCII art video output'
+ 'libpulse: PulseAudio audio output'
+ 'alsa-lib: ALSA audio output'
+ 'jack: jack audio server'
+ 'libsamplerate: audio Resampler'
+ 'libsoxr: SoX audio Resampler'
+ 'chromaprint: Chromaprint audio fingerprinter'
+ 'lirc: lirc control'
+ 'libgoom2: Goom visualization'
+ 'projectm: ProjectM visualisation'
+ 'ncurses: ncurses interface'
+ 'libnotify: notification plugin'
+ 'gtk3: notification plugin')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
+options=('!emptydirs')
+source=(https://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz{,.asc}
+ update-vlc-plugin-cache.hook
+ aom-remove-unsupported-pixel-formats.patch
+ lua53_compat.patch
+ vlc-qt5.11.patch)
+sha512sums=('1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab'
+ 'SKIP'
+ '80357bae69e32b353d3784932d854e294906798e14faffb87c3383c3b6f6bdc57cbabb9c6e3f3c1adf0f8ddbb24153e72104c963cf1934970c2983c96daef9df'
+ '5757a6f35e106883072c31d137fd247c65a544f730cf736ca2e81a31357305b5c002b52349337d8e1667fbe68628bc253ec69eee727f268aee7902a5bef82dce'
+ '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f'
+ '66aad0ec32d1a96f65566b04eb9c0b4574824e281940fe5c0de54ac5f92189693a9f2576203d2c8562d7174ec5315cbbd683d93c481d16119d3038e30a58cbf5')
+validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp
+ sed -e 's|-Werror-implicit-function-declaration||g' -i configure
+ sed 's|whoami|echo builduser|g' -i configure
+ sed 's|hostname -f|echo arch|g' -i configure
+ patch -Np1 < "${srcdir}/aom-remove-unsupported-pixel-formats.patch"
+ patch -Np1 < "${srcdir}/lua53_compat.patch"
+ patch -Np1 < "${srcdir}/vlc-qt5.11.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ export CFLAGS+=" -I/usr/include/samba-4.0"
+ export CPPFLAGS+=" -I/usr/include/samba-4.0"
+ export CXXFLAGS+=" -std=c++11"
+ export LUAC=/usr/bin/luac
+ export LUA_LIBS="$(pkg-config --libs lua)"
+ export RCC=/usr/bin/rcc-qt5
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-rpath \
+ --enable-nls \
+ --enable-archive \
+ --enable-live555 \
+ --enable-dc1394 \
+ --enable-dv1394 \
+ --enable-dvdread \
+ --enable-dvdnav \
+ --enable-bluray \
+ --disable-opencv \
+ --enable-smbclient \
+ --enable-sftp \
+ --enable-nfs \
+ --enable-realrtsp \
+ --enable-dvbpsi \
+ --enable-gme \
+ --enable-ogg \
+ --enable-shout \
+ --enable-matroska \
+ --enable-mod \
+ --enable-mpc \
+ --enable-mad \
+ --enable-mpg123 \
+ --enable-gst-decode \
+ --enable-avcodec \
+ --enable-libva \
+ --enable-avformat \
+ --enable-postproc \
+ --enable-faad \
+ --enable-vpx \
+ --enable-twolame \
+ --disable-fdkaac \
+ --enable-a52 \
+ --enable-dca \
+ --enable-flac \
+ --enable-libmpeg2 \
+ --enable-vorbis \
+ --enable-speex \
+ --enable-opus \
+ --enable-oggspots \
+ --disable-schroedinger \
+ --enable-png \
+ --enable-jpeg \
+ --enable-x264 \
+ --enable-x265 \
+ --enable-zvbi \
+ --enable-libass \
+ --enable-kate \
+ --enable-tiger \
+ --enable-vdpau \
+ --enable-wayland \
+ --enable-sdl-image \
+ --enable-freetype \
+ --enable-fribidi \
+ --enable-harfbuzz \
+ --enable-fontconfig \
+ --enable-svg \
+ --enable-svgdec \
+ --enable-aa \
+ --enable-caca \
+ --enable-pulse \
+ --enable-alsa \
+ --enable-jack \
+ --enable-samplerate \
+ --enable-soxr \
+ --enable-chromaprint \
+ --enable-chromecast \
+ --enable-qt \
+ --enable-skins2 \
+ --enable-libtar \
+ --enable-ncurses \
+ --enable-lirc \
+ --enable-goom \
+ --enable-projectm \
+ --enable-avahi \
+ --enable-mtp \
+ --enable-upnp \
+ --enable-microdns \
+ --enable-libxml2 \
+ --disable-libgcrypt \
+ --enable-gnutls \
+ --enable-taglib \
+ --enable-secret \
+ --enable-kwallet \
+ --disable-update-check \
+ --enable-notify \
+ --enable-libplacebo \
+ --enable-vlc
+ make
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ for res in 16 32 48 128 256; do
+ install -Dm 644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
+ "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
+ done
+ install -Dm 644 "${srcdir}/update-vlc-plugin-cache.hook" -t "${pkgdir}/usr/share/libalpm/hooks"
+}
+
+# vim: ts=2 sw=2 et:
Copied: vlc/repos/staging-x86_64/aom-remove-unsupported-pixel-formats.patch (from rev 327992, vlc/trunk/aom-remove-unsupported-pixel-formats.patch)
===================================================================
--- staging-x86_64/aom-remove-unsupported-pixel-formats.patch (rev 0)
+++ staging-x86_64/aom-remove-unsupported-pixel-formats.patch 2018-07-05 13:18:13 UTC (rev 327993)
@@ -0,0 +1,37 @@
+From 622360c2c4335fff793f81f5e673326a581f5c0c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
+Date: Thu, 19 Apr 2018 18:25:07 +0300
+Subject: [PATCH] aom: Remove unsupported pixel formats
+
+Support for these was apparently never in the codebase, and the enum
+values were recently removed from the public headers [1].
+
+This fixes build with latest libaom build.
+
+[1] https://aomedia.googlesource.com/aom/+/3f29cc20e3a4c348cb41a797c68de856ddb84e12
+---
+ modules/codec/aom.c | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/modules/codec/aom.c b/modules/codec/aom.c
+index 5bb442b5d50..60034158c47 100644
+--- a/modules/codec/aom.c
++++ b/modules/codec/aom.c
+@@ -116,17 +116,6 @@ static const struct
+
+ { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 },
+ { VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 },
+- { VLC_CODEC_YUYV, AOM_IMG_FMT_YUY2, 8, 0 },
+- { VLC_CODEC_UYVY, AOM_IMG_FMT_UYVY, 8, 0 },
+- { VLC_CODEC_YVYU, AOM_IMG_FMT_YVYU, 8, 0 },
+-
+- { VLC_CODEC_RGB15, AOM_IMG_FMT_RGB555, 8, 0 },
+- { VLC_CODEC_RGB16, AOM_IMG_FMT_RGB565, 8, 0 },
+- { VLC_CODEC_RGB24, AOM_IMG_FMT_RGB24, 8, 0 },
+- { VLC_CODEC_RGB32, AOM_IMG_FMT_RGB32, 8, 0 },
+-
+- { VLC_CODEC_ARGB, AOM_IMG_FMT_ARGB, 8, 0 },
+- { VLC_CODEC_BGRA, AOM_IMG_FMT_ARGB_LE, 8, 0 },
+
+ { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 },
+ { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 },
Copied: vlc/repos/staging-x86_64/lua53_compat.patch (from rev 327992, vlc/trunk/lua53_compat.patch)
===================================================================
--- staging-x86_64/lua53_compat.patch (rev 0)
+++ staging-x86_64/lua53_compat.patch 2018-07-05 13:18:13 UTC (rev 327993)
@@ -0,0 +1,30 @@
+commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
+Author: Vinson Lee <vlee at freedesktop.org>
+Date: Thu Feb 5 14:48:53 2015 -0800
+
+ lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
+
+ In Lua 5.3.0, luaL_checkint was deprecated.
+
+ This patch fixes this build error with Lua 5.3.0.
+
+ lua/demux.c: In function ‘vlclua_demux_peek’:
+ lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
+ int n = luaL_checkint( L, 1 );
+ ^
+
+ Signed-off-by: Vinson Lee <vlee at freedesktop.org>
+ Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index efd94f1..85c7fc1 100644
+--- a/modules/lua/vlc.h
++++ b/modules/lua/vlc.h
+@@ -38,6 +38,7 @@
+ #include <vlc_stream.h>
+ #include <vlc_demux.h>
+
++#define LUA_COMPAT_APIINTCASTS
+ #define LUA_COMPAT_MODULE
+ #include <lua.h> /* Low level lua C API */
+ #include <lauxlib.h> /* Higher level C API */
Copied: vlc/repos/staging-x86_64/update-vlc-plugin-cache.hook (from rev 327992, vlc/trunk/update-vlc-plugin-cache.hook)
===================================================================
--- staging-x86_64/update-vlc-plugin-cache.hook (rev 0)
+++ staging-x86_64/update-vlc-plugin-cache.hook 2018-07-05 13:18:13 UTC (rev 327993)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/vlc/plugins/*
+
+[Action]
+Description = Updating the vlc plugin cache...
+When = PostTransaction
+Exec = /usr/lib/vlc/vlc-cache-gen /usr/lib/vlc/plugins
Copied: vlc/repos/staging-x86_64/vlc-qt5.11.patch (from rev 327992, vlc/trunk/vlc-qt5.11.patch)
===================================================================
--- staging-x86_64/vlc-qt5.11.patch (rev 0)
+++ staging-x86_64/vlc-qt5.11.patch 2018-07-05 13:18:13 UTC (rev 327993)
@@ -0,0 +1,10 @@
+--- a/modules/gui/qt/components/simple_preferences.cpp 2018-01-25 17:57:40.000000000 +0100
++++ b/modules/gui/qt/components/simple_preferences.cpp 2018-03-18 21:08:51.212556781 +0100
+@@ -33,6 +33,7 @@
+ #include <vlc_config_cat.h>
+ #include <vlc_configuration.h>
+
++#include <QButtonGroup>
+ #include <QString>
+ #include <QFont>
+ #include <QToolButton>
More information about the arch-commits
mailing list