Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

droid-VNC-server patch for aosp 4.0.4

By: a guest on May 9th, 2012  |  syntax: None  |  size: 2.59 KB  |  hits: 214  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. From 374987002d39adfc241cbad4cce0223c97358ba6 Mon Sep 17 00:00:00 2001
  2. From: Emeric Vigier <emeric.vigier@savoirfairelinux.com>
  3. Date: Wed, 9 May 2012 10:41:06 -0400
  4. Subject: [PATCH] adapt build to ICS AOSP 4.0.4 source tree (pandaboard)
  5.  
  6. Signed-off-by: Emeric Vigier <emeric.vigier@savoirfairelinux.com>
  7. ---
  8.  droidvncdaemon/vnc/Android.mk       |   13 +++++++------
  9.  droidvncdaemon/vnc/gralloc_method.c |    6 +++---
  10.  2 files changed, 10 insertions(+), 9 deletions(-)
  11.  
  12. diff --git a/droidvncdaemon/vnc/Android.mk b/droidvncdaemon/vnc/Android.mk
  13. index a83c1e9..56da538 100755
  14. --- a/droidvncdaemon/vnc/Android.mk
  15. +++ b/droidvncdaemon/vnc/Android.mk
  16. @@ -5,7 +5,7 @@ include $(CLEAR_VARS)
  17.  
  18.  LOCAL_ARM_MODE := arm
  19.  
  20. -local_c_flags +=  -Wall   -O3 -DLIBVNCSERVER_WITH_WEBSOCKETS -DLIBVNCSERVER_HAVE_LIBPNG
  21. +local_c_flags +=  -Wall   -O3 -DLIBVNCSERVER_WITH_WEBSOCKETS -DLIBVNCSERVER_HAVE_LIBPNG -DLIBVNCSERVER_HAVE_LIBJPEG
  22.  
  23.  local_src_files:= \
  24.         input.c \
  25. @@ -54,10 +54,11 @@ local_c_includes := \
  26.         $(LOCAL_PATH)/libvncserver-kanaka/libvncserver \
  27.         $(LOCAL_PATH)/libvncserver-kanaka \
  28.         $(LOCAL_PATH)/libvncserver-kanaka/common \
  29. -       $(LOCAL_PATH)/../../zlib \
  30. -       $(LOCAL_PATH)/../../jpeg \
  31. -       $(LOCAL_PATH)/../../openssl/include \
  32. -       $(LOCAL_PATH)/../../libpng \
  33. +       $(LOCAL_PATH)/libvncserver-kanaka/rfb \
  34. +       $(LOCAL_PATH)/../../../zlib \
  35. +       $(LOCAL_PATH)/../../../jpeg \
  36. +       $(LOCAL_PATH)/../../../openssl/include \
  37. +       $(LOCAL_PATH)/../../../libpng \
  38.  
  39.  #######################################
  40.  
  41. @@ -89,6 +90,6 @@ LOCAL_MODULE:= androidvncserver_gingerup
  42.  LOCAL_MODULE_TAGS:= optional
  43.  
  44.  LOCAL_STATIC_LIBRARIES := libcutils libz libpng  jpeg
  45. -LOCAL_SHARED_LIBRARIES := libcrypto libssl  libhardware libsurfaceflinger_client libui
  46. +LOCAL_SHARED_LIBRARIES := libcrypto libssl  libhardware libsurfaceflinger_client libui libgui
  47.  
  48.  include $(BUILD_EXECUTABLE)
  49. diff --git a/droidvncdaemon/vnc/gralloc_method.c b/droidvncdaemon/vnc/gralloc_method.c
  50. index 59f3506..a270c01 100644
  51. --- a/droidvncdaemon/vnc/gralloc_method.c
  52. +++ b/droidvncdaemon/vnc/gralloc_method.c
  53. @@ -155,7 +155,7 @@ int init_gralloc()
  54.    
  55.      CHECK_RV;
  56.    
  57. -    if (!fbdev->read) {
  58. +    if (!fbdev->post) {
  59.          rv = -ENOTSUP;
  60.          close_gralloc();
  61.          return rv;
  62. @@ -170,7 +170,7 @@ int init_gralloc()
  63.                           &buf, &stride);
  64.  
  65.  
  66. -    rv = fbdev->read(fbdev, buf);
  67. +    rv = fbdev->post(fbdev, buf);
  68.  
  69.      CHECK_RV;
  70.      
  71. @@ -226,7 +226,7 @@ int readfb_gralloc ()
  72.      int rv;
  73.  
  74.  
  75. -    rv = fbdev->read(fbdev, buf);
  76. +    rv = fbdev->post(fbdev, buf);
  77.  
  78.      CHECK_RV;
  79.      
  80. --
  81. 1.7.5.4
create a new version of this paste RAW Paste Data