[Tizen] Revert "(Build) Disable to compile unused modules"

This reverts commit 8509d1bf59fa91c20a0a442fb9c84428bd3b702a.

There are imaging issues with TM1, TV, TW3 and Emulator.
* Unable to find package: dali2-extension-color-controller-plugin

We should modify meta files for each profiles later.

Change-Id: I2b15c56d189e69845d86d4aac6f445b5c6250294

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index b370622afae8cc9c389f243b424db75f2bfa88d2..a0fbbd6403e3ba13a392f095716b1ece1251d53a 100755 (executable)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -40,35 +40,12 @@ AC_ARG_ENABLE([web-engine-plugin],
               [enable_web_engine_plugin=$enableval],
               [enable_web_engine_plugin=no])
 
-AC_ARG_ENABLE([imageloader-extension],
-              [AC_HELP_STRING([--enable-imageloader-extension],
-                              [Turns on image loader extension build])],
-              [enable_imageloader_extension=$enableval],
-              [enable_imageloader_extension=no])
-
-AC_ARG_ENABLE([color-controller],
-              [AC_HELP_STRING([--enable-color-controller],
-                              [Turns on color controller plugin build])],
-              [enable_color_controller=$enableval],
-              [enable_color_controller=no])
-
-AC_ARG_ENABLE([evas-plugin],
-              [AC_HELP_STRING([--enable-evas-plugin],
-                              [Turns on evas plugin])],
-              [enable_evas_plugin=$enableval],
-              [enable_evas_plugin=no])
-
 PKG_CHECK_MODULES([DALI], [dali2-core dali2-adaptor dali2-toolkit])
 
 AC_CONFIG_SUBDIRS(key)
 AC_CONFIG_SUBDIRS(video-player)
-
-if test "x$enable_imageloader_extension" = "xyes"; then
 AC_CONFIG_SUBDIRS(image-loader)
-fi
-if test "x$enable_color_controller" = "xyes"; then
 AC_CONFIG_SUBDIRS(color-controller)
-fi
 
 if test "x$with_tizen_55_or_greater" = "xyes"; then
   AC_CONFIG_SUBDIRS(vector-animation-renderer)

diff --git a/build/tizen/dali-extension/Makefile.am b/build/tizen/dali-extension/Makefile.am
index 7623641855b04dd3a5f459b0d13c88df6f880513..990e5704ef0ede5c65f727923e8d364811824142 100755 (executable)
--- a/build/tizen/dali-extension/Makefile.am
+++ b/build/tizen/dali-extension/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Samsung Electronics Co., Ltd.
+# Copyright (c) 2020 Samsung Electronics Co., Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,21 +19,17 @@
 extension_src_dir = ../../../dali-extension
 
 # evas-plugin
-if EVAS_PLUGIN
 include ../../../dali-extension/devel-api/evas-plugin/file.list
 include ../../../dali-extension/internal/evas-plugin/file.list
-endif
 
 lib_LTLIBRARIES =
 
 lib_LTLIBRARIES += libdali2-extension.la
 
 # Todo Evas plugin separation
-if EVAS_PLUGIN
 libdali2_extension_la_SOURCES = \
             $(evas_plugin_devel_src_files) \
             $(evas_plugin_internal_src_files)
-endif
 
 libdali2_extension_la_DEPENDENCIES =
 
@@ -42,28 +38,20 @@ libdali2_extension_la_CXXFLAGS = \
             $(DALI_CFLAGS) \
             $(DALI_EXTENSION_CFLAGS) \
             $(DALI_ADAPTOR_INTEGRATION_CFLAGS) \
+            $(ELEMENTARY_CFLAGS) \
+            $(EVAS_CFLAGS) \
             $(WAYLAND_CFLAGS) \
             -DEFL_BETA_API_SUPPORT \
             -I../../../ \
             -Werror -Wall
 
-if EVAS_PLUGIN
-libdali2_extension_la_CXXFLAGS += \
-            $(ELEMENTARY_CFLAGS) \
-            $(EVAS_CFLAGS)
-endif
-
 libdali2_extension_la_LIBADD = \
             $(DLOG_LIBS) \
             $(DALI_LIBS) \
             $(DALI_ADAPTOR_INTEGRATION_LIBS) \
-            $(WAYLAND_LIBS)
-
-if EVAS_PLUGIN
-libdali2_extension_la_LIBADD += \
             $(ELEMENTARY_LIBS) \
-            $(EVAS_LIBS)
-endif
+            $(EVAS_LIBS) \
+            $(WAYLAND_LIBS)
 
 libdali2_extension_la_LDFLAGS = \
             -rdynamic
@@ -72,8 +60,5 @@ libdali2_extension_la_LDFLAGS = \
 dali2_extensiondir = $(devincludepath)/dali-extension
 dali2_extension_HEADERS = ../../../dali-extension/dali-extension.h
 
