From 26bef6c86a38eb5668a6fc437b551daeae7ac1a9 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sat, 4 Jul 2020 11:52:12 +0200
Subject: [PATCH] bcm2835-driver: drop support for old, proprietary GL driver

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/graphics/bcm2835-driver/package.mk | 56 ++++++---------------
 1 file changed, 15 insertions(+), 41 deletions(-)

diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk
index d74f7df2eb..b9c5723ca8 100644
--- a/packages/graphics/bcm2835-driver/package.mk
+++ b/packages/graphics/bcm2835-driver/package.mk
@@ -20,33 +20,21 @@ else
 fi
 
 makeinstall_target() {
-  # Install vendor header files
+  # Install vendor header files except proprietary GL headers
   mkdir -p ${SYSROOT_PREFIX}/usr/include
-    if [ "${OPENGLES}" = "bcm2835-driver" ]; then
-      cp -PRv ${PKG_FLOAT}/opt/vc/include/* ${SYSROOT_PREFIX}/usr/include
-    else
-      for f in $(cd ${PKG_FLOAT}/opt/vc/include; ls | grep -v "GL"); do
-        cp -PRv ${PKG_FLOAT}/opt/vc/include/$f ${SYSROOT_PREFIX}/usr/include
-      done
-    fi
+    for f in $(cd ${PKG_FLOAT}/opt/vc/include; ls | grep -v "GL"); do
+      cp -PRv ${PKG_FLOAT}/opt/vc/include/$f ${SYSROOT_PREFIX}/usr/include
+    done
 
-  # Install EGL, OpenGL ES, Open VG, etc. vendor libs & pkgconfigs
+  # Install vendor libs & pkgconfigs except proprietary GL libs
   mkdir -p ${SYSROOT_PREFIX}/usr/lib
-    if [ "${OPENGLES}" = "bcm2835-driver" ]; then
-      cp -PRv ${PKG_FLOAT}/opt/vc/lib/*.so              ${SYSROOT_PREFIX}/usr/lib
-      ln -sf ${SYSROOT_PREFIX}/usr/lib/libbrcmEGL.so    ${SYSROOT_PREFIX}/usr/lib/libEGL.so
-      ln -sf ${SYSROOT_PREFIX}/usr/lib/libbrcmGLESv2.so ${SYSROOT_PREFIX}/usr/lib/libGLESv2.so
-      cp -PRv ${PKG_FLOAT}/opt/vc/lib/*.a               ${SYSROOT_PREFIX}/usr/lib
-      cp -PRv ${PKG_FLOAT}/opt/vc/lib/pkgconfig         ${SYSROOT_PREFIX}/usr/lib
-    else
-      for f in $(cd ${PKG_FLOAT}/opt/vc/lib; ls *.so *.a | grep -Ev "^lib(EGL|GL)"); do
-        cp -PRv ${PKG_FLOAT}/opt/vc/lib/$f              ${SYSROOT_PREFIX}/usr/lib
+    for f in $(cd ${PKG_FLOAT}/opt/vc/lib; ls *.so *.a | grep -Ev "^lib(EGL|GL)"); do
+      cp -PRv ${PKG_FLOAT}/opt/vc/lib/$f              ${SYSROOT_PREFIX}/usr/lib
+    done
+    mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
+      for f in $(cd ${PKG_FLOAT}/opt/vc/lib/pkgconfig; ls | grep -v "gl"); do
+        cp -PRv ${PKG_FLOAT}/opt/vc/lib/pkgconfig/$f  ${SYSROOT_PREFIX}/usr/lib/pkgconfig
       done
-      mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
-        for f in $(cd ${PKG_FLOAT}/opt/vc/lib/pkgconfig; ls | grep -v "gl"); do
-          cp -PRv ${PKG_FLOAT}/opt/vc/lib/pkgconfig/$f  ${SYSROOT_PREFIX}/usr/lib/pkgconfig
-        done
-    fi
 
   # Update prefix in vendor pkgconfig files
   for PKG_CONFIGS in $(find "${SYSROOT_PREFIX}/usr/lib" -type f -name "*.pc" 2>/dev/null); do
@@ -58,19 +46,11 @@ makeinstall_target() {
     ln -sf ${SYSROOT_PREFIX}/usr/lib     ${SYSROOT_PREFIX}/opt/vc/lib
     ln -sf ${SYSROOT_PREFIX}/usr/include ${SYSROOT_PREFIX}/opt/vc/include
 
-  # Install EGL, OpenGL ES and other vendor libs
+  # Install vendor libs except proprietary GL
   mkdir -p ${INSTALL}/usr/lib
-    if [ "${OPENGLES}" = "bcm2835-driver" ]; then
-      cp -PRv ${PKG_FLOAT}/opt/vc/lib/*.so ${INSTALL}/usr/lib
-      ln -sf /usr/lib/libbrcmEGL.so        ${INSTALL}/usr/lib/libEGL.so
-      ln -sf /usr/lib/libbrcmEGL.so        ${INSTALL}/usr/lib/libEGL.so.1
-      ln -sf /usr/lib/libbrcmGLESv2.so     ${INSTALL}/usr/lib/libGLESv2.so
-      ln -sf /usr/lib/libbrcmGLESv2.so     ${INSTALL}/usr/lib/libGLESv2.so.2
-    else
-      for f in $(cd ${PKG_FLOAT}/opt/vc/lib; ls *.so | grep -Ev "^lib(EGL|GL)"); do
-        cp -PRv ${PKG_FLOAT}/opt/vc/lib/$f ${INSTALL}/usr/lib
-      done
-    fi
+    for f in $(cd ${PKG_FLOAT}/opt/vc/lib; ls *.so | grep -Ev "^lib(EGL|GL)"); do
+      cp -PRv ${PKG_FLOAT}/opt/vc/lib/$f ${INSTALL}/usr/lib
+    done
 
   # Install useful tools
   mkdir -p ${INSTALL}/usr/bin
@@ -88,9 +68,3 @@ makeinstall_target() {
     ln -sf /usr/lib ${INSTALL}/opt/vc/lib
 }
 
-post_install() {
-  # unbind Framebuffer console
-  if [ "${OPENGLES}" = "bcm2835-driver" ]; then
-    enable_service unbind-console.service
-  fi
-}