- updated to 1.8.2

- removed obsolete gcc patch
- added gir patch (build introspection even also when both shared+static libraries are built

diff --git a/graphene-gcc.patch b/graphene-gcc.patch
deleted file mode 100644 (file)
index a6a7b79..0000000
--- a/graphene-gcc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- graphene-0.99.2/src/graphene-point3d.c.orig        2014-06-23 12:40:39.000000000 +0200
-+++ graphene-0.99.2/src/graphene-point3d.c     2014-07-27 08:09:01.524038179 +0200
-@@ -37,6 +37,7 @@
- #include "config.h"
- 
- #include <math.h>
-+#include <stdlib.h>
- 
- #include "graphene-point3d.h"
- #include "graphene-vec3.h"
---- graphene-0.99.2/src/graphene-point.c.orig  2014-06-23 12:40:39.000000000 +0200
-+++ graphene-0.99.2/src/graphene-point.c       2014-07-27 08:08:36.847372544 +0200
-@@ -36,6 +36,7 @@
- #include "config.h"
- 
- #include <math.h>
-+#include <stdlib.h>
- 
- #include "graphene-point.h"
- #include "graphene-simd4f.h"
---- graphene-0.99.2/src/graphene-quad.c.orig   2014-06-23 12:40:39.000000000 +0200
-+++ graphene-0.99.2/src/graphene-quad.c        2014-07-27 08:09:21.187370685 +0200
-@@ -35,6 +35,8 @@
- #include "graphene-rect.h"
- #include "graphene-line-segment.h"
- 
-+#include <stdlib.h>
-+
- /**
-  * graphene_quad_alloc: (constructor)
-  *
---- graphene-0.99.2/src/graphene-quaternion.c.orig     2014-06-23 12:40:39.000000000 +0200
-+++ graphene-0.99.2/src/graphene-quaternion.c  2014-07-27 08:09:35.794036737 +0200
-@@ -35,6 +35,7 @@
- #include "config.h"
- 
- #include <math.h>
-+#include <stdlib.h>
- 
- #include "graphene-quaternion.h"
- 
---- graphene-0.99.2/src/graphene-rect.c.orig   2014-06-23 12:40:39.000000000 +0200
-+++ graphene-0.99.2/src/graphene-rect.c        2014-07-27 08:09:54.334035960 +0200
-@@ -37,6 +37,7 @@
- #include "config.h"
- 
- #include <math.h>
-+#include <stdlib.h>
- 
- #include "graphene-rect.h"
- 
---- graphene-0.99.2/src/graphene-size.c.orig   2014-06-23 12:40:39.000000000 +0200
-+++ graphene-0.99.2/src/graphene-size.c        2014-07-27 08:11:34.260698434 +0200
-@@ -33,6 +33,7 @@
- #include "config.h"
- 
- #include <math.h>
-+#include <stdlib.h>
- 
- #include "graphene-point.h"
- 

diff --git a/graphene-gir.patch b/graphene-gir.patch
new file mode 100644 (file)
index 0000000..48dfa8b
--- /dev/null
+++ b/graphene-gir.patch
@@ -0,0 +1,11 @@
+--- graphene-1.8.2/meson.build.orig    2018-06-13 18:51:25.000000000 +0200
++++ graphene-1.8.2/meson.build 2018-10-22 05:51:10.943800526 +0200
+@@ -216,7 +216,7 @@
+ 
+ # Optional dependency on GObject-Introspection; if GObject is disabled
+ # then we don't build introspection data either
+-build_gir = build_gobject and get_option('introspection') and get_option('default_library') == 'shared'
++build_gir = build_gobject and get_option('introspection') and get_option('default_library') != 'static'
+ 
+ # Check for InitOnce on Windows
+ if host_system == 'windows'

diff --git a/graphene.spec b/graphene.spec
index a1617b4ebf6cc63f29d52aaeb03bea42a9e525d2..d2966cf16457bf9b93eeeb1935b82d51c6722233 100644 (file)
--- a/graphene.spec
+++ b/graphene.spec
@@ -13,21 +13,25 @@
 Summary:       Graphene - a thin layer of types for graphic libraries
 Summary(pl.UTF-8):     Graphene - cienka warstwa typów dla bibliotek graficznych
 Name:          graphene
-Version:       1.6.0
+Version:       1.8.2
 Release:       1
 License:       MIT
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/graphene/1.6/%{name}-%{version}.tar.xz
-# Source0-md5: 4f823f2e6a9849ea2c85d4be52c0326f
-Patch0:                %{name}-gcc.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/graphene/1.8/%{name}-%{version}.tar.xz
+# Source0-md5: 87e023dcf748da9fb83bed4f18f6a8e6
+Patch0:                %{name}-gir.patch
 URL:           https://github.com/ebassi/graphene
-BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.11
+BuildRequires: gcc >= 5:3.2
+%if %{with sse2}
+BuildRequires: gcc >= 6:4.9
+%endif
 BuildRequires: glib2-devel >= 1:2.40.0
 %{?with_introspection:BuildRequires:   gobject-introspection-devel >= 1.41.0}
 BuildRequires: gtk-doc >= 1.20
-BuildRequires: libtool >= 2:2.2.6
+BuildRequires: meson >= 0.43.1
+BuildRequires: ninja
 BuildRequires: pkgconfig
+%{?with_introspection:BuildRequires:   python3 >= 1:3}
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 Requires:      glib2 >= 1:2.40.0
@@ -87,29 +91,19 @@ Dokumentacja API biblioteki Graphene.
 %patch0 -p1
 
 %build
-%{__gtkdocize}
-%{__libtoolize}
-%{__aclocal} -I build/autotools
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       %{!?with_armneon:--disable-arm-neon} \
-       %{!?with_introspection:--disable-introspection} \
-       --disable-silent-rules \
-       %{!?with_sse2:--disable-sse2} \
-       %{?with_static_libs:--enable-static} \
-       --with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build \
+       %{!?with_armneon:-Darm_neon=false} \
+       -Dgtk_doc=true \
+       %{!?with_introspection:-Dintrospection=false} \
+       %{!?with_sse2:-Dsse2=false} \
+       -Dtests=false
+
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgraphene-1.0.la
+%meson_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -119,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc LICENSE README.md
 %attr(755,root,root) %{_libdir}/libgraphene-1.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgraphene-1.0.so.0
 %if %{with introspection}