Thu Dec 1 14:10:27 UTC 2011

3 files changed, 0 insertions, 129 deletions

diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD
deleted file mode 100644
index b94ba9382..000000000
--- a/staging/vlc/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 143525 2011-11-25 17:22:46Z andyrtr $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
-
-pkgname=vlc
-pkgver=1.1.12
-pkgrel=5
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('GPL')
-depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
-         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'  'xcb-util-keysyms'
-         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
-makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify'
-             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
-             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
-             'lirc-utils' 'gnutls' 'libcaca')
-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'
-            'libpulse: PulseAudio support'
-            'vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/http/.hosts'
-        'usr/share/vlc/http/dialogs/.hosts'
-        'usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'bp-set-channel-map-pulseaudio-1.0.patch')
-md5sums=('91de1ad308c947e35380f9d747ff5713'
-         'bae24e02207364d76a1a118644de484e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
-
-  patch -Np1 -i ${srcdir}/bp-set-channel-map-pulseaudio-1.0.patch
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --enable-faad \
-              --enable-v4l \
-              --enable-snapshot \
-              --enable-dbus-control \
-              --enable-nls \
-              --enable-lirc \
-              --enable-pvr \
-              --enable-ncurses \
-              --with-live555-tree=/usr/lib/live \
-              --enable-upnp \
-              --enable-realrtsp
-  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
-}
diff --git a/staging/vlc/bp-set-channel-map-pulseaudio-1.0.patch b/staging/vlc/bp-set-channel-map-pulseaudio-1.0.patch
deleted file mode 100644
index e63b3f97b..000000000
--- a/staging/vlc/bp-set-channel-map-pulseaudio-1.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 15a821886296a8efe5f8b9015b6e9c5ae5e3ae79 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Tue, 11 Oct 2011 19:19:21 +0300
-Subject: Set channel map when using PulseAudio 1.0
-
-(cherry picked from commit ca2cb5f01340252a85ad5bed877e84407f092b21)
----
- modules/audio_output/pulse.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
-index d67dc31..18ee280 100644
---- a/modules/audio_output/pulse.c
-+++ b/modules/audio_output/pulse.c
-@@ -640,6 +640,7 @@ static int Open(vlc_object_t *obj)
-         formatv[formatc]->encoding = encoding;
-         pa_format_info_set_rate(formatv[formatc], ss.rate);
-         pa_format_info_set_channels(formatv[formatc], ss.channels);
-+        pa_format_info_set_channel_map(formatv[formatc], &map);
-         formatc++;
-     }
- 
-@@ -649,6 +650,7 @@ static int Open(vlc_object_t *obj)
-     pa_format_info_set_sample_format(formatv[formatc], ss.format);
-     pa_format_info_set_rate(formatv[formatc], ss.rate);
-     pa_format_info_set_channels(formatv[formatc], ss.channels);
-+    pa_format_info_set_channel_map(formatv[formatc], &map);
-     formatc++;
- 
-     /* Create a playback stream */
--- 
-1.7.4.1
-
diff --git a/staging/vlc/vlc.install b/staging/vlc/vlc.install
deleted file mode 100644
index dc4961cae..000000000
--- a/staging/vlc/vlc.install
+++ /dev/null
@@ -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
-}