packages: crossmingw32-pixman/crossmingw32-pixman.spec, crossmingw32-pixman...

qboosh qboosh at pld-linux.org
Fri Apr 23 07:12:27 CEST 2010


Author: qboosh                       Date: Fri Apr 23 05:12:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.18.0
- added notls patch, disabled TLS (currently doesn't work correctly with mingw32)

---- Files affected:
packages/crossmingw32-pixman:
   crossmingw32-pixman.spec (1.7 -> 1.8) , pixman-notls.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/crossmingw32-pixman/crossmingw32-pixman.spec
diff -u packages/crossmingw32-pixman/crossmingw32-pixman.spec:1.7 packages/crossmingw32-pixman/crossmingw32-pixman.spec:1.8
--- packages/crossmingw32-pixman/crossmingw32-pixman.spec:1.7	Mon Mar 22 08:13:09 2010
+++ packages/crossmingw32-pixman/crossmingw32-pixman.spec	Fri Apr 23 07:12:21 2010
@@ -2,13 +2,14 @@
 Summary:	Pixel manipulation library - cross Mingw32
 Summary(pl.UTF-8):	Biblioteka operacji na pikselach - wersja skrośna Mingw32
 Name:		crossmingw32-pixman
-Version:	0.16.6
+Version:	0.18.0
 Release:	1
 License:	MIT
 Group:		Development/Libraries
 Source0:	http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2
-# Source0-md5:	fbd6ee9cb09d0b26281557bc7afcb3ab
+# Source0-md5:	a1b5a0a145cab653f5c1e8cf2f98f945
 Patch0:		pixman-no_pkgconfig.patch
+Patch1:		pixman-notls.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -75,6 +76,7 @@
 %prep
 %setup -q -n pixman-%{version}
 %patch0 -p1
+%patch1 -p1
 
 # disable gtk-based test
 :> test/Makefile.am
@@ -88,8 +90,10 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	CPPFLAGS="%{rpmcppflags} -DPIXMAN_NO_TLS" \
 	--target=%{target} \
-	--host=%{target}
+	--host=%{target} \
+	--disable-silent-rules
 
 %{__make}
 
@@ -134,6 +138,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2010/04/23 05:12:21  qboosh
+- updated to 0.18.0
+- added notls patch, disabled TLS (currently doesn't work correctly with mingw32)
+
 Revision 1.7  2010/03/22 07:13:09  qboosh
 - updated to 0.16.6 (from pixman.spec)
 

================================================================
Index: packages/crossmingw32-pixman/pixman-notls.patch
diff -u /dev/null packages/crossmingw32-pixman/pixman-notls.patch:1.1
--- /dev/null	Fri Apr 23 07:12:27 2010
+++ packages/crossmingw32-pixman/pixman-notls.patch	Fri Apr 23 07:12:21 2010
@@ -0,0 +1,18 @@
+--- pixman-0.18.0/pixman/pixman-compiler.h.orig	2010-03-28 00:39:02.000000000 +0100
++++ pixman-0.18.0/pixman/pixman-compiler.h	2010-04-21 23:26:50.704991410 +0200
+@@ -70,7 +70,14 @@
+ #endif
+ 
+ /* TLS */
+-#if defined(TOOLCHAIN_SUPPORTS__THREAD)
++#if defined(PIXMAN_NO_TLS)
++
++#   define PIXMAN_DEFINE_THREAD_LOCAL(type, name)			\
++    static type name
++#   define PIXMAN_GET_THREAD_LOCAL(name)				\
++    (&name)
++
++#elif defined(TOOLCHAIN_SUPPORTS__THREAD)
+ 
+ #   define PIXMAN_DEFINE_THREAD_LOCAL(type, name)			\
+     static __thread type name
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-pixman/crossmingw32-pixman.spec?r1=1.7&r2=1.8&f=u



More information about the pld-cvs-commit mailing list