[packages/crossmingw32-gdk-pixbuf2/meson] - updated to 2.38.0, build system changed to meson - removed outdated png-nodep,gdip patches - no .l

qboosh qboosh at pld-linux.org
Thu Sep 27 15:43:38 CEST 2018 

commit 41796a38e2fbda79145e6b174daf77578c7c93d1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Sep 27 15:46:41 2018 +0200

    - updated to 2.38.0, build system changed to meson
    - removed outdated png-nodep,gdip patches
    - no .la file, so could be problematic for use in packages using libtool - leaving on branch for now

 crossmingw32-gdk-pixbuf2.spec |  93 ++++++++++++++++++++++----------------
 gdk-pixbuf2-gdip.patch        | 101 ------------------------------------------
 gdk-pixbuf2-png-nodep.patch   |  34 --------------
 3 files changed, 56 insertions(+), 172 deletions(-)
---
diff --git a/crossmingw32-gdk-pixbuf2.spec b/crossmingw32-gdk-pixbuf2.spec
index 9cbf846..d1460b0 100644
--- a/crossmingw32-gdk-pixbuf2.spec
+++ b/crossmingw32-gdk-pixbuf2.spec
@@ -5,17 +5,13 @@
 Summary:	An image loading and scaling library - cross MinGW32 version
 Summary(pl.UTF-8):	Biblioteka ładująca i skalująca obrazki - wersja skrośna MinGW32
 Name:		crossmingw32-gdk-pixbuf2
-Version:	2.36.12
+Version:	2.38.0
 Release:	1
 License:	LGPL v2+
 Group:		Development/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.36/gdk-pixbuf-%{version}.tar.xz
-# Source0-md5:	7305ab43d741270ffa53ad2896d7f530
-Patch0:		gdk-pixbuf2-png-nodep.patch
-Patch1:		gdk-pixbuf2-gdip.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.38/gdk-pixbuf-%{version}.tar.xz
+# Source0-md5:	77765f24496dc8c90c6e0cbe10fd8f0e
 URL:		https://developer.gnome.org/gdk-pixbuf/
-BuildRequires:	autoconf >= 2.63
-BuildRequires:	automake >= 1:1.11
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	crossmingw32-glib2 >= 2.48.0
 BuildRequires:	crossmingw32-jasper
@@ -24,7 +20,8 @@ BuildRequires:	gettext-tools >= 0.19
 # glib-genmarshal, glib-mkenums
 BuildRequires:	glib2-devel >= 1:2.48.0
 BuildRequires:	gtk-doc >= 1.20
-BuildRequires:	libtool >= 2:2.2.6
+BuildRequires:	meson >= 0.46.0
+BuildRequires:	ninja
 BuildRequires:	pkgconfig >= 1:0.15
 BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
@@ -54,8 +51,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		__pkgconfig_provides	%{nil}
 %define		__pkgconfig_requires	%{nil}
 
-#define         filterout_ld            (-Wl,)?-as-needed.*
-
 %ifnarch %{ix86}
 # arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
 %define		optflags	-O2
@@ -77,6 +72,18 @@ ładowane moduły.
 
 Ten pakiet zawiera wersję skrośną dla Win32.
 
