[gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/files/

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/files/

[Anthony G. Basile]

commit:     3d328b71caf7e73cec098a24ace971e13a6e5ba9
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 20:05:50 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 20:06:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d328b71

x11-libs/gdk-pixbuf: extend non-glibc fix to uclibc

Gentoo-Bug: 563052

Package-Manager: portage-2.2.20.1

 x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch
index 3915dff..cb50899 100644
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch
@@ -40,7 +40,7 @@ index ae71788..9e9571f 100644
  #include <time.h>
  #include <string.h>
  
-+#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
  #define PRETEND_MEM_SIZE (16 * 1024 * 1024)
  #define REMAINING_MEM_SIZE 100000
  

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/files/

[Alexandre Rostovtsev]

commit:     92308a3ae2aeed9279463f49f6fd118807a9be54
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  1 13:14:55 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 13:14:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92308a3a

x11-libs/gdk-pixbuf: remove unused patch

Package-Manager: portage-2.2.20.1

 .../gdk-pixbuf-2.31.1-pixops-no-scaling.patch      | 129 ---------------------
 1 file changed, 129 deletions(-)

diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.1-pixops-no-scaling.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.1-pixops-no-scaling.patch
deleted file mode 100644
index a8587fc..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.31.1-pixops-no-scaling.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From cc5fce6315dcc1127a3e2106223305ff763be815 Mon Sep 17 00:00:00 2001
-From: Hans Petter Jansson <hpj@copyleft.no>
-Date: Thu, 10 Nov 2005 19:13:00 +0000
-Subject: [PATCH] pixops: Special-case compositing/copying with no scaling
-
-When there is no scaling involved, make gdk_pixbuf_composite_color()
-faster by avoiding the scaling code path.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=80927
----
- gdk-pixbuf/pixops/pixops.c | 95 +++++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 90 insertions(+), 5 deletions(-)
-
-diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
-index 993223e..29a1c14 100644
---- a/gdk-pixbuf/pixops/pixops.c
-+++ b/gdk-pixbuf/pixops/pixops.c
-@@ -421,6 +421,86 @@ pixops_composite_nearest (guchar        *dest_buf,
- }
- 
- static void
-+pixops_composite_nearest_noscale (guchar        *dest_buf,
-+				  int            render_x0,
-+				  int            render_y0,
-+				  int            render_x1,
-+				  int            render_y1,
-+				  int            dest_rowstride,
-+				  int            dest_channels,
-+				  gboolean       dest_has_alpha,
-+				  const guchar  *src_buf,
-+				  int            src_width,
-+				  int            src_height,
-+				  int            src_rowstride,
-+				  int            src_channels,
-+				  gboolean       src_has_alpha,
-+				  int            overall_alpha)
-+{
-+  int i, j;
-+  int x;
-+
-+  for (i = 0; i < (render_y1 - render_y0); i++)
-+    {
-+      const guchar *src  = src_buf + (i + render_y0) * src_rowstride;
-+      guchar       *dest = dest_buf + i * dest_rowstride;
-+
-+      x = render_x0 * src_channels;
-+
-+      for (j=0; j < (render_x1 - render_x0); j++)
-+	{
-+	  const guchar *p = src + x;
-+	  unsigned int  a0;
-+
-+	  if (src_has_alpha)
-+	    a0 = (p[3] * overall_alpha) / 0xff;
-+	  else
-+	    a0 = overall_alpha;
-+
-+	  switch (a0)
-+	    {
-+	    case 0:
-+	      break;
-+	    case 255:
-+	      dest[0] = p[0];
-+	      dest[1] = p[1];
-+	      dest[2] = p[2];
-+	      if (dest_has_alpha)
-+		dest[3] = 0xff;
-+	      break;
-+	    default:
-+	      if (dest_has_alpha)
-+	        {
-+		  unsigned int w0 = 0xff * a0;
-+		  unsigned int w1 = (0xff - a0) * dest[3];
-+		  unsigned int w = w0 + w1;
-+
-+		  dest[0] = (w0 * p[0] + w1 * dest[0]) / w;
-+		  dest[1] = (w0 * p[1] + w1 * dest[1]) / w;
-+		  dest[2] = (w0 * p[2] + w1 * dest[2]) / w;
-+		  dest[3] = w / 0xff;
-+	        }
-+	      else
-+	        {
-+		  unsigned int a1 = 0xff - a0;
-+		  unsigned int tmp;
-+
-+		  tmp = a0 * p[0] + a1 * dest[0] + 0x80;
-+		  dest[0] = (tmp + (tmp >> 8)) >> 8;
-+		  tmp = a0 * p[1] + a1 * dest[1] + 0x80;
-+		  dest[1] = (tmp + (tmp >> 8)) >> 8;
-+		  tmp = a0 * p[2] + a1 * dest[2] + 0x80;
-+		  dest[2] = (tmp + (tmp >> 8)) >> 8;
-+	        }
-+	      break;
-+	    }
-+	  dest += dest_channels;
-+	  x += src_channels;
-+	}
-+    }
-+}
-+
-+static void
- pixops_composite_color_nearest (guchar        *dest_buf,
- 				int            render_x0,
- 				int            render_y0,
-@@ -1781,11 +1861,16 @@ _pixops_composite_real (guchar          *dest_buf,
- 
-   if (interp_type == PIXOPS_INTERP_NEAREST)
-     {
--      pixops_composite_nearest (dest_buf, render_x0, render_y0, render_x1,
--				render_y1, dest_rowstride, dest_channels,
--				dest_has_alpha, src_buf, src_width, src_height,
--				src_rowstride, src_channels, src_has_alpha,
--				scale_x, scale_y, overall_alpha);
-+      if (scale_x == 1.0 && scale_y == 1.0)
-+	pixops_composite_nearest_noscale (dest_buf, render_x0, render_y0, render_x1, render_y1,
-+					  dest_rowstride, dest_channels, dest_has_alpha,
-+					  src_buf, src_width, src_height, src_rowstride, src_channels,
-+					  src_has_alpha, overall_alpha);
-+      else
-+	pixops_composite_nearest (dest_buf, render_x0, render_y0, render_x1, render_y1,
-+				  dest_rowstride, dest_channels, dest_has_alpha,
-+				  src_buf, src_width, src_height, src_rowstride, src_channels,
-+				  src_has_alpha, scale_x, scale_y, overall_alpha);
-       return;
-     }
-   
--- 
-2.5.1
-