From cab2f164a23c2ca6b036df35d79a02193ff5ab94 Mon Sep 17 00:00:00 2001 From: Randy Li Date: Mon, 18 Jul 2016 11:11:01 +0800 Subject: [PATCH] fixup for minor bugs found at build time 1. install path 2. debian rules for cmake 3. some typo --- CMakeLists.txt | 34 +++++++++++++++++++++++-------- debian/changelog | 11 ++++++++++ debian/control | 6 +++--- debian/libmali-rk3288-dev.install | 2 +- debian/libmali-rk32881.install | 2 +- debian/libmali-rk32881.links | 2 ++ debian/rules | 19 ++++++++--------- lib/libEGL.so.1 | 1 - lib/libEGL.so.1.0.0 | 1 - lib/libGLESv2.so.2 | 1 - lib/libGLESv2.so.2.0.0 | 1 - lib/libgbm.so | 1 - lib/libgbm.so.1 | 1 - lib/libgbm.so.1.0.0 | 1 - pkgconfig/glesv2.pc.cmake | 2 +- 15 files changed, 52 insertions(+), 33 deletions(-) delete mode 120000 lib/libEGL.so.1 delete mode 120000 lib/libEGL.so.1.0.0 delete mode 120000 lib/libGLESv2.so.2 delete mode 120000 lib/libGLESv2.so.2.0.0 delete mode 120000 lib/libgbm.so delete mode 120000 lib/libgbm.so.1 delete mode 120000 lib/libgbm.so.1.0.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index be08159..0be3b0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,23 +5,39 @@ PROJECT(libmali C) INCLUDE(GNUInstallDirs) CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/egl.pc.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/egl.pc") + "${CMAKE_CURRENT_BINARY_DIR}/egl.pc" @ONLY) CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/gbm.pc.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/gbm.pc") + "${CMAKE_CURRENT_BINARY_DIR}/gbm.pc" @ONLY) CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/glesv2.pc.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/glesv2.pc") + "${CMAKE_CURRENT_BINARY_DIR}/glesv2.pc" @ONLY) INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/lib/libmali.so" -DESTINATION "${CMAKE_INSTALL_LIBDIR}") +DESTINATION "${CMAKE_INSTALL_LIBDIR}/") INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/egl.pc" -DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/gbm.pc" -DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/glesv2.pc" -DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") + +INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/gbm.h" +DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/") + +INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/EGL" +DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/") + +INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/GLES" +DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/") + +INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/GLES2" +DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/") + +INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/GLES3" +DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/") + +INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/KHR" +DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/") -INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/inc" -DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") diff --git a/debian/changelog b/debian/changelog index dfdb818..fa86875 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libmali-rk3288 (1.4-3) unstable; urgency=low + * Use the header files from graphics team + + -- Randy Li Mon, 18 Jul 2016 11:41:25 +0800 + +libmali-rk3288 (1.4-2) unstable; urgency=low + * New build system and multiarch support in pkgconfig file + + The new pkgconfig would like the program directly link + to mali against those symbol links. + + -- Randy Li Mon, 18 Jul 2016 09:31:25 +0800 libmali-rk3288 (1.4-1) unstable; urgency=low * The binary files comes from graphics department. diff --git a/debian/control b/debian/control index 98eb561..96aaeeb 100644 --- a/debian/control +++ b/debian/control @@ -11,9 +11,9 @@ Section: libdevel Architecture: any Depends: libmali-rk32881 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same -Provides: libgbm-dev -Conflicts: libgbm-dev -Replaces: libgbm-dev +Provides: libgbm-dev, libegl1-mesa-dev, libgles2-mesa-dev +Conflicts: libgbm-dev, libegl1-mesa-dev, libgles2-mesa-dev +Replaces: libgbm-dev, libegl1-mesa-dev, libgles2-mesa-dev Description: The mali library for Rockchip RK3288. . This package provides the development environment for compiling programs diff --git a/debian/libmali-rk3288-dev.install b/debian/libmali-rk3288-dev.install index 5bdb65d..02845c2 100755 --- a/debian/libmali-rk3288-dev.install +++ b/debian/libmali-rk3288-dev.install @@ -1,3 +1,3 @@ #! /usr/bin/dh-exec usr/include/* -usr/lib/pkgconfig/* +usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/* diff --git a/debian/libmali-rk32881.install b/debian/libmali-rk32881.install index dc2b23e..5065bf6 100755 --- a/debian/libmali-rk32881.install +++ b/debian/libmali-rk32881.install @@ -1,2 +1,2 @@ #! /usr/bin/dh-exec -usr/lib/*/libmali.so +usr/lib/${DEB_HOST_MULTIARCH}/libmali.so diff --git a/debian/libmali-rk32881.links b/debian/libmali-rk32881.links index ef6ac13..85f993e 100755 --- a/debian/libmali-rk32881.links +++ b/debian/libmali-rk32881.links @@ -1,5 +1,7 @@ #! /usr/bin/dh-exec +usr/lib/${DEB_HOST_MULTIARCH}/libmali.so usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so usr/lib/${DEB_HOST_MULTIARCH}/libmali.so usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1 usr/lib/${DEB_HOST_MULTIARCH}/libmali.so usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1.0.0 +usr/lib/${DEB_HOST_MULTIARCH}/libmali.so usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so usr/lib/${DEB_HOST_MULTIARCH}/libmali.so usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libmali.so usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2.0.0 diff --git a/debian/rules b/debian/rules index 478ba28..3dc54ed 100755 --- a/debian/rules +++ b/debian/rules @@ -19,17 +19,14 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # main packaging script based on dh7 syntax %: - dh $@ + dh $@ --parallel --buildsystem=cmake # debmake generated override targets # This is example for Cmake (See http://bugs.debian.org/641051 ) -#override_dh_auto_configure: -# dh_auto_configure -- \ -# -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) -override_dh_auto_link: - dh_link --package=libmali-rk3288-dev \ - usr/lib/$(DEB_HOST_MULTIARCH)/libmali.so usr/lib/$(DEB_HOST_MULTIARCH)/libgbm.so.1 - dh_link --package=libmali-rk3288-dev \ - usr/lib/$(DEB_HOST_MULTIARCH)/libmali.so usr/lib/$(DEB_HOST_MULTIARCH)/libgbm.so - dh_link --package=libmali-rk3288-dev \ - usr/lib/$(DEB_HOST_MULTIARCH)/libmali.so usr/lib/$(DEB_HOST_MULTIARCH)/libgbm.so.1.0.0 +override_dh_auto_configure: + dh_auto_configure -- \ + -DCMAKE_C_COMPILER=/usr/bin/${DEB_HOST_MULTIARCH}-gcc \ + -DCMAKE_CXX_COMPILER=/usr/bin/${DEB_HOST_MULTIARCH}-g++ \ + -DPKG_CONFIG_EXECUTABLE=/usr/bin/${DEB_HOST_MULTIARCH}-pkg-config \ + -DCMAKE_LIBRARY_PATH=${DEB_HOST_MULTIARCH} \ + -DCMAKE_LIBRARY_ARCHITECTURE=${DEB_HOST_MULTIARCH} diff --git a/lib/libEGL.so.1 b/lib/libEGL.so.1 deleted file mode 120000 index dc6a278..0000000 --- a/lib/libEGL.so.1 +++ /dev/null @@ -1 +0,0 @@ -libmali.so \ No newline at end of file diff --git a/lib/libEGL.so.1.0.0 b/lib/libEGL.so.1.0.0 deleted file mode 120000 index dc6a278..0000000 --- a/lib/libEGL.so.1.0.0 +++ /dev/null @@ -1 +0,0 @@ -libmali.so \ No newline at end of file diff --git a/lib/libGLESv2.so.2 b/lib/libGLESv2.so.2 deleted file mode 120000 index dc6a278..0000000 --- a/lib/libGLESv2.so.2 +++ /dev/null @@ -1 +0,0 @@ -libmali.so \ No newline at end of file diff --git a/lib/libGLESv2.so.2.0.0 b/lib/libGLESv2.so.2.0.0 deleted file mode 120000 index dc6a278..0000000 --- a/lib/libGLESv2.so.2.0.0 +++ /dev/null @@ -1 +0,0 @@ -libmali.so \ No newline at end of file diff --git a/lib/libgbm.so b/lib/libgbm.so deleted file mode 120000 index dc6a278..0000000 --- a/lib/libgbm.so +++ /dev/null @@ -1 +0,0 @@ -libmali.so \ No newline at end of file diff --git a/lib/libgbm.so.1 b/lib/libgbm.so.1 deleted file mode 120000 index dc6a278..0000000 --- a/lib/libgbm.so.1 +++ /dev/null @@ -1 +0,0 @@ -libmali.so \ No newline at end of file diff --git a/lib/libgbm.so.1.0.0 b/lib/libgbm.so.1.0.0 deleted file mode 120000 index dc6a278..0000000 --- a/lib/libgbm.so.1.0.0 +++ /dev/null @@ -1 +0,0 @@ -libmali.so \ No newline at end of file diff --git a/pkgconfig/glesv2.pc.cmake b/pkgconfig/glesv2.pc.cmake index 60fbb48..1e5238c 100644 --- a/pkgconfig/glesv2.pc.cmake +++ b/pkgconfig/glesv2.pc.cmake @@ -4,7 +4,7 @@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ Name: glesv2 -Description: mali GLESV2 library +Description: Mali GLESV2 library Requires.private: Version: Libs: -L${libdir} -lGLESv2