Skip to content

Commit 62d114f

Browse files
author
Neeraj Deshpande
committed
Merge branch 'main' into main-update
2 parents f488f17 + 04b5255 commit 62d114f

File tree

12 files changed

+116
-7
lines changed

12 files changed

+116
-7
lines changed

‎package/explora-sdk/explora-sdk.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# explora-sdk
44
#
55
################################################################################
6-
EXPLORA_SDK_VERSION = bcm7267
6+
EXPLORA_SDK_VERSION = bcm7267_19.2.2
77
EXPLORA_SDK_SITE = [email protected]:Metrological/SDK_Explora.git
88
EXPLORA_SDK_SITE_METHOD = git
99
EXPLORA_SDK_INSTALL_STAGING = YES

‎package/glibc/2.24/gcc8_backporting.patch‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
--- glibc-2.24/misc/regexp.c_bkp 2021-10-11 01:25:18.503972709 -0700
2+
+++ glibc-2.24/misc/regexp.c 2021-10-11 01:26:28.256366941 -0700
3+
@@ -30,13 +30,13 @@
4+
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23)
5+
6+
/* Define the variables used for the interface. */
7+
-char *loc1;
8+
-char *loc2;
9+
+char *loc1 __attribute__ ((nocommon));
10+
+char *loc2 __attribute__ ((nocommon));
11+
compat_symbol (libc, loc1, loc1, GLIBC_2_0);
12+
compat_symbol (libc, loc2, loc2, GLIBC_2_0);
13+
14+
/* Although we do not support the use we define this variable as well. */
15+
-char *locs;
16+
+char *locs __attribute__ ((nocommon));
17+
compat_symbol (libc, locs, locs, GLIBC_2_0);
18+
19+

‎package/glibc/2.24/glibc.hash‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Locally calculated (fetched from Github)
2+
sha256 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 glibc-2.24.tar.xz
3+

‎package/glibc/Config.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ if BR2_TOOLCHAIN_BUILDROOT_GLIBC
22

33
comment "Glibc Options"
44

5+
config BR2_PACKAGE_GLIBC_LEGACY
6+
bool "2.24"
7+
default n
8+
help
9+
"For Legacy deployments, Use Glibc2.24."
10+
511
config BR2_PACKAGE_GLIBC
612
bool
713
default y

