Author: qboosh Date: Sat Nov 20 09:44:45 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- glitz is obsolete
- fribidi deps
- License is BSD
---- Files affected:
packages/evas:
evas.spec (1.65 -> 1.66)
---- Diffs:
================================================================
Index: packages/evas/evas.spec
diff -u packages/evas/evas.spec:1.65 packages/evas/evas.spec:1.66
--- packages/evas/evas.spec:1.65 Sat Nov 20 07:43:02 2010
+++ packages/evas/evas.spec Sat Nov 20 10:44:39 2010
@@ -35,7 +35,7 @@
%define subver beta2
Version: 1.0.0
Release: 0.%{subver}.1
-License: LGPL v2.1
+License: BSD
Group: Libraries
Source0:
http://download.enlightenment.org/releases/%{name}-%{version}.%{subver}.tar.bz2
# Source0-md5: 9257e31106b472f5e36e0461b0884170
@@ -47,10 +47,11 @@
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: glitz-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel >= 1.2
BuildRequires: librsvg-devel >= 1:2.14.0
@@ -61,8 +62,10 @@
BuildRequires: readline-devel
BuildRequires: xcb-util-devel
BuildRequires: xorg-lib-libXext-devel
-Requires: freetype >= 1:2.2
Requires: eet >= %{eet_ver}
+Requires: eina >= 1.0.0
+Requires: freetype >= 1:2.2
+Requires: fribidi >= 0.19.2
Obsoletes: evas-libs
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -87,7 +90,8 @@
Requires: eet-devel >= %{eet_ver}
Requires: fontconfig-devel
Requires: freetype-devel >= 1:2.2
-# 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
@@ -172,18 +176,6 @@
%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
-Group: X11/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description engine-glitz_x11
-Glitz X11 rendering engine module for Evas.
-
-%description engine-glitz_x11 -l pl.UTF-8
-Moduł silnika renderującego Glitz 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
@@ -456,24 +448,23 @@
%setup -q -n %{name}-%{version}.%{subver}
%build
-rm -rf autom4te.cache
-rm -f aclocal.m4 ltmain.sh
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
+ --disable-silent-rules \
%{!?with_static_libs:--disable-static} \
- --enable-buffer \
- --%{?with_fb:en}%{!?with_fb:dis}able-fb \
- --%{?with_soft_xcb:en}%{!?with_soft_xcb:dis}able-software-xcb \
- --enable-gl-x11 \
- --enable-xrender-x11 \
- --%{?with_sdl:en}%{!?with_sdl:dis}able-software-sdl \
- --%{?with_sdl:en}%{!?with_sdl:dis}able-gl-sdl \
- --%{?with_directfb:en}%{!?with_directfb:dis}able-directfb \
- --%{?with_xrender_xcb:en}%{!?with_xrender_xcb:dis}able-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 \
@@ -483,25 +474,13 @@
--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} V=1
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
@@ -509,7 +488,7 @@
%{__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
@@ -580,14 +559,6 @@
%dir %{_libdir}/%{name}/modules/engines/gl_x11/linux-gnu-*
%attr(755,root,root)
%{_libdir}/%{name}/modules/engines/gl_x11/linux-gnu-*/module.so
-%if 0
-%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
-%endif
-
%files engine-software_generic
%defattr(644,root,root,755)
%dir %{_libdir}/%{name}/modules/engines/software_generic
@@ -726,6 +697,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.66 2010/11/20 09:44:39 qboosh
+- glitz is obsolete
+- fribidi deps
+- License is BSD
+
Revision 1.65 2010/11/20 06:43:02 qboosh
- cleanup, fixed doc files
- package bmp and tga loader modules
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/evas/evas.spec?r1=1.65&r2=1.66&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
