[arch-commits] Commit in chromium/repos (testing-i686 testing-i686/PKGBUILD)

Pierre Schmitz pierre at archlinux.org
Wed Jan 27 09:12:18 EST 2010


    Date: Wednesday, January 27, 2010 @ 09:12:17
  Author: pierre
Revision: 65325

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

........
  r65324 | pierre | 2010-01-27 15:11:42 +0100 (Mi, 27 Jan 2010) | 2 lines
  
  upgpkg: chromium 4.0.249.78-2
      use system ffmpeg
........

Modified:
  chromium/repos/testing-i686/	(properties)
  chromium/repos/testing-i686/PKGBUILD

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


Property changes on: chromium/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /chromium/trunk:1-64713
   + /chromium/trunk:1-65324

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2010-01-27 14:11:42 UTC (rev 65324)
+++ testing-i686/PKGBUILD	2010-01-27 14:12:17 UTC (rev 65325)
@@ -3,12 +3,12 @@
 
 pkgname=chromium
 pkgver=4.0.249.78
-pkgrel=1
+pkgrel=2
 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web'
 arch=('i686' 'x86_64')
 url='http://www.chromium.org/'
 license=('BSD')
-depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libxslt')
+depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libxslt' 'ffmpeg')
 makedepends=('python' 'perl' 'gperf')
 provides=('chromium-browser')
 conflicts=('chromium-browser')
@@ -41,6 +41,7 @@
 		use_system_libxslt=1 \
 		use_system_bzip2=1 \
 		use_system_libpng=1 \
+		use_system_ffmpeg=1 \
 		werror="
 
 	patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1
@@ -65,8 +66,9 @@
 		${pkgdir}/usr/lib/chromium/chromium-sandbox
 	install -m 0644 -D src/out/Release/chrome.pak \
 		${pkgdir}/usr/lib/chromium/chrome.pak
-	install -m 0644 -D src/out/Release/libffmpegsumo.so \
-		${pkgdir}/usr/lib/chromium/libffmpegsumo.so
+	ln -s /usr/lib/libavcodec.so.52 ${pkgdir}/usr/lib/chromium/libavcodec.so.52
+	ln -s /usr/lib/libavformat.so.52 ${pkgdir}/usr/lib/chromium/libavformat.so.52
+	ln -s /usr/lib/libavutil.so.50 ${pkgdir}/usr/lib/chromium/libavutil.so.50
 	cp -a src/out/Release/locales src/out/Release/resources \
 		${pkgdir}/usr/lib/chromium/
 	find ${pkgdir}/usr/lib/chromium/ -name '*.d' -type f -delete



More information about the arch-commits mailing list