New upstream 20160324.debian/20160324-1

Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>

17 files changed, 197 insertions, 47 deletions

diff --git a/debian/README.source b/debian/README.source
index a91bfc6..03c0afd 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -8,7 +8,7 @@ pristine-tar.
 
 And use the following command to clone the package:
 
- * gbp clone https://git.linaro.org/people/paul.liu/s900-gpu-binary.git --pristine-tar
+ * gbp clone --pristine-tar https://git.linaro.org/people/paul.liu/s900-gpu-binary.git
 
 To build the package:
 
diff --git a/debian/changelog b/debian/changelog
index 7150b7e..b9b1dfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+s900-gpu-binary (20160324-1) unstable; urgency=low
+
+  * Imported Upstream version 20160324
+
+ -- Ying-Chun Liu (PaulLiu) <paulliu@debian.org>  Thu, 24 Mar 2016 15:02:34 +0800
+
 s900-gpu-binary (20160322-1) unstable; urgency=low
 
   * Update debian/README.source to include gbp usage.
diff --git a/debian/control b/debian/control
index 006c11d..3142f44 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,10 @@ Description: pvr private lib
 Package: libgles1-pvr
 Section: non-free/libs
 Architecture: arm64
-Depends: libpvr-private, ${misc:Depends}, ${shlibs:Depends}
+Depends: libglapi-pvr (= ${binary:Version}),
+         libpvr-private,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Provides: libgles1, libgles1-mesa
 Conflicts: libgles1, libgles1-mesa
 Replaces: libgles1, libgles1-mesa
@@ -53,7 +56,10 @@ Description: pvr implementation of the OpenGL|ES 1.x API -- development files
 Package: libgles2-pvr
 Section: non-free/libs
 Architecture: arm64
-Depends: libpvr-private, ${misc:Depends}, ${shlibs:Depends}
+Depends: libglapi-pvr (= ${binary:Version}),
+         libpvr-private,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Conflicts: libgles2, libgles2-mesa
 Replaces: libgles2, libgles2-mesa
 Provides: libgles2, libgles2-mesa
@@ -91,13 +97,10 @@ Description: pvr implementation of the OpenGL|ES 2.x API -- development files
 Package: libegl1-pvr
 Section: non-free/libs
 Architecture: arm64
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- libudev1 [linux-any],
-Provides: libegl1-x11, libegl1-mesa
-Conflicts: libegl1-x11, libegl1-mesa
-Replaces: libegl1-x11, libegl1-mesa
+Depends: libudev1 [linux-any], ${misc:Depends}, ${shlibs:Depends}
+Provides: libegl1-mesa, libegl1-x11
+Conflicts: libegl1-mesa, libegl1-x11
+Replaces: libegl1-mesa, libegl1-x11
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: pvr implementation of the EGL API -- runtime
@@ -111,24 +114,23 @@ Description: pvr implementation of the EGL API -- runtime
 Package: libegl1-pvr-dev
 Section: non-free/libdevel
 Architecture: arm64
-Depends:
- libegl1-pvr (= ${binary:Version}),
- libdrm-dev [!hurd-any],
- x11proto-dri2-dev,
- x11proto-gl-dev,
- libx11-dev,
- libxext-dev,
- libxxf86vm-dev,
- libxdamage-dev,
- libxfixes-dev,
- libxcb-glx0-dev,
- libxcb-dri2-0-dev,
- libxcb-dri3-dev,
- libxcb-present-dev,
- libxcb-sync-dev,
- libxshmfence-dev,
- libx11-xcb-dev,
- ${misc:Depends},
+Depends: libdrm-dev [!hurd-any],
+         libegl1-pvr (= ${binary:Version}),
+         libx11-dev,
+         libx11-xcb-dev,
+         libxcb-dri2-0-dev,
+         libxcb-dri3-dev,
+         libxcb-glx0-dev,
+         libxcb-present-dev,
+         libxcb-sync-dev,
+         libxdamage-dev,
+         libxext-dev,
+         libxfixes-dev,
+         libxshmfence-dev,
+         libxxf86vm-dev,
+         x11proto-dri2-dev,
+         x11proto-gl-dev,
+         ${misc:Depends}
 Provides: libegl1-mesa-dev
 Conflicts: libegl1-mesa-dev
 Replaces: libegl1-mesa-dev
