Skip to content

Commit c9c251a

Browse files
VinodsathyaseelanVinodsathyaseelan
committed
Merge branch 'main' into development/lxc-kernel-5.10
2 parents 588f193 + 8e50b2d commit c9c251a

File tree

4 files changed

+198
-22
lines changed

4 files changed

+198
-22
lines changed

‎configs/raspberrypi3_wpe_wst_defconfig‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
BR2_arm=y
2+
BR2_cortex_a53=y
3+
BR2_ARM_FPU_NEON_VFPV4=y
4+
BR2_ARM_INSTRUCTIONS_THUMB2=y
5+
6+
BR2_TOOLCHAIN_BUILDROOT_CXX=y
7+
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
8+
9+
BR2_BINUTILS_VERSION_2_33_X=y
10+
BR2_GCC_VERSION_9_X=y
11+
12+
BR2_CCACHE=y
13+
BR2_OPTIMIZE_2=y
14+
15+
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
16+
17+
BR2_LINUX_KERNEL=y
18+
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
19+
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
20+
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
21+
BR2_LINUX_KERNEL_LZ4=y
22+
BR2_LINUX_KERNEL_DTS_SUPPORT=y
23+
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"
24+
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
25+
26+
BR2_TARGET_ROOTFS_EXT2=y
27+
BR2_TARGET_ROOTFS_EXT2_4=y
28+
BR2_TARGET_ROOTFS_EXT2_SIZE="512M"
29+
BR2_TARGET_ROOTFS_TAR=y
30+
31+
BR2_TARGET_GENERIC_ROOT_PASSWD="root"
32+
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
33+
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh"
34+
BR2_ROOTFS_POST_SCRIPT_ARGS="--rpi-wifi --add-miniuart-bt-overlay --overclock-pi3 --tvmode-720 --gpu_mem_1024=384 --add-vc4-fkms-v3d-overlay --silent --add-dtparam-audio"
35+
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
36+
37+
BR2_PACKAGE_HOST_DOSFSTOOLS=y
38+
BR2_PACKAGE_HOST_GENIMAGE=y
39+
BR2_PACKAGE_HOST_MTOOLS=y
40+
41+
BR2_PACKAGE_RPI_FIRMWARE=y
42+
BR2_PACKAGE_RPI_VERSION_RPI3=y
43+
BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
44+
45+
BR2_PACKAGE_MESA3D=y
46+
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y
47+
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
48+
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y
49+
BR2_PACKAGE_MESA3D_OPENGL_ES=y
50+
BR2_PACKAGE_KMSCUBE=y
51+
52+
BR2_PACKAGE_DROPBEAR=y
53+
BR2_PACKAGE_LIBSOUP=y
54+
BR2_PACKAGE_LIBSOUP_SSL=y
55+
BR2_PACKAGE_BITSTREAM_VERA=y
56+
BR2_PACKAGE_CA_CERTIFICATES=y
57+
BR2_PACKAGE_WEBP=y
58+
BR2_PACKAGE_ORC=y
59+
BR2_PACKAGE_SHARED_MIME_INFO=y
60+
BR2_PACKAGE_XKEYBOARD_CONFIG=y
61+
BR2_PACKAGE_RNG_TOOLS=y
62+
63+
BR2_PACKAGE_WPEBACKEND_RDK=y
64+
BR2_PACKAGE_WPEWEBKIT=y
65+
BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA=y
66+
BR2_PACKAGE_WESTEROS=y
67+
68+
BR2_PACKAGE_WPEFRAMEWORK=y
69+
BR2_PACKAGE_WPEFRAMEWORK_CDMI_CLEARKEY=y
70+
BR2_PACKAGE_WPEFRAMEWORK_COMPOSITOR=y
71+
BR2_PACKAGE_WPEFRAMEWORK_DHCPSERVER=y
72+
BR2_PACKAGE_WPEFRAMEWORK_LOCATIONSYNC=y
73+
BR2_PACKAGE_WPEFRAMEWORK_LOCATIONSYNC_URI="http://jsonip.metrological.com/?maf=true"
74+
BR2_PACKAGE_WPEFRAMEWORK_MONITOR=y
75+
BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL=y
76+
BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL_DEVINPUT=y
77+
BR2_PACKAGE_WPEFRAMEWORK_SNAPSHOT=n
78+
BR2_PACKAGE_WPEFRAMEWORK_PLAYERINFO=n
79+
BR2_PACKAGE_WPEFRAMEWORK_DISPLAYINFO=n
80+
BR2_PACKAGE_WPEFRAMEWORK_TIMESYNC=y
81+
BR2_PACKAGE_WPEFRAMEWORK_TRACECONTROL=y
82+
BR2_PACKAGE_WPEFRAMEWORK_WEBSERVER=y
83+
BR2_PACKAGE_WPEFRAMEWORK_WIFICONTROL=y
84+
85+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER=y
86+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_STARTURL="file:///www/index.html"
87+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_MEMORYPRESSURE="databaseprocess:50m,networkprocess:80m,webprocess:250m,rpcprocess:80m"
88+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_DISKCACHE="512m"
89+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_XHRCACHE=y
90+
BR2_PACKAGE_WPEFRAMEWORK_YOUTUBE=y
91+
BR2_PACKAGE_WPEFRAMEWORK_UX=y
92+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_THREADEDPAINTING="2"
93+
94+
BR2_PACKAGE_GSTREAMER1=y
95+
BR2_PACKAGE_GST1_PLUGINS_BASE=y
96+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER=y
97+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP=y
98+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER=y
99+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE=y
100+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC=y
101+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR=y
102+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING=y
103+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT=y
104+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO=y
105+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OVERLAYCOMPOSITION=y
106+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_RAWPARSE=y
107+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE=y
108+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP=y
109+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
110+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE=y
111+
BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL=y
112+
BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GBM=y
113+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA=y
114+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR=y
115+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG=y
116+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS=y
117+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO=y
118+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA=y
119+
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS=y
120+
BR2_PACKAGE_GST1_PLUGINS_GOOD=y
121+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT=y
122+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE=y
123+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX=y
124+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX=y
125+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA=y
126+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123=y
127+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
128+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
129+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC=y
130+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC=y
131+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX=y
132+
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX=y
133+
BR2_PACKAGE_GST1_PLUGINS_BAD=y
134+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX=y
135+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX=y
136+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX=y
137+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC=y
138+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
139+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL=y
140+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH=y
141+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD=y
142+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC=y
143+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS=y
144+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y
145+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y
146+
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP=y
147+
BR2_PACKAGE_GST1_PLUGINS_UGLY=y
148+
BR2_PACKAGE_GST1_VAAPI=y
149+
BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON=y
150+
151+
BR2_PACKAGE_RDKSPLASHSCREEN=y
152+
BR2_PACKAGE_RDKSPLASHSCREEN_OPERATOR="metrological"