-if EVAS_PLUGIN
 dali2_extension_evasplugindir = $(devincludepath)/dali-extension/devel-api/evas-plugin
 dali2_extension_evasplugin_HEADERS = $(evas_plugin_devel_header_files)
-endif
-

diff --git a/build/tizen/dali-extension/configure.ac b/build/tizen/dali-extension/configure.ac
index e1a4f55eb6fe844aa7862e631a53585430c61d8f..423d19a79741cc08b510aadde52010ec13b22e4c 100755 (executable)
--- a/build/tizen/dali-extension/configure.ac
+++ b/build/tizen/dali-extension/configure.ac
@@ -16,20 +16,15 @@ LT_INIT
 DALI_EXTENSION_VERSION=dali_version
 AC_SUBST(DALI_EXTENSION_VERSION)
 
-AM_CONDITIONAL([EVAS_PLUGIN], [test x$evas_plugin = xtrue])
-
 if test "x$enable_debug" = "xyes"; then
   DALI_CFLAGS="$DALI_CFLAGS -DDEBUG_ENABLED"
 fi
 
-PKG_CHECK_MODULES(DALI_ADAPTOR_INTEGRATION, dali2-adaptor-integration)
-PKG_CHECK_MODULES(WAYLAND, [ecore-wl2])
-
 # For evas-plugin
-if test "x$enable_evas_plugin" = "xyes"; then
+PKG_CHECK_MODULES(DALI_ADAPTOR_INTEGRATION, dali2-adaptor-integration)
 PKG_CHECK_MODULES(ELEMENTARY, elementary)
 PKG_CHECK_MODULES(EVAS, evas)
-fi
+PKG_CHECK_MODULES(WAYLAND, [ecore-wl2])
 
 devincludepath=${includedir}
 AC_SUBST(devincludepath)

diff --git a/dali-extension/dali-extension.h b/dali-extension/dali-extension.h
index f257b61336cfc165fa420ac5fc708d65c3f3f983..3d634aa4e456237e6cd964090ff2404ef93bc392 100644 (file)
--- a/dali-extension/dali-extension.h
+++ b/dali-extension/dali-extension.h
@@ -2,7 +2,7 @@
 #define DALI_EXTENSION_H
 
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,7 @@
  *
  */
 
-#if defined(EVAS_PLUGIN)
 #include <dali-extension/devel-api/evas-plugin/evas-plugin.h>
 #include <dali-extension/devel-api/evas-plugin/scene.h>
-#endif
 
 #endif // DALI_EXTENSION_H

diff --git a/dali-extension/image-loader/loader-dummy.cpp b/dali-extension/image-loader/loader-dummy.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 4c7ae98..f39c0a7
--- a/dali-extension/image-loader/loader-dummy.cpp
+++ b/dali-extension/image-loader/loader-dummy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,19 +18,21 @@
 // HEADER
 #include "loader-dummy.h"
 
-#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
 #include <dali/integration-api/debug.h>
