[arch-commits] Commit in vlc/repos (14 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Sun Jun 7 11:43:34 UTC 2015
Date: Sunday, June 7, 2015 @ 13:43:34
Author: bpiotrowski
Revision: 240403
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
vlc/repos/extra-i686/PKGBUILD
(from rev 240402, vlc/trunk/PKGBUILD)
vlc/repos/extra-i686/lua53_compat.patch
(from rev 240402, vlc/trunk/lua53_compat.patch)
vlc/repos/extra-i686/vlc.install
(from rev 240402, vlc/trunk/vlc.install)
vlc/repos/extra-x86_64/PKGBUILD
(from rev 240402, vlc/trunk/PKGBUILD)
vlc/repos/extra-x86_64/lua53_compat.patch
(from rev 240402, vlc/trunk/lua53_compat.patch)
vlc/repos/extra-x86_64/vlc.install
(from rev 240402, vlc/trunk/vlc.install)
Deleted:
vlc/repos/extra-i686/PKGBUILD
vlc/repos/extra-i686/lua53_compat.patch
vlc/repos/extra-i686/vlc-gcc5-sse-target-workaround.patch
vlc/repos/extra-i686/vlc.install
vlc/repos/extra-x86_64/PKGBUILD
vlc/repos/extra-x86_64/lua53_compat.patch
vlc/repos/extra-x86_64/vlc-gcc5-sse-target-workaround.patch
vlc/repos/extra-x86_64/vlc.install
---------------------------------------------------+
/PKGBUILD | 212 ++++++++++++++++++++
/lua53_compat.patch | 60 +++++
/vlc.install | 36 +++
extra-i686/PKGBUILD | 113 ----------
extra-i686/lua53_compat.patch | 30 --
extra-i686/vlc-gcc5-sse-target-workaround.patch | 12 -
extra-i686/vlc.install | 18 -
extra-x86_64/PKGBUILD | 113 ----------
extra-x86_64/lua53_compat.patch | 30 --
extra-x86_64/vlc-gcc5-sse-target-workaround.patch | 12 -
extra-x86_64/vlc.install | 18 -
11 files changed, 308 insertions(+), 346 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-06-07 11:43:15 UTC (rev 240402)
+++ extra-i686/PKGBUILD 2015-06-07 11:43:34 UTC (rev 240403)
@@ -1,113 +0,0 @@
-# $Id$
-# Maintainer: 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=2.2.1
-pkgrel=4
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('LGPL2.1' 'GPL2')
-depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy'
- 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska'
- 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
- 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
- 'libxinerama')
-makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
- 'libdc1394' 'libavc1394' 'lirc' 'libcaca' 'gtk2'
- 'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
- 'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs'
- 'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa')
-optdepends=('avahi: for service discovery using bonjour protocol'
- 'libnotify: for notification plugin'
- 'gtk2: for notify plugin'
- 'ncurses: for ncurses interface support'
- 'libdvdcss: for decoding encrypted DVDs'
- 'lirc: for lirc plugin'
- 'libavc1394: for devices using the 1394ta AV/C'
- 'libdc1394: for IEEE 1394 plugin'
- 'kdelibs: KDE Solid hardware integration'
- 'libva-vdpau-driver: vdpau back-end for nvidia'
- 'libva-intel-driver: back-end for intel cards'
- 'libbluray: for Blu-Ray support'
- 'flac: for Free Lossless Audio Codec plugin'
- 'portaudio: for portaudio support'
- 'twolame: for TwoLAME mpeg2 encoder plugin'
- 'projectm: for ProjectM visualisation plugin'
- 'libcaca: for colored ASCII art video output'
- 'libgme: for libgme plugin'
- 'librsvg: for SVG plugin'
- 'gnome-vfs: for GNOME Virtual File System support'
- 'libgoom2: for libgoom plugin'
- 'vcdimager: navigate VCD with libvcdinfo'
- 'aalib: for ASCII art plugin'
- 'libmtp: for MTP devices support'
- 'smbclient: for SMB access plugin'
- 'libcdio: for audio CD playback support'
- 'ttf-freefont: for subtitle font '
- 'ttf-dejavu: for subtitle font'
- 'opus: for opus support'
- 'libssh2: for sftp support'
- 'lua-socket: for http interface')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/lua/http/.hosts'
- 'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!emptydirs')
-install=vlc.install
-source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
- "vlc-gcc5-sse-target-workaround.patch"
- "lua53_compat.patch")
-md5sums=('42273945758b521c408fabc7fd6d9946'
- 'cf5b92e290da2f1b0b4d0cd0eda6b32b'
- '96d3b346d9149ffb1b430066dfb6249a')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
- sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
-
- # Fix build with GCC 5 on i686
- # GCC PR URL: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66047
- # Workaround: https://bugzilla.redhat.com/show_bug.cgi?id=1215630#c11
- patch -p1 < "${srcdir}/vlc-gcc5-sse-target-workaround.patch"
-
- patch -p1 < "${srcdir}/lua53_compat.patch"
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" \
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --disable-rpath \
- --enable-faad \
- --enable-nls \
- --enable-lirc \
- --enable-ncurses \
- --enable-realrtsp \
- --enable-aa \
- --enable-vcdx \
- --enable-upnp \
- --enable-opus \
- --enable-sftp \
- LUAC=/usr/bin/luac LUA_LIBS="`pkg-config --libs lua`" \
- RCC=/usr/bin/rcc-qt4
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- for res in 16 32 48 128; do
- install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
- "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
- done
-}
Copied: vlc/repos/extra-i686/PKGBUILD (from rev 240402, vlc/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-06-07 11:43:34 UTC (rev 240403)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: 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=2.2.1
+pkgrel=5
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+arch=('i686' 'x86_64')
+url="http://www.videolan.org/vlc/"
+license=('LGPL2.1' 'GPL2')
+depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy'
+ 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska'
+ 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
+ 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
+ 'libxinerama')
+makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
+ 'libdc1394' 'libavc1394' 'lirc' 'libcaca' 'gtk2'
+ 'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
+ 'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs'
+ 'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa')
+optdepends=('avahi: for service discovery using bonjour protocol'
+ 'libnotify: for notification plugin'
+ 'gtk2: for notify plugin'
+ 'ncurses: for ncurses interface support'
+ 'libdvdcss: for decoding encrypted DVDs'
+ 'lirc: for lirc plugin'
+ 'libavc1394: for devices using the 1394ta AV/C'
+ 'libdc1394: for IEEE 1394 plugin'
+ 'kdelibs: KDE Solid hardware integration'
+ 'libva-vdpau-driver: vdpau back-end for nvidia'
+ 'libva-intel-driver: back-end for intel cards'
+ 'libbluray: for Blu-Ray support'
+ 'flac: for Free Lossless Audio Codec plugin'
+ 'portaudio: for portaudio support'
+ 'twolame: for TwoLAME mpeg2 encoder plugin'
+ 'projectm: for ProjectM visualisation plugin'
+ 'libcaca: for colored ASCII art video output'
+ 'libgme: for libgme plugin'
+ 'librsvg: for SVG plugin'
+ 'gnome-vfs: for GNOME Virtual File System support'
+ 'libgoom2: for libgoom plugin'
+ 'vcdimager: navigate VCD with libvcdinfo'
+ 'aalib: for ASCII art plugin'
+ 'libmtp: for MTP devices support'
+ 'smbclient: for SMB access plugin'
+ 'libcdio: for audio CD playback support'
+ 'ttf-freefont: for subtitle font '
+ 'ttf-dejavu: for subtitle font'
+ 'opus: for opus support'
+ 'libssh2: for sftp support'
+ 'lua-socket: for http interface')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
+backup=('usr/share/vlc/lua/http/.hosts'
+ 'usr/share/vlc/lua/http/dialogs/.hosts')
+options=('!emptydirs')
+install=vlc.install
+source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+ "lua53_compat.patch")
+md5sums=('42273945758b521c408fabc7fd6d9946'
+ '96d3b346d9149ffb1b430066dfb6249a')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
+ sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
+
+ patch -p1 < "${srcdir}/lua53_compat.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" \
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-rpath \
+ --enable-faad \
+ --enable-nls \
+ --enable-lirc \
+ --enable-ncurses \
+ --enable-realrtsp \
+ --enable-aa \
+ --enable-vcdx \
+ --enable-upnp \
+ --enable-opus \
+ --enable-sftp \
+ LUAC=/usr/bin/luac LUA_LIBS="`pkg-config --libs lua`" \
+ RCC=/usr/bin/rcc-qt4
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ for res in 16 32 48 128; do
+ install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
+ "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
+ done
+}
Deleted: extra-i686/lua53_compat.patch
===================================================================
--- extra-i686/lua53_compat.patch 2015-06-07 11:43:15 UTC (rev 240402)
+++ extra-i686/lua53_compat.patch 2015-06-07 11:43:34 UTC (rev 240403)
@@ -1,30 +0,0 @@
-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/extra-i686/lua53_compat.patch (from rev 240402, vlc/trunk/lua53_compat.patch)
===================================================================
--- extra-i686/lua53_compat.patch (rev 0)
+++ extra-i686/lua53_compat.patch 2015-06-07 11:43:34 UTC (rev 240403)
@@ -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 */
Deleted: extra-i686/vlc-gcc5-sse-target-workaround.patch
===================================================================
--- extra-i686/vlc-gcc5-sse-target-workaround.patch 2015-06-07 11:43:15 UTC (rev 240402)
+++ extra-i686/vlc-gcc5-sse-target-workaround.patch 2015-06-07 11:43:34 UTC (rev 240403)
@@ -1,12 +0,0 @@
-diff -upr vlc-2.2.1.orig/include/vlc_cpu.h vlc-2.2.1/include/vlc_cpu.h
---- vlc-2.2.1.orig/include/vlc_cpu.h 2014-06-14 18:14:12.000000000 +0300
-+++ vlc-2.2.1/include/vlc_cpu.h 2015-05-12 02:31:29.843264593 +0300
-@@ -65,7 +65,7 @@ VLC_API unsigned vlc_CPU(void);
- # define vlc_CPU_MMXEXT() ((vlc_CPU() & VLC_CPU_MMXEXT) != 0)
- # define vlc_CPU_SSE() ((vlc_CPU() & VLC_CPU_SSE) != 0)
- # if VLC_GCC_VERSION(4, 4) || defined(__clang__)
--# define VLC_SSE __attribute__ ((__target__ ("sse")))
-+# define VLC_SSE __attribute__ ((used)) __attribute__ ((__target__ ("sse")))
- # else
- # define VLC_SSE VLC_SSE_is_not_implemented_on_this_compiler
- # endif
Deleted: extra-i686/vlc.install
===================================================================
--- extra-i686/vlc.install 2015-06-07 11:43:15 UTC (rev 240402)
+++ extra-i686/vlc.install 2015-06-07 11:43:34 UTC (rev 240403)
@@ -1,18 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
Copied: vlc/repos/extra-i686/vlc.install (from rev 240402, vlc/trunk/vlc.install)
===================================================================
--- extra-i686/vlc.install (rev 0)
+++ extra-i686/vlc.install 2015-06-07 11:43:34 UTC (rev 240403)
@@ -0,0 +1,18 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ rm -f usr/lib/vlc/plugins/plugins-*.dat
+}
+
+post_remove() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-06-07 11:43:15 UTC (rev 240402)
+++ extra-x86_64/PKGBUILD 2015-06-07 11:43:34 UTC (rev 240403)
@@ -1,113 +0,0 @@
-# $Id$
-# Maintainer: 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=2.2.1
-pkgrel=4
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('LGPL2.1' 'GPL2')
-depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy'
- 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska'
- 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
- 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
- 'libxinerama')
-makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
- 'libdc1394' 'libavc1394' 'lirc' 'libcaca' 'gtk2'
- 'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
- 'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs'
- 'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa')
-optdepends=('avahi: for service discovery using bonjour protocol'
- 'libnotify: for notification plugin'
- 'gtk2: for notify plugin'
- 'ncurses: for ncurses interface support'
- 'libdvdcss: for decoding encrypted DVDs'
- 'lirc: for lirc plugin'
- 'libavc1394: for devices using the 1394ta AV/C'
- 'libdc1394: for IEEE 1394 plugin'
- 'kdelibs: KDE Solid hardware integration'
- 'libva-vdpau-driver: vdpau back-end for nvidia'
- 'libva-intel-driver: back-end for intel cards'
- 'libbluray: for Blu-Ray support'
- 'flac: for Free Lossless Audio Codec plugin'
- 'portaudio: for portaudio support'
- 'twolame: for TwoLAME mpeg2 encoder plugin'
- 'projectm: for ProjectM visualisation plugin'
- 'libcaca: for colored ASCII art video output'
- 'libgme: for libgme plugin'
- 'librsvg: for SVG plugin'
- 'gnome-vfs: for GNOME Virtual File System support'
- 'libgoom2: for libgoom plugin'
- 'vcdimager: navigate VCD with libvcdinfo'
- 'aalib: for ASCII art plugin'
- 'libmtp: for MTP devices support'
- 'smbclient: for SMB access plugin'
- 'libcdio: for audio CD playback support'
- 'ttf-freefont: for subtitle font '
- 'ttf-dejavu: for subtitle font'
- 'opus: for opus support'
- 'libssh2: for sftp support'
- 'lua-socket: for http interface')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/lua/http/.hosts'
- 'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!emptydirs')
-install=vlc.install
-source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
- "vlc-gcc5-sse-target-workaround.patch"
- "lua53_compat.patch")
-md5sums=('42273945758b521c408fabc7fd6d9946'
- 'cf5b92e290da2f1b0b4d0cd0eda6b32b'
- '96d3b346d9149ffb1b430066dfb6249a')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
- sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
-
- # Fix build with GCC 5 on i686
- # GCC PR URL: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66047
- # Workaround: https://bugzilla.redhat.com/show_bug.cgi?id=1215630#c11
- patch -p1 < "${srcdir}/vlc-gcc5-sse-target-workaround.patch"
-
- patch -p1 < "${srcdir}/lua53_compat.patch"
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" \
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --disable-rpath \
- --enable-faad \
- --enable-nls \
- --enable-lirc \
- --enable-ncurses \
- --enable-realrtsp \
- --enable-aa \
- --enable-vcdx \
- --enable-upnp \
- --enable-opus \
- --enable-sftp \
- LUAC=/usr/bin/luac LUA_LIBS="`pkg-config --libs lua`" \
- RCC=/usr/bin/rcc-qt4
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- for res in 16 32 48 128; do
- install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
- "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
- done
-}
Copied: vlc/repos/extra-x86_64/PKGBUILD (from rev 240402, vlc/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-06-07 11:43:34 UTC (rev 240403)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: 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=2.2.1
+pkgrel=5
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+arch=('i686' 'x86_64')
+url="http://www.videolan.org/vlc/"
+license=('LGPL2.1' 'GPL2')
+depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy'
+ 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska'
+ 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
+ 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
+ 'libxinerama')
+makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
+ 'libdc1394' 'libavc1394' 'lirc' 'libcaca' 'gtk2'
+ 'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
+ 'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs'
+ 'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa')
+optdepends=('avahi: for service discovery using bonjour protocol'
+ 'libnotify: for notification plugin'
+ 'gtk2: for notify plugin'
+ 'ncurses: for ncurses interface support'
+ 'libdvdcss: for decoding encrypted DVDs'
+ 'lirc: for lirc plugin'
+ 'libavc1394: for devices using the 1394ta AV/C'
+ 'libdc1394: for IEEE 1394 plugin'
+ 'kdelibs: KDE Solid hardware integration'
+ 'libva-vdpau-driver: vdpau back-end for nvidia'
+ 'libva-intel-driver: back-end for intel cards'
+ 'libbluray: for Blu-Ray support'
+ 'flac: for Free Lossless Audio Codec plugin'
+ 'portaudio: for portaudio support'
+ 'twolame: for TwoLAME mpeg2 encoder plugin'
+ 'projectm: for ProjectM visualisation plugin'
+ 'libcaca: for colored ASCII art video output'
+ 'libgme: for libgme plugin'
+ 'librsvg: for SVG plugin'
+ 'gnome-vfs: for GNOME Virtual File System support'
+ 'libgoom2: for libgoom plugin'
+ 'vcdimager: navigate VCD with libvcdinfo'
+ 'aalib: for ASCII art plugin'
+ 'libmtp: for MTP devices support'
+ 'smbclient: for SMB access plugin'
+ 'libcdio: for audio CD playback support'
+ 'ttf-freefont: for subtitle font '
+ 'ttf-dejavu: for subtitle font'
+ 'opus: for opus support'
+ 'libssh2: for sftp support'
+ 'lua-socket: for http interface')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
+backup=('usr/share/vlc/lua/http/.hosts'
+ 'usr/share/vlc/lua/http/dialogs/.hosts')
+options=('!emptydirs')
+install=vlc.install
+source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+ "lua53_compat.patch")
+md5sums=('42273945758b521c408fabc7fd6d9946'
+ '96d3b346d9149ffb1b430066dfb6249a')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
+ sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
+
+ patch -p1 < "${srcdir}/lua53_compat.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" \
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-rpath \
+ --enable-faad \
+ --enable-nls \
+ --enable-lirc \
+ --enable-ncurses \
+ --enable-realrtsp \
+ --enable-aa \
+ --enable-vcdx \
+ --enable-upnp \
+ --enable-opus \
+ --enable-sftp \
+ LUAC=/usr/bin/luac LUA_LIBS="`pkg-config --libs lua`" \
+ RCC=/usr/bin/rcc-qt4
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ for res in 16 32 48 128; do
+ install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
+ "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
+ done
+}
Deleted: extra-x86_64/lua53_compat.patch
===================================================================
--- extra-x86_64/lua53_compat.patch 2015-06-07 11:43:15 UTC (rev 240402)
+++ extra-x86_64/lua53_compat.patch 2015-06-07 11:43:34 UTC (rev 240403)
@@ -1,30 +0,0 @@
-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/extra-x86_64/lua53_compat.patch (from rev 240402, vlc/trunk/lua53_compat.patch)
===================================================================
--- extra-x86_64/lua53_compat.patch (rev 0)
+++ extra-x86_64/lua53_compat.patch 2015-06-07 11:43:34 UTC (rev 240403)
@@ -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 */
Deleted: extra-x86_64/vlc-gcc5-sse-target-workaround.patch
===================================================================
--- extra-x86_64/vlc-gcc5-sse-target-workaround.patch 2015-06-07 11:43:15 UTC (rev 240402)
+++ extra-x86_64/vlc-gcc5-sse-target-workaround.patch 2015-06-07 11:43:34 UTC (rev 240403)
@@ -1,12 +0,0 @@
-diff -upr vlc-2.2.1.orig/include/vlc_cpu.h vlc-2.2.1/include/vlc_cpu.h
---- vlc-2.2.1.orig/include/vlc_cpu.h 2014-06-14 18:14:12.000000000 +0300
-+++ vlc-2.2.1/include/vlc_cpu.h 2015-05-12 02:31:29.843264593 +0300
-@@ -65,7 +65,7 @@ VLC_API unsigned vlc_CPU(void);
- # define vlc_CPU_MMXEXT() ((vlc_CPU() & VLC_CPU_MMXEXT) != 0)
- # define vlc_CPU_SSE() ((vlc_CPU() & VLC_CPU_SSE) != 0)
- # if VLC_GCC_VERSION(4, 4) || defined(__clang__)
--# define VLC_SSE __attribute__ ((__target__ ("sse")))
-+# define VLC_SSE __attribute__ ((used)) __attribute__ ((__target__ ("sse")))
- # else
- # define VLC_SSE VLC_SSE_is_not_implemented_on_this_compiler
- # endif
Deleted: extra-x86_64/vlc.install
===================================================================
--- extra-x86_64/vlc.install 2015-06-07 11:43:15 UTC (rev 240402)
+++ extra-x86_64/vlc.install 2015-06-07 11:43:34 UTC (rev 240403)
@@ -1,18 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
Copied: vlc/repos/extra-x86_64/vlc.install (from rev 240402, vlc/trunk/vlc.install)
===================================================================
--- extra-x86_64/vlc.install (rev 0)
+++ extra-x86_64/vlc.install 2015-06-07 11:43:34 UTC (rev 240403)
@@ -0,0 +1,18 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ rm -f usr/lib/vlc/plugins/plugins-*.dat
+}
+
+post_remove() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
More information about the arch-commits
mailing list