diff --git a/.gitignore b/.gitignore index c645b54..e17f585 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,8 @@ CMakeCache.txt cmake_install.cmake install_manifest.txt *\.debhelper\.log +/debian/libmali-rk-dev/ +/debian/libmali-rk-midgard-4th0/ +/debian/libmali-rk-midgard0/ +/debian/libmali-rk-utgard0/ +/debian/tmp/ diff --git a/CMakeLists.txt b/CMakeLists.txt index dce4af1..133ea30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/mali.icd" DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/OpenCL/vendors/") INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/lib/libmali-midgard.so" +"${CMAKE_CURRENT_SOURCE_DIR}/lib/libmali-midgard-4th.so" "${CMAKE_CURRENT_SOURCE_DIR}/lib/libmali-utgard.so" DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/debian/changelog b/debian/changelog index 11fbf81..b0ecd49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +libmali-rk (1.5-1) testing; urgency=medium + + * mali: update the mali library for rk3399 + + -- Randy Li Wed, 12 Oct 2016 01:29:07 +0000 + +libmali-rk (1.4-7) unstable; urgency=medium + + * mali: add mali library used for the Mali midgard 4th gen + + -- Randy Li Wed, 31 Aug 2016 09:08:16 +0000 + +libmali-rk (1.4-6) unstable; urgency=medium + + * mali: upgrade Mali midgard library to t76x-r12p0 + * debian: install link for opencl support in mali midgrade + + -- Randy Li Mon, 15 Aug 2016 09:30:11 +0000 + libmali-rk (1.4-5) unstable; urgency=medium * header: add opencl header diff --git a/debian/control b/debian/control index 1804719..ab4917d 100644 --- a/debian/control +++ b/debian/control @@ -27,9 +27,9 @@ 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 +Conflicts: libmali-rk-utgard0, libmali-rk-midgard-4th0 Replaces: libegl1-mesa, libegl1-x11, libgles2-mesa, libgbm1 -Description: The mali library for Rockchip RK3288 and RK3399. +Description: The mali library for Rockchip RK3288. Package: libmali-rk-utgard0 Architecture: armhf @@ -37,6 +37,16 @@ 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-midgard0 +Conflicts: libmali-rk-midgard0, libmali-rk-midgard-4th0 Replaces: libegl1-mesa, libegl1-x11, libgles2-mesa, libgbm1 Description: The mali library for Rockchip RK29 serial. + +Package: libmali-rk-midgard-4th0 +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-midgard0, libmali-rk-utgard0 +Replaces: libegl1-mesa, libegl1-x11, libgles2-mesa, libgbm1 +Description: The mali library for Rockchip RK3399. diff --git a/debian/libmali-rk-midgard-4th0.install b/debian/libmali-rk-midgard-4th0.install new file mode 100755 index 0000000..95dec3f --- /dev/null +++ b/debian/libmali-rk-midgard-4th0.install @@ -0,0 +1,3 @@ +#! /usr/bin/dh-exec +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-4th.so +#usr/etc/OpenCL/vendors => /etc/OpenCL/venders diff --git a/debian/libmali-rk-midgard-4th0.links b/debian/libmali-rk-midgard-4th0.links new file mode 100755 index 0000000..ad2cfee --- /dev/null +++ b/debian/libmali-rk-midgard-4th0.links @@ -0,0 +1,10 @@ +#! /usr/bin/dh-exec +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-4th.so usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1 +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-4th.so usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1.0.0 +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-4th.so usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2 +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-4th.so usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2.0.0 +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-4th.so usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so.1 +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-4th.so usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so.1.0.0 +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-4th.so usr/lib/${DEB_HOST_MULTIARCH}/libmali.so +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-4th.so usr/lib/${DEB_HOST_MULTIARCH}/libMaliOpenCL.so +usr/lib/${DEB_HOST_MULTIARCH}/libmali-midgard-4th.so usr/lib/${DEB_HOST_MULTIARCH}/libOpenCL.so