Removing unnecessary dependencies

Change-Id: I50d11b88986777f29ca094e8934b920de136d402
Signed-off-by: David Steele <david.steele@partner.samsung.com>

diff --git a/build/slp/configure.ac b/build/slp/configure.ac
index 3b18801..281491d 100644 (file)
--- a/build/slp/configure.ac
+++ b/build/slp/configure.ac
@@ -17,7 +17,7 @@
 
 m4_define([dali_version],[0.1.1])
 AC_INIT([dali], [dali_version])
-AM_INIT_AUTOMAKE([-Wall -Wfloat-equal -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall -Wfloat-equal foreign])
 
 AC_PROG_CXX
 AC_PROG_LIBTOOL
@@ -30,7 +30,7 @@ LT_INIT
 DALI_VERSION=dali_version
 AC_SUBST(DALI_VERSION)
 
-PKG_CHECK_MODULES(OPENGLES20, opengl-es-20)
+#PKG_CHECK_MODULES(OPENGLES20, opengl-es-20)
 
 DALI_CFLAGS=-DPLATFORM_SLP
 

diff --git a/build/slp/dali-core.pc.in b/build/slp/dali-core.pc.in
index a2c7742..e7cab47 100644 (file)
--- a/build/slp/dali-core.pc.in
+++ b/build/slp/dali-core.pc.in
@@ -7,6 +7,6 @@ includedir=@devincludepath@
 Name: Samsung OpenGLES Toolkit
 Description: 3D Canvas Toolkit using OpenGLES
 Version: ${apiversion}
-Requires: opengl-es-20
+Requires:
 Libs: -L${libdir} -ldali-core
 Cflags: -I${includedir}

diff --git a/build/slp/dali-core/Makefile.am b/build/slp/dali-core/Makefile.am
index 2aebc6c..ed68d5b 100644 (file)
--- a/build/slp/dali-core/Makefile.am
+++ b/build/slp/dali-core/Makefile.am
@@ -73,10 +73,9 @@ libdali_core_la_CXXFLAGS = -DDALI_COMPILATION \
                            -DDALI_EMOTICON_DIR="\"${emoticons_dir}\"" \
                            -Werror -Wall -Wfloat-equal \
                            $(dali_core_includes) \
-                           $(DALI_CFLAGS) \
-                           $(OPENGLES20_CFLAGS)
+                           $(DALI_CFLAGS)
 
-libdali_core_la_LIBADD = $(OPENGLES20_LIBS) -lboost_thread
+libdali_core_la_LIBADD = -lboost_thread
 
 # Create an empty shaderbin dir
 install-data-local:
@@ -193,8 +192,7 @@ linker_test_CXXFLAGS = \
   -Werror -Wall -Wfloat-equal \
   -I../../../automated-tests/src/dali/dali-test-suite-utils \
   $(dali_core_includes) \
-  $(DALI_CFLAGS) \
-  $(OPENGLES20_CFLAGS)
+  $(DALI_CFLAGS)
 
 linker_test_DEPENDENCIES = libdali-core.la
 linker_test_LDADD = \

diff --git a/packaging/dali.spec b/packaging/dali.spec
index 8d324ae..68fae16 100644 (file)
--- a/packaging/dali.spec
+++ b/packaging/dali.spec
@@ -4,22 +4,20 @@ Version:    0.9.15
 Release:    1
 Group:      System/Libraries
 License:    Flora
-URL:        TO_BE_FILLED
+URL:        https://review.tizen.org/git/?p=platform/core/uifw/dali-core.git;a=summary
 Source0:    %{name}-%{version}.tar.gz
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires:       boost-thread
 BuildRequires:  pkgconfig
-BuildRequires:  opengl-es-devel
 BuildRequires:  gawk
 BuildRequires:  boost-devel
 BuildRequires:  boost-thread
-BuildRequires:  sec-product-features
 ExclusiveArch:  armv7l
 
 %description
-The OpenGLES Canvas Core Library
+The OpenGLES Canvas Core Library provides a 3D scene graph
 
 ##############################
 # devel
@@ -28,26 +26,23 @@ The OpenGLES Canvas Core Library
 # dali-capi - i.e. to break cyclic dependencies.
 %package devel
 Summary:    Development components for the OpenGLES Canvas Core Library
-Group:      Development/Libs
+Group:      Development/Building
 Requires:   %{name} = %{version}-%{release}
 Requires:   %{name}-integration-devel = %{version}-%{release}
-%ifarch %{ix86}
-Requires:   opengl-es-devel
-%endif
 
 %description devel
-Development components for the OpenGLES Canvas Core Library
+Development components for the OpenGLES Canvas Core Library - public headers and package config
 
 ##############################
 # integration-devel
 ##############################
 %package integration-devel
 Summary:    Integration development package for the OpenGLES Canvas
-Group:      Development/Libs
+Group:      Development/Building
 Requires:   %{name} = %{version}-%{release}
 
 %description integration-devel
-Integration development package for the OpenGLES Canvas
+Integration development package for the OpenGLES Canvas - headers for integrating with an adaptor/platform abstraction library.
 
 ##############################
 # Preparation
@@ -95,10 +90,6 @@ cd build/slp
 mkdir -p %{buildroot}/usr/share/license
 cp -af %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{name}
 
-%if 0%{?sec_product_feature_graphics_adreno}
-  mkdir -p %{buildroot}%{shader_bin_dir}
-  mv %{_builddir}/%{name}-%{version}/dali/shaderbins/adreno330/*.dali-bin %{buildroot}%{shader_bin_dir}
-%endif
 
 ##############################
 # Post Install
@@ -129,9 +120,6 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/lib%{name}-core.so*
 %defattr(-,app,app,-)
-%if 0%{?sec_product_feature_graphics_adreno}
-  %{shader_bin_dir}/*
-%endif
 %dir %{shader_bin_dir}
 %{_datadir}/license/%{name}