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

[Giovanni Scafora]

    Date: Sunday, October 5, 2008 @ 15:48:41
  Author: giovanni
Revision: 14330

Merged revisions 14329 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/vlc/trunk

................
  r14329 | giovanni | 2008-10-05 21:30:48 +0200 (dom, 05 ott 2008) | 9 lines
  
  Merged revisions 14058 via svnmerge from 
  svn+ssh://archlinux.org/home/svn-packages/vlc/trunk
  
  ........
    r14058 | giovanni | 2008-10-02 19:56:17 +0200 (gio, 02 ott 2008) | 1 line
    
    Deleted unnecessary vlc.install file
  ........
................

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

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


Property changes on: vlc/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /vlc/trunk:1-14328
   + /vlc/trunk:1-14329

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-05 19:30:48 UTC (rev 14329)
+++ extra-i686/PKGBUILD	2008-10-05 19:48:41 UTC (rev 14330)
@@ -4,7 +4,7 @@
 
 pkgname=vlc
 pkgver=0.9.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -22,8 +22,9 @@
 
 build() {
   cd ${startdir}/src/vlc-0.9.3
-
-  [ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader --disable-live555 --with-live555-tree=/usr/lib/live-media"
+  sed -i -e 's:#include <vlc\/vlc.h>:#include <vlc/vlc.h> \n #include <locale.h>: ' modules/misc/freetype.c
+  sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/VeraBd.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"
   ./configure --prefix=/usr --enable-dvdread --enable-dvdnav \
               --enable-madi --enable-ffmpeg --disable-rpath \