[arch-commits] Commit in opal/repos (3 files)

[Jan de Groot]

    Date: Monday, October 12, 2009 @ 03:47:28
  Author: jgc
Revision: 55145

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

........
  r55144 | jgc | 2009-10-12 09:47:10 +0200 (Mon, 12 Oct 2009) | 1 line
  
  Merge gnome-unstable
........

Modified:
  opal/repos/extra-i686/	(properties)
  opal/repos/extra-i686/PKGBUILD
Deleted:
  opal/repos/extra-i686/gcc-4.4.patch

---------------+
 PKGBUILD      |   12 +++++-------
 gcc-4.4.patch |   10 ----------
 2 files changed, 5 insertions(+), 17 deletions(-)


Property changes on: opal/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /opal/trunk:1-46648
   + /opal/trunk:1-55144

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-12 07:47:10 UTC (rev 55144)
+++ extra-i686/PKGBUILD	2009-10-12 07:47:28 UTC (rev 55145)
@@ -2,22 +2,20 @@
 # Maintainer: Jan de Groot <jan at archlinux.org>
 # Contributor: Tom K <tomk at runbox.com>
 pkgname=opal
-pkgver=3.6.4
+pkgver=3.6.6
 pkgrel=1
 pkgdesc="Open Phone Abstraction Library"
 arch=(i686 x86_64)
 url="http://www.ekiga.org"
 license=('GPL')
-depends=('ptlib=2.6.4' 'libtheora' 'x264>=20090416' 'speex')
+depends=('ptlib=2.6.5' 'libtheora' 'x264>=20090416' 'speex')
 makedepends=('ffmpeg')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.6/${pkgname}-${pkgver}.tar.bz2
-        gcc-4.4.patch)
-md5sums=('d894c176818a33d34a04b21386798c4f'
-         '8ca6eb81099815d0323105dd2603766c')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.6/${pkgname}-${pkgver}.tar.bz2)
+#gcc-4.4.patch)
+sha256sums=('60c9d75703bedfeca7140cb76b23fae7179ce1f86e7e8b0026b72d66acd75c82')
 
 build() {
   cd "${srcdir}/opal-${pkgver}"
-  patch -Np0 -i "${srcdir}/gcc-4.4.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Deleted: extra-i686/gcc-4.4.patch
===================================================================
--- extra-i686/gcc-4.4.patch	2009-10-12 07:47:10 UTC (rev 55144)
+++ extra-i686/gcc-4.4.patch	2009-10-12 07:47:28 UTC (rev 55145)
@@ -1,10 +0,0 @@
---- plugins/video/H.264/gpl/enc-ctx.cxx~	2009-05-19 09:52:39.000000000 +0000
-+++ plugins/video/H.264/gpl/enc-ctx.cxx	2009-05-19 18:35:05.361761163 +0000
-@@ -35,6 +35,7 @@
-   #define STRCMPI  strcasecmp
- #endif
- #include <string.h>
-+#include <cstdio>
- 
- #ifndef X264_LINK_STATIC
- X264Library X264Lib;