diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-03-02 23:26:20 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-03-02 23:26:20 +0100 |
| commit | 7403ea730d75ce0af51cb1bd5665674bb5bfae42 (patch) | |
| tree | d93cc0b4a8878d90ab0bb79c76d75805ee1c2a9d /package/rpi-userland/0003-remove-faulty-assert.patch | |
| parent | 1021766976319b40e64ca8dee12d21c758197801 (diff) | |
| parent | e6803b9f91357773154daed13d6e83712d49476c (diff) | |
| download | buildroot-7403ea730d75ce0af51cb1bd5665674bb5bfae42.tar.gz buildroot-7403ea730d75ce0af51cb1bd5665674bb5bfae42.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/rpi-userland/0003-remove-faulty-assert.patch')
| -rw-r--r-- | package/rpi-userland/0003-remove-faulty-assert.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/package/rpi-userland/0003-remove-faulty-assert.patch b/package/rpi-userland/0003-remove-faulty-assert.patch deleted file mode 100644 index c23c43ae0e..0000000000 --- a/package/rpi-userland/0003-remove-faulty-assert.patch +++ /dev/null @@ -1,21 +0,0 @@ -interface: remove faulty assert() to make weston happy at runtime - -This was removed after a discussion on IRC with the weston guys -('daniels' on irc.freenode.net/#wayland). - -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> ---- -Upstream status: no, will be pushed by weston guys later. -If not, I'll do it. - -diff -durN rpi-userland-77d32cd.orig/interface/vmcs_host/vc_vchi_dispmanx.c rpi-userland-77d32cd/interface/vmcs_host/vc_vchi_dispmanx.c ---- rpi-userland-77d32cd.orig/interface/vmcs_host/vc_vchi_dispmanx.c 2013-10-04 17:43:44.000000000 +0200 -+++ rpi-userland-77d32cd/interface/vmcs_host/vc_vchi_dispmanx.c 2013-10-08 22:28:51.611433539 +0200 -@@ -1187,7 +1187,6 @@ - continue; - - if(dispmanx_client.update_callback ) { -- vcos_assert( dispmanx_client.pending_update_handle == (DISPMANX_UPDATE_HANDLE_T) dispmanx_client.notify_buffer[1]); - dispmanx_client.update_callback((DISPMANX_UPDATE_HANDLE_T) dispmanx_client.notify_buffer[1], dispmanx_client.update_callback_param); - } - } |