@@ -172,17 +174,15 @@ Description: Miscellaneous pvr GL utilities
 Package: libgl1-pvr-glx
 Section: non-free/libs
 Architecture: arm64
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- libudev1 [linux-any],
+Depends: libglapi-pvr (= ${binary:Version}),
+         libudev1 [linux-any],
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: libgl1-pvr-dri
 Conflicts: libgl1, libgl1-mesa-glx
 Replaces: libgl1, libgl1-mesa-glx
 Provides: libgl1, libgl1-mesa-glx
-Breaks:
- glx-diversions (<< 0.4),
- libopengl-perl (<< 0.6704+dfsg-2),
+Breaks: glx-diversions (<< 0.4), libopengl-perl (<< 0.6704+dfsg-2)
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: pvr implementation of the OpenGL API -- GLX runtime
@@ -203,6 +203,136 @@ Description: pvr implementation of the OpenGL API -- GLX runtime
 Package: xserver-xorg-core-pvr
 Architecture: arm64
 Section: non-free/x11
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Xorg X server - libglx replacement
  Replace libglx
+
+Package: libwayland-egl1-pvr
+Section: non-free/libs
+Architecture: arm64
+Depends: libegl1-pvr, ${misc:Depends}, ${shlibs:Depends}
+Provides: libwayland-egl1, libwayland-egl1-mesa
+Conflicts: libwayland-egl1, libwayland-egl1-mesa
+Replaces: libegl1-mesa-drivers  (<< 10.1.0-2),
+          libwayland-egl1,
+          libwayland-egl1-mesa
+Breaks: libegl1-mesa-drivers (<< 10.1.0-2)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: implementation of the Wayland EGL platform -- runtime
+ This package contains the pvr implementation of the Wayland EGL platform
+
+Package: libgl1-pvr-dev
+Section: non-free/libdevel
+Architecture: arm64
+Depends: libdrm-dev (>= 2.4.65) [!hurd-any],
+         libgl1-pvr-glx (= ${binary:Version}),
+         libx11-dev,
+         libx11-xcb-dev,
+         libxcb-dri2-0-dev,
+         libxcb-dri3-dev,
+         libxcb-glx0-dev,
+         libxcb-present-dev,
+         libxcb-sync-dev,
+         libxdamage-dev,
+         libxext-dev,
+         libxfixes-dev,
+         libxshmfence-dev,
+         libxxf86vm-dev,
+         x11proto-dri2-dev (>= 2.6),
+         x11proto-gl-dev (>= 1.4.14),
+         ${misc:Depends}
+Conflicts: libgl-dev, libgl1-mesa-dev
+Replaces: libgl-dev, libgl1-mesa-dev
+Provides: libgl-dev, libgl1-mesa-dev
+Multi-Arch: same
+Description: pvr implementation of the OpenGL API -- GLX development files
+ This version of PVR provides GLX and DRI capabilities: it is capable of
+ both direct and indirect rendering.  For direct rendering, it can use DRI
+ modules from the libgl1-mesa-dri package to accelerate drawing.
+ .
+ This package includes headers and static libraries for compiling
+ programs with PVR.
+ .
+ For a complete description of pvr, please look at the libgl1-pvr-glx
+ package.
+
+Package: libglapi-pvr
+Section: non-free/libs
+Architecture: arm64
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libglapi-mesa
+Replaces: libglapi-mesa
+Provides: libglapi-mesa
+Multi-Arch: same
+Description: pvr implementation of the GL API -- shared library
+ The pvr GL API module is responsible for dispatching all the gl*
+ functions. It is intended to be mainly used by both the libgles1-pvr
+ and libgles2-pvr packages.
+
+Package: pvr-opencl-icd
+Section: non-free/libs
+Architecture: arm64
+Pre-Depends: ${misc:Pre-Depends}
+Depends: pvr-icd-libopencl1 | libopencl1, ${misc:Depends}, ${shlibs:Depends}
+Provides: opencl-icd
+Multi-Arch: same
+Description: pvr implementation of the OpenCL API -- ICD runtime
+ This package contains the pvr implementation of the OpenCL (Open Compute
+ Language) library, which is intended for use with an ICD loader. OpenCL
+ provides a standardized interface for computational analysis on graphical
+ processing units.
+
+Package: pvr-icd-libopencl1
+Section: non-free/libs
+Architecture: arm64
+Multi-Arch: same
+Depends: libpvr-private, ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Conflicts: amd-app, libopencl1, nvidia-libopencl1-dev, ocl-icd-libopencl1
+Provides: libopencl-1.1-1,
+          libopencl-1.2-1,
+          libopencl-2.0-1,
+          libopencl-2.1-1,
+          libopencl1
+Replaces: amd-app, libopencl1, nvidia-libopencl1-dev
+Description: PVR OpenCL ICD Loader
+ OpenCL (Open Computing Language) is a multivendor open standard for
+ general-purpose parallel programming of heterogeneous systems that include
+ CPUs, GPUs and other processors.
+ .
+ This package contains an installable client driver loader (ICD Loader)
+ library that can be used to load any (free or non-free) installable client
+ driver (ICD) for OpenCL. It acts as a demultiplexer so several ICD can
+ be installed and used together.
+
+Package: pvr-icd-opencl-dev
+Architecture: arm64
+Multi-Arch: same
+Section: non-free/libdevel
+Depends: opencl-headers,
+         pvr-icd-libopencl1 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: libgl1-pvr-dev | libgl-dev, libpoclu-dev
+Pre-Depends: ${misc:Pre-Depends}
+Breaks: amd-libopencl1 (<< 1:13.4-4~),
+        nvidia-libopencl1 (<< 305~),
+        ocl-icd-libopencl1 (<< 2.1.3-5~)
+Conflicts: ocl-icd-opencl-dev, opencl-dev
+Provides: opencl-dev
+Replaces: amd-libopencl1 (<< 1:13.4-4~),
+          nvidia-libopencl1 (<< 305~),
+          ocl-icd-libopencl1 (<< 2.1.3-5~),
+          opencl-dev
+Description: OpenCL development files
+ OpenCL (Open Computing Language) is a multivendor open standard for
+ general-purpose parallel programming of heterogeneous systems that include
+ CPUs, GPUs and other processors.
+ .
+ This package provides the development files: headers and libraries.
+ .
+ It also ensures that the ocl-icd ICD loader is installed so its additionnal
+ features (compared to the OpenCL norm) can be used: .pc file, avaibility to
+ select an ICD without root privilege, etc.
diff --git a/debian/libegl1-pvr-dev.install b/debian/libegl1-pvr-dev.install
index 865486b..b7679be 100644
--- a/debian/libegl1-pvr-dev.install
+++ b/debian/libegl1-pvr-dev.install
@@ -1,4 +1,7 @@
-target_arm64/usr/lib/*/libEGL.so usr/lib/aarch64-linux-gnu
-target_arm64/usr/include/EGL usr/include
-target_arm64/usr/include/KHR usr/include
-target_arm64/usr/lib/*/pkgconfig/egl.pc usr/lib/aarch64-linux-gnu/pkgconfig
+# Wayland support, only on Linux:
+usr/include/EGL
+usr/include/KHR
+usr/lib/*/libEGL.so
+usr/lib/*/libwayland-egl.so
+usr/lib/*/pkgconfig/egl.pc
+usr/lib/*/pkgconfig/wayland-egl.pc
diff --git a/debian/libegl1-pvr.install b/debian/libegl1-pvr.install
index 950ed6e..cb37489 100644
--- a/debian/libegl1-pvr.install
+++ b/debian/libegl1-pvr.install
@@ -1 +1 @@
-target_arm64/usr/lib/*/libEGL.so.* usr/lib/aarch64-linux-gnu
+usr/lib/*/libEGL.so.*
diff --git a/debian/libgl1-pvr-dev.install b/debian/libgl1-pvr-dev.install
new file mode 100644
index 0000000..a8c371e
--- /dev/null
+++ b/debian/libgl1-pvr-dev.install
@@ -0,0 +1,2 @@
+usr/lib/*/libGL.so
+usr/lib/*/pkgconfig/gl.pc
diff --git a/debian/libgl1-pvr-dri.dirs b/debian/libgl1-pvr-dri.dirs
deleted file mode 100644
index 51e894a..0000000
--- a/debian/libgl1-pvr-dri.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/aarch64-linux-gnu/dri
diff --git a/debian/libgl1-pvr-dri.install b/debian/libgl1-pvr-dri.install
index 769eb72..6deaf51 100644
--- a/debian/libgl1-pvr-dri.install
+++ b/debian/libgl1-pvr-dri.install
@@ -1 +1 @@
-build/pvr_dri.so usr/lib/aarch64-linux-gnu/dri
+usr/lib/*/dri/*.so
diff --git a/debian/libgl1-pvr-glx.install b/debian/libgl1-pvr-glx.install
index 93b163f..6fc3110 100644
--- a/debian/libgl1-pvr-glx.install
+++ b/debian/libgl1-pvr-glx.install
@@ -1,2 +1 @@
-target_arm64/usr/lib/aarch64-linux-gnu/libGL.so.1 usr/lib/aarch64-linux-gnu
-target_arm64/usr/lib/aarch64-linux-gnu/libGL.so.1.2.0 usr/lib/aarch64-linux-gnu
+usr/lib/*/libGL.so.*
diff --git a/debian/libglapi-pvr.install b/debian/libglapi-pvr.install
new file mode 100644
index 0000000..e93d0c3
--- /dev/null
+++ b/debian/libglapi-pvr.install
@@ -0,0 +1 @@
+usr/lib/*/libglapi.so.0*
diff --git a/debian/libgles1-pvr-dev.install b/debian/libgles1-pvr-dev.install
index f77559d..f05401c 100644
--- a/debian/libgles1-pvr-dev.install
+++ b/debian/libgles1-pvr-dev.install
@@ -1 +1 @@
-target_arm64/usr/lib/pkgconfig/glesv1_cm.pc usr/lib/aarch64-linux-gnu/pkgconfig
+target_arm64/usr/lib/*/pkgconfig/glesv1_cm.pc usr/lib/aarch64-linux-gnu/pkgconfig
diff --git a/debian/libgles2-pvr-dev.install b/debian/libgles2-pvr-dev.install
index 0d5be5a..3ccf1cc 100644
--- a/debian/libgles2-pvr-dev.install
+++ b/debian/libgles2-pvr-dev.install
@@ -1 +1 @@
-target_arm64/usr/lib/pkgconfig/glesv2.pc usr/lib/aarch64-linux-gnu/pkgconfig
+target_arm64/usr/lib/*/pkgconfig/glesv2.pc usr/lib/aarch64-linux-gnu/pkgconfig
diff --git a/debian/libwayland-egl1-pvr.install b/debian/libwayland-egl1-pvr.install
new file mode 100644
index 0000000..5992ac2
--- /dev/null
+++ b/debian/libwayland-egl1-pvr.install
@@ -0,0 +1 @@
+usr/lib/*/libwayland-egl.so.*
diff --git a/debian/pvr-icd-libopencl1.links b/debian/pvr-icd-libopencl1.links
new file mode 100644
index 0000000..97c4441
--- /dev/null
+++ b/debian/pvr-icd-libopencl1.links
@@ -0,0 +1,2 @@
+usr/lib/aarch64-linux-gnu/libOpenCL.so.1.0.0 usr/lib/aarch64-linux-gnu/libOpenCL.so.1
+usr/lib/aarch64-linux-gnu/libPVROCL.so usr/lib/aarch64-linux-gnu/libOpenCL.so.1.0.0
diff --git a/debian/pvr-icd-opencl-dev.links b/debian/pvr-icd-opencl-dev.links
new file mode 100644
index 0000000..bd648aa
--- /dev/null
+++ b/debian/pvr-icd-opencl-dev.links
@@ -0,0 +1 @@
+usr/lib/aarch64-linux-gnu/libOpenCL.so.1 usr/lib/aarch64-linux-gnu/libOpenCL.so
diff --git a/debian/pvr-opencl-icd.install b/debian/pvr-opencl-icd.install
new file mode 100644
index 0000000..043b750
--- /dev/null
+++ b/debian/pvr-opencl-icd.install
@@ -0,0 +1 @@
+etc/OpenCL/vendors/*.icd
diff --git a/debian/rules b/debian/rules
index 8918887..d224ece 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,11 @@ override_dh_auto_build:
 	#patchelf --set-rpath '$$ORIGIN/pvr' build/libGLESv1_CM.so.*
 	#patchelf --set-rpath '$$ORIGIN/../../../aarch64-linux-gnu/pvr' build/pvr_drv.so
 
+override_dh_auto_install:
+	dh_auto_install
+	mkdir -p $(CURDIR)/debian/tmp
+	./install.sh -v --root $(CURDIR)/debian/tmp
+
 override_dh_auto_clean:
 	rm -rf $(CURDIR)/build
 	dh_auto_clean