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

[Jan de Groot]

    Date: Sunday, April 20, 2008 @ 07:35:45
  Author: jgc
Revision: 490

Merged revisions 2-489 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/pixman/trunk

........
  r151 | jgc | 2008-04-12 12:28:40 +0000 (Sat, 12 Apr 2008) | 2 lines
  
  upgpkg: pixman 0.10.0-1
      Update to last version, remove patch. Still no license, as there is not any known license included in the source
........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........

Modified:
  pixman/repos/extra-i686/	(properties)
  pixman/repos/extra-i686/PKGBUILD
Deleted:
  pixman/repos/extra-i686/pixman-compose-fix.patch

--------------------------+
 PKGBUILD                 |   18 ++++++------------
 pixman-compose-fix.patch |   22 ----------------------
 2 files changed, 6 insertions(+), 34 deletions(-)


Property changes on: pixman/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /pixman/trunk:1
   + /pixman/trunk:1-489

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-20 11:28:24 UTC (rev 489)
+++ extra-i686/PKGBUILD	2008-04-20 11:35:45 UTC (rev 490)
@@ -1,26 +1,20 @@
 # $Id$
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 pkgname=pixman
-pkgver=0.9.6
+pkgver=0.10.0
 pkgrel=1
-pkgdesc=""
+pkgdesc="Pixman library"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org"
 license=()
 depends=('glibc')
 options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 \
-        pixman-compose-fix.patch)
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('fb23e17a8a0308e8fad6dc153753ba9a')
 
 build() {
   cd "${startdir}/src/${pkgname}-${pkgver}"
-  
-  patch -Np1 -i ${startdir}/src/pixman-compose-fix.patch || return 1
-
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR="${startdir}/pkg" install
+  make DESTDIR="${startdir}/pkg" install || return 1
 }
-
-md5sums=('7681334f55d41a705339228145d02c11'
-         '26ee31eea878759f66b874b6a6bd7c35')

Deleted: extra-i686/pixman-compose-fix.patch
===================================================================
--- extra-i686/pixman-compose-fix.patch	2008-04-20 11:28:24 UTC (rev 489)
+++ extra-i686/pixman-compose-fix.patch	2008-04-20 11:35:45 UTC (rev 490)
@@ -1,22 +0,0 @@
-diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
-index 1e91864..027394a 100644
---- a/pixman/pixman-compose.c
-+++ b/pixman/pixman-compose.c
-@@ -3880,7 +3880,7 @@ static void fbFetchTransformed(bits_image_t * pict, int x, int y, int width, uin
- 			    idistx = 256 - distx;
- 			    idisty = 256 - disty;
- 			    
--			    b = bits + (y1)*stride;
-+			    b = bits + (signed)((y1)*stride);
- 			    x_off = x1;
- 			    
- 			    x1_out = (x1 < box.x1) | (x1 >= box.x2);
-@@ -3946,7 +3946,7 @@ static void fbFetchTransformed(bits_image_t * pict, int x, int y, int width, uin
- 			    idistx = 256 - distx;
- 			    idisty = 256 - disty;
- 			    
--			    b = bits + (y1)*stride;
-+			    b = bits + (signed)((y1)*stride);
- 			    x_off = x1;
- 			    
- 			    tl = pixman_region_contains_point(pict->common.src_clip, x1, y1, &box)