upstream merge

Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
	src/lib/canvas/evas_gl.c
	src/modules/engines/gl_x11/evas_engine.c

Change-Id: Ifd24607a8142e088f367b79f4a28ec6e1ca7114b

diff --cc .gitignore
index e047c2d,542535f..b46dd18
mode 100755,100644..100755
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore

diff --cc packaging/evas.spec
index e34a33c,0000000..d1b71bd
mode 100755,000000..100755
--- 1/packaging/evas.spec
--- /dev/null
+++ b/packaging/evas.spec
@@@ -1,116 -1,0 +1,118 @@@
- Version:    1.2.0+svn.72376slp2+build01
 +#sbs-git:slp/pkgs/e/evas evas 1.1.0+svn.69113slp2+build01 828d8bb285397266eb8985fd081fa2692fa3a7d6
 +Name:       evas
 +Summary:    Multi-platform Canvas Library
++Version:    1.2.0+svn.73001slp2+build01
 +Release:    1
 +Group:      System/Libraries
 +License:    BSD
 +URL:        http://www.enlightenment.org/
 +Source0:    %{name}-%{version}.tar.gz
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +BuildRequires:  eina-devel
 +BuildRequires:  eet-devel
 +BuildRequires:  libx11-devel
 +BuildRequires:  libxi-devel
 +BuildRequires:  libxrender-devel
 +BuildRequires:  fontconfig-devel
 +BuildRequires:  freetype-devel
 +BuildRequires:  fribidi-devel
 +BuildRequires:  libxext-devel
 +BuildRequires:  libpng-devel
 +BuildRequires:  libxpm-devel
 +BuildRequires:  zlib-devel
 +BuildRequires:  harfbuzz-devel
 +BuildRequires:  libsm-devel
 +BuildRequires:  libjpeg-devel
 +BuildRequires:  giflib-devel
 +BuildRequires:  pixman-devel
 +BuildRequires:  opengl-es-devel
 +
 +%description
 +Enlightenment DR17 advanced canvas library Evas is an advanced canvas library, providing six engines for rendering: X11,
 + OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
 + and Qtopia.
 + .
 + Due to its simple API, evas can be developed with rapidly, and cleanly.
 + .
 + This package contains the core library and a set of image loaders and/or savers
 + for various formats: eet, gif, jpeg, png, svg, tiff, bmp, wbmp and xpm
 +
 +
 +%package devel
 +Summary:    Multi-platform Canvas Library (devel)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +
 +
 +%description devel
 +Enlightenment DR17 advanced canvas library (devel)
 +
 +
 +%prep
 +%setup -q
 +
 +%build
 +export CFLAGS+=" -fvisibility=hidden -ffast-math -fPIC"
 +export LDFLAGS+=" -fvisibility=hidden -Wl,--hash-style=both -Wl,--as-needed"
 +
 +%autogen
 +%configure --disable-static \
 +      --disable-image-loader-svg \
 +      --enable-simple-x11 \
 +      --with-x \
 +      --enable-fb \
 +      --enable-xrender-x11 \
 +      --enable-line-dither-mask \
 +      --disable-image-loader-edb \
 +      --disable-rpath \
 +      --enable-gl-x11 \
 +      --enable-gl-flavor-gles \
 +      --enable-gles-variety-sgx \
 +      --enable-pixman \
 +      --enable-pixman-image \
 +      --enable-pixman-image-scale-sample \
 +      --enable-tile-rotate \
 +%ifarch %{arm}
 +      --enable-pthreads \
 +      --enable-cpu-neon \
 +      --enable-winkcodec=yes
 +%else
 +      --enable-pthreads \
 +      --enable-winkcodec=no
 +%endif
 +  
 +make %{?jobs:-j%jobs}
 +
 +
 +%install
 +rm -rf %{buildroot}
 +%make_install
 +
 +
 +%post -p /sbin/ldconfig
 +
 +
 +%postun -p /sbin/ldconfig
 +
 +
 +%files
 +%defattr(-,root,root,-)
 +%{_libdir}/libevas.so.*
 +%{_libdir}/evas/modules/engines/*/*/module.so
 +%{_libdir}/evas/modules/loaders/*/*/module.so
 +%{_libdir}/evas/modules/savers/*/*/module.so
 +%{_libdir}/evas/cserve2/loaders/*/*/module.so
 +%{_bindir}/evas_cserve2_client
++%{_bindir}/evas_cserve2_usage
++%{_bindir}/evas_cserve2_debug
 +%{_libexecdir}/evas_cserve2
 +%{_libexecdir}/evas_cserve2_slave
 +%{_libexecdir}/dummy_slave
 +
 +%files devel
 +%defattr(-,root,root,-)
 +%{_includedir}/evas-1/*.h
 +%{_libdir}/libevas.so
 +%{_libdir}/pkgconfig/*.pc
 +%{_datadir}/evas/examples/*

diff --cc src/modules/engines/gl_x11/evas_x_main.c
Simple merge

diff --cc src/modules/engines/software_generic/evas_engine.c
Simple merge