Merge branch 'libmali' of github.com:JeffyCN/mirrors

Author: tsukumijima

.gitignore

@@ -5,7 +5,6 @@
 *.orig
 *.rej
 *.loT
-*.bin
 *.pc
 .deps
 .libs

debian/control

@@ -19,31 +19,31 @@ Homepage: https://github.com/rockchip-linux/libmali
 Vcs-Git: https://github.com/rockchip-linux/libmali
 Vcs-Browser: https://github.com/rockchip-linux/libmali
 
-Package: libmali-bifrost-g31-g13p0-gbm
+Package: libmali-bifrost-g31-g13p0-cl
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
 Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g31-g13p0-only-cl
+Package: libmali-bifrost-g31-g13p0-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
 Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g31-g13p0-wayland-gbm
+Package: libmali-bifrost-g31-g13p0-nocl-wayland-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
 Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g31-g13p0-without-cl-wayland-gbm
+Package: libmali-bifrost-g31-g13p0-wayland-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
@@ -59,31 +59,31 @@ Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g31-g24p0-gbm
+Package: libmali-bifrost-g31-g24p0-cl
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
 Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g31-g24p0-only-cl
+Package: libmali-bifrost-g31-g24p0-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
 Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g31-g24p0-wayland-gbm
+Package: libmali-bifrost-g31-g24p0-nocl-wayland-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
 Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g31-g24p0-without-cl-wayland-gbm
+Package: libmali-bifrost-g31-g24p0-wayland-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
@@ -99,31 +99,31 @@ Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g31-g2p0-gbm
+Package: libmali-bifrost-g31-g2p0-cl
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
 Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g31-g2p0-only-cl
+Package: libmali-bifrost-g31-g2p0-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
 Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g31-g2p0-wayland-gbm
+Package: libmali-bifrost-g31-g2p0-nocl-wayland-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
 Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g31-g2p0-without-cl-wayland-gbm
+Package: libmali-bifrost-g31-g2p0-wayland-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
@@ -171,15 +171,15 @@ Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g52-g13p0-wayland-gbm
+Package: libmali-bifrost-g52-g13p0-nocl-dummy-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
 Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g52-g13p0-without-cl-dummy-gbm
+Package: libmali-bifrost-g52-g13p0-wayland-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
@@ -235,15 +235,15 @@ Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g52-g24p0-wayland-gbm
+Package: libmali-bifrost-g52-g24p0-nocl-dummy-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
 Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g52-g24p0-without-cl-dummy-gbm
+Package: libmali-bifrost-g52-g24p0-wayland-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
@@ -291,15 +291,15 @@ Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g52-g2p0-wayland-gbm
+Package: libmali-bifrost-g52-g2p0-nocl-dummy-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali
 Replaces: libmali
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mali GPU User-Space Binary Drivers
 
-Package: libmali-bifrost-g52-g2p0-without-cl-dummy-gbm
+Package: libmali-bifrost-g52-g2p0-wayland-gbm
 Architecture: armhf arm64
 Provides: libmali
 Conflicts: libmali

debian/targets

@@ -1,39 +1,39 @@
+aarch64-linux-gnu/libmali-bifrost-g31-g13p0-cl.so
 aarch64-linux-gnu/libmali-bifrost-g31-g13p0-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g31-g13p0-only-cl.so
+aarch64-linux-gnu/libmali-bifrost-g31-g13p0-nocl-wayland-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g31-g13p0-wayland-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g31-g13p0-without-cl-wayland-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g31-g13p0-x11-gbm.so
+aarch64-linux-gnu/libmali-bifrost-g31-g24p0-cl.so
 aarch64-linux-gnu/libmali-bifrost-g31-g24p0-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g31-g24p0-only-cl.so
+aarch64-linux-gnu/libmali-bifrost-g31-g24p0-nocl-wayland-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g31-g24p0-wayland-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g31-g24p0-without-cl-wayland-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g31-g24p0-x11-gbm.so
+aarch64-linux-gnu/libmali-bifrost-g31-g2p0-cl.so
 aarch64-linux-gnu/libmali-bifrost-g31-g2p0-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g31-g2p0-only-cl.so
