Author: qboosh Date: Sun May 27 18:07:15 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 1.2.0 - removed obsolete automake patch - added wayland patch to fix wayland_egl engine build - software_sdl engine has been dropped (Obsoletes added to software_16_sdl) - reintroduced software_16 engine - added software_16_x11, wayland_egl, wayland_shm engines
---- Files affected: packages/evas: evas.spec (1.81 -> 1.82) , evas-wayland.patch (NONE -> 1.1) (NEW), automake.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/evas/evas.spec diff -u packages/evas/evas.spec:1.81 packages/evas/evas.spec:1.82 --- packages/evas/evas.spec:1.81 Sat Feb 11 11:57:31 2012 +++ packages/evas/evas.spec Sun May 27 20:07:10 2012 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +# TODO: liblinebreak? # # Conditional build: %bcond_without mmx # MMX and MMX2 support (on x86) @@ -7,6 +8,7 @@ %bcond_without fb # FB engine %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 engine with XCB support (experimental) %bcond_without static_libs # don't build static library # @@ -21,28 +23,28 @@ %endif # %define edb_ver 1.0.5.043 -%define eet_ver 1.5.0 +%define eet_ver 1.6.0 Summary: Multi-platform Canvas Library Summary(pl.UTF-8): Wieloplatformowa biblioteka do rysowania Name: evas -Version: 1.1.0 -Release: 6 +Version: 1.2.0 +Release: 1 License: BSD Group: Libraries Source0: http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: f8d8751be7cfc8124e5af31e2dced792 +# Source0-md5: a245e432695cea1120d43cdbcb94b7f7 Patch0: %{name}-harfbuzz.patch -Patch1: automake.patch +Patch1: %{name}-wayland.patch URL: http://trac.enlightenment.org/e/wiki/Evas -%{?with_directfb:BuildRequires: DirectFB-devel} +%{?with_directfb:BuildRequires: DirectFB-devel >= 0.9.16} BuildRequires: Mesa-libGLU-devel -%{?with_sdl:BuildRequires: SDL-devel} +%{?with_sdl:BuildRequires: SDL-devel >= 1.2.0} BuildRequires: autoconf >= 2.59-9 BuildRequires: automake >= 1.6 BuildRequires: edb-devel >= %{edb_ver} BuildRequires: eet-devel >= %{eet_ver} -BuildRequires: eina-devel >= 1.1.0 +BuildRequires: eina-devel >= 1.2.0 BuildRequires: fontconfig-devel >= 2.5.0 BuildRequires: freetype-devel >= 1:2.2 BuildRequires: fribidi-devel >= 0.19.2 @@ -53,22 +55,27 @@ BuildRequires: librsvg-devel >= 1:2.14.0 BuildRequires: libtiff-devel BuildRequires: libtool +BuildRequires: pixman-devel BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: xorg-lib-libXext-devel %if %{with xcb} BuildRequires: libxcb-devel -# --enable-pixman ? -#BuildRequires: pixman-devel BuildRequires: xcb-util-image-devel >= 0.2.1 %endif +%if %{with wayland} +BuildRequires: OpenGL-devel +BuildRequires: Mesa-libEGL-devel >= 7.10 +BuildRequires: Mesa-libGLES-devel +BuildRequires: Mesa-libwayland-egl-devel +BuildRequires: wayland-devel +%endif Requires: eet >= %{eet_ver} -Requires: eina >= 1.1.0 +Requires: eina >= 1.2.0 Requires: freetype >= 1:2.2 Requires: fribidi >= 0.19.2 Requires: harfbuzz >= 0.6.0 Obsoletes: evas-libs -Obsoletes: evas-engine-software_16 Obsoletes: evas-engine-software_qtopia Obsoletes: evas-engine-xrender_x11 Obsoletes: evas-engine-xrender_xcb @@ -92,7 +99,8 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: eet-devel >= %{eet_ver} -Requires: fontconfig-devel +Requires: eina-devel >= 1.2.0 +Requires: fontconfig-devel >= 2.5.0 Requires: freetype-devel >= 1:2.2 Requires: fribidi-devel >= 0.19.2 Requires: harfbuzz-devel >= 0.6.0 @@ -134,6 +142,7 @@ Summary(pl.UTF-8): Moduł silnika renderującego na DirectFB dla Evas Group: X11/Libraries Requires: %{name} = %{version}-%{release} +Requires: DirectFB >= 0.9.16 %description engine-directfb DirectFB rendering engine module for Evas. @@ -158,6 +167,7 @@ Summary(pl.UTF-8): Moduł silnika renderującego na SDL OpenGL dla Evas Group: X11/Libraries Requires: %{name}-engine-software_generic = %{version}-%{release} +Requires: SDL >= 1.2.0 %description engine-gl_sdl SDL OpenGL rendering engine module for Evas. @@ -177,11 +187,25 @@ %description engine-gl_x11 -l pl.UTF-8 Moduł silnika renderującego na OpenGL pod X11 dla Evas. +%package engine-software_16 +Summary: 16-bit software rendering engine module for Evas +Summary(pl.UTF-8): Moduł silnika programowego renderującego 16-bitowego dla Evas +Group: X11/Libraries +Requires: %{name}-engine-software_generic = %{version}-%{release} + +%description engine-software_16 +16-bit software rendering engine module for Evas. + +%description engine-software_16 -l pl.UTF-8 +Moduł silnika programowego renderującego 16-bitowego dla Evas. + %package engine-software_16_sdl Summary: 16-bit SDL software rendering engine module for Evas Summary(pl.UTF-8): Moduł silnika programowego renderującego 16-bitowego na SDL dla Evas Group: X11/Libraries Requires: %{name}-engine-software_generic = %{version}-%{release} +Requires: SDL >= 1.2.0 +Obsoletes: evas-engine-software_sdl %description engine-software_16_sdl 16-bit SDL software rendering engine module for Evas. @@ -189,6 +213,18 @@ %description engine-software_16_sdl -l pl.UTF-8 Moduł silnika programowego renderującego 16-bitowego na SDL dla Evas. +%package engine-software_16_x11 +Summary: 16-bit X11 software rendering engine module for Evas +Summary(pl.UTF-8): Moduł silnika programowego renderującego 16-bitowego na X11 dla Evas +Group: X11/Libraries +Requires: %{name}-engine-software_generic = %{version}-%{release} + +%description engine-software_16_x11 +16-bit X11 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. + %package engine-software_generic Summary: Software rendering common engine module for Evas Summary(pl.UTF-8): Moduł wspólnego programowego silnika renderującego dla Evas @@ -201,18 +237,6 @@ %description engine-software_generic -l pl.UTF-8 Moduł wspólnego programowego silnika renderującego 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-software_x11 Summary: Software X11 rendering engine module for Evas Summary(pl.UTF-8): Moduł programowego silnika renderującego X11 dla Evas @@ -226,6 +250,30 @@ %description engine-software_x11 -l pl.UTF-8 Moduł programowego silnika renderującego X11 dla Evas. +%package engine-wayland_egl +Summary: Wayland EGL rendering engine module for Evas +Summary(pl.UTF-8): Moduł silnika renderującego Wayland EGL dla Evas +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%description engine-wayland_egl +Wayland EGL rendering engine module for Evas. + +%description engine-wayland_egl -l pl.UTF-8 +Moduł silnika renderującego Wayland EGL dla Evas. + +%package engine-wayland_shm +Summary: Wayland SHM rendering engine module for Evas +Summary(pl.UTF-8): Moduł silnika renderującego Wayland SHM dla Evas +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%description engine-wayland_shm +Wayland SHM rendering engine module for Evas. + +%description engine-wayland_shm -l pl.UTF-8 +Moduł silnika renderującego Wayland SHM dla Evas. + # loaders: %package loader-edb Summary: EDB Image loader module for Evas @@ -420,6 +468,8 @@ --enable-fb%{!?with_fb:=no} \ --enable-font-loader-eet \ --enable-gl-sdl%{!?with_sdl:=no} \ + --enable-gl-xcb%{!?with_xcb:=no} \ + --enable-gl-xlib \ --enable-image-loader-edb \ --enable-image-loader-eet \ --enable-image-loader-gif \ @@ -429,14 +479,15 @@ --enable-image-loader-tiff \ --enable-image-loader-xpm \ --enable-pixman \ - --enable-software-sdl%{!?with_sdl:=no} \ + --enable-software-16-sdl%{!?with_sdl:=no} \ + --enable-software-16-x11 \ --enable-software-xcb%{!?with_xcb:=no} \ --enable-software-xlib \ - --enable-gl-xcb%{!?with_xcb:=no} \ - --enable-gl-xlib \ + --enable-wayland-egl%{!?with_wayland:=no} \ + --enable-wayland-shm%{!?with_wayland:=no} \ --disable-valgrind -%{__make} V=1 +%{__make} %install rm -rf $RPM_BUILD_ROOT @@ -499,9 +550,14 @@ %{_pkgconfigdir}/evas-fb.pc %{?with_sdl:%{_pkgconfigdir}/evas-opengl-sdl.pc} %{_pkgconfigdir}/evas-opengl-x11.pc +%{_pkgconfigdir}/evas-software-16-x11.pc %{_pkgconfigdir}/evas-software-buffer.pc %{?with_sdl:%{_pkgconfigdir}/evas-software-sdl.pc} %{_pkgconfigdir}/evas-software-x11.pc +%if %{with wayland} +%{_pkgconfigdir}/evas-wayland-egl.pc +%{_pkgconfigdir}/evas-wayland-shm.pc +%endif %{_examplesdir}/%{name}-%{version} %if %{with static_libs} @@ -546,6 +602,18 @@ %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-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_16_x11 +%defattr(644,root,root,755) +%dir %{_libdir}/%{name}/modules/engines/software_16_x11 +%dir %{_libdir}/%{name}/modules/engines/software_16_x11/linux-gnu-* +%attr(755,root,root) %{_libdir}/%{name}/modules/engines/software_16_x11/linux-gnu-*/module.so + %if %{with sdl} %files engine-software_16_sdl %defattr(644,root,root,755) @@ -560,20 +628,25 @@ %dir %{_libdir}/%{name}/modules/engines/software_generic/linux-gnu-* %attr(755,root,root) %{_libdir}/%{name}/modules/engines/software_generic/linux-gnu-*/module.so -%if %{with sdl} -%files engine-software_sdl -%defattr(644,root,root,755) -%dir %{_libdir}/%{name}/modules/engines/software_sdl -%dir %{_libdir}/%{name}/modules/engines/software_sdl/linux-gnu-* -%attr(755,root,root) %{_libdir}/%{name}/modules/engines/software_sdl/linux-gnu-*/module.so -%endif - %files engine-software_x11 %defattr(644,root,root,755) %dir %{_libdir}/%{name}/modules/engines/software_x11 %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 wayland} +%files engine-wayland_egl +%defattr(644,root,root,755) +%dir %{_libdir}/%{name}/modules/engines/wayland_egl +%dir %{_libdir}/%{name}/modules/engines/wayland_egl/linux-gnu-* +%attr(755,root,root) %{_libdir}/%{name}/modules/engines/wayland_egl/linux-gnu-*/module.so + +%files engine-wayland_shm +%defattr(644,root,root,755) +%dir %{_libdir}/%{name}/modules/engines/wayland_shm +%dir %{_libdir}/%{name}/modules/engines/wayland_shm/linux-gnu-* +%attr(755,root,root) %{_libdir}/%{name}/modules/engines/wayland_shm/linux-gnu-*/module.so + %files loader-edb %defattr(644,root,root,755) %dir %{_libdir}/%{name}/modules/loaders/edb @@ -664,6 +737,14 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.82 2012/05/27 18:07:10 qboosh +- updated to 1.2.0 +- removed obsolete automake patch +- added wayland patch to fix wayland_egl engine build +- software_sdl engine has been dropped (Obsoletes added to software_16_sdl) +- reintroduced software_16 engine +- added software_16_x11, wayland_egl, wayland_shm engines + Revision 1.81 2012/02/11 10:57:31 adamg - release 6 (rebuild against libpng-1.5) ================================================================ Index: packages/evas/evas-wayland.patch diff -u /dev/null packages/evas/evas-wayland.patch:1.1 --- /dev/null Sun May 27 20:07:15 2012 +++ packages/evas/evas-wayland.patch Sun May 27 20:07:10 2012 @@ -0,0 +1,46 @@ +--- evas-1.2.0/src/modules/engines/wayland_egl/evas_engine.h.orig 2012-01-12 14:07:46.000000000 +0100 ++++ evas-1.2.0/src/modules/engines/wayland_egl/evas_engine.h 2012-05-27 17:32:54.658986859 +0200 +@@ -1,6 +1,10 @@ + #ifndef EVAS_ENGINE_H + #define EVAS_ENGINE_H + ++#ifndef GLES_WAYLAND ++#define GLES_WAYLAND 1 ++#endif ++ + #include "config.h" + #include "evas_common.h" + #include "evas_private.h" +--- evas-1.2.0/src/modules/engines/gl_common/evas_gl_common.h.orig 2012-04-20 15:36:16.000000000 +0200 ++++ evas-1.2.0/src/modules/engines/gl_common/evas_gl_common.h 2012-05-27 17:32:34.405654373 +0200 +@@ -26,10 +26,10 @@ + # include <SDL/SDL_opengl.h> + # endif + # else +-# if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) ++# if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) || defined (GLES_WAYLAND) + # if defined(GLES_VARIETY_S3C6410) + # include <GLES2/gl2.h> +-# elif defined(GLES_VARIETY_SGX) ++# elif defined(GLES_VARIETY_SGX) || defined (GLES_WAYLAND) + # include <GLES2/gl2.h> + # include <GLES2/gl2ext.h> + # endif +@@ -341,7 +341,7 @@ + /* If this is set: Force drawing with a particular filter */ + GLuint filter_prog; + +-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) ++#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) || defined (GLES_WAYLAND) + // FIXME: hack. expose egl display to gl core for egl image sec extn. + void *egldisp; + #endif +@@ -633,7 +633,7 @@ + extern void (*glsym_glProgramParameteri) (GLuint a, GLuint b, GLint d); + extern void (*glsym_glReleaseShaderCompiler)(void); + +-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) ++#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) || defined (GLES_WAYLAND) + extern void *(*secsym_eglCreateImage) (void *a, void *b, GLenum c, void *d, const int *e); + extern unsigned int (*secsym_eglDestroyImage) (void *a, void *b); + extern void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/evas/evas.spec?r1=1.81&r2=1.82 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