‎package/westeros-soc/0005-Change-default-card.patch‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎package/westeros-soc/0005-Metro-westeros-gl-changes.patch‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
diff -ruN westeros-soc.orig/drm/westeros-gl/westeros-gl.c westeros-soc/drm/westeros-gl/westeros-gl.c
2+
--- westeros-soc.orig/drm/westeros-gl/westeros-gl.c 2021-06-04 21:14:52.000000000 +0530
3+
+++ westeros-soc/drm/westeros-gl/westeros-gl.c 2021-06-24 15:42:12.565757151 +0530
4+
@@ -65,7 +65,7 @@
5+
#define TRACE3(...) INT_TRACE3(__VA_ARGS__, "")
6+
#define FRAME(...) INT_FRAME(__VA_ARGS__, "")
7+
8+
-#define DEFAULT_CARD "/dev/dri/card0"
9+
+// #define DEFAULT_CARD "/dev/dri/card0"
10+
#ifdef WESTEROS_PLATFORM_QEMUX86
11+
#define DEFAULT_MODE_WIDTH (1280)
12+
#define DEFAULT_MODE_HEIGHT (1024)
13+
@@ -3627,10 +3627,12 @@
14+
drmver->desc_len, drmver->desc );
15+
16+
len= strlen( drmver->name );
17+
- if ( (len == 5) && !strncmp( drmver->name, "meson", len ) )
18+
+ if ( ((len == 5) && !strncmp( drmver->name, "meson", len )) ||
19+
+ ((len == 3) && !strncmp( drmver->name, "vc4", len )) )
20+
{
21+
#ifdef USE_REFRESH_LOCK
22+
- if ( getenv("WESTEROS_GL_USE_REFRESH_LOCK") )
23+
+ // if ( getenv("WESTEROS_GL_USE_REFRESH_LOCK") )
24+
+ if (true)
25+
{
26+
g_useRefreshLock= true;
27+

‎package/wpe/wpewebkit/wpewebkit.mk‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,26 @@ WPEWEBKIT_FLAGS = \
3434
-DEXPORT_DEPRECATED_WEBKIT2_C_API=ON \
3535
-DENABLE_ACCELERATED_2D_CANVAS=ON \
3636
-DENABLE_GEOLOCATION=OFF \
37-
-DENABLE_DEVICE_ORIENTATION=ON \
38-
-DENABLE_GAMEPAD=ON \
39-
-DENABLE_SUBTLE_CRYPTO=ON \
40-
-DENABLE_FULLSCREEN_API=ON \
41-
-DENABLE_NOTIFICATIONS=ON \
42-
-DENABLE_DATABASE_PROCESS=ON \
43-
-DENABLE_INDEXED_DATABASE=ON \
44-
-DENABLE_MEDIA_STATISTICS=ON \
45-
-DENABLE_FETCH_API=ON \
37+
-DENABLE_DEVICE_ORIENTATION=OFF \
38+
-DENABLE_GAMEPAD=OFF \
39+
-DENABLE_SUBTLE_CRYPTO=OFF \
40+
-DENABLE_FULLSCREEN_API=OFF \
41+
-DENABLE_NOTIFICATIONS=OFF \
42+
-DENABLE_DATABASE_PROCESS=OFF \
43+
-DENABLE_INDEXED_DATABASE=OFF \
44+
-DENABLE_MEDIA_STATISTICS=OFF \
45+
-DENABLE_FETCH_API=OFF \
4646
-DENABLE_WEBDRIVER=ON \
47-
-DENABLE_SAMPLING_PROFILER=ON
47+
-DENABLE_SAMPLING_PROFILER=ON \
48+
-DENABLE_TOUCH_EVENTS=OFF \
49+
-DENABLE_FTL_JIT=OFF \
50+
-DENABLE_MATHML=OFF \
51+
-DENABLE_METER_ELEMENT=OFF \
52+
-DENABLE_SVG_FONTS=OFF \
53+
-DENABLE_WEBASSEMBLY=OFF
54+
55+
56+
4857

4958
WPEWEBKIT_DEPENDENCIES += gstreamer1 gst1-plugins-base \
5059
gst1-plugins-good gst1-plugins-bad

0 commit comments

Comments
 (0)