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

[Giovanni Scafora]

    Date: Tuesday, October 27, 2009 @ 21:12:35
  Author: giovanni
Revision: 56790

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

........
  r56788 | giovanni | 2009-10-27 17:50:58 -0700 (mar, 27 ott 2009) | 2 lines
  
  upgpkg: vlc 1.0.2-4
      Fix for FS16859
........

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

----------+
 PKGBUILD |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-28 00:51:36 UTC (rev 56789)
+++ extra-i686/PKGBUILD	2009-10-28 01:12:35 UTC (rev 56790)
@@ -6,7 +6,7 @@
 pkgname=('vlc' 
          'vlc-plugin')
 pkgver=1.0.2
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
@@ -15,14 +15,14 @@
            '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'
+           'avahi' 'ttf-freefont' '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}/${pkgbase}-${pkgver}
-  sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c
+  sed -i -e 's:truetype/freefont:TTF:g' 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"
   ./configure --prefix=/usr \
@@ -65,7 +65,7 @@
            'lua' 'libv4l' 'libcddb' 'smbclient' 'libmatroska' 
            'taglib' 'sysfsutils' 'libmpcdec' 'hal' 'ffmpeg>=0.5' 
            'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
-           'avahi' 'ttf-dejavu' 'libxv' 'libass' 'xdg-utils')
+           'avahi' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils')
   optdepends=('libnotify')
   options=('!libtool')
   install=vlc.install