[packages/glamor] - updated to 0.5.1 - updated pc patch - added link patch

[qboosh]

commit d306023c59241b11cbdd17a99edd183f02814c32
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Aug 30 17:06:15 2013 +0200

    - updated to 0.5.1
    - updated pc patch
    - added link patch

 glamor-link.patch | 24 ++++++++++++++++++++++++
 glamor-pc.patch   |  9 ---------
 glamor.spec       | 27 +++++++++++++++++++--------
 3 files changed, 43 insertions(+), 17 deletions(-)
---
diff --git a/glamor.spec b/glamor.spec
index 823efc2..bb83363 100644
--- a/glamor.spec
+++ b/glamor.spec
@@ -3,13 +3,15 @@
 Summary:	Open-source X.org graphics common driver based on GL library
 Summary(pl.UTF-8):	Ogólny sterownik graficzny X.org o otwartych źródłach, oparty na bibliotece GL
 Name:		glamor
-Version:	0.5
+Version:	0.5.1
 Release:	1
 License:	MIT
 Group:		Libraries
-Source0:	http://cgit.freedesktop.org/xorg/driver/glamor/snapshot/%{name}-%{version}.tar.gz
-# Source0-md5:	846e61d731f8d6d456c3b15c627fd762
+#Source0:	http://cgit.freedesktop.org/xorg/driver/glamor/snapshot/%{name}-%{version}.tar.gz
+Source0:	http://xorg.freedesktop.org/releases/individual/driver/%{name}-egl-%{version}.tar.bz2
+# Source0-md5:	025c4e64dbc22009a8576f76a6f6eb7c
 Patch0:		%{name}-pc.patch
+Patch1:		%{name}-link.patch
 URL:		http://www.freedesktop.org/wiki/Software/Glamor
 BuildRequires:	Mesa-libEGL-devel
 BuildRequires:	Mesa-libGL-devel >= 7.1.0
@@ -29,6 +31,9 @@ Requires:	pixman >= 0.21.8
 Requires:	xorg-xserver-server >= 1.10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# relies on symbols from X server
+%define		skip_post_check_so	libglamor.so.*
+
 %description
 The glamor module is an open-source 2D graphics common driver for the
 X Window System as implemented by X.org. It supports a variety of
@@ -75,8 +80,9 @@ Header file for Glamor modules API.
 Plik nagłówkowy API modułów Glamor.
 
 %prep
-%setup -q
+%setup -q -n %{name}-egl-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -85,7 +91,6 @@ Plik nagłówkowy API modułów Glamor.
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-static \
 	--enable-glx-tls
 %{__make}
 
@@ -95,20 +100,26 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libglamor.la \
+	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc COPYING README ReleaseNote
-%attr(755,root,root) %{_libdir}/xorg/modules/libglamor.so
+%doc COPYING ChangeLog README
+%attr(755,root,root) %{_libdir}/libglamor.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libglamor.so.0
 %attr(755,root,root) %{_libdir}/xorg/modules/libglamoregl.so
 %{_datadir}/X11/xorg.conf.d/glamor.conf
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libglamor.so
 %{_includedir}/xorg/glamor.h
 %{_pkgconfigdir}/glamor.pc
 %{_pkgconfigdir}/glamor-egl.pc
diff --git a/glamor-link.patch b/glamor-link.patch
new file mode 100644
index 0000000..4823790
--- /dev/null
+++ b/glamor-link.patch
@@ -0,0 +1,24 @@
+--- glamor-egl-0.5.1/src/Makefile.am.orig	2013-08-26 08:57:47.000000000 +0200
++++ glamor-egl-0.5.1/src/Makefile.am	2013-08-30 16:53:47.195169407 +0200
+@@ -5,9 +5,9 @@
+ SOLARIS_ASM_CFLAGS=""
+ 
+ if GLAMOR_GLES2
+-libglamor_la_LIBADD = $(GLESV2_LIBS)
++libglamor_la_LIBADD = $(GLESV2_LIBS) $(LIBPIXMAN_LIBS)
+ else
+-libglamor_la_LIBADD = $(GL_LIBS)
++libglamor_la_LIBADD = $(GL_LIBS) $(LIBPIXMAN_LIBS)
+ endif
+ 
+ AM_CPPFLAGS = \
+--- glamor-egl-0.5.1/configure.ac.orig	2013-08-26 09:01:50.000000000 +0200
++++ glamor-egl-0.5.1/configure.ac	2013-08-30 16:53:25.768503636 +0200
+@@ -116,6 +116,7 @@
+ AC_SUBST([GLAMOR_GL_CFLAGS])
+ 
+ PKG_CHECK_MODULES([LIBDRM], $LIBDRM)
++PKG_CHECK_MODULES([LIBPIXMAN], $LIBPIXMAN)
+ PKG_CHECK_MODULES(EGL, $LIBEGL, [EGL=yes], [EGL=no])
+ AM_CONDITIONAL([EGL], [test "x$EGL" = xyes])
+ 
diff --git a/glamor-pc.patch b/glamor-pc.patch
index f3fb935..f07591d 100644
--- a/glamor-pc.patch
+++ b/glamor-pc.patch
@@ -7,12 +7,3 @@
 -Cflags: -I${sdkdir} -L${moduledir} ${GLAMOR_GL_CFLAGS} ${GLAMOR_EGL_CFLAGS}
 +Cflags: -I${sdkdir} ${GLAMOR_GL_CFLAGS} ${GLAMOR_EGL_CFLAGS}
  
---- glamor-0.4.1/glamor.pc.in.orig	2012-04-28 12:28:33.000000000 +0200
-+++ glamor-0.4.1/glamor.pc.in	2012-05-08 21:23:23.999568920 +0200
-@@ -9,5 +9,5 @@
- Name: glamor
- Description: X.Org glamor common library.
- Version: @PACKAGE_VERSION@
--Cflags: -I${sdkdir} -L${moduledir} -lglamor ${GLAMOR_GL_CFLAGS}
-+Cflags: -I${sdkdir} ${GLAMOR_GL_CFLAGS}
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glamor.git/commitdiff/d306023c59241b11cbdd17a99edd183f02814c32