Fri May 27 22:47:26 UTC 2011

1 files changed, 28 insertions, 54 deletions

diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 6536aa6d9..1a636f80e 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,30 +1,43 @@
-# $Id: PKGBUILD 119562 2011-04-12 10:29:49Z giovanni $
+# $Id: PKGBUILD 125527 2011-05-26 14:21:55Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
-pkgbase=vlc
-pkgname=('vlc' 'vlc-plugin')
+pkgname=vlc
 pkgver=1.1.9
-pkgrel=1
+pkgrel=2
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
-makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils'
-             'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-             'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-             'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
-             'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
-             'avahi' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'libxpm'
-             'xulrunner' 'pkgconfig' 'live-media' 'libnotify' 'libcdio'
+depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio'
+           'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
+           'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
+           'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
+           'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
+           'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
+makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify'
              'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
              'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse')
+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'
+            'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)'
+            'libpulse: PulseAudio support')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
 options=('!libtool')
-source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
+install=vlc.install
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('06adb1848e6b87fbe1ced77ec0f91e4c')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
   ./configure --prefix=/usr \
@@ -37,35 +50,12 @@ build() {
               --enable-lirc \
               --enable-pvr \
               --enable-ncurses \
-              --enable-mozilla \
               --with-live555-tree=/usr/lib/live \
               --enable-realrtsp
   make
 }
-
-package_vlc() {
-  pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-  depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio'
-           'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-           'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-           'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
-           'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
-           'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
-  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'
-              'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)'
-              'libpulse: PulseAudio support')
-  options=('!libtool')
-  conflicts=('vlc-pulse-plugin')
-  replaces=('vlc-pulse-plugin')
-  install=vlc.install
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}/" install
 
@@ -73,20 +63,4 @@ package_vlc() {
     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
-
-  rm -rf "${pkgdir}/usr/lib/mozilla"
-}
-
-package_vlc-plugin() {
-  pkgdesc="VLC mozilla browser plugin"
-  depends=("${pkgbase}=${pkgver}" 'nspr' 'xulrunner' 'libxpm')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  #for linking against libvlc
-  make -C src DESTDIR="${pkgdir}" install-libLTLIBRARIES
-
-  make -C projects/mozilla DESTDIR="${pkgdir}/" install
-
-  #clean up libvlc
-  make -C src DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES
 }