diff options
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | 0001-Prevent-including-missing-SVGs.patch | 33 | ||||
-rw-r--r-- | PKGBUILD | 91 |
3 files changed, 90 insertions, 43 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Oct 16 15:28:36 UTC 2017 +# Fri Oct 20 16:26:47 UTC 2017 pkgbase = vlc-nightly pkgdesc = A multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot - pkgver = 3.0.0v20171016 + pkgver = 3.0.0v20171018 pkgrel = 1 url = http://www.videolan.org/vlc/ arch = i686 @@ -63,6 +63,7 @@ pkgbase = vlc-nightly depends = libsecret depends = libarchive depends = qt5-base + depends = qt5-svg depends = libglvnd depends = hicolor-icon-theme depends = qt5-x11extras @@ -100,13 +101,15 @@ pkgbase = vlc-nightly conflicts = vlc replaces = vlc-plugin options = !emptydirs - source = http://nightlies.videolan.org/build/source/vlc-3.0.0-20171016-0238-git.tar.xz + source = http://nightlies.videolan.org/build/source/vlc-3.0.0-20171018-0238-git.tar.xz source = update-vlc-plugin-cache.hook source = https://git.archlinux.org/svntogit/packages.git/plain/trunk/lua53_compat.patch?h=packages/vlc + source = 0001-Prevent-including-missing-SVGs.patch source = find-deps.py sha256sums = 82abfbd64cd6606afaf1c938f5b7cb8e29484d258719ee674d1a769bfce94431 sha256sums = c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a sha256sums = d1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa + sha256sums = 599ce4bf0db5fc74f54bc03136b662606c22b8435b81440b02fc73f52d09bd7f sha256sums = 90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7 pkgname = vlc-nightly diff --git a/0001-Prevent-including-missing-SVGs.patch b/0001-Prevent-including-missing-SVGs.patch new file mode 100644 index 000000000000..dd5a46260828 --- /dev/null +++ b/0001-Prevent-including-missing-SVGs.patch @@ -0,0 +1,33 @@ +--- a/modules/gui/qt/vlc.qrc 2017-10-18 21:40:51.489682799 +0200 ++++ b/modules/gui/qt/vlc.qrc 2017-10-18 21:39:05.602097150 +0200 +@@ -106,19 +106,19 @@ + <file alias="sample_skins.png">pixmaps/sample_skins.png</file> + </qresource> + <qresource prefix="/prefsmenu/advanced"> +- <file alias="audio.svg">pixmaps/prefs/advprefs_audio.svg</file> +- <file alias="codec.svg">pixmaps/prefs/advprefs_codec.svg</file> +- <file alias="extended.svg">pixmaps/prefs/advprefs_extended.svg</file> +- <file alias="intf.svg">pixmaps/prefs/advprefs_intf.svg</file> +- <file alias="playlist.svg">pixmaps/prefs/advprefs_playlist.svg</file> +- <file alias="sout.svg">pixmaps/prefs/advprefs_sout.svg</file> +- <file alias="video.svg">pixmaps/prefs/advprefs_video.svg</file> ++ <file alias="audio.svg">pixmaps/prefs/advprefs_audio.png</file> ++ <file alias="codec.svg">pixmaps/prefs/advprefs_codec.png</file> ++ <file alias="extended.svg">pixmaps/prefs/advprefs_extended.png</file> ++ <file alias="intf.svg">pixmaps/prefs/advprefs_intf.png</file> ++ <file alias="playlist.svg">pixmaps/prefs/advprefs_playlist.png</file> ++ <file alias="sout.svg">pixmaps/prefs/advprefs_sout.png</file> ++ <file alias="video.svg">pixmaps/prefs/advprefs_video.png</file> + </qresource> + <qresource prefix="/win7"> +- <file alias="pause.svg">pixmaps/win7/win7thumbnail_pause.svg</file> +- <file alias="prev.svg">pixmaps/win7/win7thumbnail_prev.svg</file> +- <file alias="play.svg">pixmaps/win7/win7thumbnail_play.svg</file> +- <file alias="next.svg">pixmaps/win7/win7thumbnail_next.svg</file> ++ <file alias="pause.svg">pixmaps/win7/win7thumbnail_pause.png</file> ++ <file alias="prev.svg">pixmaps/win7/win7thumbnail_prev.png</file> ++ <file alias="play.svg">pixmaps/win7/win7thumbnail_play.png</file> ++ <file alias="next.svg">pixmaps/win7/win7thumbnail_next.png</file> + </qresource> + <qresource prefix="/sidebar"> + <file alias="disc.svg">pixmaps/playlist/sidebar-icons/disc.svg</file> @@ -1,12 +1,13 @@ # $Id$ # Maintainer: Sebastian Weiland <sebastianweiland97@gmail.com> +# Contributor: Martchus <martchus@gmx.net> # Original package: Xavion <Xavion (dot) 0 (at) Gmail (dot) com> _appname_=vlc pkgname=${_appname_}-nightly -pkgver=3.0.0v20171016 +pkgver=3.0.0v20171018 _pkgver=3.0.0 -_snapshot_=20171016 +_snapshot_=20171018 _snapver_=0238 _nightly_=${_snapshot_}-${_snapver_} pkgrel=1 @@ -19,7 +20,7 @@ depends=('libmatroska' 'a52dec' 'sidplay2-libs' 'libfdk-aac' 'faad2' 'ffmpeg' 'l 'libdvdnav' 'libmad' 'libmpcdec' 'libmpeg2' 'libproxy' 'libshout' 'libtar' 'libtiger' 'libupnp' 'libxinerama' 'libxpm' 'lua' 'sdl_image' 'mesa' 'sndio' 'wayland' 'wayland-protocols' - 'taglib' 'xcb-util-keysyms' 'zvbi' 'libsecret' 'libarchive' 'qt5-base' 'libglvnd' + 'taglib' 'xcb-util-keysyms' 'zvbi' 'libsecret' 'libarchive' 'qt5-base' 'qt5-svg' 'libglvnd' 'hicolor-icon-theme' 'qt5-x11extras' "${_detected_depends[@]}") makedepends=('aalib' 'flac' 'git' 'libavc1394' 'libbluray' 'libcaca' 'libdc1394' 'libdvdcss' @@ -60,22 +61,29 @@ provides=("${_appname_}") replaces=("${_appname_}-plugin") options=("!emptydirs") source=("http://nightlies.videolan.org/build/source/vlc-${_pkgver}-${_nightly_}-git.tar.xz" -"update-vlc-plugin-cache.hook" -"https://git.archlinux.org/svntogit/packages.git/plain/trunk/lua53_compat.patch?h=packages/vlc" -'find-deps.py') + 'update-vlc-plugin-cache.hook' + 'https://git.archlinux.org/svntogit/packages.git/plain/trunk/lua53_compat.patch?h=packages/vlc' + '0001-Prevent-including-missing-SVGs.patch' + 'find-deps.py') pkgver() { printf 3.0.0v$_snapshot_ } -build() { - cd "${_appname_}-3.0.0-git" - ./bootstrap +prepare() { + cd "${_appname_}-3.0.0-git" + + ./bootstrap + patch -Np1 -i "${srcdir}/vlc" - # Patch - sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp - sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype/freetype.c - # Config + sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp + sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype/freetype.c + patch -p1 -i "$srcdir/0001-Prevent-including-missing-SVGs.patch" +} + +build() { + cd "${_appname_}-3.0.0-git" + export CFLAGS+=" -I/usr/include/samba-4.0" export CPPFLAGS+=" -I/usr/include/samba-4.0" export CXXFLAGS+=" -std=gnu++11" @@ -84,46 +92,49 @@ build() { export RCC=/usr/bin/rcc-qt5 export PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-rpath \ - --enable-faad \ - --enable-nls \ - --enable-lirc \ - --enable-ncurses \ - --enable-realrtsp \ - --enable-aa \ - --enable-upnp \ - --enable-opus \ - --enable-sftp \ - --enable-fdkaac \ - --enable-archive \ - --enable-bluray \ - --enable-daala - ./compile + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-rpath \ + --enable-faad \ + --enable-nls \ + --enable-lirc \ + --enable-ncurses \ + --enable-realrtsp \ + --enable-aa \ + --enable-upnp \ + --enable-opus \ + --enable-sftp \ + --enable-fdkaac \ + --enable-archive \ + --enable-bluray \ + --enable-daala + + ./compile } package() { - cd "${_appname_}-3.0.0-git" + cd "${_appname_}-3.0.0-git" - make -i DESTDIR="${pkgdir}" install + make -i DESTDIR="${pkgdir}" install - for res in 16 32 48 128; do - install -D -m644 "${srcdir}/${_appname_}-3.0.0-git/share/icons/${res}x${res}/${_appname_}.png" \ - "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${_appname_}.png" - done + for res in 16 32 48 128; do + install -D -m644 "${srcdir}/${_appname_}-3.0.0-git/share/icons/${res}x${res}/${_appname_}.png" \ + "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${_appname_}.png" + done install -Dm644 "$srcdir"/update-vlc-plugin-cache.hook "$pkgdir"/usr/share/libalpm/hooks/update-vlc-plugin-cache.hook # Update dependencies automatically based on dynamic libraries - # _detected_depends=($(find "$pkgdir"/usr -name "*.so" | xargs python "$srcdir"/find-deps.py)) + # _detected_depends=($(find "$pkgdir"/usr -name "*.so" | xargs python "$srcdir"/find-deps.py)) -# msg 'Auto-detected dependencies:' -# echo "${_detected_depends[@]}" | fold -s -w 79 | sed 's/^/ /' -# depends=("${_detected_depends[@]}" "${_undetected_depends[@]}") + # msg 'Auto-detected dependencies:' + # echo "${_detected_depends[@]}" | fold -s -w 79 | sed 's/^/ /' + # depends=("${_detected_depends[@]}" "${_undetected_depends[@]}") } sha256sums=('82abfbd64cd6606afaf1c938f5b7cb8e29484d258719ee674d1a769bfce94431' 'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a' 'd1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa' + '599ce4bf0db5fc74f54bc03136b662606c22b8435b81440b02fc73f52d09bd7f' '90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7') |