diff --git a/.gitignore b/.gitignore index e3e0d1f..8a4118d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ pixman-0.18.2.tar.bz2 /pixman-0.32.6.tar.gz /pixman-0.33.2.tar.gz /pixman-0.34.0.tar.gz +/pixman-0.38.0.tar.gz diff --git a/mingw-pixman.spec b/mingw-pixman.spec index 6812aba..50d45b7 100644 --- a/mingw-pixman.spec +++ b/mingw-pixman.spec @@ -1,8 +1,8 @@ -%?mingw_package_header +%{?mingw_package_header} Name: mingw-pixman -Version: 0.34.0 -Release: 7%{?dist} +Version: 0.38.0 +Release: 1%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -11,15 +11,23 @@ URL: http://cgit.freedesktop.org/pixman/ Source0: http://cairographics.org/releases/pixman-%{version}.tar.gz Source1: make-pixman-snapshot.sh +# Allow building a static library with meson +Patch0: pixman_meson-static-library.patch + BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils +BuildRequires: mingw32-libgomp BuildRequires: mingw64-filesystem >= 95 BuildRequires: mingw64-gcc BuildRequires: mingw64-binutils +BuildRequires: mingw64-libgomp + +BuildRequires: gcc +BuildRequires: meson %description @@ -56,25 +64,21 @@ Requires: mingw64-pixman = %{version}-%{release} Static version of the cross compiled Pixman library. -%?mingw_debug_package +%{?mingw_debug_package} %prep -%setup -q -n pixman-%{version} +%autosetup -p1 -n pixman-%{version} %build -# Uses GTK for its testsuite, so disable this otherwise -# we have a chicken & egg problem on mingw -%mingw_configure --disable-gtk --disable-sse2 --enable-static --enable-shared -%mingw_make %{?_smp_mflags} +# Uses GTK for its testsuite, so disable this otherwise we have a chicken & egg problem on mingw +%mingw_meson --default-library=both -Dgtk=disabled +%mingw_ninja %install -%mingw_make install DESTDIR=$RPM_BUILD_ROOT - -# Drop all .la files -find $RPM_BUILD_ROOT -name "*.la" -delete +%mingw_ninja_install # Win32 @@ -101,6 +105,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Wed Aug 28 2019 Sandro Mani - 0.38.0-1 +- Update to 0.38.0 + * Thu Jul 25 2019 Fedora Release Engineering - 0.34.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/pixman_meson-static-library.patch b/pixman_meson-static-library.patch new file mode 100644 index 0000000..ab23562 --- /dev/null +++ b/pixman_meson-static-library.patch @@ -0,0 +1,12 @@ +diff -rupN --no-dereference pixman-0.38.0/pixman/meson.build pixman-0.38.0-new/pixman/meson.build +--- pixman-0.38.0/pixman/meson.build 2019-01-21 12:17:13.000000000 +0100 ++++ pixman-0.38.0-new/pixman/meson.build 2019-08-28 02:07:16.104054508 +0200 +@@ -97,7 +97,7 @@ pixman_files = files( + 'pixman-utils.c', + ) + +-libpixman = shared_library( ++libpixman = library( + 'pixman-1', + [pixman_files, config_h, version_h], + link_with : [pixman_simd_libs], diff --git a/sources b/sources index 55e8287..79dba4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e80ebae4da01e77f68744319f01d52a3 pixman-0.34.0.tar.gz +SHA512 (pixman-0.38.0.tar.gz) = 1b0205dbe9d9185c68813ce577a889f3c83e83fbd9955c3a72d411c3b476e6be93fc246b5b6ef4ee17e2bb8eb6fb5559e01dff7feb6a6c4c6314f980e960d690