[packages/graphene] - updated to 1.2.10 - updated gcc patch - removed obsolete bench patch
qboosh
qboosh at pld-linux.org
Thu Oct 15 21:48:23 CEST 2015
commit 4c5fe2b6e0c3abbfd556d8ad3b8ebc3a5d48359e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Oct 15 21:49:23 2015 +0200
- updated to 1.2.10
- updated gcc patch
- removed obsolete bench patch
graphene-bench.patch | 31 -------------------------------
graphene-gcc.patch | 11 -----------
graphene.spec | 47 ++++++++++++++++++++++++++++++++++++-----------
3 files changed, 36 insertions(+), 53 deletions(-)
---
diff --git a/graphene.spec b/graphene.spec
index 209c6a0..39e73fb 100644
--- a/graphene.spec
+++ b/graphene.spec
@@ -3,24 +3,23 @@
#
# Conditional build:
%bcond_without static_libs # static library
-%bcond_with introspection # gobject introspection
+%bcond_without introspection # gobject introspection
%bcond_with sse2 # x86 SSE2 fast paths
%bcond_without armneon # ARM NEON fast paths
#
%ifarch pentium4 %{x8664}
-%define with_sse2
+%define with_sse2 1
%endif
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: 0.99.2
-Release: 2
+Version: 1.2.10
+Release: 1
License: MIT
Group: Libraries
-Source0: https://github.com/ebassi/graphene/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: ccd4e4d991fb41ff163b1e27cfc41ea2
-Patch0: %{name}-bench.patch
-Patch1: %{name}-gcc.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/graphene/1.2/%{name}-%{version}.tar.xz
+# Source0-md5: 07b2a7b84e993370fc8915a92a34d7e6
+Patch0: %{name}-gcc.patch
URL: https://github.com/ebassi/graphene
BuildRequires: glib2-devel >= 1:2.40.0
%{?with_introspection:BuildRequires: gobject-introspection-devel >= 1.41.0}
@@ -29,6 +28,8 @@ BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
BuildRequires: libtool >= 2:2.2.6
BuildRequires: pkgconfig
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
Requires: glib2 >= 1:2.40.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,10 +68,20 @@ Static Graphene library.
%description static -l pl.UTF-8
Statyczna biblioteka Graphene.
+%package apidocs
+Summary: API documentation for Graphene library
+Summary(pl.UTF-8): Dokumentacja API biblioteki Graphene
+Group: Documentation
+
+%description apidocs
+API documentation for Graphene library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki Graphene.
+
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%{__gtkdocize}
@@ -81,9 +92,11 @@ Statyczna biblioteka Graphene.
%{__automake}
%configure \
%{!?with_armneon:--disable-arm-neon} \
+ %{!?with_introspection:--disable-introspection} \
--disable-silent-rules \
%{!?with_sse2:--disable-sse2} \
- %{?with_static_libs:--enable-static}
+ %{?with_static_libs:--enable-static} \
+ --with-html-dir=%{_gtkdocdir}
%{__make}
%install
@@ -103,14 +116,22 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc LICENSE README.md
+%doc ChangeLog
%attr(755,root,root) %{_libdir}/libgraphene-1.0.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgraphene-1.0.so.0
+%if %{with introspection}
+%{_libdir}/girepository-1.0/Graphene-1.0.typelib
+%endif
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libgraphene-1.0.so
%{_includedir}/graphene-1.0
+%dir %{_libdir}/graphene-1.0
+%{_libdir}/graphene-1.0/include
+%if %{with introspection}
+%{_datadir}/gir-1.0/Graphene-1.0.gir
+%endif
%{_pkgconfigdir}/graphene-1.0.pc
%{_pkgconfigdir}/graphene-gobject-1.0.pc
@@ -119,3 +140,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/libgraphene-1.0.a
%endif
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/graphene
diff --git a/graphene-bench.patch b/graphene-bench.patch
deleted file mode 100644
index 6e820c6..0000000
--- a/graphene-bench.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- graphene-0.99.2/src/bench/Makefile.am.orig 2014-06-23 12:40:39.000000000 +0200
-+++ graphene-0.99.2/src/bench/Makefile.am 2014-07-26 23:00:42.822085470 +0200
-@@ -11,9 +11,17 @@
- noinst_LTLIBRARIES =
- TESTS =
-
-+SIMD_CFLAGS=
-+if BUILD_WITH_SSE2
-+SIMD_CFLAGS+=$(SSE2_CFLAGS)
-+endif
-+if BUILD_WITH_ARM_NEON
-+SIMD_CFLAGS+=$(NEON_CFLAGS)
-+endif
-+
- # common library for benchmark utilities
- libgraphene_bench_la_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -DG_LOG_DOMAIN=\"Graphene-Bench\"
--libgraphene_bench_la_CFLAGS = $(GRAPHENE_CFLAGS) $(MAINTAINER_CFLAGS)
-+libgraphene_bench_la_CFLAGS = $(GRAPHENE_CFLAGS) $(MAINTAINER_CFLAGS) $(SIMD_CFLAGS)
- libgraphene_bench_la_LIBADD = $(GRAPHENE_LIBS)
- libgraphene_bench_la_SOURCES = graphene-bench-utils.h graphene-bench-utils.c
- noinst_LTLIBRARIES += libgraphene-bench.la
-@@ -39,7 +47,8 @@
- bench_backends += sse
-
- matrix_sse_SOURCES = matrix.c
--matrix_sse_CPPFLAGS = -DGRAPHENE_BENCHMARK=1 -DGRAPHENE_HAS_SSE=1 -DIMPL=\"sse\"
-+matrix_sse_CFLAGS = $(SSE2_CFLAGS) $(GLIB_CFLAGS)
-+matrix_sse_CPPFLAGS = -DGRAPHENE_BENCHMARK=1 -DGRAPHENE_COMPILATION=1 -DGRAPHENE_HAS_SSE=1 -DIMPL=\"sse\"
- noinst_PROGRAMS += matrix-sse
-
- benchmark-sse: matrix-sse$(EXEEXT)
diff --git a/graphene-gcc.patch b/graphene-gcc.patch
index a5fd658..a6a7b79 100644
--- a/graphene-gcc.patch
+++ b/graphene-gcc.patch
@@ -49,17 +49,6 @@
#include "graphene-rect.h"
---- graphene-0.99.2/src/graphene-simd4f.h.orig 2014-06-23 12:40:39.000000000 +0200
-+++ graphene-0.99.2/src/graphene-simd4f.h 2014-07-27 08:10:55.077366743 +0200
-@@ -586,7 +586,7 @@ typedef union {
- __ua.f[3] < __ub.f[3] ? __ua.f[3] : __ub.f[3]); \
- }))
-
--# define graphene_simd4f_max (a,b) \
-+# define graphene_simd4f_max(a,b) \
- (G_GNUC_EXTENSION ({ \
- graphene_simd4f_union_t __ua = { (a) }; \
- graphene_simd4f_union_t __ub = { (b) }; \
--- 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 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/graphene.git/commitdiff/4c5fe2b6e0c3abbfd556d8ad3b8ebc3a5d48359e
More information about the pld-cvs-commit
mailing list