From: Gilbok Lee <gilbok.lee@samsung.com>
Date: Tue, 5 Mar 2024 06:20:27 +0000 (+0900)
Subject: Merge branch 'main' into ci/gilbok-lee/update_public
X-Git-Tag: accepted/tizen/unified/20240326.105045^2^2^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=660ebcfb1895d69a000a0271f2deae1c159c6bd5;p=platform%2Fcore%2Fmultimedia%2Fesplusplayer.git

Merge branch 'main' into ci/gilbok-lee/update_public
---

660ebcfb1895d69a000a0271f2deae1c159c6bd5
diff --cc include/esplusplayer_capi/esplusplayer_capi.h
index 8b07515,4f26314..51861bd
mode 100644,100755..100755
--- a/include/esplusplayer_capi/esplusplayer_capi.h
+++ b/include/esplusplayer_capi/esplusplayer_capi.h
diff --cc packaging/esplusplayer.spec
index 6f7f179,38ed4e3..a14219d
--- a/packaging/esplusplayer.spec
+++ b/packaging/esplusplayer.spec
@@@ -8,8 -7,8 +8,7 @@@
  #echo "Product Type: %{_vd_cfg_product_type}"
  Name:       esplusplayer
  Summary:    new multimedia streaming player
- Version:    1.3.3
- Release:    1
+ Version:    1.3.7
 -Release:    0
  Group:      Multimedia/Libraries
  License:    Apache-2.0
  Source0:    %{name}-%{version}.tar.gz
diff --cc src/esplusplayer/CMakeLists.txt
index e31120d,dc95d9c..6a62e6a
--- a/src/esplusplayer/CMakeLists.txt
+++ b/src/esplusplayer/CMakeLists.txt
@@@ -21,15 -21,11 +21,16 @@@ SET(${fw_name}_CXXFLAGS "-Wall -Werror 
  
  SET(dependents "gstreamer-1.0 glib-2.0 dlog"
                 "boost"
 -               "tv-resource-manager"
                 "elementary ecore ecore-wl2"
-                "jsoncpp")
+                "jsoncpp"
+                "drmdecrypt")
  
 +IF(${TIZEN_PUBLIC} STREQUAL "OFF")
 +SET(dependents ${dependents} "tv-resource-manager")
 +ELSE(${TIZEN_PUBLIC} STREQUAL "OFF")
 +SET(dependents ${dependents} "capi-media-sound-manager")
 +ENDIF(${TIZEN_PUBLIC} STREQUAL "OFF")
 +
  INCLUDE(FindPkgConfig)
  
  IF(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)
diff --cc src/esplusplayer/src/esplayer.cpp
index fa1922e,a022e13..9096ef6
mode 100644,100755..100755
--- a/src/esplusplayer/src/esplayer.cpp
+++ b/src/esplusplayer/src/esplayer.cpp
diff --cc src/plusplayer-core/src/trackrendereradapter_utils.cpp
index 8bdbdc5,5666638..bde1350
mode 100644,100755..100755
--- a/src/plusplayer-core/src/trackrendereradapter_utils.cpp
+++ b/src/plusplayer-core/src/trackrendereradapter_utils.cpp