[arch-commits] Commit in vlc/repos (8 files)

Jan de Groot jgc at nymeria.archlinux.org
Tue Jan 14 12:25:23 UTC 2014


    Date: Tuesday, January 14, 2014 @ 13:25:22
  Author: jgc
Revision: 204042

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  vlc/repos/staging-i686/
  vlc/repos/staging-i686/PKGBUILD
    (from rev 204041, vlc/trunk/PKGBUILD)
  vlc/repos/staging-i686/vlc-2.0.7-vaapi-compat.patch
    (from rev 204041, vlc/trunk/vlc-2.0.7-vaapi-compat.patch)
  vlc/repos/staging-i686/vlc.install
    (from rev 204041, vlc/trunk/vlc.install)
  vlc/repos/staging-x86_64/
  vlc/repos/staging-x86_64/PKGBUILD
    (from rev 204041, vlc/trunk/PKGBUILD)
  vlc/repos/staging-x86_64/vlc-2.0.7-vaapi-compat.patch
    (from rev 204041, vlc/trunk/vlc-2.0.7-vaapi-compat.patch)
  vlc/repos/staging-x86_64/vlc.install
    (from rev 204041, vlc/trunk/vlc.install)

---------------------------------------------+
 staging-i686/PKGBUILD                       |  105 ++++++++++++++++++++++++++
 staging-i686/vlc-2.0.7-vaapi-compat.patch   |   11 ++
 staging-i686/vlc.install                    |   18 ++++
 staging-x86_64/PKGBUILD                     |  105 ++++++++++++++++++++++++++
 staging-x86_64/vlc-2.0.7-vaapi-compat.patch |   11 ++
 staging-x86_64/vlc.install                  |   18 ++++
 6 files changed, 268 insertions(+)

Copied: vlc/repos/staging-i686/PKGBUILD (from rev 204041, vlc/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2014-01-14 12:25:22 UTC (rev 204042)
@@ -0,0 +1,105 @@
+# $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.1.2
+pkgrel=3
+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-utils' 'libcaca' 
+             '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'
+            'ncurses: for ncurses interface support'
+            'libdvdcss: for decoding encrypted DVDs'
+            'lirc-utils: 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-2.0.7-vaapi-compat.patch')
+md5sums=('fb6787ad749aadcfaeab3471939b3426'
+         '6df10774bb7acf20e09d6139e5c7839e')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch"
+
+  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
+}
+
+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/staging-i686/vlc-2.0.7-vaapi-compat.patch (from rev 204041, vlc/trunk/vlc-2.0.7-vaapi-compat.patch)
===================================================================
--- staging-i686/vlc-2.0.7-vaapi-compat.patch	                        (rev 0)
+++ staging-i686/vlc-2.0.7-vaapi-compat.patch	2014-01-14 12:25:22 UTC (rev 204042)
@@ -0,0 +1,11 @@
+diff -rupN a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
+--- a/modules/codec/avcodec/vaapi.c	2013-01-22 09:51:40.000000000 +0000
++++ b/modules/codec/avcodec/vaapi.c	2013-07-27 17:23:37.965202118 +0000
+@@ -47,6 +47,7 @@
+ 
+ #include <X11/Xlib.h>
+ #include <va/va_x11.h>
++#include <va/va_compat.h>
+ 
+ typedef struct
+ {

Copied: vlc/repos/staging-i686/vlc.install (from rev 204041, vlc/trunk/vlc.install)
===================================================================
--- staging-i686/vlc.install	                        (rev 0)
+++ staging-i686/vlc.install	2014-01-14 12:25:22 UTC (rev 204042)
@@ -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
+}

Copied: vlc/repos/staging-x86_64/PKGBUILD (from rev 204041, vlc/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2014-01-14 12:25:22 UTC (rev 204042)
@@ -0,0 +1,105 @@
+# $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.1.2
+pkgrel=3
+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-utils' 'libcaca' 
+             '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'
+            'ncurses: for ncurses interface support'
+            'libdvdcss: for decoding encrypted DVDs'
+            'lirc-utils: 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-2.0.7-vaapi-compat.patch')
+md5sums=('fb6787ad749aadcfaeab3471939b3426'
+         '6df10774bb7acf20e09d6139e5c7839e')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch"
+
+  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
+}
+
+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/staging-x86_64/vlc-2.0.7-vaapi-compat.patch (from rev 204041, vlc/trunk/vlc-2.0.7-vaapi-compat.patch)
===================================================================
--- staging-x86_64/vlc-2.0.7-vaapi-compat.patch	                        (rev 0)
+++ staging-x86_64/vlc-2.0.7-vaapi-compat.patch	2014-01-14 12:25:22 UTC (rev 204042)
@@ -0,0 +1,11 @@
+diff -rupN a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
+--- a/modules/codec/avcodec/vaapi.c	2013-01-22 09:51:40.000000000 +0000
++++ b/modules/codec/avcodec/vaapi.c	2013-07-27 17:23:37.965202118 +0000
+@@ -47,6 +47,7 @@
+ 
+ #include <X11/Xlib.h>
+ #include <va/va_x11.h>
++#include <va/va_compat.h>
+ 
+ typedef struct
+ {

Copied: vlc/repos/staging-x86_64/vlc.install (from rev 204041, vlc/trunk/vlc.install)
===================================================================
--- staging-x86_64/vlc.install	                        (rev 0)
+++ staging-x86_64/vlc.install	2014-01-14 12:25:22 UTC (rev 204042)
@@ -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