fixup for minor bugs found at build time

1. install path
2. debian rules for cmake
3. some typo

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}")

debian/changelog

@@ -1,3 +1,14 @@
+libmali-rk3288 (1.4-3) unstable; urgency=low
+  * Use the header files from graphics team
+
+ -- Randy Li <randy.li@rock-chips.com>  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 <randy.li@rock-chips.com>  Mon, 18 Jul 2016 09:31:25 +0800
 libmali-rk3288 (1.4-1) unstable; urgency=low
 
   * The binary files comes from graphics department.

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

debian/libmali-rk3288-dev.install

@@ -1,3 +1,3 @@
 #! /usr/bin/dh-exec
 usr/include/*
-usr/lib/pkgconfig/*
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/*

debian/libmali-rk32881.install

@@ -1,2 +1,2 @@
 #! /usr/bin/dh-exec
-usr/lib/*/libmali.so
+usr/lib/${DEB_HOST_MULTIARCH}/libmali.so

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

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}

lib/libEGL.so.1

@@ -1 +0,0 @@
-libmali.so

lib/libEGL.so.1.0.0

@@ -1 +0,0 @@
-libmali.so

lib/libGLESv2.so.2

@@ -1 +0,0 @@
-libmali.so

lib/libGLESv2.so.2.0.0

@@ -1 +0,0 @@
-libmali.so

lib/libgbm.so

@@ -1 +0,0 @@
-libmali.so

lib/libgbm.so.1

@@ -1 +0,0 @@
-libmali.so

lib/libgbm.so.1.0.0

@@ -1 +0,0 @@
-libmali.so

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