From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Tue, 13 Jan 2009 12:49:03 +0000 (+0000)
Subject: - Resynch with Fedora package (0.13.2).
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=d93ad604c3855b8140d5dc938a2de6de3ae71dc6;p=fedora-mingw.git

- Resynch with Fedora package (0.13.2).
- Disable static library for speed.
- Use _smp_mflags.
- Requires pkgconfig.
- Depends on dlfcn.
---

diff --git a/.hgignore b/.hgignore
index 50aab3c..aa0166a 100644
--- a/.hgignore
+++ b/.hgignore
@@ -108,6 +108,7 @@ pdcurses/PDCurses-3.4.tar.gz
 pidgin/pidgin-2.5.2.tar.bz2
 pixman/pixman-0.11.10.tar.gz
 pixman/pixman-0.12.0.tar.gz
+pixman/pixman-0.13.2.tar.gz
 poco/poco-1.3.3p1.tar.bz2
 portablexdr/portablexdr-4.0.10.tar.gz
 portablexdr/portablexdr-4.0.11.tar.gz
diff --git a/pixman/make-pixman-snapshot.sh b/pixman/make-pixman-snapshot.sh
new file mode 100755
index 0000000..0cd65a3
--- /dev/null
+++ b/pixman/make-pixman-snapshot.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+DIRNAME=pixman-$( date +%Y%m%d )
+
+rm -rf $DIRNAME
+git clone git://git.freedesktop.org/git/pixman $DIRNAME
+cd $DIRNAME
+if [ -z "$1" ]; then
+    git log | head -1
+else
+    git checkout $1
+fi
+rm -rf .git
+cd ..
+tar jcf $DIRNAME.tar.bz2 $DIRNAME
+rm -rf $DIRNAME
diff --git a/pixman/mingw32-pixman.spec b/pixman/mingw32-pixman.spec
index f724f6e..0dad5d1 100644
--- a/pixman/mingw32-pixman.spec
+++ b/pixman/mingw32-pixman.spec
@@ -5,21 +5,26 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-pixman
-Version:        0.12.0
-Release:        2%{?dist}
+Version:        0.13.2
+Release:        1%{?dist}
 Summary:        MinGW Windows Pixman library
 
 License:        MIT
 URL:            http://xorg.freedesktop.org/
-Source0:        http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.gz
 Group:          Development/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:        http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.gz
+Source1:        make-pixman-snapshot.sh
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 23
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-dlfcn
+
+Requires:       pkgconfig
 
 %description
 MinGW Windows Pixman library.
@@ -28,11 +33,12 @@ MinGW Windows Pixman library.
 %prep
 %setup -q -n pixman-%{version}
 
+
 %build
 # Uses GTK for its testsuite, so disable this otherwise
 # we have a chicken & egg problem on mingw
-%{_mingw32_configure} --disable-gtk
-make
+%{_mingw32_configure} --disable-gtk --disable-static
+make %{?_smp_mflags}
 
 
 %install
@@ -40,7 +46,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm $RPM_BUILD_ROOT/%{_mingw32_libdir}/libpixman-1.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,7 +59,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libpixman-1.la
 %{_mingw32_libdir}/pkgconfig/pixman-1.pc
 
+
 %changelog
+* Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 0.13.2-1
+- Resynch with Fedora package (0.13.2).
+- Disable static library for speed.
+- Use _smp_mflags.
+- Requires pkgconfig.
+- Depends on dlfcn.
+
 * Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 0.12.0-2
 - Rename mingw -> mingw32.