(Build) Fix checks for gles20, glyphcache install folder

Tizen Common does not have "gles20", but only "glesv2" and
"egl" in all repos. We have a macro to replace it in the
specfile, but not the autoconf files. Fixing.

The glyphcache install folder seems to have changed in
latest releases ("/opt/usr" to "/usr"). Fixing.

Use the %configure macro instead of "./configure". Simplify
the specfile by using a conditional variable.

Signed-off-by: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>
Change-Id: Icc88ee08b2f373be92e1a9be0f85656da032f99e

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 413aff6..b71effa 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -127,11 +127,7 @@ AM_CONDITIONAL([UBUNTU_PROFILE], [test x$enable_profile = xUBUNTU])
 AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes])
 
 if test "x$enable_profile" = "xCOMMON"; then
-if test "x$enable_wayland" = "xyes"; then
-PKG_CHECK_MODULES(OPENGLES20, glesv2)
-else
-PKG_CHECK_MODULES(OPENGLES20, gles20)
-fi
+PKG_CHECK_MODULES(OPENGLES20, glesv2 egl)
 PKG_CHECK_MODULES(HAPTIC, haptic)
 fi
 

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 8aa5ba7..ceacb70 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -94,7 +94,7 @@ Dynamics plugin to wrap the libBulletDynamics libraries
 ##############################
 %prep
 %setup -q
-%define dali_data_rw_dir         /opt/usr/share/dali/
+%define dali_data_rw_dir         /usr/share/dali/
 %define dali_data_ro_dir         /usr/share/dali/
 %define user_font_cache_dir      %{dali_data_rw_dir}/glyphcache/
 %define user_shader_cache_dir    %{dali_data_rw_dir}/core/shaderbin/
@@ -128,15 +128,12 @@ CXXFLAGS+=" -D_ARCH_ARM_ -lgcc"
 %if %{with wayland}
 CFLAGS+=" -DWAYLAND"
 CXXFLAGS+=" -DWAYLAND"
+configure_flags="--enable-wayland"
 %endif
 
 libtoolize --force
 cd %{_builddir}/%{name}-%{version}/build/tizen && autoreconf --install
-%if %{with wayland}
-cd %{_builddir}/%{name}-%{version}/build/tizen && CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" FONT_PRELOADED_PATH="%{font_preloaded_path}" FONT_DOWNLOADED_PATH="%{font_downloaded_path}" FONT_APPLICATION_PATH="%{font_application_path}" FONT_CONFIGURATION_FILE="%{font_configuration_file}" ./configure --prefix=$PREFIX --with-jpeg-turbo --enable-gles=20 --enable-profile=COMMON --enable-wayland --libdir=%{_libdir}
-%else
-cd %{_builddir}/%{name}-%{version}/build/tizen && CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" FONT_PRELOADED_PATH="%{font_preloaded_path}" FONT_DOWNLOADED_PATH="%{font_downloaded_path}" FONT_APPLICATION_PATH="%{font_application_path}" FONT_CONFIGURATION_FILE="%{font_configuration_file}" ./configure --prefix=$PREFIX --with-jpeg-turbo --enable-gles=20 --enable-profile=COMMON --libdir=%{_libdir}
-%endif
+cd %{_builddir}/%{name}-%{version}/build/tizen && CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" FONT_PRELOADED_PATH="%{font_preloaded_path}" FONT_DOWNLOADED_PATH="%{font_downloaded_path}" FONT_APPLICATION_PATH="%{font_application_path}" FONT_CONFIGURATION_FILE="%{font_configuration_file}" %configure --prefix=$PREFIX --with-jpeg-turbo --enable-gles=20 --enable-profile=COMMON $configure_flags --libdir=%{_libdir}
 
 make %{?jobs:-j%jobs}