packages: evas/evas.spec - split xcb_api bcond from xcb=?UTF-8?Q?=20?=(the latter is on b...

[qboosh]

Author: qboosh                       Date: Mon May 28 17:31:35 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- split xcb_api bcond from xcb (the latter is on by default, just controls xcb deps use)
- build software_8_x11 engine whenever xcb is allowed, but use XCB for gl_x11/software_x11
  only if xcb_api is chosen
- tag gl_x11/software_x11 engines and -devel package with xapi version (xcb/xlib)

---- Files affected:
packages/evas:
   evas.spec (1.84 -> 1.85) 

---- Diffs:

================================================================
Index: packages/evas/evas.spec
diff -u packages/evas/evas.spec:1.84 packages/evas/evas.spec:1.85
--- packages/evas/evas.spec:1.84	Mon May 28 18:49:35 2012
+++ packages/evas/evas.spec	Mon May 28 19:31:30 2012
@@ -9,7 +9,8 @@
 %bcond_without	directfb	# DirectFB engine
 %bcond_without	sdl		# SDL (OpenGL and software) engines
 %bcond_without	wayland		# wayland-egl, wayland-shm engines
-%bcond_with	xcb		# software*_x11/gl_x11 engines with XCB support (experimental)
+%bcond_without	xcb		# XCB engines (software_8_x11, possibly software_x11/gl_x11)
+%bcond_with	xcb_api		# software_x11/gl_x11 engines with XCB support (experimental)
 %bcond_without	static_libs	# don't build static library
 #
 %ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
@@ -21,6 +22,14 @@
 %ifnarch ppc
 %undefine	with_altivec
 %endif
+%if %{without xcb}
+%undefine	xcb_api
+%endif
+%if %{with xcb_api}
+%define		xapi	xcb
+%else
+%define		xapi	xlib
+%endif
 #
 %define		edb_ver		1.0.5.043
 %define		eet_ver 	1.6.0
@@ -104,6 +113,7 @@
 Requires:	freetype-devel >= 1:2.2
 Requires:	fribidi-devel >= 0.19.2
 Requires:	harfbuzz-devel >= 0.6.0
+Provides:	%{name}-devel(%{xapi}) = %{version}-%{release}
 
 %description devel
 Header files for Evas.
@@ -180,6 +190,7 @@
 Summary(pl.UTF-8):	Moduł silnika renderującego na OpenGL pod X11 dla Evas
 Group:		X11/Libraries
 Requires:	%{name}-engine-software_generic = %{version}-%{release}
+Provides:	%{name}-engine-gl_x11(%{xapi}) = %{version}-%{release}
 
 %description engine-gl_x11
 OpenGL under X11 rendering engine module for Evas.
@@ -206,10 +217,11 @@
 Requires:	%{name}-engine-software_8 = %{version}-%{release}
 
 %description engine-software_8_x11
-8-bit X11 software rendering engine module for Evas.
+8-bit X11 (XCB) software rendering engine module for Evas.
 
 %description engine-software_8_x11 -l pl.UTF-8
-Moduł silnika programowego renderującego 8-bitowego na X11 dla Evas.
+Moduł silnika programowego renderującego 8-bitowego na X11 (XCB) dla
+Evas.
 
 %package engine-software_16
 Summary:	16-bit software rendering engine module for Evas
@@ -244,10 +256,11 @@
 Requires:	%{name}-engine-software_16 = %{version}-%{release}
 
 %description engine-software_16_x11
-16-bit X11 software rendering engine module for Evas.
+16-bit X11 (Xlib) software rendering engine module for Evas.
 
 %description engine-software_16_x11 -l pl.UTF-8
-Moduł silnika programowego renderującego 16-bitowego na X11 dla Evas.
+Moduł silnika programowego renderującego 16-bitowego na X11 (Xlib) dla
+Evas.
 
 %package engine-software_generic
 Summary:		Software rendering common engine module for Evas
@@ -492,7 +505,7 @@
 	--enable-fb%{!?with_fb:=no} \
 	--enable-font-loader-eet	\
 	--enable-gl-sdl%{!?with_sdl:=no} \
-	--enable-gl-xcb%{!?with_xcb:=no} \
+	--enable-gl-xcb%{!?with_xcb_api:=no} \
 	--enable-gl-xlib \
 	--enable-image-loader-edb	\
 	--enable-image-loader-eet	\
@@ -503,10 +516,10 @@
 	--enable-image-loader-tiff	\
 	--enable-image-loader-xpm	\
 	--enable-pixman			\
-	--enable-software-8-x11 \
+	--enable-software-8-x11%{!?with_xcb:=no} \
 	--enable-software-16-sdl%{!?with_sdl:=no} \
 	--enable-software-16-x11 \
-	--enable-software-xcb%{!?with_xcb:=no} \
+	--enable-software-xcb%{!?with_xcb_api:=no} \
 	--enable-software-xlib \
 	--enable-wayland-egl%{!?with_wayland:=no} \
 	--enable-wayland-shm%{!?with_wayland:=no} \
@@ -575,7 +588,7 @@
 %{_pkgconfigdir}/evas-fb.pc
 %{?with_sdl:%{_pkgconfigdir}/evas-opengl-sdl.pc}
 %{_pkgconfigdir}/evas-opengl-x11.pc
-%{_pkgconfigdir}/evas-software-8-x11.pc
+%{?with_xcb:%{_pkgconfigdir}/evas-software-8-x11.pc}
 %{_pkgconfigdir}/evas-software-16-x11.pc
 %{_pkgconfigdir}/evas-software-buffer.pc
 %{?with_sdl:%{_pkgconfigdir}/evas-software-sdl.pc}
@@ -628,6 +641,7 @@
 %dir %{_libdir}/%{name}/modules/engines/gl_x11/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/gl_x11/linux-gnu-*/module.so
 
+%if %{with xcb}
 %files engine-software_8
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/modules/engines/software_8
@@ -639,6 +653,7 @@
 %dir %{_libdir}/%{name}/modules/engines/software_8_x11
 %dir %{_libdir}/%{name}/modules/engines/software_8_x11/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/software_8_x11/linux-gnu-*/module.so
+%endif
 
 %files engine-software_16
 %defattr(644,root,root,755)
@@ -775,6 +790,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2012/05/28 17:31:30  qboosh
+- split xcb_api bcond from xcb (the latter is on by default, just controls xcb deps use)
+- build software_8_x11 engine whenever xcb is allowed, but use XCB for gl_x11/software_x11
+  only if xcb_api is chosen
+- tag gl_x11/software_x11 engines and -devel package with xapi version (xcb/xlib)
+
 Revision 1.84  2012/05/28 16:49:35  qboosh
 - added 8-bit engines
 - completed inter-module dependencies
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/evas/evas.spec?r1=1.84&r2=1.85