packages: xorg-lib-libXft/xorg-lib-libXft-lcd-filter.patch, xorg-lib-libXft...

qboosh qboosh at pld-linux.org
Tue Oct 13 08:37:42 CEST 2009 

Author: qboosh                       Date: Tue Oct 13 06:37:42 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.1.14
- updated lcd-filter patch

---- Files affected:
packages/xorg-lib-libXft:
   xorg-lib-libXft-lcd-filter.patch (1.1 -> 1.2) , xorg-lib-libXft.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/xorg-lib-libXft/xorg-lib-libXft-lcd-filter.patch
diff -u packages/xorg-lib-libXft/xorg-lib-libXft-lcd-filter.patch:1.1 packages/xorg-lib-libXft/xorg-lib-libXft-lcd-filter.patch:1.2
--- packages/xorg-lib-libXft/xorg-lib-libXft-lcd-filter.patch:1.1	Tue Feb 20 16:10:13 2007
+++ packages/xorg-lib-libXft/xorg-lib-libXft-lcd-filter.patch	Tue Oct 13 08:37:37 2009
@@ -1,11 +1,17 @@
---- libXft-2.1.12/src/xftglyphs.c.orig	2006-12-07 11:17:19.000000000 +0100
-+++ libXft-2.1.12/src/xftglyphs.c	2007-02-20 15:41:14.000000000 +0100
-@@ -23,23 +23,14 @@
+--- libXft-2.1.14/src/xftglyphs.c.orig	2009-01-30 00:19:09.000000000 +0100
++++ libXft-2.1.14/src/xftglyphs.c	2009-10-13 07:53:29.629017390 +0200
+@@ -21,27 +21,18 @@
   */
  
  #include "xftint.h"
 -#include <freetype/ftoutln.h>
  
+-#if HAVE_FT_GLYPHSLOT_EMBOLDEN
+-#include <freetype/ftsynth.h>
++#if FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH < 20202
++#  error  "FreeType 2.2.2 or later required to compile this version of libXft"
+ #endif
+ 
 -static const int    filters[3][3] = {
 -    /* red */
 -#if 0
@@ -14,8 +20,12 @@
 -{    65536*1/4, 65536*2/4, 65537*1/4 },
 -    /* blue */
 -{    65538*1/7,65538*2/7,65538*4/7 },
-+#if FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH < 20202
-+#  error  "FreeType 2.2.2 or later required to compile this version of libXft"
++#include FT_OUTLINE_H
++#include FT_LCD_FILTER_H
++#include FT_SYNTHESIS_H
++
++#if HAVE_FT_GLYPHSLOT_EMBOLDEN
++#include <freetype/ftsynth.h>
  #endif
 -{    65538*9/13,65538*3/13,65538*1/13 },
 -    /* green */
@@ -23,14 +33,10 @@
 -    /* blue */
 -{    65538*1/13,65538*3/13,65538*9/13 },
 -};
-+
-+#include FT_OUTLINE_H
-+#include FT_LCD_FILTER_H
-+#include FT_SYNTHESIS_H
  
  /*
   * Validate the memory info for a font
-@@ -67,6 +58,295 @@
+@@ -69,6 +60,295 @@
  		font->glyph_memory, glyph_memory);
  }
  
@@ -326,7 +332,7 @@
  _X_EXPORT void
  XftFontLoadGlyphs (Display	    *dpy,
  		   XftFont	    *pub,
-@@ -85,20 +365,14 @@
+@@ -87,20 +367,14 @@
      unsigned char   *bufBitmap = bufLocal;
      int		    bufSize = sizeof (bufLocal);
      int		    size, pitch;
@@ -350,7 +356,7 @@
  
      if (!info)
  	return;
-@@ -108,24 +382,19 @@
+@@ -110,24 +384,19 @@
      if (!face)
  	return;
  
@@ -379,7 +385,7 @@
  	}
      }
  
-@@ -146,7 +415,10 @@
+@@ -148,7 +417,10 @@
  	if (xftg->glyph_memory)
  	    continue;
  	
@@ -390,7 +396,7 @@
  	if (error)
  	{
  	    /*
-@@ -179,7 +451,7 @@
+@@ -181,7 +453,7 @@
  	/*
  	 * Compute glyph metrics from FreeType information
  	 */
