Merge branch 'main' into ci/gilbok-lee/update_public
authorGilbok Lee <gilbok.lee@samsung.com>
Tue, 5 Mar 2024 06:20:27 +0000 (15:20 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Tue, 5 Mar 2024 06:20:27 +0000 (15:20 +0900)
1  2 
include/esplusplayer_capi/esplusplayer_capi.h
packaging/esplusplayer.spec
src/esplusplayer/CMakeLists.txt
src/esplusplayer/include_internal/esplayer/esplayer.h
src/esplusplayer/src/esplayer.cpp
src/esplusplayer/src/esplusplayer_capi.cpp
src/plusplayer-core/src/trackrendereradapter_utils.cpp

@@@ -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
@@@ -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)