X-Git-Url: http://git.pld-linux.org/?p=packages%2Fevas.git;a=blobdiff_plain;f=evas.spec;h=780a3a5a7bee184cca2efe1e53986c2befa335ba;hp=290fd45931528cea3f1f4e7a3f441596f35f7ef6;hb=aeeb419b4d45d4ad3ea3a67ea72680e06c1a5568;hpb=8eaabbe36ac86148f199d113d1970fee634b3f06

diff --git a/evas.spec b/evas.spec
index 290fd45..780a3a5 100644
--- a/evas.spec
+++ b/evas.spec
@@ -1,9 +1,15 @@
 #
+# TODO :
+# software-xcb	- BR: xcb-util => 0.2.1 +patch
+# xrender-xcb	- BR: xcb-util < 0.2.1
+#
 # Conditional build:
 %bcond_without	mmx		# without MMX and MMX2
 %bcond_without	sse		# without SSE
 %bcond_without	altivec		# without altivec
-%bcond_without	directfb	# build without DirectFB support
+%bcond_without	fb		# build without FB support
+%bcond_with	soft_xcb	# build with software xcb support
+%bcond_with	xrender_xcb	# build with xrender xcb support
 %bcond_without	static_libs	# don't build static library
 #
 %ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
@@ -16,22 +22,24 @@
 %undefine	with_altivec
 %endif
 #
+%define		edb_ver 	1.0.5.042
+%define		eet_ver 	1.0.1
+
 Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
-Version:	0.9.9.038
-Release:	1
+Version:	0.9.9.043
+Release:	0.8
 License:	BSD
 Group:		Libraries
-Source0:	http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	6eb1b18ed8b17d0db9b9f794b2a73c92
+Source0:	http://download.enlightenment.org/snapshots/2008-05-19/%{name}-%{version}.tar.bz2
+# Source0-md5:	31716723798107535dfaf4cf84017685
 URL:		http://enlightenment.org/p.php?p=about/libs/evas
-%{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.16}
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	autoconf >= 2.59-9
-BuildRequires:	automake >= 1.4
-BuildRequires:	edb-devel >= 1.0.5
-BuildRequires:	eet-devel >= 0.9.10.038
+BuildRequires:	automake >= 1.6
+BuildRequires:	edb-devel >= %{edb_ver}
+BuildRequires:	eet-devel >= %{eet_ver}
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 1:2.2
 BuildRequires:	giflib-devel
@@ -46,7 +54,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	xcb-util-devel
 BuildRequires:	xorg-lib-libXext-devel
 Requires:	freetype >= 1:2.2
-Requires:	eet >= 0.9.10.038
+Requires:	eet >= %{eet_ver}
 Obsoletes:	evas-libs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,12 +75,10 @@ Summary:	Evas header files
 Summary(pl.UTF-8):	Pliki nagłówkowe Evas
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	edb-devel >= 1.0.5
-Requires:	eet-devel >= 0.9.10.038
+Requires:	edb-devel >= %{edb_ver}
+Requires:	eet-devel >= %{eet_ver}
 Requires:	fontconfig-devel
 Requires:	freetype-devel >= 1:2.2
-# for evas-directfb
-#%{?with_directfb:Requires:	DirectFB-devel >= 0.9.16}
 # for evas-gl_x11, evas-glitz_x11, evas-software_x11, evas-xrender_x11
 #Requires:	xorg-lib-libX11-devel
 # for evas-software_xcb, evas-xrender_xcb
@@ -110,18 +116,6 @@ Memory Buffer rendering engine module for Evas.
 %description engine-buffer -l pl.UTF-8
 Moduł silnika renderującego do bufora dla Evas.
 
-%package engine-directfb
-Summary:	Directfb rendering engine module for Evas
-Summary(pl.UTF-8):	Moduł silnika renderującego na Directfb dla Evas
-Group:		X11/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-directfb
-Directfb rendering engine module for Evas.
-
-%description engine-directfb -l pl.UTF-8
-Moduł silnika renderującego na Directfb dla Evas.
-
 %package engine-fb
 Summary:	Framebuffer rendering engine module for Evas
 Summary(pl.UTF-8):	Moduł silnika renderującego na framebuffer dla Evas
