Skip to content

Commit 1fd3da0

Browse files
committed
Adding Westeros Packages to the main branch!
1 parent 36e2b8d commit 1fd3da0

19 files changed

+527
-0
lines changed

package/Config.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ endif
351351
source "package/tekui/Config.in"
352352
source "package/weston/Config.in"
353353
source "package/weston-imx/Config.in"
354+
source "package/westeros/Config.in"
354355
source "package/x11r7/Config.in"
355356

356357
comment "X applications"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
config BR2_PACKAGE_WESTEROS_SIMPLEBUFFER
2+
bool "westeros-simplebuffer"
3+
select BR2_PACKAGE_WAYLAND
4+
select BR2_PACKAGE_WAYLAND_PROTOCOLS
5+
help
6+
http://wayland.freedesktop.org/
7+
8+
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
################################################################################
2+
#
3+
# westeros-simplebuffer
4+
#
5+
################################################################################
6+
7+
WESTEROS_SIMPLEBUFFER_VERSION = 521af113012e1b77cc4dfaaaff076bff3d017745
8+
WESTEROS_SIMPLEBUFFER_SITE_METHOD = git
9+
WESTEROS_SIMPLEBUFFER_SITE = git://github.com/rdkcmf/westeros
10+
WESTEROS_SIMPLEBUFFER_INSTALL_STAGING = YES
11+
WESTEROS_SIMPLEBUFFER_SUBDIR = simplebuffer/
12+
WESTEROS_SIMPLEBUFFER_AUTORECONF = YES
13+
WESTEROS_SIMPLEBUFFER_AUTORECONF_OPTS = "-Icfg"
14+
15+
WESTEROS_SIMPLEBUFFER_DEPENDENCIES = wayland libglib2
16+
17+
define WESTEROS_SIMPLEBUFFER_RUN_AUTOCONF
18+
mkdir -p $(@D)/simplebuffer/cfg
19+
mkdir -p $(@D)/simplebuffer/m4
20+
endef
21+
WESTEROS_SIMPLEBUFFER_PRE_CONFIGURE_HOOKS += WESTEROS_SIMPLEBUFFER_RUN_AUTOCONF
22+
23+
define WESTEROS_SIMPLEBUFFER_BUILD_CMDS
24+
SCANNER_TOOL=${HOST_DIR}/usr/bin/wayland-scanner $(MAKE) -C $(@D)/simplebuffer/protocol
25+
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/simplebuffer
26+
endef
27+
28+
define WESTEROS_SIMPLEBUFFER_INSTALL_STAGING_CMDS
29+
install -Dm 0644 $(@D)/simplebuffer/protocol/simplebuffer-client-protocol.h ${STAGING_DIR}/usr/include/simplebuffer-client-protocol.h
30+
$(MAKE1) -C $(@D)/simplebuffer DESTDIR=$(STAGING_DIR) install
31+
endef
32+
33+
define WESTEROS_SIMPLEBUFFER_INSTALL_TARGET_CMDS
34+
install -Dm 0644 $(@D)/simplebuffer/protocol/simplebuffer-client-protocol.h ${TARGET_DIR}/usr/include/simplebuffer-client-protocol.h
35+
$(MAKE1) -C $(@D)/simplebuffer DESTDIR=$(TARGET_DIR) install
36+
endef
37+
38+
$(eval $(autotools-package))
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
config BR2_PACKAGE_WESTEROS_SIMPLESHELL
2+
bool "westeros-simpleshell"
3+
select BR2_PACKAGE_WAYLAND
4+
select BR2_PACKAGE_WAYLAND_PROTOCOLS
5+
select BR2_PACKAGE_LIBXKBCOMMON
6+
help
7+
http://wayland.freedesktop.org/
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
################################################################################
2+
#
3+
# westeros-simpleshell
4+
#
5+
################################################################################
6+
7+
WESTEROS_SIMPLESHELL_VERSION = 521af113012e1b77cc4dfaaaff076bff3d017745
8+
WESTEROS_SIMPLESHELL_SITE_METHOD = git
9+
WESTEROS_SIMPLESHELL_SITE = git://github.com/rdkcmf/westeros
10+
WESTEROS_SIMPLESHELL_INSTALL_STAGING = YES
11+
WESTEROS_SIMPLESHELL_SUBDIR = simpleshell/
12+
WESTEROS_SIMPLESHELL_AUTORECONF = YES
13+
WESTEROS_SIMPLESHELL_AUTORECONF_OPTS = "-Icfg"
14+
15+
WESTEROS_SIMPLESHELL_DEPENDENCIES = wayland libglib2
16+
17+
define WESTEROS_SIMPLESHELL_RUN_AUTOCONF
18+
mkdir -p $(@D)/simpleshell/cfg
19+
mkdir -p $(@D)/simpleshell/m4
20+
endef
21+
WESTEROS_SIMPLESHELL_PRE_CONFIGURE_HOOKS += WESTEROS_SIMPLESHELL_RUN_AUTOCONF
22+
23+
define WESTEROS_SIMPLESHELL_BUILD_CMDS
24+
SCANNER_TOOL=${HOST_DIR}/usr/bin/wayland-scanner $(MAKE) -C $(@D)/simpleshell/protocol
25+
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/simpleshell
26+
endef
27+
28+
define WESTEROS_SIMPLESHELL_INSTALL_STAGING_CMDS
29+
$(MAKE1) -C $(@D)/simpleshell DESTDIR=$(STAGING_DIR) install
30+
endef
31+
32+
define WESTEROS_SIMPLESHELL_INSTALL_TARGET_CMDS
33+
$(MAKE1) -C $(@D)/simpleshell DESTDIR=$(TARGET_DIR) install
34+
endef
35+
36+
$(eval $(autotools-package))
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
diff --git a/brcm/Makefile.am b/brcm/Makefile.am
2+
index 2bfc998..4bebec0 100644
3+
--- a/brcm/Makefile.am
4+
+++ b/brcm/Makefile.am
5+
@@ -35,6 +35,16 @@ AM_CFLAGS = -DUSE_WESTEROS $(NEXUS_CFLAGS) $(NXCLIENT_CFLAGS) -I$(ROCKFORD_TOP)/
6+
7+
AM_LDFLAGS =
8+
9+
+if ENABLE_VC5
10+
+AM_CFLAGS += \
11+
+ -DVCX=5 \
12+
+ -I${PKG_CONFIG_SYSROOT_DIR}/usr/include/interface/khronos/include \
13+
+ -I${PKG_CONFIG_SYSROOT_DIR}/usr/include/interface/khronos/include/bcg_abstract \
14+
+ -I${PKG_CONFIG_SYSROOT_DIR}/usr/include/vcos/include
15+
+else
16+
+AM_CFLAGS += -DVCX=3
17+
+endif
18+
+
19+
lib_LTLIBRARIES = libwesteros_gl.la
20+
21+
libwesteros_gl_la_SOURCES = westeros-gl/westeros-gl.cpp
22+
diff --git a/brcm/configure.ac b/brcm/configure.ac
23+
index f18567f..78fa91e 100644
24+
--- a/brcm/configure.ac
25+
+++ b/brcm/configure.ac
26+
@@ -60,6 +60,21 @@ PKG_CHECK_MODULES([WAYLAND_SERVER],[wayland-server >= 1.6.0])
27+
WAYLANDLIB="-lwayland-client"
28+
AC_SUBST(WAYLANDLIB)
29+
30+
+ENABLE_VC5=" "
31+
+
32+
+AC_ARG_ENABLE([vc5],
33+
+ AS_HELP_STRING([--enable-vc5],[enable vc5 build]),
34+
+ [
35+
+ case "${enableval}" in
36+
+ yes) ENABLE_VC5=true ;;
37+
+ no) ENABLE_VC5=false ;;
38+
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-vc5 ]) ;;
39+
+ esac
40+
+ ],
41+
+ [echo "vc5 build is enable"])
42+
+AM_CONDITIONAL([ENABLE_VC5], [test x$ENABLE_VC5 = xtrue])
43+
+AC_SUBST(ENABLE_VC5)
44+
+
45+
AC_CONFIG_FILES([Makefile])
46+
AC_SUBST(WAYLAND_CFLAGS)
47+
AC_SUBST(GUPNP_VERSION)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/westeros-nested.cpp b/westeros-nested.cpp
2+
index b241a48..a36efe2 100644
3+
--- a/westeros-nested.cpp
4+
+++ b/westeros-nested.cpp
5+
@@ -1040,7 +1040,7 @@ void WstNestedConnectionAttachAndCommitDevice( WstNestedConnection *nc,
6+
struct wl_buffer *buffer;
7+
8+
buffer= wl_sb_create_buffer( nc->sb,
9+
- (uint32_t)deviceBuffer,
10+
+ (uintptr_t)deviceBuffer,
11+
width,
12+
height,
13+
stride,
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
diff -Nur org/brcm/westeros-sink/westeros-sink-soc.c new/brcm/westeros-sink/westeros-sink-soc.c
2+
--- org/brcm/westeros-sink/westeros-sink-soc.c 2018-01-22 11:35:30.879246883 -0500
3+
+++ new/brcm/westeros-sink/westeros-sink-soc.c 2018-01-22 15:59:12.966799192 -0500
4+
@@ -1545,6 +1545,7 @@
5+
if ( sink->videoStarted )
6+
{
7+
sink->soc.presentationStarted= TRUE;
8+
+ GST_INFO("Video decoder presentation started");
9+
}
10+
}
11+
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/brcm/westeros-sink/Makefile.am b/brcm/westeros-sink/Makefile.am
2+
index 3766f42..9d6ef99 100644
3+
--- a/brcm/westeros-sink/Makefile.am
4+
+++ b/brcm/westeros-sink/Makefile.am
5+
@@ -48,7 +48,7 @@ libwesteros_sink_la_LDFLAGS= \
6+
-lwesteros_simpleshell_client \
7+
-lwayland-egl \
8+
-lnxclient \
9+
- -lnexus
10+
+ $(NEXUSLIBS)
11+
12+
distcleancheck_listfiles = *-libtool
13+

package/westeros-sink/Config.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
config BR2_PACKAGE_WESTEROS_SINK
2+
bool "westeros-sink"
3+
select BR2_PACKAGE_WAYLAND
4+
select BR2_PACKAGE_WAYLAND_PROTOCOLS
5+
select BR2_PACKAGE_WAYLAND_EGL_BNXS if BR2_PACKAGE_HAS_NEXUS
6+
help
7+
http://wayland.freedesktop.org/
8+
9+

0 commit comments

Comments
 (0)