+#include <dali/public-api/images/image.h>
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
 // INTERNAL INCLUDES
 
 namespace Dali
 {
 namespace Plugin
 {
+
 /**
  * This code is a dummy code. You can implement it here.
  */
 
-bool LoadImageHeader(const Dali::ImageLoader::Input& input, unsigned int& width, unsigned int& height)
+bool LoadImageHeader( const Dali::ImageLoader::Input& input, unsigned int& width, unsigned int& height )
 {
   bool success = false;
   /* Loads the header of a image file and fills in the width and height appropriately. */
@@ -38,7 +40,8 @@ bool LoadImageHeader(const Dali::ImageLoader::Input& input, unsigned int& width,
   return success;
 }
 
-bool LoadBitmapFromImage(const Dali::ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap)
+
+bool LoadBitmapFromImage( const Dali::ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
 {
   bool success = false;
   /* Loads the bitmap from an image file.  This function checks the header first */
@@ -46,5 +49,5 @@ bool LoadBitmapFromImage(const Dali::ImageLoader::Input& input, Dali::Devel::Pix
   return success;
 }
 
-} // namespace Plugin
-} // namespace Dali
+}
+}

diff --git a/dali-extension/image-loader/tizen-image-loader.cpp b/dali-extension/image-loader/tizen-image-loader.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 70ca83b..34bf24b
--- a/dali-extension/image-loader/tizen-image-loader.cpp
+++ b/dali-extension/image-loader/tizen-image-loader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
  */
 
 // CLASS HEADER
-#include <dali/integration-api/bitmap.h>
-#include <dali/integration-api/debug.h>
 #include <tizen-image-loader.h>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/bitmap.h>
 #include "loader-dummy.h"
 
 // The plugin factories
@@ -27,9 +27,9 @@ extern "C" DALI_EXPORT_API Dali::ImageLoaderPlugin* CreateImageLoaderPlugin(void
   return new Dali::Plugin::TizenImageLoader;
 }
 
-extern "C" DALI_EXPORT_API void DestroyImageLoaderPlugin(Dali::ImageLoaderPlugin* plugin)
+extern "C" DALI_EXPORT_API void DestroyImageLoaderPlugin( Dali::ImageLoaderPlugin* plugin )
 {
-  if(plugin != NULL)
+  if( plugin != NULL )
   {
     delete plugin;
   }
@@ -41,58 +41,61 @@ namespace Plugin
 {
 namespace
 {
-/**
+  /**
    * Enum for file formats, has to be in sync with BITMAP_LOADER_LOOKUP_TABLE
    */
-enum FileFormats
-{
-  // Unknown file format
-  FORMAT_UNKNOWN = -1,
+  enum FileFormats
+  {
+    // Unknown file format
+    FORMAT_UNKNOWN = -1,
 
-  // formats that use magic bytes
-  FORMAT_DUMMY = 0,
-  FORMAT_TOTAL_COUNT
-};
+    // formats that use magic bytes
+    FORMAT_DUMMY = 0,
+    FORMAT_TOTAL_COUNT
+  };
 
-/**
+  /**
    * A lookup table containing all the bitmap loaders with the appropriate information.
    * Has to be in sync with enum FileFormats
    */
-const Dali::ImageLoader::BitmapLoader BITMAP_LOADER_LOOKUP_TABLE[FORMAT_TOTAL_COUNT] =
+  const Dali::ImageLoader::BitmapLoader BITMAP_LOADER_LOOKUP_TABLE[FORMAT_TOTAL_COUNT] =
   {
-    {0x0, 0x0, LoadBitmapFromImage, nullptr, LoadImageHeader, Dali::Integration::Bitmap::BITMAP_2D_PACKED_PIXELS},
-};
+    { 0x0,                0x0,                LoadBitmapFromImage,  LoadImageHeader,  Dali::Integration::Bitmap::BITMAP_2D_PACKED_PIXELS },
+  };
 
-struct FormatExtension
-{
-  const std::string extension;
-  FileFormats       format;
-};
 
-const FormatExtension FORMAT_EXTENSIONS[] =
+  struct FormatExtension
   {
-    {".dummy", FORMAT_DUMMY}};
+    const std::string extension;
+    FileFormats format;
+  };
 
-const unsigned int FORMAT_EXTENSIONS_COUNT = sizeof(FORMAT_EXTENSIONS) / sizeof(FormatExtension);
+  const FormatExtension FORMAT_EXTENSIONS[] =
+  {
+    { ".dummy",  FORMAT_DUMMY  }
+  };
 
-FileFormats GetFormatHint(const std::string& filename)
-{
-  FileFormats format = FORMAT_UNKNOWN;
+  const unsigned int FORMAT_EXTENSIONS_COUNT = sizeof(FORMAT_EXTENSIONS) / sizeof(FormatExtension);
 
-  for(unsigned int i = 0; i < FORMAT_EXTENSIONS_COUNT; ++i)
+
+  FileFormats GetFormatHint( const std::string& filename )
   {
-    unsigned int length = FORMAT_EXTENSIONS[i].extension.size();
-    if((filename.size() > length) &&
-       (0 == filename.compare(filename.size() - length, length, FORMAT_EXTENSIONS[i].extension)))
+    FileFormats format = FORMAT_UNKNOWN;
+
+    for ( unsigned int i = 0; i < FORMAT_EXTENSIONS_COUNT; ++i )
     {
-      format = FORMAT_EXTENSIONS[i].format;
-      break;
+      unsigned int length = FORMAT_EXTENSIONS[i].extension.size();
+      if ( ( filename.size() > length ) &&
+           ( 0 == filename.compare( filename.size() - length, length, FORMAT_EXTENSIONS[i].extension ) ) )
+      {
+        format = FORMAT_EXTENSIONS[i].format;
+        break;
+      }
     }
+    return format;
   }
-  return format;
-}
 
-} // namespace
+}
 
 TizenImageLoader::TizenImageLoader()
 {
@@ -102,11 +105,11 @@ TizenImageLoader::~TizenImageLoader()
 {
 }
 
-const Dali::ImageLoader::BitmapLoader* TizenImageLoader::BitmapLoaderLookup(const std::string& filename) const
+const Dali::ImageLoader::BitmapLoader* TizenImageLoader::BitmapLoaderLookup( const std::string& filename ) const
 {
-  const Dali::ImageLoader::BitmapLoader* lookupPtr = BITMAP_LOADER_LOOKUP_TABLE;
-  FileFormats                            format    = GetFormatHint(filename);
-  if(format != FORMAT_UNKNOWN)
+  const Dali::ImageLoader::BitmapLoader *lookupPtr = BITMAP_LOADER_LOOKUP_TABLE;
+  FileFormats format =  GetFormatHint( filename );
+  if ( format != FORMAT_UNKNOWN )
   {
     lookupPtr = BITMAP_LOADER_LOOKUP_TABLE + format;
     return lookupPtr;
@@ -120,3 +123,4 @@ const Dali::ImageLoader::BitmapLoader* TizenImageLoader::BitmapLoaderLookup(cons
 } // namespace Plugin
 
 } // namespace Dali
+

diff --git a/packaging/dali-extension.spec b/packaging/dali-extension.spec
index 74013a64bd2e11dd59b5935ed91986b47152d787..f5c11f739826809218d9a317deb8975929776c12 100755 (executable)
--- a/packaging/dali-extension.spec
+++ b/packaging/dali-extension.spec
@@ -43,14 +43,11 @@ BuildRequires:  pkgconfig(dali2-adaptor)
 BuildRequires:  pkgconfig(dali2-toolkit)
 BuildRequires:  pkgconfig(dlog)
 
-BuildRequires:  pkgconfig(dali2-adaptor-integration)
-BuildRequires:  pkgconfig(ecore-wl2)
-
 # For evas-plugin
-%if 0%{?enable_evas_plugin}
+BuildRequires:  pkgconfig(dali2-adaptor-integration)
 BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(evas)
-%endif
+BuildRequires:  pkgconfig(ecore-wl2)
 
 %if 0%{?tizen_65_or_greater}
 BuildRequires:  pkgconfig(rive_tizen)
@@ -216,6 +213,9 @@ Header & package configuration of rive-animation-view
 %define dali_data_ro_dir         %TZ_SYS_RO_SHARE/dali/
 %define dev_include_path %{_includedir}
 
+# Use Image Loader Plugin
+%define use_image_loader 0
+
 ##############################
 # Build
 ##############################
@@ -254,18 +254,13 @@ autoreconf --install
 %endif
 %if 0%{?enable_web_engine_plugin} == 1
            --enable-web-engine-plugin \
-%endif
-%if 0%{?enable_image_loader}
-           --enable-imageloader-extension \
-%endif
-%if 0%{?enable_color_controller}
-           --enable-color-controller \
-%endif
-%if 0%{?enable_evas_plugin}
-           --enable-evas-plugin \
 %endif
            --enable-ecore-wl2 \
            --enable-keyextension
+%if 0%{?use_image_loader}
+%configure \
+           --enable-imageloader-extension
+%endif
 
 make %{?jobs:-j%jobs}
 
@@ -320,11 +315,9 @@ popd
 exit 0
 %endif
 
-%if 0%{?enable_image_loader}
 %post image-loader-plugin
 /sbin/ldconfig
 exit 0
-%endif
 
 %if 0%{?tizen_55_or_greater}
 %post vector-animation-renderer-plugin
@@ -338,11 +331,9 @@ exit 0
 exit 0
 %endif
 
-%if 0%{?enable_color_controller}
 %post color-controller-plugin
 /sbin/ldconfig
 exit 0
-%endif
 
 %if 0%{?tizen_55_or_greater} && 0%{?enable_web_engine_plugin} == 1
 %post web-engine-lwe-plugin
@@ -381,11 +372,9 @@ exit 0
 exit 0
 %endif
 
-%if 0%{?enable_image_loader}
 %postun image-loader-plugin
 /sbin/ldconfig
 exit 0
-%endif
 
 %if 0%{?tizen_55_or_greater}
 %postun vector-animation-renderer-plugin
@@ -399,11 +388,9 @@ exit 0
 exit 0
 %endif
 
-%if 0%{?enable_color_controller}
 %postun color-controller-plugin
 /sbin/ldconfig
 exit 0
-%endif
 
 %if 0%{?tizen_55_or_greater} && 0%{?enable_web_engine_plugin} == 1
 %postun web-engine-lwe-plugin
@@ -455,7 +442,7 @@ exit 0
 %license LICENSE
 %endif
 
-%if 0%{?enable_image_loader}
+%if 0%{?use_image_loader}
 %files image-loader-plugin
 %manifest dali-extension.manifest
 %defattr(-,root,root,-)
@@ -484,13 +471,11 @@ exit 0
 %{_libdir}/pkgconfig/dali2-extension-rive-animation-view.pc
 %endif
 
-%if 0%{?enable_color_controller}
 %files color-controller-plugin
 %manifest dali-extension.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libdali2-color-controller-plugin.so*
 %license LICENSE
-%endif
 
 %if 0%{?tizen_55_or_greater} && 0%{?enable_web_engine_plugin} == 1
 %files web-engine-lwe-plugin