[Spark] package src changed to original instead fork

Author: HaseenaSainul

package/pxcore-libnode/pxcore-libnode.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PXCORE_LIBNODE_VERSION = f8a3e47e4e8e9bb0fcef5ae89e465a15235d8bec
+PXCORE_LIBNODE_VERSION = 4580fa4cb35a1f5aa72fdf9d2e09207b2f11d122
 PXCORE_LIBNODE_SITE_METHOD = git
 PXCORE_LIBNODE_SITE = git://github.com/pxscene/pxCore
 PXCORE_LIBNODE_DEPENDENCIES = host-python openssl

package/rtcore/rtcore.mk

@@ -3,7 +3,7 @@
 # rtcore
 #
 ################################################################################
-RTCORE_VERSION = 65b261180bd189248bd3c69933fb369109080dcf
+RTCORE_VERSION = 4580fa4cb35a1f5aa72fdf9d2e09207b2f11d122
 RTCORE_SITE_METHOD = git
 RTCORE_SITE = git://github.com/pxscene/pxCore
 RTCORE_INSTALL_STAGING = YES

package/spark/0002-pxScene-disable-2DMultisampleEXT.patch

@@ -0,0 +1,13 @@
+diff --git a/examples/pxScene2d/src/pxContextGL.cpp b/examples/pxScene2d/src/pxContextGL.cpp
+index aef118b..d24b083 100644
+--- a/examples/pxScene2d/src/pxContextGL.cpp
++++ b/examples/pxScene2d/src/pxContextGL.cpp
+@@ -504,7 +504,7 @@ public:
+ #if (defined(PX_PLATFORM_WAYLAND_EGL) || defined(PX_PLATFORM_GENERIC_EGL)) && !defined(PXSCENE_DISABLE_PXCONTEXT_EXT)
+       if (mAntiAliasing)
+       {
+-        glFramebufferTexture2DMultisampleEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTextureId, 0, 2);
++        //glFramebufferTexture2DMultisampleEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTextureId, 0, 2);
+       }
+ #endif
+ 

package/spark/0003-pxScene-init.js-path-configurable.patch

@@ -0,0 +1,15 @@
+diff --git a/examples/pxScene2d/src/pxScene2d.cpp b/examples/pxScene2d/src/pxScene2d.cpp
+index e19a7d4..b9f6f42 100644
+--- a/examples/pxScene2d/src/pxScene2d.cpp
++++ b/examples/pxScene2d/src/pxScene2d.cpp
+@@ -2980,7 +2980,9 @@ void pxScriptView::runScript()
+     mReady = new rtPromise();
+ #endif
+ 
+-    mCtx->runFile("init.js");
++    string s = getenv("PXSCENE_PATH");
++    s.append("init.js");
++    mCtx->runFile(s.c_str());
+ 
+     char buffer[MAX_URL_SIZE + 50];
+     memset(buffer, 0, sizeof(buffer));

package/spark/0004-pxScriptView-getScene-scope-change-to-public.patch

@@ -0,0 +1,19 @@
+diff --git a/examples/pxScene2d/src/pxScene2d.h b/examples/pxScene2d/src/pxScene2d.h
+index 91abfd9..089e0af 100644
+--- a/examples/pxScene2d/src/pxScene2d.h
++++ b/examples/pxScene2d/src/pxScene2d.h
+@@ -652,12 +652,13 @@ public:
+   rtError suspend(const rtValue& v, bool& b);
+   rtError resume(const rtValue& v, bool& b);
+   rtError textureMemoryUsage(rtValue& v);
++
++  static rtError getScene(int /*numArgs*/, const rtValue* /*args*/, rtValue* result, void* ctx);
+   
+ protected:
+ 
+   static rtError printFunc(int /*numArgs*/, const rtValue* /*args*/, rtValue* result, void* ctx);
+ 
+-  static rtError getScene(int /*numArgs*/, const rtValue* /*args*/, rtValue* result, void* ctx);
+   static rtError makeReady(int /*numArgs*/, const rtValue* /*args*/, rtValue* result, void* ctx);
+ 
+   static rtError getContextID(int /*numArgs*/, const rtValue* /*args*/, rtValue* result, void* /*ctx*/);

package/spark/Spark.pc

@@ -7,5 +7,5 @@ Name: Spark
 Description: Spark
 Requires:
 Version: 1.0
-Libs: -L${libdir} -lpxCore -lSpark
+Libs: -L${libdir} -lrtCore -lSpark
 Cflags: -I${includedir}

package/spark/spark.mk

@@ -3,16 +3,15 @@
 # spark
 #
 ################################################################################
