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

Giovanni Scafora giovanni at archlinux.org
Fri Feb 27 17:34:41 UTC 2015


    Date: Friday, February 27, 2015 @ 18:34:41
  Author: giovanni
Revision: 232095

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

Added:
  vlc/repos/extra-i686/PKGBUILD
    (from rev 232094, vlc/trunk/PKGBUILD)
  vlc/repos/extra-i686/vlc.install
    (from rev 232094, vlc/trunk/vlc.install)
  vlc/repos/extra-x86_64/PKGBUILD
    (from rev 232094, vlc/trunk/PKGBUILD)
  vlc/repos/extra-x86_64/vlc.install
    (from rev 232094, vlc/trunk/vlc.install)
Deleted:
  vlc/repos/extra-i686/PKGBUILD
  vlc/repos/extra-i686/vlc-2.0.7-vaapi-compat.patch
  vlc/repos/extra-i686/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch
  vlc/repos/extra-i686/vlc-2.1.5-ffmpeg-2.4.patch
  vlc/repos/extra-i686/vlc.install
  vlc/repos/extra-x86_64/PKGBUILD
  vlc/repos/extra-x86_64/vlc-2.0.7-vaapi-compat.patch
  vlc/repos/extra-x86_64/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch
  vlc/repos/extra-x86_64/vlc-2.1.5-ffmpeg-2.4.patch
  vlc/repos/extra-x86_64/vlc.install

-------------------------------------------------------------------------+
 /PKGBUILD                                                               |  202 ++++++++++
 /vlc.install                                                            |   36 +
 extra-i686/PKGBUILD                                                     |  112 -----
 extra-i686/vlc-2.0.7-vaapi-compat.patch                                 |   11 
 extra-i686/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch   |   26 -
 extra-i686/vlc-2.1.5-ffmpeg-2.4.patch                                   |   15 
 extra-i686/vlc.install                                                  |   18 
 extra-x86_64/PKGBUILD                                                   |  112 -----
 extra-x86_64/vlc-2.0.7-vaapi-compat.patch                               |   11 
 extra-x86_64/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch |   26 -
 extra-x86_64/vlc-2.1.5-ffmpeg-2.4.patch                                 |   15 
 extra-x86_64/vlc.install                                                |   18 
 12 files changed, 238 insertions(+), 364 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-02-27 17:34:33 UTC (rev 232094)
