|
| 1 | +diff --git a/BSEAV/lib/gpu/include/EGL/eglplatform.h b/BSEAV/lib/gpu/include/EGL/eglplatform.h |
| 2 | +index b71c2d19a..2e9fe7f2e 100644 |
| 3 | +--- a/BSEAV/lib/gpu/include/EGL/eglplatform.h |
| 4 | ++++ b/BSEAV/lib/gpu/include/EGL/eglplatform.h |
| 5 | +@@ -95,6 +95,8 @@ typedef void* EGLNativeDisplayType; |
| 6 | + |
| 7 | + #elif defined(__unix__) |
| 8 | + |
| 9 | ++#define BROADCOM_PLATFORM 1 |
| 10 | ++ |
| 11 | + #ifdef BROADCOM_PLATFORM |
| 12 | + |
| 13 | + typedef void *EGLNativeDisplayType; |
| 14 | +diff --git a/BSEAV/lib/gpu/vc5/platform/nexus/platform_nexus_common.mk b/BSEAV/lib/gpu/vc5/platform/nexus/platform_nexus_common.mk |
| 15 | +index fc37e4408..8a7c0121b 100644 |
| 16 | +--- a/BSEAV/lib/gpu/vc5/platform/nexus/platform_nexus_common.mk |
| 17 | ++++ b/BSEAV/lib/gpu/vc5/platform/nexus/platform_nexus_common.mk |
| 18 | +@@ -82,7 +82,6 @@ CFLAGS += \ |
| 19 | + -mfpu=neon |
| 20 | + endif |
| 21 | + |
| 22 | +-LDFLAGS += -Wl,--no-undefined |
| 23 | + LDFLAGS += -L$(V3DDRIVER_LIB_TARGET) -lv3ddriver -lpthread |
| 24 | + |
| 25 | + ifeq ($(V3D_DEBUG),y) |
| 26 | +@@ -135,9 +134,7 @@ OUTDIR : |
| 27 | + |
| 28 | + .phony: V3DDriver |
| 29 | + V3DDriver: |
| 30 | +- $(Q)$(MAKE) --no-print-directory -C $(V3D_DIR) -f V3DDriver.mk \ |
| 31 | +- OBJDIR=$(V3DDRIVER_OBJ_TARGET) LIBDIR=$(V3DDRIVER_LIB_TARGET) \ |
| 32 | +- NEXUS_BIN_DIR=$(NEXUS_BIN_DIR) $(MAKECMDGOALS) |
| 33 | ++ $(Q)$(MAKE) --no-print-directory -C $(V3D_DIR) -f V3DDriver.mk $(MAKECMDGOALS) |
| 34 | + |
| 35 | + # $(1) = src |
| 36 | + # $(2) = obj |
| 37 | +diff --git a/magnum/basemodules/dbg/bdbg.h b/magnum/basemodules/dbg/bdbg.h |
| 38 | +index db4f40495..fa9046659 100644 |
| 39 | +--- a/magnum/basemodules/dbg/bdbg.h |
| 40 | ++++ b/magnum/basemodules/dbg/bdbg.h |
| 41 | +@@ -957,7 +957,7 @@ See Also: |
| 42 | + #else |
| 43 | + #define BDBG_ASSERT(expr) (expr) ? (void) 0 : BDBG_P_AssertFailed(#expr, BSTD_FILE, BSTD_LINE) |
| 44 | + #endif |
| 45 | +-#define BDBG_CASSERT(expr) do switch(0){case 0: case (expr):;} while(0) |
| 46 | ++#define BDBG_CASSERT(expr) do switch(0){case (expr):;} while(0) |
| 47 | + #define BDBG_CWARNING(expr) do {if(0){int unused = 1/(expr);unused++;}} while(0) |
| 48 | + #define BDBG_CWARNING_EXPR(expr) ((1/(expr)) ? 0 : 0) |
| 49 | + |
| 50 | +diff --git a/nexus/nxclient/apps/Makefile b/nexus/nxclient/apps/Makefile |
| 51 | +index 8b46518ce..2d2055625 100644 |
| 52 | +--- a/nexus/nxclient/apps/Makefile |
| 53 | ++++ b/nexus/nxclient/apps/Makefile |
| 54 | +@@ -52,7 +52,6 @@ BASIC_BUILD_APPS = \ |
| 55 | + audio_fade \ |
| 56 | + audio_fade_toggle \ |
| 57 | + audio_karaoke \ |
| 58 | +- audio_presentation \ |
| 59 | + audio_wav_convert \ |
| 60 | + best_effort_bvn_status \ |
| 61 | + blit_client \ |
| 62 | +diff --git a/nexus/nxclient/server/nxserverlib.c b/nexus/nxclient/server/nxserverlib.c |
| 63 | +index aeae7d977..49a934f24 100644 |
| 64 | +--- a/nexus/nxclient/server/nxserverlib.c |
| 65 | ++++ b/nexus/nxclient/server/nxserverlib.c |
| 66 | +@@ -1194,6 +1194,33 @@ int nxserverlib_set_server_alpha(nxclient_t client, unsigned alpha) |
| 67 | + return 0; |
| 68 | + } |
| 69 | + |
| 70 | ++int nxserverlib_set_server_position(nxclient_t client, NEXUS_Rect rect) |
| 71 | ++{ |
| 72 | ++ NEXUS_SurfaceCompositorClientSettings client_settings; |
| 73 | ++ NEXUS_Error rc; |
| 74 | ++ struct b_req *req; |
| 75 | ++ |
| 76 | ++ for (req = BLST_D_FIRST(&client->requests); req; req = BLST_D_NEXT(req, link)) { |
| 77 | ++ unsigned i; |
| 78 | ++ for (i=0;i<NXCLIENT_MAX_IDS;i++) { |
| 79 | ++ if (!req->results.surfaceClient[i].id) continue; |
| 80 | ++ |
| 81 | ++ BDBG_OBJECT_ASSERT(client, b_client); |
| 82 | ++ NEXUS_SurfaceCompositor_GetClientSettings(client->session->surfaceCompositor, req->handles.surfaceClient[i].handle, &client_settings); |
| 83 | ++ |
| 84 | ++ client_settings.composition.position.x = rect.x; |
| 85 | ++ client_settings.composition.position.y = rect.y; |
| 86 | ++ client_settings.composition.position.width = rect.width; |
| 87 | ++ client_settings.composition.position.height = rect.height; |
| 88 | ++ |
| 89 | ++ rc = NEXUS_SurfaceCompositor_SetClientSettings(client->session->surfaceCompositor, req->handles.surfaceClient[i].handle, &client_settings); |
| 90 | ++ if (rc) return BERR_TRACE(rc); |
| 91 | ++ } |
| 92 | ++ } |
| 93 | ++ |
| 94 | ++ return 0; |
| 95 | ++} |
| 96 | ++ |
| 97 | + static NEXUS_DisplayHandle b_get_vbi_display(struct b_session *session) |
| 98 | + { |
| 99 | + return session->display[1].display ? session->display[1].display : session->display[0].display; |
| 100 | +@@ -4080,6 +4107,11 @@ void nxserverlib_get_settings(nxserver_t server, struct nxserver_settings *setti |
| 101 | + } |
| 102 | + |
| 103 | + nxserver_t nxserverlib_init(const struct nxserver_settings *settings) |
| 104 | ++{ |
| 105 | ++ return (nxserverlib_init_extended(settings, true)); |
| 106 | ++} |
| 107 | ++ |
| 108 | ++nxserver_t nxserverlib_init_extended(const struct nxserver_settings *settings, const bool authorizedOnly) |
| 109 | + { |
| 110 | + NEXUS_PlatformStartServerSettings serverSettings; |
| 111 | + NEXUS_Error rc; |
| 112 | +@@ -4154,7 +4186,7 @@ nxserver_t nxserverlib_init(const struct nxserver_settings *settings) |
| 113 | + BKNI_ReleaseMutex(server->settings.lock); |
| 114 | + |
| 115 | + NEXUS_Platform_GetDefaultStartServerSettings(&serverSettings); |
| 116 | +- serverSettings.allowUnauthenticatedClients = false; |
| 117 | ++ serverSettings.allowUnauthenticatedClients = !authorizedOnly; |
| 118 | + rc = NEXUS_Platform_StartServer(&serverSettings); |
| 119 | + BDBG_ASSERT(!rc); |
| 120 | + |
| 121 | +diff --git a/nexus/nxclient/server/nxserverlib.h b/nexus/nxclient/server/nxserverlib.h |
| 122 | +index f7457a3a1..63184fd94 100644 |
| 123 | +--- a/nexus/nxclient/server/nxserverlib.h |
| 124 | ++++ b/nexus/nxclient/server/nxserverlib.h |
| 125 | +@@ -362,6 +362,7 @@ struct nxserver_cmdline_settings |
| 126 | + /* nxserver_lib.c API */ |
| 127 | + void nxserver_get_default_settings(struct nxserver_settings *settings); |
| 128 | + nxserver_t nxserverlib_init(const struct nxserver_settings *settings); |
| 129 | ++nxserver_t nxserverlib_init_extended(const struct nxserver_settings *settings, const bool authorizedOnly); |
| 130 | + void nxserverlib_uninit(nxserver_t server); |
| 131 | + struct b_session *nxserver_get_client_session(nxclient_t client); |
| 132 | + /* get_singleton is used for nxclient local to use externally opened nxserverlib */ |
| 133 | +@@ -372,6 +373,7 @@ void nxserverlib_get_settings(nxserver_t server, struct nxserver_settings *setti |
| 134 | + int nxserverlib_send_input(nxclient_t client, unsigned inputClientId, const NEXUS_InputRouterCode *pCode); |
| 135 | + #endif |
| 136 | + int nxserverlib_set_server_alpha(nxclient_t client, unsigned alpha); |
| 137 | ++int nxserverlib_set_server_position(nxclient_t client, NEXUS_Rect rect); |
| 138 | + #if NEXUS_HAS_ASTM |
| 139 | + /* modify the system defaults for ASTM */ |
| 140 | + void nxserverlib_get_astm_settings(NEXUS_AstmSettings *pSettings); |
0 commit comments