-SPARK_VERSION = c41e786db26ceddc472dd6eb1ab27359de74092d
+SPARK_VERSION = 4580fa4cb35a1f5aa72fdf9d2e09207b2f11d122
 SPARK_SITE_METHOD = git
-SPARK_SITE = git://github.com/HaseenaSainul/pxCore
+SPARK_SITE = git://github.com/pxscene/pxCore
 SPARK_INSTALL_STAGING = YES
 
 SPARK_DEPENDENCIES = openssl freetype westeros util-linux libpng libcurl pxcore-libnode
 
-export HOSTNAME = "raspberrypi"
-
 SPARK_CONF_OPTS += \
+    -DBUILD_SHARED_LIBS=OFF \
     -DBUILD_WITH_WAYLAND=ON \
     -DBUILD_WITH_WESTEROS=ON \
     -DBUILD_WITH_TEXTURE_USAGE_MONITORING=ON \
@@ -24,14 +23,11 @@ SPARK_CONF_OPTS += \
     -DPXCORE_MATRIX_HELPERS=OFF \
     -DBUILD_PXWAYLAND_SHARED_LIB=OFF \
     -DBUILD_PXWAYLAND_STATIC_LIB=OFF \
-    -DPXCORE_ESSOS=ON \
-    -DBUILD_PXSCENE_ESSOS=ON \
     -DPREFER_SYSTEM_LIBRARIES=ON \
     -DDISABLE_TURBO_JPEG=ON \
     -DDISABLE_DEBUG_MODE=ON \
     -DSPARK_BACKGROUND_TEXTURE_CREATION=ON \
     -DSPARK_ENABLE_LRU_TEXTURE_EJECTION=OFF \
-    -DHOSTNAME=raspberrypi \
     -DSUPPORT_DUKTAPE=OFF \
     -DBUILD_DUKTAPE=ON
 
@@ -57,13 +53,13 @@ else
 SPARK_CONF_OPTS += \
     -DBUILD_RTCORE_LIBS=ON \
     -DBUILD_RTCORE_STATIC_LIB=OFF
-endif
 
-define SPARK_INSTALL_LIBS
-    $(INSTALL) -m 755 $(@D)/build/egl/libpxCore.so $(1)/usr/lib/
+define RTCORE_INSTALL_LIBS
     $(INSTALL) -m 755 $(@D)/build/egl/librtCore.so $(1)/usr/lib/
 endef
 
+endif
+
 SPARK_INSTALL_PATH = usr/share/WPEFramework/Spark
 define SPARK_INSTALL_DEPS
     mkdir -p $(TARGET_DIR)/$(SPARK_INSTALL_PATH)
@@ -82,16 +78,15 @@ define SPARK_INSTALL_DEPS
 endef
 
 ifeq ($(BR2_PACKAGE_SPARK_LIB), y)
-
-ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+ifeq ($(BR2_PACKAGE_WESTEROS), y)
 define SPARK_INSTALL_PX_NATIVE_WINDOW
-    mkdir -p $(STAGING_DIR)/usr/include/spark/gles
-    cp -ar $(@D)/src/gles/*.h $(STAGING_DIR)/usr/include/spark/gles/
+    mkdir -p $(STAGING_DIR)/usr/include/spark/wayland_egl
+    cp -ar $(@D)/src/wayland_egl/*.h $(STAGING_DIR)/usr/include/spark/wayland_egl/
 endef
 endif
 
 define SPARK_INSTALL_STAGING_CMDS
-    $(call SPARK_INSTALL_LIBS, $(STAGING_DIR))
+    $(call RTCORE_INSTALL_LIBS, $(STAGING_DIR))
     cp -ar $(@D)/src/*.h $(STAGING_DIR)/usr/include/
     mkdir -p $(STAGING_DIR)/usr/include/spark
     cp -ar $(@D)/examples/pxScene2d/src/*.h $(STAGING_DIR)/usr/include/spark/
@@ -113,7 +108,7 @@ endef
 
 define SPARK_INSTALL_TARGET_CMDS
     $(SPARK_INSTALL_DEPS)
-    $(call SPARK_INSTALL_LIBS, $(TARGET_DIR))
+    $(call RTCORE_INSTALL_LIBS, $(TARGET_DIR))
     $(INSTALL) -m 755 $(@D)/examples/pxScene2d/src/Spark $(TARGET_DIR)/usr/bin
 endef
 endif

package/wpe/wpeframework-plugins/wpeframework-plugins.mk

@@ -335,9 +335,9 @@ else
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_SPARK_AUTOSTART=false
 endif
 
-ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLATFORM_LINUX=ON
-WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLATFORM_GENERIC_EGL=ON
+ifeq ($(BR2_PACKAGE_WESTEROS),y)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLATFORM_WAYLAND_EGL=ON
 endif
 endif