+aarch64-linux-gnu/libmali-bifrost-g31-g2p0-nocl-wayland-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g31-g2p0-wayland-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g31-g2p0-without-cl-wayland-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g31-g2p0-x11-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g13p0-dummy-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g52-g13p0-dummy-wayland-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g13p0-dummy.so
+aarch64-linux-gnu/libmali-bifrost-g52-g13p0-dummy-wayland-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g13p0-gbm.so
+aarch64-linux-gnu/libmali-bifrost-g52-g13p0-nocl-dummy-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g13p0-wayland-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g52-g13p0-without-cl-dummy-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g13p0-x11-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g13p0-x11-wayland-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g24p0-dummy-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g52-g24p0-dummy-wayland-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g24p0-dummy.so
+aarch64-linux-gnu/libmali-bifrost-g52-g24p0-dummy-wayland-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g24p0-gbm.so
+aarch64-linux-gnu/libmali-bifrost-g52-g24p0-nocl-dummy-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g24p0-wayland-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g52-g24p0-without-cl-dummy-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g24p0-x11-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g24p0-x11-wayland-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g2p0-dummy-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g2p0-dummy.so
 aarch64-linux-gnu/libmali-bifrost-g52-g2p0-gbm.so
+aarch64-linux-gnu/libmali-bifrost-g52-g2p0-nocl-dummy-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g2p0-wayland-gbm.so
-aarch64-linux-gnu/libmali-bifrost-g52-g2p0-without-cl-dummy-gbm.so
 aarch64-linux-gnu/libmali-bifrost-g52-g2p0-x11-gbm.so
 aarch64-linux-gnu/libmali-midgard-t86x-r18p0-gbm.so
 aarch64-linux-gnu/libmali-midgard-t86x-r18p0-wayland-gbm.so
@@ -47,8 +47,8 @@ aarch64-linux-gnu/libmali-valhall-g610-g13p0-wayland-gbm.so
 aarch64-linux-gnu/libmali-valhall-g610-g13p0-x11-gbm.so
 aarch64-linux-gnu/libmali-valhall-g610-g13p0-x11-wayland-gbm.so
 aarch64-linux-gnu/libmali-valhall-g610-g24p0-dummy-gbm.so
-aarch64-linux-gnu/libmali-valhall-g610-g24p0-dummy-wayland-gbm.so
 aarch64-linux-gnu/libmali-valhall-g610-g24p0-dummy.so
+aarch64-linux-gnu/libmali-valhall-g610-g24p0-dummy-wayland-gbm.so
 aarch64-linux-gnu/libmali-valhall-g610-g24p0-gbm.so
 aarch64-linux-gnu/libmali-valhall-g610-g24p0-wayland-gbm.so
 aarch64-linux-gnu/libmali-valhall-g610-g24p0-x11-gbm.so
@@ -58,42 +58,42 @@ aarch64-linux-gnu/libmali-valhall-g610-g6p0-gbm.so
 aarch64-linux-gnu/libmali-valhall-g610-g6p0-wayland-gbm.so
 aarch64-linux-gnu/libmali-valhall-g610-g6p0-x11-gbm.so
 aarch64-linux-gnu/libmali-valhall-g610-g6p0-x11-wayland-gbm.so
+arm-linux-gnueabihf/libmali-bifrost-g31-g13p0-cl.so
 arm-linux-gnueabihf/libmali-bifrost-g31-g13p0-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g31-g13p0-only-cl.so
+arm-linux-gnueabihf/libmali-bifrost-g31-g13p0-nocl-wayland-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g31-g13p0-wayland-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g31-g13p0-without-cl-wayland-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g31-g13p0-x11-gbm.so
+arm-linux-gnueabihf/libmali-bifrost-g31-g24p0-cl.so
 arm-linux-gnueabihf/libmali-bifrost-g31-g24p0-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g31-g24p0-only-cl.so
+arm-linux-gnueabihf/libmali-bifrost-g31-g24p0-nocl-wayland-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g31-g24p0-wayland-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g31-g24p0-without-cl-wayland-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g31-g24p0-x11-gbm.so
+arm-linux-gnueabihf/libmali-bifrost-g31-g2p0-cl.so
 arm-linux-gnueabihf/libmali-bifrost-g31-g2p0-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g31-g2p0-only-cl.so