‎package/glibc/glibc.mk‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ GLIBC_SITE = $(call github,riscv,riscv-glibc,$(GLIBC_VERSION))
1313
else ifeq ($(BR2_csky),y)
1414
GLIBC_VERSION = 7630ed2fa60caea98f500e4a7a51b88f9bf1e176
1515
GLIBC_SITE = $(call github,c-sky,glibc,$(GLIBC_VERSION))
16+
else ifeq ($(BR2_PACKAGE_GLIBC_LEGACY),y)
17+
GLIBC_VERSION = 2.24
18+
GLIBC_SITE = $(BR2_GNU_MIRROR)/libc
19+
GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.xz
20+
GLIBC_SRC_SUBDIR = .
1621
else
1722
# Generate version string using:
1823
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
@@ -119,8 +124,8 @@ define GLIBC_CONFIGURE_CMDS
119124
# Do the configuration
120125
(cd $(@D)/build; \
121126
$(TARGET_CONFIGURE_OPTS) \
122-
CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \
123-
CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \
127+
CFLAGS="-Wno-error -O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \
128+
CXXFLAGS="-Wno-error -O2 $(GLIBC_EXTRA_CFLAGS)" \
124129
$(GLIBC_CONF_ENV) \
125130
$(SHELL) $(@D)/configure \
126131
--target=$(GNU_TARGET_NAME) \

‎package/gstreamer1/Config.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ if BR2_PACKAGE_GSTREAMER1
55
source "package/gstreamer1/gst1-bcm/Config.in"
66
source "package/gstreamer1/gst1-aamp/Config.in"
77
source "package/gstreamer1/gstreamer1-mm/Config.in"
8+
source "package/gstreamer1/gst1-cencdecrypt/Config.in"
89
source "package/gstreamer1/gst1-plugins-base/Config.in"
910
source "package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in"
1011
source "package/gstreamer1/gst1-plugins-good/Config.in"

‎package/gstreamer1/gst1-cencdecrypt/Config.in‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
config BR2_PACKAGE_GST1_CENCDECRYPT
2+
bool "gst1-cencdecrypt"
3+
help
4+
GStreamer plug-in to use OpenCDMI CDM decrypt functionalities.
5+

‎package/gstreamer1/gst1-cencdecrypt/gst1-cencdecrypt.mk‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
GST1_CENCDECRYPT_VERSION = dad6b3e32783f8c127eddf824813d8e9725f579f
2+
GST1_CENCDECRYPT_SITE = [email protected]:WebPlatformForEmbedded/gstcencdecryptor.git
3+
GST1_CENCDECRYPT_SITE_METHOD = git
4+
GST1_CENCDECRYPT_INSTALL_STAGING = YES
5+
GST1_CENCDECRYPT_DEPENDENCIES = gstreamer1 wpeframework wpeframework-clientlibraries libcurl
6+
7+
$(eval $(cmake-package))

‎package/libepoxy/0001_make_graphic_libs_configureble.patch‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
diff --git a/src/dispatch_common.c b/src/dispatch_common.c
2+
index b3e4f5f..538d468 100644
3+
--- a/src/dispatch_common.c
4+
+++ b/src/dispatch_common.c
5+
@@ -173,6 +173,9 @@
6+
7+
#include "dispatch_common.h"
8+
9+
+#define xstr(s) str(s)
10+
+#define str(s) #s
11+
+
12+
#if defined(__APPLE__)
13+
#define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
14+
#define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL"
15+
@@ -190,10 +193,10 @@
16+
#define OPENGL_LIB "OPENGL32"
17+
#else
18+
#define GLVND_GLX_LIB "libGLX.so.1"
19+
-#define GLX_LIB "libGL.so.1"
20+
-#define EGL_LIB "libEGL.so.1"
21+
-#define GLES1_LIB "libGLESv1_CM.so.1"
22+
-#define GLES2_LIB "libGLESv2.so.2"
23+
+#define GLX_LIB xstr(GLX_LIB_NAME)
24+
+#define EGL_LIB xstr(EGL_LIB_NAME)
25+
+#define GLES1_LIB xstr(GLES1_LIB_NAME)
26+
+#define GLES2_LIB xstr(GLES2_LIB_NAME)
27+
#define OPENGL_LIB "libOpenGL.so.0"
28+
#endif
29+

‎package/libepoxy/libepoxy.mk‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,35 @@ else
2121
LIBEPOXY_CONF_OPTS += -Degl=no
2222
endif
2323

24+
ifeq ($(BR2_PACKAGE_HAS_NEXUS),y)
25+
26+
ifeq ($(BR2_PACKAGE_EXPLORA_SDK),y)
27+
LIBEPOXY_DEPENDENCIES += explora-sdk
28+
endif
29+
30+
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_COMPOSITORCLIENT)$(BR2_PACKAGE_WESTEROS),yy)
31+
LIBEPOXY_CFLAGS += -DGLX_LIB_NAME=libwayland-egl.so \
32+
-DEGL_LIB_NAME=libwayland-egl.so \
33+
-DGLES1_LIB_NAME=libwayland-egl.so \
34+
-DGLES2_LIB_NAME=libwayland-egl.so
35+
else
36+
LIBEPOXY_CFLAGS += -DGLX_LIB_NAME=libv3ddriver.so \
37+
-DEGL_LIB_NAME=libv3ddriver.so \
38+
-DGLES1_LIB_NAME=libv3ddriver.so \
39+
-DGLES2_LIB_NAME=libv3ddriver.so
40+
endif
41+
else ifeq ($(BR2_PACKAGE_HORIZON_SDK),y)
42+
LIBEPOXY_CFLAGS += -DGLX_LIB_NAME=libGLESv2.so \
43+
-DEGL_LIB_NAME=libEGL.so \
44+
-DGLES1_LIB_NAME=libGLESv1_CM.so \
45+
-DGLES2_LIB_NAME=libGLESv2.so
46+
else
47+
LIBEPOXY_CFLAGS += -DGLX_LIB_NAME=libGL.so.1 \
48+
-DEGL_LIB_NAME=libEGL.so.1 \
49+
-DGLES1_LIB_NAME=libGLESv1_CM.so.1 \
50+
-DGLES2_LIB_NAME=libGLESv2.so.2
51+
endif
52+
2453
ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_XLIB_LIBX11),yy)
2554
LIBEPOXY_CONF_OPTS += -Dglx=yes -Dx11=true
2655
LIBEPOXY_DEPENDENCIES += libgl xlib_libX11

0 commit comments

Comments
 (0)