[arch-commits] Commit in vlc (3 files)

[Giovanni Scafora]

    Date: Monday, September 29, 2008 @ 18:36:02
  Author: giovanni
Revision: 13929

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

................
  r13928 | giovanni | 2008-09-30 00:33:21 +0200 (mar, 30 set 2008) | 9 lines
  
  Merged revisions 13926 via svnmerge from 
  svn+ssh://archlinux.org/home/svn-packages/vlc/trunk
  
  ........
    r13926 | giovanni | 2008-09-30 00:25:45 +0200 (mar, 30 set 2008) | 1 line
    
    archrelease: new repo testing-i686
  ........
................

Modified:
  vlc/repos/testing-i686/	(properties)
  vlc/repos/testing-i686/PKGBUILD
  vlc/trunk/PKGBUILD

-----------------------------+
 repos/testing-i686/PKGBUILD |    4 +++-
 trunk/PKGBUILD              |    2 --
 2 files changed, 3 insertions(+), 3 deletions(-)


Property changes on: vlc/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /vlc/trunk:1-13927
   + /vlc/trunk:1-13928

Modified: repos/testing-i686/PKGBUILD
===================================================================
--- repos/testing-i686/PKGBUILD	2008-09-29 22:33:21 UTC (rev 13928)
+++ repos/testing-i686/PKGBUILD	2008-09-29 22:36:02 UTC (rev 13929)
@@ -21,7 +21,9 @@
 
 build() {
   cd ${startdir}/src/vlc-0.9.3
-  
+  sed -i -e 's:#include <vlc\/vlc.h>:#include <vlc/vlc.h> \n #include <locale.h>: ' src/misc/charset.c
+  sed -i -e 's:/truetype/freefont/FreeSerifBold.ttf:/TTF/VeraBd.ttf:' modules/misc/freetype.c
+
   [ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader --disable-live555 --with-live555-tree=/usr/lib/live-media"
   [ "${CARCH}" = "x86_64" ] && EXTRAFEATURES="--enable-fast-install"
   ./configure --prefix=/usr --enable-dvdread --enable-dvdnav \

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2008-09-29 22:33:21 UTC (rev 13928)
+++ trunk/PKGBUILD	2008-09-29 22:36:02 UTC (rev 13929)
@@ -21,8 +21,6 @@
 
 build() {
   cd ${startdir}/src/vlc-0.9.3
-  sed -i -e 's:#include <vlc\/vlc.h>:#include <vlc/vlc.h> \n #include <locale.h>: ' src/misc/charset.c
-  sed -i -e 's:/truetype/freefont/FreeSerifBold.ttf:/TTF/VeraBd.ttf:' modules/misc/freetype.c
 
   [ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader --disable-live555 --with-live555-tree=/usr/lib/live-media"
   [ "${CARCH}" = "x86_64" ] && EXTRAFEATURES="--enable-fast-install"