X-Git-Url: http://git.pld-linux.org/?p=packages%2Fevas.git;a=blobdiff_plain;f=evas.spec;h=3b3df5794399da56a47feda828c96d61c1264221;hp=1da8dc155cd5c5f1c9d4396e3a73c802c80a9017;hb=9fc197a5a788834450bc6d16f69dc3b251db0063;hpb=d3c7064c034535cc18d2b8d1dfca7a9e7a57291f

diff --git a/evas.spec b/evas.spec
index 1da8dc1..3b3df57 100644
--- a/evas.spec
+++ b/evas.spec
@@ -1,9 +1,18 @@
 #
+# TODO :
+# software-xcb	- BR: xcb-util => 0.2.1 +patch
+# xrender-xcb	- BR: xcb-util < 0.2.1
+# sdl		doesn't compile
+#
 # Conditional build:
 %bcond_without	mmx		# without MMX and MMX2
 %bcond_without	sse		# without SSE
 %bcond_without	altivec		# without altivec
+%bcond_without	fb		# build without FB support
 %bcond_without	directfb	# build without DirectFB support
+%bcond_with	sdl		# build with SDL 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,24 +25,31 @@
 %undefine	with_altivec
 %endif
 #
+%define		edb_ver		1.0.5.043
+%define		eet_ver 	1.3.2
+
 Summary:	Multi-platform Canvas Library
 Summary(pl.UTF-8):	Wieloplatformowa biblioteka do rysowania
 Name:		evas
-Version:	0.9.9.038
-Release:	1
+%define	subver	beta2
+Version:	1.0.0
+Release:	0.%{subver}.1
 License:	BSD
 Group:		Libraries
-Source0:	http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	6eb1b18ed8b17d0db9b9f794b2a73c92
+Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.%{subver}.tar.bz2
+# Source0-md5:	9257e31106b472f5e36e0461b0884170
 URL:		http://enlightenment.org/p.php?p=about/libs/evas
-%{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.16}
-BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	DirectFB-devel
+BuildRequires:	Mesa-libGLU-devel
+BuildRequires:	SDL-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:	eina-devel >= 1.0.0
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 1:2.2
+BuildRequires:	fribidi-devel >= 0.19.2
 BuildRequires:	giflib-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 1.2
@@ -42,10 +58,13 @@ BuildRequires:	libtiff-devel
 BuildRequires:	libtool
 BuildRequires:	libxcb-devel
 BuildRequires:	pkgconfig
+BuildRequires:	readline-devel
 BuildRequires:	xcb-util-devel
 BuildRequires:	xorg-lib-libXext-devel
+Requires:	eet >= %{eet_ver}
+Requires:	eina >= 1.0.0
 Requires:	freetype >= 1:2.2
-Requires:	eet >= 0.9.10.038
+Requires:	fribidi >= 0.19.2
 Obsoletes:	evas-libs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,13 +85,12 @@ 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:	fribidi-devel >= 0.19.2
+# for evas-gl_x11, evas-software_x11, evas-xrender_x11
 #Requires:	xorg-lib-libX11-devel
 # for evas-software_xcb, evas-xrender_xcb
 #Requires:	libxcb-devel
@@ -109,18 +127,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
@@ -133,6 +139,30 @@ Framebuffer rendering engine module for Evas.
 %description engine-fb -l pl.UTF-8
 Moduł silnika renderującego na framebuffer dla Evas.
 
+%package engine-gl_sdl
+Summary:	SDL OpenGL rendering engine module for Evas
+Summary(pl.UTF-8):	Moduł silnika renderującego na SDL OpenGL dla Evas
+Group:		X11/Libraries
+Requires:	%{name}-engine-software_generic = %{version}-%{release}
+
+%description engine-gl_sdl
+SDL OpenGL rendering engine module for Evas.
+
+%description engine-gl_sdl -l pl.UTF-8
+Moduł silnika renderującego na SDL OpenGL dla Evas.
+
+%package engine-software_sdl
+Summary:	SDL software rendering engine module for Evas
+Summary(pl.UTF-8):	Moduł silnika programowego renderującego na SDL dla Evas
+Group:		X11/Libraries
+Requires:	%{name}-engine-software_generic = %{version}-%{release}
+
+%description engine-software_sdl
+SDL software rendering engine module for Evas.
+
+%description engine-software_sdl -l pl.UTF-8
+Moduł silnika programowego renderującego na SDL dla Evas.
+
 %package engine-gl_x11
 Summary:	OpenGL under X11 rendering engine module for Evas
 Summary(pl.UTF-8):	Moduł silnika renderującego na OpenGL pod X11 dla Evas
@@ -145,20 +175,20 @@ OpenGL under X11 rendering engine module for Evas.
 %description engine-gl_x11 -l pl.UTF-8
 Moduł silnika renderującego na OpenGL pod X11 dla Evas.
 
-%package engine-glitz_x11
-Summary:	Glitz X11 rendering engine module for Evas
-Summary(pl.UTF-8):	Moduł silnika renderującego na OpenGL pod X11 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-glitz_x11
-Glitz X11 rendering engine module for Evas.
+%description engine-directfb
+DirectFB rendering engine module for Evas.
 
-%description engine-glitz_x11 -l pl.UTF-8
-Moduł silnika renderującego Glitz X11 dla Evas.
+%description engine-directfb -l pl.UTF-8
+Moduł silnika renderującego na DirectFB dla Evas.
 
 %package engine-software_generic