@@ -399,7 +405,7 @@
  	{
  	    /*
  	     * calculate the true width by transforming all four corners.
-@@ -258,17 +530,14 @@
+@@ -260,17 +532,14 @@
  	    }
  	}
  
@@ -407,8 +413,6 @@
 -	    pitch = (width * hmul + 3) & ~3;
 -	else
 -	    pitch = ((width + 31) & ~31) >> 3;
--
--	size = pitch * height * vmul;
 +        if ( glyphslot->format != FT_GLYPH_FORMAT_BITMAP )
 +        {
 +            error = FT_Render_Glyph( face->glyph, mode );
@@ -416,6 +420,8 @@
 +                continue;
 +        }
  
+-	size = pitch * height * vmul;
+-
 -	xftg->metrics.width = width;
 -	xftg->metrics.height = height;
 -	xftg->metrics.x = -TRUNC(left);
@@ -424,7 +430,7 @@
  
  	if (font->info.spacing >= FC_MONO)
  	{
-@@ -308,103 +577,13 @@
+@@ -310,103 +579,13 @@
  	    xftg->metrics.yOff = -TRUNC(ROUND(glyphslot->advance.y));
  	}
  	
@@ -533,7 +539,7 @@
  	
  	if (XftDebug() & XFT_DBG_GLYPH)
  	{
-@@ -421,29 +600,72 @@
+@@ -423,29 +602,72 @@
  		int		x, y;
  		unsigned char	*line;
  
@@ -612,7 +618,7 @@
  	/*
  	 * Use the glyph index as the wire encoding; it
  	 * might be more efficient for some locales to map
-@@ -453,121 +675,24 @@
+@@ -455,121 +677,24 @@
  	 */
  	glyph = (Glyph) glyphindex;
  
@@ -708,7 +714,7 @@
 -			memcpy (xftg->bitmap, bufBitmapRgba, sizergba);
 -		}
 -		else
--		    xftg->bitmap = 0;
+-		    xftg->bitmap = NULL;
 -	    }
 -	}
 -	else
@@ -742,7 +748,7 @@
  			    c = ((c << 1) & 0xaa) | ((c >> 1) & 0x55);
  			    c = ((c << 2) & 0xcc) | ((c >> 2) & 0x33);
  			    c = ((c << 4) & 0xf0) | ((c >> 4) & 0x0f);
-@@ -575,8 +700,12 @@
+@@ -577,8 +702,12 @@
  			}
  		    }
  		}
@@ -757,16 +763,16 @@
  		XRenderAddGlyphs (dpy, font->glyphset, &glyph,
  				  &xftg->metrics, 1, 
  				  (char *) bufBitmap, size);
-@@ -592,7 +721,7 @@
+@@ -594,7 +723,7 @@
  		else
- 		    xftg->bitmap = 0;
+ 		    xftg->bitmap = NULL;
  	    }
 -	}
 +
  	font->glyph_memory += xftg->glyph_memory;
  	info->glyph_memory += xftg->glyph_memory;
  	if (XftDebug() & XFT_DBG_CACHE)
-@@ -603,8 +732,6 @@
+@@ -605,8 +734,6 @@
      }
      if (bufBitmap != bufLocal)
  	free (bufBitmap);

================================================================
Index: packages/xorg-lib-libXft/xorg-lib-libXft.spec
diff -u packages/xorg-lib-libXft/xorg-lib-libXft.spec:1.31 packages/xorg-lib-libXft/xorg-lib-libXft.spec:1.32
--- packages/xorg-lib-libXft/xorg-lib-libXft.spec:1.31	Thu Aug 13 20:11:06 2009
+++ packages/xorg-lib-libXft/xorg-lib-libXft.spec	Tue Oct 13 08:37:37 2009
@@ -6,23 +6,24 @@
 Summary:	X Font Rendering library
 Summary(pl.UTF-8):	Biblioteka do renderowania fontów
 Name:		xorg-lib-libXft
-Version:	2.1.13
-Release:	3
+Version:	2.1.14
+Release:	1
 License:	MIT
 Group:		X11/Libraries
 Source0:	http://xorg.freedesktop.org/archive/individual/lib/libXft-%{version}.tar.bz2
-# Source0-md5:	bc8881851f3bd8dcc625fac37350a1c6
+# Source0-md5:	254e62a233491e0e1251636536163e20
 Patch0:		%{name}-lcd-filter.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	fontconfig-devel >= 2.2
 %{?with_lcd:BuildRequires:	freetype-devel >= 1:2.3.0}
-%{!?with_lcd:BuildRequires:	freetype-devel}
+%{!?with_lcd:BuildRequires:	freetype-devel >= 2}
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	xorg-lib-libXrender-devel >= 0.8.2
-BuildRequires:	xorg-util-util-macros
+BuildRequires:	xorg-util-util-macros >= 1.3
+Requires:	fontconfig
 %{?with_lcd:Requires:	freetype >= 1:2.3.0}
 Requires:	xorg-lib-libXrender >= 0.8.2
 Obsoletes:	XFree86-xft
@@ -30,7 +31,6 @@
 Obsoletes:	Xft
 Obsoletes:	libXft
 Obsoletes:	xft
-Requires:	fontconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -106,7 +106,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libXft.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libXft.so.2
 
@@ -131,6 +131,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2009/10/13 06:37:37  qboosh
+- updated to 2.1.14
+- updated lcd-filter patch
+
 Revision 1.31  2009/08/13 18:11:06  arekm
 - rel 3; R: fontconfig for main config
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-lib-libXft/xorg-lib-libXft-lcd-filter.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-lib-libXft/xorg-lib-libXft.spec?r1=1.31&r2=1.32&f=u

More information about the pld-cvs-commit mailing list