@@ -279,6 +273,18 @@ JPEG Image loader module for Evas.
 %description loader-jpeg -l pl.UTF-8
 Moduł wczytywania obrazów JPEG dla Evas.
 
+%package loader-pmaps
+Summary:	PMAPS Image loader module for Evas
+Summary(pl.UTF-8):	Moduł wczytywania obrazów PMAPS dla Evas
+Group:		X11/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description loader-pmaps
+PMAPS Image loader module for Evas.
+
+%description loader-pmaps -l pl.UTF-8
+Moduł wczytywania obrazów PMAPS dla Evas.
+
 %package loader-png
 Summary:	PNG Image loader module for Evas
 Summary(pl.UTF-8):	Moduł wczytywania obrazów PNG dla Evas
@@ -393,8 +399,10 @@ Moduł zapisywania obrazów TIFF dla Evas.
 %setup -q
 
 %build
+rm -rf autom4te.cache
+rm -f aclocal.m4 ltmain.sh
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -402,14 +410,13 @@ Moduł zapisywania obrazów TIFF dla Evas.
 	%{!?with_static_libs:--disable-static} \
 	--disable-software-qtopia \
 	--enable-software-x11 	\
-	--enable-software-xcb	\
 	--enable-buffer		\
-	--%{?with_directfb:en}%{!?with_directfb:dis}able-directfb	\
-	--enable-fb		\
+	--%{?with_fb:en}%{!?with_fb:dis}able-fb		\
+	--%{?with_soft_xcb:en}%{!?with_soft_xcb:dis}able-software-xcb	\
 	--enable-gl-x11		\
 	--enable-glitz-x11	\
 	--enable-xrender-x11	\
-	--enable-xrender-xcb	\
+	--%{?with_xrender_xcb:en}%{!?with_xrender_xcb:dis}able-xrender-xcb	\
 	--enable-font-loader-eet	\
 	--enable-image-loader-edb	\
 	--enable-image-loader-eet	\
@@ -457,6 +464,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING COPYING-PLAIN README
 %attr(755,root,root) %{_libdir}/libevas.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libevas.so.0
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/modules
 %dir %{_libdir}/%{name}/modules/engines
@@ -465,7 +473,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/evas-config
 %attr(755,root,root) %{_libdir}/libevas.so
 %{_libdir}/libevas.la
 %{_includedir}/Evas.h
@@ -486,17 +493,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/modules/engines/buffer/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/buffer/linux-gnu-*/module.so
 
-%files engine-directfb
-%defattr(644,root,root,755)
-%dir %{_libdir}/%{name}/modules/engines/directfb
-%dir %{_libdir}/%{name}/modules/engines/directfb/linux-gnu-*
-%attr(755,root,root) %{_libdir}/%{name}/modules/engines/directfb/linux-gnu-*/module.so
-
+%if %{with fb}
 %files engine-fb
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/modules/engines/fb
 %dir %{_libdir}/%{name}/modules/engines/fb/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/fb/linux-gnu-*/module.so
+%endif
 
 %files engine-gl_x11
 %defattr(644,root,root,755)
@@ -530,11 +533,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/modules/engines/software_x11/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/software_x11/linux-gnu-*/module.so
 
+%if %{with soft_xcb}
 %files engine-software_xcb
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/modules/engines/software_xcb
 %dir %{_libdir}/%{name}/modules/engines/software_xcb/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/software_xcb/linux-gnu-*/module.so
+%endif
 
 %files engine-xrender_x11
 %defattr(644,root,root,755)
@@ -542,11 +547,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/modules/engines/xrender_x11/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/xrender_x11/linux-gnu-*/module.so
 
+%if %{with xrender_xcb}
 %files engine-xrender_xcb
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/modules/engines/xrender_xcb
 %dir %{_libdir}/%{name}/modules/engines/xrender_xcb/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/xrender_xcb/linux-gnu-*/module.so
+%endif
 
 %files loader-edb
 %defattr(644,root,root,755)
@@ -572,6 +579,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/modules/loaders/jpeg/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/loaders/jpeg/linux-gnu-*/module.so
 
+%files loader-pmaps
+%defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/modules/loaders/pmaps
+%dir %{_libdir}/%{name}/modules/loaders/pmaps/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/modules/loaders/pmaps/linux-gnu-*/module.so
+
 %files loader-png
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/modules/loaders/png