libhybris: Update the applied patch to match the latest upstream commit which...

libhybris: Update the applied patch to match the latest upstream commit which is used by the current meta-smartphone

recipes-core/libhybris/libhybris/0001-Disable-wifi-module.patch → recipes-core/libhybris/libhybris/0001-Disable-the-wifi-and-opencl-modules-as-their-necessa.patch

-From 7c9fa12d1f5feaaddb9e3d3a6e5a8352eb980942 Mon Sep 17 00:00:00 2001
+From eacd1b2e22597e7d07aa21e7f0af320acd50e669 Mon Sep 17 00:00:00 2001
 From: Florent Revest <revestflo@gmail.com>
-Date: Sat, 21 Oct 2017 21:12:33 +0200
-Subject: [PATCH] Disable wifi module
+Date: Sun, 16 Sep 2018 19:55:43 +0200
+Subject: [PATCH] Disable the wifi and opencl modules as their necessary
+ headers are never distributed as part of asteroidos ports
 
 ---
  hybris/Makefile.am       |  2 +-
- hybris/configure.ac      |  2 --
- hybris/tests/Makefile.am | 10 +---------
- 3 files changed, 2 insertions(+), 12 deletions(-)
+ hybris/tests/Makefile.am | 19 +------------------
+ 2 files changed, 2 insertions(+), 19 deletions(-)
 
 diff --git a/hybris/Makefile.am b/hybris/Makefile.am
-index 906140e..fc6a786 100644
+index 4879a9c..fc6a786 100644
 --- a/hybris/Makefile.am
 +++ b/hybris/Makefile.am
 @@ -6,7 +6,7 @@ endif
  if HAS_ANDROID_5_0_0
  SUBDIRS += libsync
  endif
--SUBDIRS += egl glesv1 glesv2 ui sf input camera vibrator media wifi
+-SUBDIRS += egl glesv1 glesv2 ui sf input camera vibrator media wifi opencl
 +SUBDIRS += egl glesv1 glesv2 ui sf input camera vibrator media
  
  if HAS_LIBNFC_NXP_HEADERS
  SUBDIRS += libnfc_nxp libnfc_ndef_nxp
-diff --git a/hybris/configure.ac b/hybris/configure.ac
-index 8015754..c498ebd 100644
---- a/hybris/configure.ac
-+++ b/hybris/configure.ac
-@@ -269,8 +269,6 @@ AC_CONFIG_FILES([
- 	vibrator/libvibrator.pc
- 	media/Makefile
- 	media/libmedia.pc
--	wifi/Makefile
--	wifi/libwifi.pc
- 	include/Makefile
- 	input/Makefile
- 	input/libis.pc
 diff --git a/hybris/tests/Makefile.am b/hybris/tests/Makefile.am
-index 43fb93c..625aa4b 100644
+index 242436b..625aa4b 100644
 --- a/hybris/tests/Makefile.am
 +++ b/hybris/tests/Makefile.am
-@@ -11,8 +11,7 @@ bin_PROGRAMS = \
+@@ -11,9 +11,7 @@ bin_PROGRAMS = \
  	test_vibrator \
  	test_media \
  	test_recorder \
 -	test_gps \
+-	test_opencl \
 -	test_wifi
 +	test_gps
  
  if HAS_ANDROID_4_2_0
  bin_PROGRAMS += test_hwcomposer
-@@ -210,10 +209,3 @@ test_vibrator_LDADD = \
+@@ -211,18 +209,3 @@ test_vibrator_LDADD = \
  	$(top_builddir)/hardware/libhardware.la \
  	$(top_builddir)/vibrator/libvibrator.la
  
@@ -60,6 +48,14 @@ index 43fb93c..625aa4b 100644
 -test_wifi_LDADD = \
 -	$(top_builddir)/wifi/libwifi.la
 -
+-test_opencl_SOURCES = test_opencl.c
+-test_opencl_CFLAGS = \
+-	-I$(top_srcdir)/include \
+-	$(ANDROID_HEADERS_CFLAGS)
+-test_opencl_LDADD = \
+-	$(top_builddir)/common/libhybris-common.la \
+-	$(top_builddir)/opencl/libOpenCL.la
+-
 -- 
-2.14.2
+2.19.0
 

recipes-core/libhybris/libhybris_git.bbappend

 FILESEXTRAPATHS_prepend := "${THISDIR}/libhybris:"
-SRC_URI += " file://0001-Disable-wifi-module.patch;striplevel=2"
+SRC_URI += " file://0001-Disable-the-wifi-and-opencl-modules-as-their-necessa.patch;striplevel=2"
 
 DEPENDS += " wayland "
 EXTRA_OECONF += " --enable-wayland --with-default-egl-platform=wayland --with-default-hybris-ld-library-path=/usr/libexec/hal-droid/system/lib:/vendor/lib:/system/lib"