+%package static
+Summary:	Static gdk-pixbuf library (cross MinGW32 version)
+Summary(pl.UTF-8):	Statyczna biblioteka gdk-pixbuf (wersja skrośna MinGW32)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static gdk-pixbuf library (cross MinGW32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka gdk-pixbuf (wersja skrośna MinGW32).
+
 %package dll
 Summary:	DLL gdk-pixbuf libraries for Windows
 Summary(pl.UTF-8):	Biblioteki DLL gdk-pixbuf dla Windows
@@ -93,38 +100,47 @@ Biblioteki DLL gdk-pixbuf dla Windows.
 
 %prep
 %setup -q -n gdk-pixbuf-%{version}
-%patch0 -p1
-%patch1 -p1
 
-# disable thumbnailer (unwanted, generates files using built library/binary)
-%{__sed} -i -e '/^SUBDIRS/s/ thumbnailer / /' Makefile.am
+# disable loaders.cache generation
+%{__sed} -i -e "/^loaders_cache/,/^loaders_dep/ d" gdk-pixbuf/meson.build
+# disable tests and thumbnailer (unwanted, generates files using built library/binary)
+%{__sed} -i -e "/^subdir('tests')/d" meson.build
+%{__sed} -i -e "/^subdir('thumbnailer')/d" meson.build
+
+cat > meson-cross.txt <<'EOF'
+[host_machine]
+system = 'windows'
+cpu_family = 'x86'
+cpu = 'i386'
+endian='little'
+[binaries]
+c = '%{__cc}'
+ar = '%{target}-ar'
+windres = '%{target}-windres'
+pkgconfig = 'pkg-config'
+[properties]
+; force gnu99 to disable __STRICT_ANSI__ and unblock fdopen() in mingw32
+c_args = ['%(echo %{rpmcflags} | sed -e "s/ \+/ /g;s/ /', '/g")', '-std=gnu99']
+EOF
 
 %build
-%{__gettextize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
-%configure \
-	--target=%{target} \
-	--host=%{target} \
-	--disable-gtk-doc \
-	--disable-man \
-	--disable-silent-rules \
-	--with-libjasper \
-	%{!?with_gdiplus:--without-gdiplus}
-
-%{__make} \
-	GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
-	GLIB_MKENUMS=/usr/bin/glib-mkenums
+%meson build \
+	--cross-file meson-cross.txt \
+	-Ddocs=false \
+	-Dgir=false \
+	-Dinstalled_tests=false \
+	-Djasper=true \
+	-Dman=false \
+	%{?with_gdiplus:-Dnative_windows_loaders=true} \
+	-Dx11=false
+
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%meson_install -j1 -C build
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
 %{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
@@ -137,8 +153,8 @@ install -d $RPM_BUILD_ROOT%{_dlldir}
 
 # shut up check-files
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/*.exe
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{gtk-doc,locale,man}
-%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/%{abiver}/loaders/*.{la,dll.a}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/%{abiver}/loaders/*.dll.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -146,10 +162,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %{_libdir}/libgdk_pixbuf-2.0.dll.a
-%{_libdir}/libgdk_pixbuf-2.0.la
 %{_includedir}/gdk-pixbuf-2.0
 %{_pkgconfigdir}/gdk-pixbuf-2.0.pc
 
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libgdk_pixbuf-2.0.a
+
 %files dll
 %defattr(644,root,root,755)
 %{_dlldir}/libgdk_pixbuf-2.0-*.dll
diff --git a/gdk-pixbuf2-gdip.patch b/gdk-pixbuf2-gdip.patch
deleted file mode 100644
index b23ae68..0000000
--- a/gdk-pixbuf2-gdip.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- gdk-pixbuf-2.26.1/gdk-pixbuf/Makefile.am.orig	2012-04-14 20:11:34.000000000 +0200
-+++ gdk-pixbuf-2.26.1/gdk-pixbuf/Makefile.am	2012-04-15 18:03:52.776039347 +0200
-@@ -208,7 +208,7 @@
- # create a partial one that's enough for our use.
- 
- libgdiplus = libgdiplus.dll.a
--gdiplus_ldflag = -Wl,$(libgdiplus)
-+gdiplus_ldflag = -L. -lgdiplus # -Wl,$(libgdiplus)
- 
- libgdiplus.dll.a: gdiplus.def
- 	$(DLLTOOL) --kill-at --dllname gdiplus.dll --input-def $(srcdir)/gdiplus.def --output-lib $@
-@@ -265,7 +265,7 @@
- 	libpixbufloader-gdip-jpeg.la \
- 	libpixbufloader-gdip-tiff.la
- 
--libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-+libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined
- libpixbufloader_gdip_ico_la_SOURCES = 	\
- 	io-gdip-native.h		\
- 	io-gdip-propertytags.h		\
-@@ -274,9 +274,9 @@
- 	io-gdip-animation.c		\
- 	io-gdip-animation.h		\
- 	io-gdip-ico.c
--libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32)
-+libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
- 
--libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-+libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined
- libpixbufloader_gdip_wmf_la_SOURCES = 	\
- 	io-gdip-native.h		\
- 	io-gdip-propertytags.h		\
-@@ -285,9 +285,9 @@
- 	io-gdip-animation.c		\
- 	io-gdip-animation.h		\
- 	io-gdip-wmf.c
--libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32)
-+libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
- 
--libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-+libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined
- libpixbufloader_gdip_emf_la_SOURCES = 	\
- 	io-gdip-native.h		\
- 	io-gdip-propertytags.h		\
-@@ -296,9 +296,9 @@
- 	io-gdip-animation.c		\
- 	io-gdip-animation.h		\
- 	io-gdip-emf.c
--libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32)
-+libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
- 
--libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-+libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined
- libpixbufloader_gdip_bmp_la_SOURCES = 	\
- 	io-gdip-native.h		\
- 	io-gdip-propertytags.h		\
-@@ -307,9 +307,9 @@
- 	io-gdip-animation.c		\
- 	io-gdip-animation.h		\
- 	io-gdip-bmp.c
--libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32)
-+libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
- 
--libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-+libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined
- libpixbufloader_gdip_gif_la_SOURCES = 	\
- 	io-gdip-native.h		\
- 	io-gdip-propertytags.h		\
-@@ -318,9 +318,9 @@
- 	io-gdip-animation.c		\
- 	io-gdip-animation.h		\
- 	io-gdip-gif.c
--libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32)
-+libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
- 
--libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-+libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined
- libpixbufloader_gdip_jpeg_la_SOURCES = 	\
- 	io-gdip-native.h		\
- 	io-gdip-propertytags.h		\
-@@ -329,9 +329,9 @@
- 	io-gdip-animation.c		\
- 	io-gdip-animation.h		\
- 	io-gdip-jpeg.c
--libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32)
-+libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
- 
--libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-+libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined
- libpixbufloader_gdip_tiff_la_SOURCES = 	\
- 	io-gdip-native.h		\
- 	io-gdip-propertytags.h		\
-@@ -340,7 +340,7 @@
- 	io-gdip-animation.c		\
- 	io-gdip-animation.h		\
- 	io-gdip-tiff.c
--libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32)
-+libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
- 
- endif
- 
diff --git a/gdk-pixbuf2-png-nodep.patch b/gdk-pixbuf2-png-nodep.patch
deleted file mode 100644
index 6f69555..0000000
--- a/gdk-pixbuf2-png-nodep.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- gdk-pixbuf-2.24.1/gdk-pixbuf-2.0.pc.in.orig	2011-08-27 04:33:58.000000000 +0200
-+++ gdk-pixbuf-2.24.1/gdk-pixbuf-2.0.pc.in	2011-12-26 21:54:19.189840017 +0100
-@@ -12,7 +12,7 @@
- Description: Image loading and scaling
- Version: @VERSION@
- Requires: gobject-2.0
--Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
-+Requires.private: gmodule-no-export-2.0
- Libs: -L${libdir} -lgdk_pixbuf- at GDK_PIXBUF_API_VERSION@
- Libs.private: @GDK_PIXBUF_EXTRA_LIBS@
- Cflags: -I${includedir}/gdk-pixbuf- at GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
---- gdk-pixbuf-2.24.1/configure.ac.orig	2011-12-26 19:47:09.966251231 +0100
-+++ gdk-pixbuf-2.24.1/configure.ac	2011-12-26 21:55:25.193175561 +0100
-@@ -814,9 +814,7 @@
-     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
-   fi
-   if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
--    if test -z $PNG_DEP_CFLAGS_PACKAGES; then
-       STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
--    fi
-   fi
-   if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
-     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
-@@ -918,8 +916,8 @@
- GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
- GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
- GDK_PIXBUF_EXTRA_CFLAGS=
--GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
--GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
-+GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-+GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
- 
- AC_SUBST(PNG_DEP_CFLAGS_PACKAGES)
- AC_SUBST(GDK_PIXBUF_PACKAGES)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-gdk-pixbuf2.git/commitdiff/41796a38e2fbda79145e6b174daf77578c7c93d1

More information about the pld-cvs-commit mailing list