Skip to content

Commit ce6721e

Browse files
Sid2001-makersid-TEL
authored andcommitted
RDKEMW-3109:Build latest rdknativescript for ubuntu
Reason for change: Cleaned up the code Test Procedure: build should be successful. Risks: low Priority: P2
1 parent faa5adb commit ce6721e

10 files changed

+1129
-0
lines changed

externals/aamp.diff

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
/**
2+
* If not stated otherwise in this file or this component's LICENSE
3+
* file the following copyright and licenses apply:
4+
*
5+
* Copyright 2024 RDK Management
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
**/
19+
20+
diff --git a/CMakeLists.txt b/CMakeLists.txt
21+
index 900f60b05..57ac3da3a 100755
22+
--- a/CMakeLists.txt
23+
+++ b/CMakeLists.txt
24+
@@ -111,9 +111,10 @@ endif()
25+
26+
if(CMAKE_WPEWEBKIT_JSBINDINGS)
27+
message("CMAKE_WPEWEBKIT_JSBINDINGS is set, Finding JavaScriptCore")
28+
- pkg_search_module(PC_WPE_WEBKIT wpe-webkit-deprecated-0.1 wpe-webkit-1.0 wpe-webkit-1.1)
29+
- find_path (JSC_INCDIR JavaScriptCore/JavaScript.h HINTS ${PC_WPE_WEBKIT_INCLUDEDIR} ${PC_WPE_WEBKIT_INCLUDE_DIRS})
30+
- include_directories(${JSC_INCDIR})
31+
+# pkg_search_module(PC_WPE_WEBKIT wpe-webkit-deprecated-0.1 wpe-webkit-1.0 wpe-webkit-1.1)
32+
+# find_path (JSC_INCDIR JavaScriptCore/JavaScript.h HINTS ${PC_WPE_WEBKIT_INCLUDEDIR} ${PC_WPE_WEBKIT_INCLUDE_DIRS})
33+
+# include_directories(${JSC_INCDIR})
34+
+ include_directories($ENV{EXT_INSTALL_PATH})
35+
else()
36+
message("CMAKE_WPEWEBKIT_JSBINDINGS not set")
37+
endif()
38+
@@ -658,7 +659,7 @@ endif()
39+
if(CMAKE_WPEWEBKIT_JSBINDINGS)
40+
message("CMAKE_WPEWEBKIT_JSBINDINGS set, creating jsbinding library")
41+
include_directories(${CMAKE_CURRENT_SOURCE_DIR} jsbindings jsbindings/PersistentWatermark)
42+
- add_subdirectory(test)
43+
+# add_subdirectory(test)
44+
set(JSBINDINGS_STD_SOURCES jsbindings/jscontroller-jsbindings.cpp jsbindings/jsbindings.cpp jsbindings/jsutils.cpp jsbindings/jsmediaplayer.cpp jsbindings/jseventlistener.cpp jsbindings/jsevent.cpp jsbindings/PersistentWatermark/PersistentWatermark.cpp)
45+
if(CMAKE_WPEWEBKIT_WATERMARK_JSBINDINGS)
46+
add_library(aampjsbindings SHARED ${JSBINDINGS_STD_SOURCES} jsbindings/PersistentWatermark/PersistentWatermarkDisplaySequencer.cpp jsbindings/PersistentWatermark/PersistentWatermarkEventHandler.cpp jsbindings/PersistentWatermark/PersistentWatermarkPluginAccess.cpp jsbindings/PersistentWatermark/PersistentWatermarkStorage.cpp)
47+
@@ -686,7 +687,8 @@ if(CMAKE_AUXILIARY_AUDIO_ENABLED)
48+
endif()
49+
50+
message("LIB_AAMP_DEPENDS is ${LIBAAMP_DEPENDS}")
51+
-target_link_libraries(aamp ${LIBAAMP_DEPENDS} ${LIBAAMP_MOCK_DEPENDS})
52+
+#target_link_libraries(aamp ${LIBAAMP_DEPENDS} ${LIBAAMP_MOCK_DEPENDS})
53+
+target_link_libraries(aamp -L$ENV{EXT_INSTALL_PATH}/lib ${LIBAAMP_DEPENDS} ${LIBAAMP_MOCK_DEPENDS})
54+
55+
if (CMAKE_WPEFRAMEWORK_REQUIRED)
56+
set(LIBAAMP_DEFINES "${LIBAAMP_DEFINES} -DUSE_CPP_THUNDER_PLUGIN_ACCESS")
57+
@@ -728,7 +730,9 @@ set(GSTTESTHARNESS_SOURCES test/gstTestHarness/gst-port.cpp
58+
test/gstTestHarness/string_utils.cpp)
59+
60+
add_executable(gstTestHarness ${GSTTESTHARNESS_HEADERS} ${GSTTESTHARNESS_SOURCES})
61+
-target_link_libraries(gstTestHarness ${GSTTESTHARNESS_DEPENDS} "-lreadline")
62+
+#target_link_libraries(gstTestHarness ${GSTTESTHARNESS_DEPENDS} "-lreadline")
63+
+target_link_libraries(gstTestHarness ${GSTTESTHARNESS_DEPENDS} "-L$ENV{EXT_INSTALL_PATH}/lib -lreadline")
64+
+
65+
# XCode schema target
66+
xcode_define_schema(gstTestHarness)
67+
68+
@@ -777,9 +781,9 @@ if (UTEST_ENABLED)
69+
add_subdirectory(test/utests EXCLUDE_FROM_ALL)
70+
endif()
71+
72+
-if (CMAKE_PLATFORM_UBUNTU OR CMAKE_SYSTEM_NAME STREQUAL Darwin )
73+
- install(FILES build/aampcli-run-subtec.sh DESTINATION bin)
74+
-endif()
75+
+#if (CMAKE_PLATFORM_UBUNTU OR CMAKE_SYSTEM_NAME STREQUAL Darwin )
76+
+# install(FILES build/aampcli-run-subtec.sh DESTINATION bin)
77+
+#endif()
78+
79+
message("LIBAAMP_DEFINES is ${LIBAAMP_DEFINES}")
80+
message("LIBAAMP_SOURCES is ${LIBAAMP_SOURCES}")

externals/aampmetrics.diff

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/**
2+
* If not stated otherwise in this file or this component's LICENSE
3+
* file the following copyright and licenses apply:
4+
*
5+
* Copyright 2024 RDK Management
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
**/
19+
20+
diff --git a/CMakeLists.txt b/CMakeLists.txt
21+
index eaeec84..fbf1341 100644
22+
--- a/CMakeLists.txt
23+
+++ b/CMakeLists.txt
24+
@@ -52,7 +52,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
25+
link_directories(${LIBCJSON_LIBRARY_DIRS})
26+
endif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
27+
28+
-target_link_libraries(metrics "-lcjson")
29+
+target_link_libraries(metrics "-L$ENV{EXT_INSTALL_PATH}/lib -lcjson")
30+
31+
set_target_properties(metrics PROPERTIES PUBLIC_HEADER "IPVideoStat.h;CMCDHeaders.h;VideoCMCDHeaders.h;AudioCMCDHeaders.h;SubtitleCMCDHeaders.h;ManifestCMCDHeaders.h")
32+
install(TARGETS metrics DESTINATION lib PUBLIC_HEADER DESTINATION include)

0 commit comments

Comments
 (0)