+arm-linux-gnueabihf/libmali-bifrost-g31-g2p0-nocl-wayland-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g31-g2p0-wayland-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g31-g2p0-without-cl-wayland-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g31-g2p0-x11-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g13p0-dummy-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g52-g13p0-dummy-wayland-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g13p0-dummy.so
+arm-linux-gnueabihf/libmali-bifrost-g52-g13p0-dummy-wayland-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g13p0-gbm.so
+arm-linux-gnueabihf/libmali-bifrost-g52-g13p0-nocl-dummy-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g13p0-wayland-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g52-g13p0-without-cl-dummy-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g13p0-x11-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g13p0-x11-wayland-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g24p0-dummy-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g52-g24p0-dummy-wayland-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g24p0-dummy.so
+arm-linux-gnueabihf/libmali-bifrost-g52-g24p0-dummy-wayland-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g24p0-gbm.so
+arm-linux-gnueabihf/libmali-bifrost-g52-g24p0-nocl-dummy-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g24p0-wayland-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g52-g24p0-without-cl-dummy-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g24p0-x11-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g24p0-x11-wayland-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-dummy-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-dummy.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-gbm.so
+arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-nocl-dummy-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-wayland-gbm.so
-arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-without-cl-dummy-gbm.so
 arm-linux-gnueabihf/libmali-bifrost-g52-g2p0-x11-gbm.so
 arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r0p0-gbm.so
 arm-linux-gnueabihf/libmali-midgard-t76x-r18p0-r0p0-wayland-gbm.so
@@ -117,8 +117,8 @@ arm-linux-gnueabihf/libmali-valhall-g610-g13p0-wayland-gbm.so
 arm-linux-gnueabihf/libmali-valhall-g610-g13p0-x11-gbm.so
 arm-linux-gnueabihf/libmali-valhall-g610-g13p0-x11-wayland-gbm.so
 arm-linux-gnueabihf/libmali-valhall-g610-g24p0-dummy-gbm.so
-arm-linux-gnueabihf/libmali-valhall-g610-g24p0-dummy-wayland-gbm.so
 arm-linux-gnueabihf/libmali-valhall-g610-g24p0-dummy.so
+arm-linux-gnueabihf/libmali-valhall-g610-g24p0-dummy-wayland-gbm.so
 arm-linux-gnueabihf/libmali-valhall-g610-g24p0-gbm.so
 arm-linux-gnueabihf/libmali-valhall-g610-g24p0-wayland-gbm.so
 arm-linux-gnueabihf/libmali-valhall-g610-g24p0-x11-gbm.so

hook/meson.build

@@ -22,15 +22,14 @@ libhook_cflags = [
 ]
 
 libhook_dep = [
-  mali,
   dependency('threads'),
   cc.find_library('dl', required : false),
   dependency('libdrm', version : '>= 2.4.0'),
 ]
 
 libhook_inc = []
 
-if cc.has_function('gbm_create_device', dependencies : mali)
+if has_gbm
   # Add hooks to support new GBM APIs
   libhook_inc += include_directories('..' / gbm_headers.keys()[0])
   libhook_cflags += '-DHAS_GBM'
@@ -41,7 +40,7 @@ if cc.has_function('gbm_create_device', dependencies : mali)
   endforeach
 endif
 
-if cc.has_function('eglCreateContext', dependencies : mali)
+if has_egl
   # Add hooks to support default winsys
   libhook_inc += include_directories('../include')
   libhook_cflags += '-DHAS_EGL'
@@ -65,8 +64,8 @@ libhook = shared_library(
   c_args : libhook_cflags,
   include_directories : libhook_inc,
   dependencies : libhook_dep,
+  link_with : libmali,
   install : true,
-  install_rpath : '$ORIGIN',
   version : mali_version)
 
 libhook_ldflags = ['-L${libdir}', '-lmali-hook']

include/EGL/egl.h

@@ -6,34 +6,15 @@ extern "C" {
 #endif
 
 /*
-** Copyright (c) 2013-2017 The Khronos Group Inc.
+** Copyright 2013-2020 The Khronos Group Inc.
+** SPDX-License-Identifier: Apache-2.0
 **
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-/*
 ** This header is generated from the Khronos EGL XML API Registry.
 ** The current version of the Registry, generator scripts
 ** used to make the header, and the header can be found at
 **   http://www.khronos.org/registry/egl
 **
-** Khronos $Git commit SHA1: cb927ca98d $ on $Git commit date: 2019-08-08 01:05:38 -0700 $
+** Khronos $Git commit SHA1: 6fb1daea15 $ on $Git commit date: 2022-05-25 09:41:13 -0600 $
 */
 
 #include <EGL/eglplatform.h>
@@ -42,7 +23,7 @@ extern "C" {
 #define EGL_EGL_PROTOTYPES 1
 #endif
 
-/* Generated on date 20190808 */
+/* Generated on date 20220525 */
 
 /* Generated C header for:
  * API: egl