-Summary:	Software rendering common engine module for Evas
+Summary:		Software rendering common engine module for Evas
 Summary(pl.UTF-8):	Moduł wspólnego programowego silnika renderującego dla Evas
 Group:		X11/Libraries
 Requires:	%{name} = %{version}-%{release}
@@ -205,6 +235,18 @@ Software XCB X11 rendering engine module for Evas.
 %description engine-software_xcb -l pl.UTF-8
 Moduł programowego silnika renderującego XCB X11 dla Evas.
 
+%package engine-software_16
+Summary:	Software 16-bit rendering engine module for Evas
+Summary(pl.UTF-8):	Moduł programowego silnika renderującego 16-bitowego dla Evas
+Group:		X11/Libraries
+Requires:	%{name}-engine-software_generic = %{version}-%{release}
+
+%description engine-software_16
+Software 16-bit rendering engine module for Evas.
+
+%description engine-software_16 -l pl.UTF-8
+Moduł programowego silnika renderującego 16-bitowego dla Evas.
+
 %package engine-xrender_x11
 Summary:	XRender X11 rendering engine module for Evas
 Summary(pl.UTF-8):	Moduł silnika renderującego XRender X11 dla Evas
@@ -278,6 +320,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
@@ -389,26 +443,26 @@ TIFF Image saver module for Evas.
 Moduł zapisywania obrazów TIFF dla Evas.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.%{subver}
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-silent-rules	\
 	%{!?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		\
-	--enable-gl-x11		\
-	--enable-glitz-x11	\
-	--enable-xrender-x11	\
-	--enable-xrender-xcb	\
+	--enable-buffer \
+	--enable-directfb%{!?with_directfb:=no} \
+	--enable-fb%{!?with_fb:=no} \
+	--enable-gl-sdl%{!?with_sdl:=no} \
+	--enable-gl-x11 \
+	--enable-software-sdl%{!?with_sdl:=no} \
+	--enable-software-xcb%{!?with_soft_xcb:=no} \
+	--enable-xrender-x11 \
+	--enable-xrender-xcb%{!?with_xrender_xcb:=no} \
 	--enable-font-loader-eet	\
 	--enable-image-loader-edb	\
 	--enable-image-loader-eet	\
@@ -418,22 +472,10 @@ Moduł zapisywania obrazów TIFF dla Evas.
 	--enable-image-loader-svg	\
 	--enable-image-loader-tiff	\
 	--enable-image-loader-xpm	\
-%if %{with mmx}
-	--enable-cpu-mmx	\
-%else
-	--disable-cpu-mmx	\
-%endif
-%if %{with sse}
-	--enable-cpu-sse	\
-%else
-	--disable-cpu-sse	\
-%endif
-%if %{with altivec}
-	--enable-cpu-altivec	\
-%else
-	--disable-cpu-altivec	\
-%endif
-	--enable-cpu-c		\
+	--enable-cpu-altivec%{!?with_altivec:=no} \
+	--enable-cpu-c \
+	--enable-cpu-mmx%{!?with_mmx:=no} \
+	--enable-cpu-sse%{!?with_sse:=no} \
 	--disable-valgrind
 
 %{__make}
@@ -444,7 +486,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*/*/*/module.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*/*/*/module.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -454,23 +496,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING COPYING-PLAIN README
+%doc AUTHORS COPYING README
+%attr(755,root,root) %{_bindir}/evas_cserve
+%attr(755,root,root) %{_bindir}/evas_cserve_tool
 %attr(755,root,root) %{_libdir}/libevas.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libevas.so.1
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/modules
 %dir %{_libdir}/%{name}/modules/engines
 %dir %{_libdir}/%{name}/modules/loaders
 %dir %{_libdir}/%{name}/modules/savers
+# loaders without additional dependencies
+%dir %{_libdir}/%{name}/modules/loaders/bmp
+%dir %{_libdir}/%{name}/modules/loaders/bmp/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/modules/loaders/bmp/linux-gnu-*/module.so
+%dir %{_libdir}/%{name}/modules/loaders/tga
+%dir %{_libdir}/%{name}/modules/loaders/tga/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/modules/loaders/tga/linux-gnu-*/module.so
 
 %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
+%{_includedir}/evas-1
 %{_pkgconfigdir}/evas.pc
 # engine private structures
-%{_includedir}/Evas_Engine_*.h
 %{_pkgconfigdir}/evas-*.pc
 
 %if %{with static_libs}
@@ -485,17 +535,21 @@ 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
 
+%if %{with directfb}
 %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
+%endif
 
+%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)
@@ -503,12 +557,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/modules/engines/gl_x11/linux-gnu-*
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/gl_x11/linux-gnu-*/module.so
 
-%files engine-glitz_x11
-%defattr(644,root,root,755)
-%dir %{_libdir}/%{name}/modules/engines/glitz_x11
-%dir %{_libdir}/%{name}/modules/engines/glitz_x11/linux-gnu-*
-%attr(755,root,root) %{_libdir}/%{name}/modules/engines/glitz_x11/linux-gnu-*/module.so
-
 %files engine-software_generic
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/modules/engines/software_generic
@@ -516,6 +564,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/modules/engines/software_generic/linux-gnu-*/module.so
 
 %if 0
+%files engine-software_16
+%defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/modules/engines/software_16
+%dir %{_libdir}/%{name}/modules/engines/software_16/linux-gnu-*
+%attr(755,root,root) %{_libdir}/%{name}/modules/engines/software_16/linux-gnu-*/module.so
+
 %files engine-software_qtopia
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/modules/engines/software_qtopia
@@ -529,11 +583,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)
@@ -541,11 +597,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)
@@ -571,6 +629,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