diff --git a/CMakeLists.txt b/CMakeLists.txt index e823e80..dc474e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,10 +14,22 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/glesv2.pc.cmake" INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/mali.icd" DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/OpenCL/vendors/") +IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/libmali-midgard.so") INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/libmali-midgard.so" -"${CMAKE_CURRENT_SOURCE_DIR}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/libmali-midgard-4th.so" -"${CMAKE_CURRENT_SOURCE_DIR}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/libmali-utgard.so" DESTINATION "${CMAKE_INSTALL_LIBDIR}") +ENDIF() +IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/libmali-midgard-r1p0.so") +INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/libmali-midgard-r1p0.so" +DESTINATION "${CMAKE_INSTALL_LIBDIR}") +ENDIF() +IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/libmali-midgard-4th.so") +INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/libmali-midgard-4th.so" +DESTINATION "${CMAKE_INSTALL_LIBDIR}") +ENDIF() +IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/libmali-utgard.so") +INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/libmali-utgard.so" +DESTINATION "${CMAKE_INSTALL_LIBDIR}") +ENDIF() INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/egl.pc" "${CMAKE_CURRENT_BINARY_DIR}/gbm.pc" diff --git a/debian/control b/debian/control index 525fcc6..df8e7a4 100644 --- a/debian/control +++ b/debian/control @@ -31,6 +31,16 @@ Conflicts: libmali-rk-utgard0, libmali-rk-midgard-4th0 Replaces: libegl1-mesa, libegl1-x11, libgles2-mesa, libgbm1 Description: The mali library for Rockchip RK3288. +Package: libmali-rk-midgard0-r1p0 +Architecture: armhf +Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same +Provides: libegl1-mesa, libegl1, libgles2-mesa, libgbm1, libwayland-egl1-mesa +#Conflicts: libegl1-mesa, libegl1-x11, libgles2-mesa, libgbm1 +Conflicts: libmali-rk-utgard0, libmali-rk-midgard-4th0 +Replaces: libegl1-mesa, libegl1-x11, libgles2-mesa, libgbm1 +Description: The mali library for Rockchip RK3288. + Package: libmali-rk-utgard0 Architecture: armhf Depends: ${misc:Depends}, ${shlibs:Depends} diff --git a/debian/libmali-rk-midgard-4th0.install b/debian/libmali-rk-midgard-4th0.install index 95dec3f..fe7f763 100755 --- a/debian/libmali-rk-midgard-4th0.install +++ b/debian/libmali-rk-midgard-4th0.install @@ -1,3 +1,3 @@ #! /usr/bin/dh-exec usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-4th.so -#usr/etc/OpenCL/vendors => /etc/OpenCL/venders +etc/OpenCL/vendors/mali.icd /etc/OpenCL/venders diff --git a/debian/libmali-rk-midgard0-r1p0.install b/debian/libmali-rk-midgard0-r1p0.install new file mode 100755 index 0000000..a1e8810 --- /dev/null +++ b/debian/libmali-rk-midgard0-r1p0.install @@ -0,0 +1,3 @@ +#! /usr/bin/dh-exec +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-r1p0.so +etc/OpenCL/vendors/mali.icd /etc/OpenCL/venders \ No newline at end of file diff --git a/debian/libmali-rk-midgard0-r1p0.links b/debian/libmali-rk-midgard0-r1p0.links new file mode 100755 index 0000000..65b00d9 --- /dev/null +++ b/debian/libmali-rk-midgard0-r1p0.links @@ -0,0 +1,10 @@ +#! /usr/bin/dh-exec +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-r1p0.so usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1 +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-r1p0.so usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1.0.0 +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-r1p0.so usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2 +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-r1p0.so usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2.0.0 +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-r1p0.so usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so.1 +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-r1p0.so usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so.1.0.0 +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-r1p0.so usr/lib/${DEB_HOST_MULTIARCH}/libmali.so +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-r1p0.so usr/lib/${DEB_HOST_MULTIARCH}/libMaliOpenCL.so +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-r1p0.so usr/lib/${DEB_HOST_MULTIARCH}/libOpenCL.so diff --git a/debian/libmali-rk-midgard0.install b/debian/libmali-rk-midgard0.install index 057da74..fa78bd8 100755 --- a/debian/libmali-rk-midgard0.install +++ b/debian/libmali-rk-midgard0.install @@ -1,3 +1,3 @@ #! /usr/bin/dh-exec usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard.so -etc/OpenCL/vendors => /etc/OpenCL/venders +etc/OpenCL/vendors/mali.icd /etc/OpenCL/venders diff --git a/lib/aarch64-linux-gnu/libmali-midgard.so b/lib/aarch64-linux-gnu/libmali-midgard.so deleted file mode 100644 index d00491f..0000000 --- a/lib/aarch64-linux-gnu/libmali-midgard.so +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/lib/aarch64-linux-gnu/libmali-utgard.so b/lib/aarch64-linux-gnu/libmali-utgard.so deleted file mode 100644 index d00491f..0000000 --- a/lib/aarch64-linux-gnu/libmali-utgard.so +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/lib/arm-linux-gnueabihf/libmali-midgard-r1p0.so b/lib/arm-linux-gnueabihf/libmali-midgard-r1p0.so new file mode 100644 index 0000000..74d862d Binary files /dev/null and b/lib/arm-linux-gnueabihf/libmali-midgard-r1p0.so differ