Remove intel drm

Change-Id: I6429681697f13c58bf2ef3b34b43205ce95255a7
Signed-off-by: Duyoung Jang <duyoung.jang@samsung.com>

diff --git a/.cproject b/.cproject
index 8e44f08..eec7949 100755 (executable)
--- a/.cproject
+++ b/.cproject
@@ -47,7 +47,6 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/drm-intel&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;../../osp-appfw/src/base/inc&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;../../osp-appfw/src/app/inc&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;../../osp-appfw/src/system/inc&quot;"/>
@@ -140,7 +139,6 @@
                                                                <option id="gnu.cpp.link.option.libs.850444138" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
                                                                        <listOptionValue builtIn="false" value="pkgmgr_parser"/>
                                                                        <listOptionValue builtIn="false" value="dl"/>
-                                                                       <listOptionValue builtIn="false" value="drm-service-core-intel"/>
                                                                        <listOptionValue builtIn="false" value="app2ext"/>
                                                                        <listOptionValue builtIn="false" value="glib-2.0"/>
                                                                        <listOptionValue builtIn="false" value="pkgmgr_installer"/>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c29818..b1f9500 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,6 @@ INCLUDE_DIRECTORIES(
        /usr/include/osp/system
        /usr/include/libxml2
        /usr/include/system
-       /usr/include/drm-intel
 )
 
 SET (${this_target}_SOURCE_FILES
@@ -78,7 +77,6 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
 SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} ${OSP_COMPILER_FLAGS}")
 
 TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw -lxml2 -lpkgmgr_installer -lpkgmgr_parser -lglib-2.0 -lapp2ext -ldl" -Wl,--allow-shlib-undefined)
-TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib -ldrm-service-core-intel")
 
 ADD_SUBDIRECTORY(plugin)
 

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index 2b390f4..ce65caa 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130322.2]"
+#define OSP_INSTALLER_VERSION "version=[20130326.1]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"

diff --git a/packaging/osp-installer.spec b/packaging/osp-installer.spec
index 0b9375e..524e618 100755 (executable)
--- a/packaging/osp-installer.spec
+++ b/packaging/osp-installer.spec
@@ -16,7 +16,6 @@ BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(app2sd)
 BuildRequires:  pkgconfig(libwbxml2)
 BuildRequires:  pkgconfig(osp-appfw)
-BuildRequires:  pkgconfig(drm-service-core-intel)
 
 BuildRequires:  osp-appfw-internal-devel
 

diff --git a/src/Util/InstallerUtil.cpp b/src/Util/InstallerUtil.cpp
index 5afc9c9..378c3a0 100755 (executable)
--- a/src/Util/InstallerUtil.cpp
+++ b/src/Util/InstallerUtil.cpp
@@ -24,7 +24,6 @@
 #include <errno.h>
 #include <unistd.h>
 #include <unique_ptr.h>
-#include <drm-oem-intel.h>
 
 #include <FBaseErrorDefine.h>
 #include <FIoFile.h>
@@ -360,56 +359,15 @@ InstallerUtil::ChangeDirectoryPermission(const String& filePath, int mode, bool
 }
 
 bool
-InstallerUtil::IsDrmFile(const Tizen::Base::String& path)
+InstallerUtil::IsDrmFile(const String& path)
 {
-       bool res = true;
-       char* pFilePath = null;
-       result r = E_SUCCESS;
-       int isDrm = 0;
-
-       pFilePath = _StringConverter::CopyToCharArrayN(path);
-       TryCatch(pFilePath, r = GetLastResult(), "pFilePath is null");
-
-       isDrm = drm_oem_intel_isDrmFile(pFilePath);
-       if(isDrm == 1)
-       {
-               AppLog("IsDrmFile() called, packagePath=[%ls] is a drm file", path.GetPointer());
-       }
-       else
-       {
-               res = false;
-       }
-
-CATCH:
-       delete [] pFilePath;
-       return res;
+       return false;
 }
 
 bool
-InstallerUtil::DecryptPackage(const Tizen::Base::String& packagePath)
+InstallerUtil::DecryptPackage(const String& packagePath)
 {
-           bool res = true;
-           char* pFilePath = null;
-           result r = E_SUCCESS;
-           int result = 0;
-
-           pFilePath = _StringConverter::CopyToCharArrayN(packagePath);
-           TryCatch(pFilePath, r = GetLastResult(), "pFilePath is null");
-
-           result = drm_oem_intel_decrypt_package(pFilePath, pFilePath);
-           if(result  == 1)
-           {
-               AppLog("DecryptPackage() called, packagePath=%ls, decrpyt success", packagePath.GetPointer());
-           }
-           else
-           {
-               AppLog("DecryptPackage() called, packagePath=%ls, decrypt failed", packagePath.GetPointer());
-               res = false;
-           }
-
-CATCH:
-           delete [] pFilePath;
-           return res;
+       return true;
 }
 
 String
@@ -588,7 +546,7 @@ InstallerUtil::DumpLogData(char *pData, int dataLen)
 
        AppLog("------------------------------------------");
 
-       return TRUE;
+       return true;
 }
 
 char