packages: Mesa/Mesa.spec, Mesa/Mesa-wayland.patch (NEW)=?UTF-8?Q?=20?=- added wayland pat...

Sun Mar 11 21:17:48 CET 2012

Author: qboosh                       Date: Sun Mar 11 20:17:48 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added wayland patch to fix EGL wayland platform build
- build -libwayland-egl* (+wayland bcond)

---- Files affected:
packages/Mesa:
   Mesa.spec (1.316 -> 1.317) , Mesa-wayland.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.316 packages/Mesa/Mesa.spec:1.317

--- packages/Mesa/Mesa.spec:1.316	Sun Mar 11 18:46:36 2012
+++ packages/Mesa/Mesa.spec	Sun Mar 11 21:17:42 2012
@@ -3,7 +3,6 @@
 # TODO:
 # - consider:
 #   --enable-shared-dricore
-#   --with-egl-platforms=...,wayland (BR: pkgconfig(wayland-{client,server}))
 # - subpackage with non-dri libGL for use with X-servers with missing GLX extension?
 # - resurrect static if it's useful (using plain xorg target? DRI doesn't support static)
 #
@@ -14,6 +13,7 @@
 %bcond_without	gallium_nouveau	# gallium nouveau driver
 %bcond_without	osmesa		# OSMesa libraries
 %bcond_without	gbm		# Graphics Buffer Manager
+%bcond_without	wayland		# Wayland EGL
 %bcond_with	xa		# XA state tracker (for future vmwgfx xorg driver)
 %bcond_with	static_libs	# static libraries [not supported for DRI, thus broken currently]
 #
@@ -39,6 +39,7 @@
 # Source0-md5:	24eeebf66971809d8f40775a379b36c9
 Patch0:		%{name}-realclean.patch
 Patch1:		%{name}-link.patch
+Patch2:		%{name}-wayland.patch
 URL:		http://www.mesa3d.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -59,6 +60,8 @@
 BuildRequires:	python-modules
 BuildRequires:	rpmbuild(macros) >= 1.470
 BuildRequires:	sed >= 4.0
+# wayland-{client,server}
+%{?with_wayland:BuildRequires:	wayland-devel}
 BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXext-devel >= 1.0.5
 BuildRequires:	xorg-lib-libXfixes-devel
@@ -87,6 +90,7 @@
 
 %if %{without egl}
 %undefine	with_gbm
+%undefine	with_wayland
 %endif
 
 # _glapi_tls_Dispatch is defined in libglapi, but it's some kind of symbol ldd -r doesn't notice(?)
@@ -600,6 +604,32 @@
 Biblioteka współdzielona Mesa GL API, wspólna dla różnych API (EGL,
 GL, GLES).
 
+%package libwayland-egl
+Summary:	Wayland EGL library
+Summary(pl.UTF-8):	Biblioteka Wayland EGL
+Group:		Libraries
+Requires:	libdrm >= %{libdrm_ver}
+
+%description libwayland-egl
+Wayland EGL platform library.
+
+%description libwayland-egl -l pl.UTF-8
+Biblioteka platformy EGL Wayland.
+
+%package libwayland-egl-devel
+Summary:	Development files for Wayland EGL library
+Summary(pl.UTF-8):	Pliki programistyczne biblioteki Wayland EGL
+Group:		Development/Libraries
+Requires:	%{name}-libwayland-egl = %{version}-%{release}
+Requires:	libdrm-devel >= %{libdrm_ver}
+Requires:	wayland-devel
+
+%description libwayland-egl-devel
+Development files for Wayland EGL platform library.
+
+%description libwayland-egl-devel -l pl.UTF-8
+Pliki programistyczne biblioteki platformy EGL Wayland.
+
 %package libxatracker
 Summary:	Xorg Gallium3D accelleration library
 Summary(pl.UTF-8):	Biblioteka akceleracji Gallium3D dla Xorg
@@ -854,6 +884,7 @@
 %setup -q
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
@@ -915,7 +946,7 @@
 	--enable-egl \
 	--enable-gles1 \
 	--enable-gles2 \
-	--with-egl-platforms=x11%{?with_gbm:,drm} \
+	--with-egl-platforms=x11%{?with_gbm:,drm}%{?with_wayland:,wayland} \
 %endif
 %if %{with gallium}
 	--enable-gallium-llvm \
@@ -993,6 +1024,9 @@
 %post	libglapi -p /sbin/ldconfig
 %postun	libglapi -p /sbin/ldconfig
 
+%post	libwayland-egl -p /sbin/ldconfig
+%postun	libwayland-egl -p /sbin/ldconfig
+
 %post	libxatracker -p /sbin/ldconfig
 %postun	libxatracker -p /sbin/ldconfig
 
@@ -1193,6 +1227,18 @@
 # libglapi-devel? nothing seems to need it atm.
 #%attr(755,root,root) %{_libdir}/libglapi.so
 
+%if %{with wayland}
+%files libwayland-egl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libwayland-egl.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwayland-egl.so.1
+
+%files libwayland-egl-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libwayland-egl.so
+%{_pkgconfigdir}/wayland-egl.pc
+%endif
+
 %if %{with xa}
 %files libxatracker
 %defattr(644,root,root,755)
@@ -1292,6 +1338,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.317  2012/03/11 20:17:42  qboosh
+- added wayland patch to fix EGL wayland platform build
+- build -libwayland-egl* (+wayland bcond)
+
 Revision 1.316  2012/03/11 17:46:36  qboosh
 - -libglapi and -libgbm C: old -libEGL
 - release 2

================================================================
Index: packages/Mesa/Mesa-wayland.patch
diff -u /dev/null packages/Mesa/Mesa-wayland.patch:1.1
--- /dev/null	Sun Mar 11 21:17:48 2012
+++ packages/Mesa/Mesa-wayland.patch	Sun Mar 11 21:17:42 2012
@@ -0,0 +1,13 @@
+--- Mesa-8.0.1/src/egl/wayland/wayland-drm/Makefile.orig	2012-02-15 00:44:00.000000000 +0100
++++ Mesa-8.0.1/src/egl/wayland/wayland-drm/Makefile	2012-03-11 20:50:16.884057197 +0100
+@@ -17,8 +17,8 @@
+ 
+ # Generate protocol sources
+ prefix=$(shell $(PKG_CONFIG) --variable=prefix wayland-server)
+-exec_prefx=$(shell $(PKG_CONFIG) --variable=exec_prefix wayland-server)
+-wayland_protocoldir = $(PWD)/protocol
++exec_prefix=$(shell $(PKG_CONFIG) --variable=exec_prefix wayland-server)
++wayland_protocoldir = $(TOP)/src/egl/wayland/wayland-drm/protocol
+ wayland_scanner=$(exec_prefix)/bin/wayland-scanner
+ 
+ default: depend libwayland-drm.a $(GEN_SOURCES) $(GEN_HEADERS)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.316&r2=1.317&f=u