+++ extra-i686/PKGBUILD	2015-02-27 17:34:41 UTC (rev 232095)
@@ -1,112 +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.1.5
-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-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'
-        'vlc-2.1.5-ffmpeg-2.4.patch'
-        'vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch')
-md5sums=('3941b561f590cc95ca5e795213cba2f2'
-         '6df10774bb7acf20e09d6139e5c7839e'
-         '068a1b792064bb1aff0765a3ffa8a27a'
-         '787a854f3acde37cd6e76a8fa8e6f1d0')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch"
-  patch -p1 -i "${srcdir}/vlc-2.1.5-ffmpeg-2.4.patch"
-  patch -p1 -i "${srcdir}/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch"
-  autoreconf -fi
-
-  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/extra-i686/PKGBUILD (from rev 232094, vlc/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-02-27 17:34:41 UTC (rev 232095)
@@ -0,0 +1,101 @@
+# $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.0
+pkgrel=1
+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'
+             '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: 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")
+md5sums=('faeceb614bf3946e5f90ef0d1f51db45')
+
+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
+}
+
+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/vlc-2.0.7-vaapi-compat.patch
===================================================================
--- extra-i686/vlc-2.0.7-vaapi-compat.patch	2015-02-27 17:34:33 UTC (rev 232094)
+++ extra-i686/vlc-2.0.7-vaapi-compat.patch	2015-02-27 17:34:41 UTC (rev 232095)
@@ -1,11 +0,0 @@
-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
- {

Deleted: extra-i686/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch
===================================================================
--- extra-i686/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch	2015-02-27 17:34:33 UTC (rev 232094)
+++ extra-i686/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch	2015-02-27 17:34:41 UTC (rev 232095)
@@ -1,26 +0,0 @@
-From 1e31a5a18bb0087f9e625919a805d64a2af40bbe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
-Date: Wed, 30 Jul 2014 19:05:43 +0300
-Subject: [PATCH] avformat: initialize probe data (fixes #11851)
-
-(cherry picked from commit 49bd1c657d960ba107d9db8752f716139a938eee)
----
- modules/demux/avformat/demux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
-index bdd77fd..7349db2 100644
---- a/modules/demux/avformat/demux.c
-+++ b/modules/demux/avformat/demux.c
-@@ -157,7 +157,7 @@ int OpenDemux( vlc_object_t *p_this )
- {
-     demux_t       *p_demux = (demux_t*)p_this;
-     demux_sys_t   *p_sys;
--    AVProbeData   pd;
-+    AVProbeData   pd = { };
-     AVInputFormat *fmt = NULL;
-     unsigned int  i;
-     int64_t       i_start_time = -1;
--- 
-2.1.0
-

Deleted: extra-i686/vlc-2.1.5-ffmpeg-2.4.patch
===================================================================
--- extra-i686/vlc-2.1.5-ffmpeg-2.4.patch	2015-02-27 17:34:33 UTC (rev 232094)
+++ extra-i686/vlc-2.1.5-ffmpeg-2.4.patch	2015-02-27 17:34:41 UTC (rev 232095)
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a684338..053713a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2242,8 +2242,8 @@ AC_ARG_ENABLE(avcodec,
- [  --enable-avcodec        libavcodec codec (default enabled)])
- AS_IF([test "${enable_avcodec}" != "no"], [
-   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
--    PKG_CHECK_EXISTS([libavcodec < 56],, [
--      AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
-+    PKG_CHECK_EXISTS([libavcodec < 57],, [
-+      AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.])
-     ])
-     VLC_SAVE_FLAGS
-     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"

Deleted: extra-i686/vlc.install
===================================================================
--- extra-i686/vlc.install	2015-02-27 17:34:33 UTC (rev 232094)
+++ extra-i686/vlc.install	2015-02-27 17:34:41 UTC (rev 232095)
@@ -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 232094, vlc/trunk/vlc.install)
===================================================================
--- extra-i686/vlc.install	                        (rev 0)
+++ extra-i686/vlc.install	2015-02-27 17:34:41 UTC (rev 232095)
@@ -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-02-27 17:34:33 UTC (rev 232094)
+++ extra-x86_64/PKGBUILD	2015-02-27 17:34:41 UTC (rev 232095)
@@ -1,112 +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.1.5
-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-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'
-        'vlc-2.1.5-ffmpeg-2.4.patch'
-        'vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch')
-md5sums=('3941b561f590cc95ca5e795213cba2f2'
-         '6df10774bb7acf20e09d6139e5c7839e'
-         '068a1b792064bb1aff0765a3ffa8a27a'
-         '787a854f3acde37cd6e76a8fa8e6f1d0')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch"
-  patch -p1 -i "${srcdir}/vlc-2.1.5-ffmpeg-2.4.patch"
-  patch -p1 -i "${srcdir}/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch"
-  autoreconf -fi
-
-  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/extra-x86_64/PKGBUILD (from rev 232094, vlc/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-02-27 17:34:41 UTC (rev 232095)
@@ -0,0 +1,101 @@
+# $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.0
+pkgrel=1
+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'
+             '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: 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")
+md5sums=('faeceb614bf3946e5f90ef0d1f51db45')
+
+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
+}
+
+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/vlc-2.0.7-vaapi-compat.patch
===================================================================
--- extra-x86_64/vlc-2.0.7-vaapi-compat.patch	2015-02-27 17:34:33 UTC (rev 232094)
+++ extra-x86_64/vlc-2.0.7-vaapi-compat.patch	2015-02-27 17:34:41 UTC (rev 232095)
@@ -1,11 +0,0 @@
-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
- {

Deleted: extra-x86_64/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch
===================================================================
--- extra-x86_64/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch	2015-02-27 17:34:33 UTC (rev 232094)
+++ extra-x86_64/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch	2015-02-27 17:34:41 UTC (rev 232095)
@@ -1,26 +0,0 @@
-From 1e31a5a18bb0087f9e625919a805d64a2af40bbe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
-Date: Wed, 30 Jul 2014 19:05:43 +0300
-Subject: [PATCH] avformat: initialize probe data (fixes #11851)
-
-(cherry picked from commit 49bd1c657d960ba107d9db8752f716139a938eee)
----
- modules/demux/avformat/demux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
-index bdd77fd..7349db2 100644
---- a/modules/demux/avformat/demux.c
-+++ b/modules/demux/avformat/demux.c
-@@ -157,7 +157,7 @@ int OpenDemux( vlc_object_t *p_this )
- {
-     demux_t       *p_demux = (demux_t*)p_this;
-     demux_sys_t   *p_sys;
--    AVProbeData   pd;
-+    AVProbeData   pd = { };
-     AVInputFormat *fmt = NULL;
-     unsigned int  i;
-     int64_t       i_start_time = -1;
--- 
-2.1.0
-

Deleted: extra-x86_64/vlc-2.1.5-ffmpeg-2.4.patch
===================================================================
--- extra-x86_64/vlc-2.1.5-ffmpeg-2.4.patch	2015-02-27 17:34:33 UTC (rev 232094)
+++ extra-x86_64/vlc-2.1.5-ffmpeg-2.4.patch	2015-02-27 17:34:41 UTC (rev 232095)
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a684338..053713a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2242,8 +2242,8 @@ AC_ARG_ENABLE(avcodec,
- [  --enable-avcodec        libavcodec codec (default enabled)])
- AS_IF([test "${enable_avcodec}" != "no"], [
-   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
--    PKG_CHECK_EXISTS([libavcodec < 56],, [
--      AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
-+    PKG_CHECK_EXISTS([libavcodec < 57],, [
-+      AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.])
-     ])
-     VLC_SAVE_FLAGS
-     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"

Deleted: extra-x86_64/vlc.install
===================================================================
--- extra-x86_64/vlc.install	2015-02-27 17:34:33 UTC (rev 232094)
+++ extra-x86_64/vlc.install	2015-02-27 17:34:41 UTC (rev 232095)
@@ -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 232094, vlc/trunk/vlc.install)
===================================================================
--- extra-x86_64/vlc.install	                        (rev 0)
+++ extra-x86_64/vlc.install	2015-02-27 17:34:41 UTC (rev 232095)
@@ -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