[arch-commits] Commit in vlc/repos (extra-i686 extra-i686/PKGBUILD)

[Giovanni Scafora]

    Date: Tuesday, October 13, 2009 @ 13:45:22
  Author: giovanni
Revision: 55512

Merged revisions 55507 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/vlc/trunk

........
  r55507 | giovanni | 2009-10-13 10:19:41 -0700 (mar, 13 ott 2009) | 2 lines
  
  upgpkg: vlc 1.0.2-2
      FS16054 - Split package providing multimedia plugin
........

Modified:
  vlc/repos/extra-i686/	(properties)
  vlc/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 15 deletions(-)


Property changes on: vlc/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /vlc/trunk:1-52524
   + /vlc/trunk:1-55511

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-13 17:41:28 UTC (rev 55511)
+++ extra-i686/PKGBUILD	2009-10-13 17:45:22 UTC (rev 55512)
@@ -2,27 +2,26 @@
 # Maintainer: Giovanni Scafora <giovanni at archlinux.org>
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 
-pkgname=vlc
+pkgbase=vlc
+pkgname=('vlc' 
+         'vlc-plugin')
 pkgver=1.0.2
-pkgrel=1
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
-depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils' 'libdca' 'qt'
-         'libproxy' 'sdl_image' 'libdvdnav>=4.1.3' 'lua' 'libv4l' 'libcddb' 
-	 'smbclient' 'libmatroska' 'taglib' 'sysfsutils' 'libmpcdec' 'hal' 
-	 'ffmpeg>=0.5' 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' 
-	 'avahi' 'ttf-dejavu' 'libxv' 'libass' 'xdg-utils')
-makedepends=('pkgconfig' 'live-media>=2009.06.02')
-optdepends=('libnotify')
-options=('!libtool')
-install=vlc.install
-source=(http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils'
+           'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav>=4.1.3' 
+           'lua' 'libv4l' 'libcddb' 'smbclient' 'libmatroska' 
+           'taglib' 'sysfsutils' 'libmpcdec' 'hal' 'ffmpeg>=0.5' 
+           'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
+           'avahi' 'ttf-dejavu' 'libxv' 'libass' 'xdg-utils' 'libxpm'
+           'xulrunner' 'pkgconfig' 'live-media>=2009.06.02' 'libnotify')
+source=(http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2)
 md5sums=('69d4e30fe4fc2691780fbeacd40359d2')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgbase}-${pkgver}
   sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c
   [ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader --enable-live555 --with-live555-tree=/usr/lib/live-media"
   [ "${CARCH}" = "x86_64" ] && EXTRAFEATURES="--enable-fast-install --enable-live555 --with-live555-tree=/usr/lib/live-media"
@@ -51,16 +50,39 @@
               --enable-lirc \
               --enable-shout \
               --enable-pvr \
+              --enable-mozilla \
               --enable-release \
               --program-suffix= \
-	      --enable-realrtsp ${EXTRAFEATURES} || return 1
+              --enable-realrtsp ${EXTRAFEATURES} || return 1
   CFLAGS="-fPIC"
   make || return 1
+}
+
+package_vlc() {
+  pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+  depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils'
+           'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav>=4.1.3' 
+           'lua' 'libv4l' 'libcddb' 'smbclient' 'libmatroska' 
+           'taglib' 'sysfsutils' 'libmpcdec' 'hal' 'ffmpeg>=0.5' 
+           'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
+           'avahi' 'ttf-dejavu' 'libxv' 'libass' 'xdg-utils')
+  optdepends=('libnotify')
+  options=('!libtool')
+  install=vlc.install
+  cd ${srcdir}/${pkgbase}-${pkgver}
   make DESTDIR=${pkgdir}/ install || return 1
   
   for res in 16 32 48 128; do
     install -D -m644 ${srcdir}/vlc-${pkgver}/share/vlc${res}x${res}.png \
 		     ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png || return 1
   done
+  
   rm -rf ${pkgdir}/usr/lib/mozilla
 }
+
+package_vlc-plugin() {
+  pkgdesc="VLC Multimedia Plug-in"
+  depends=("${pkgbase}=${pkgver}" 'nspr')
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  install -Dm755 projects/mozilla/.libs/libvlcplugin.so ${pkgdir}/usr/lib/mozilla/plugins/libvlcplugin.so || return 1
+}