diff options
author | Ying-Chun Liu (PaulLiu) <paulliu@debian.org> | 2016-03-22 22:21:08 +0800 |
---|---|---|
committer | Ying-Chun Liu (PaulLiu) <paulliu@debian.org> | 2016-03-22 22:21:08 +0800 |
commit | f0960120aa91bbe064cda64760f2a409a72b44a1 (patch) | |
tree | 3f92f1e4d0829226a8761edb8e4475a22fb3a3e4 | |
parent | 6e99a2d62126aec1b539da3d712905298fa95f8b (diff) |
New upstream version.debian/20160322-1
Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
-rw-r--r-- | debian/changelog | 9 | ||||
-rw-r--r-- | debian/control | 38 | ||||
-rw-r--r-- | debian/libegl1-pvr-dev.install | 8 | ||||
-rw-r--r-- | debian/libegl1-pvr.install | 2 | ||||
-rw-r--r-- | debian/libgl1-pvr-dri.dirs | 1 | ||||
-rw-r--r-- | debian/libgl1-pvr-dri.links | 1 | ||||
-rw-r--r-- | debian/libgl1-pvr-glx.install | 2 | ||||
-rw-r--r-- | debian/libgles1-pvr-dev.install | 2 | ||||
-rw-r--r-- | debian/libgles2-pvr-dev.install | 2 | ||||
-rw-r--r-- | debian/libpvr-private.install | 22 | ||||
-rw-r--r-- | debian/libpvr-private.links | 2 | ||||
-rwxr-xr-x | debian/rules | 23 | ||||
-rw-r--r-- | debian/xserver-xorg-core-pvr.install | 1 | ||||
-rw-r--r-- | debian/xserver-xorg-core-pvr.postrm | 44 | ||||
-rw-r--r-- | debian/xserver-xorg-core-pvr.preinst | 39 |
15 files changed, 169 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog index 0d4d167..7150b7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +s900-gpu-binary (20160322-1) unstable; urgency=low + + * Update debian/README.source to include gbp usage. + * debian/copyright: update the license. + * Add libEGL replacements. + * Imported Upstream version 20160322 + + -- Ying-Chun Liu (PaulLiu) <paulliu@debian.org> Tue, 22 Mar 2016 18:54:27 +0800 + s900-gpu-binary (20151010-1) unstable; urgency=medium * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> diff --git a/debian/control b/debian/control index c54ba0f..006c11d 100644 --- a/debian/control +++ b/debian/control @@ -168,3 +168,41 @@ Architecture: arm64 Depends: libpvr-private, ${misc:Depends}, ${shlibs:Depends} Description: Miscellaneous pvr GL utilities This package provides several basic GL utilities built by pvr. + +Package: libgl1-pvr-glx +Section: non-free/libs +Architecture: arm64 +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libudev1 [linux-any], +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), +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Description: pvr implementation of the OpenGL API -- GLX runtime + PVR is a 3-D graphics library with an API which is very similar to + that of OpenGL. To the extent that pvr utilizes the OpenGL command + syntax or state machine, it is being used with authorization from + Silicon Graphics, Inc. However, the authors make no claim that pvr + is in any way a compatible replacement for OpenGL or associated with + Silicon Graphics, Inc. + . + 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-pvr-dri package to accelerate drawing. + . + This package does not include the modules themselves: these can be found + in the libgl1-pvr-dri package. + +Package: xserver-xorg-core-pvr +Architecture: arm64 +Section: non-free/x11 +Depends: ${shlibs:Depends}, ${misc:Depends}, +Description: Xorg X server - libglx replacement + Replace libglx diff --git a/debian/libegl1-pvr-dev.install b/debian/libegl1-pvr-dev.install index 43040bf..865486b 100644 --- a/debian/libegl1-pvr-dev.install +++ b/debian/libegl1-pvr-dev.install @@ -1,4 +1,4 @@ -target_arm64/usr/local/pvr/lib/libEGL.so usr/lib/aarch64-linux-gnu -target_arm64/usr/local/pvr/include/EGL usr/include -target_arm64/usr/local/pvr/include/KHR usr/include -target_arm64/usr/local/pvr/lib/pkgconfig/egl.pc usr/lib/aarch64-linux-gnu/pkgconfig +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 diff --git a/debian/libegl1-pvr.install b/debian/libegl1-pvr.install index c410396..950ed6e 100644 --- a/debian/libegl1-pvr.install +++ b/debian/libegl1-pvr.install @@ -1 +1 @@ -target_arm64/usr/local/pvr/lib/libEGL.so.* usr/lib/aarch64-linux-gnu +target_arm64/usr/lib/*/libEGL.so.* usr/lib/aarch64-linux-gnu diff --git a/debian/libgl1-pvr-dri.dirs b/debian/libgl1-pvr-dri.dirs index 11c1c1f..51e894a 100644 --- a/debian/libgl1-pvr-dri.dirs +++ b/debian/libgl1-pvr-dri.dirs @@ -1,2 +1 @@ -usr/lib/aarch64-linux-gnu/pvr usr/lib/aarch64-linux-gnu/dri diff --git a/debian/libgl1-pvr-dri.links b/debian/libgl1-pvr-dri.links deleted file mode 100644 index 004aac3..0000000 --- a/debian/libgl1-pvr-dri.links +++ /dev/null @@ -1 +0,0 @@ -usr/lib/aarch64-linux-gnu/dri usr/lib/aarch64-linux-gnu/pvr/dri diff --git a/debian/libgl1-pvr-glx.install b/debian/libgl1-pvr-glx.install new file mode 100644 index 0000000..93b163f --- /dev/null +++ b/debian/libgl1-pvr-glx.install @@ -0,0 +1,2 @@ +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 diff --git a/debian/libgles1-pvr-dev.install b/debian/libgles1-pvr-dev.install index 243bf61..f77559d 100644 --- a/debian/libgles1-pvr-dev.install +++ b/debian/libgles1-pvr-dev.install @@ -1 +1 @@ -target_arm64/usr/local/pvr/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 f32a49d..0d5be5a 100644 --- a/debian/libgles2-pvr-dev.install +++ b/debian/libgles2-pvr-dev.install @@ -1 +1 @@ -target_arm64/usr/local/pvr/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/libpvr-private.install b/debian/libpvr-private.install index ae00a23..e3e6305 100644 --- a/debian/libpvr-private.install +++ b/debian/libpvr-private.install @@ -1,11 +1,11 @@ -build/libPVROCL.so usr/lib/aarch64-linux-gnu/pvr -build/libPVROGL_MESA.so usr/lib/aarch64-linux-gnu/pvr -build/libPVRScopeServices.so usr/lib/aarch64-linux-gnu/pvr -build/libglslcompiler.so usr/lib/aarch64-linux-gnu/pvr -build/liboclcompiler.so usr/lib/aarch64-linux-gnu/pvr -build/libpvr_dri_support.so usr/lib/aarch64-linux-gnu/pvr -build/libpvrbm.so usr/lib/aarch64-linux-gnu/pvr -build/libsrv_init.so usr/lib/aarch64-linux-gnu/pvr -build/libsrv_um.so usr/lib/aarch64-linux-gnu/pvr -build/libufwriter.so usr/lib/aarch64-linux-gnu/pvr -build/libusc.so usr/lib/aarch64-linux-gnu/pvr +build/libPVROCL.so usr/lib/aarch64-linux-gnu +build/libPVROGL_MESA.so usr/lib/aarch64-linux-gnu +build/libPVRScopeServices.so usr/lib/aarch64-linux-gnu +build/libglslcompiler.so usr/lib/aarch64-linux-gnu +build/liboclcompiler.so.* usr/lib/aarch64-linux-gnu +build/libpvr_dri_support.so usr/lib/aarch64-linux-gnu +build/libpvrbm.so usr/lib/aarch64-linux-gnu +build/libsrv_init.so usr/lib/aarch64-linux-gnu +build/libsrv_um.so usr/lib/aarch64-linux-gnu +build/libufwriter.so usr/lib/aarch64-linux-gnu +build/libusc.so usr/lib/aarch64-linux-gnu diff --git a/debian/libpvr-private.links b/debian/libpvr-private.links index 2aff76e..83dd46b 100644 --- a/debian/libpvr-private.links +++ b/debian/libpvr-private.links @@ -1 +1 @@ -usr/lib/aarch64-linux-gnu/pvr usr/local/pvr/lib +usr/lib/aarch64-linux-gnu/liboclcompiler.so.1.0 usr/lib/aarch64-linux-gnu/liboclcompiler.so diff --git a/debian/rules b/debian/rules index 41d4acf..8918887 100755 --- a/debian/rules +++ b/debian/rules @@ -25,17 +25,28 @@ override_dh_auto_build: dh_auto_build rm -rf $(CURDIR)/build mkdir -p $(CURDIR)/build + + # libpvr-private cp -f $(CURDIR)/target_arm64/*.so $(CURDIR)/build - cp -f $(CURDIR)/target_arm64/usr/local/pvr/lib/dri/pvr_dri.so $(CURDIR)/build + chmod a-x $(CURDIR)/build/*.so + mv $(CURDIR)/build/liboclcompiler.so $(CURDIR)/build/liboclcompiler.so.1.0 + #for i in libpvrbm.so libPVRScopeServices.so libusc.so libpvr_dri_support.so libsrv_init.so libglslcompiler.so libPVROCL.so libsrv_um.so liboclcompiler.so libPVROGL_MESA.so libufwriter.so; do patchelf --set-rpath '$$ORIGIN' $(CURDIR)/build/$$i; done + + # libgl1-pvr-dri + cp -f `find $(CURDIR)/target_arm64 -name pvr_dri.so` $(CURDIR)/build + chmod a-x $(CURDIR)/build/*.so + #patchelf --set-rpath '$$ORIGIN/../pvr' build/pvr_dri.so + + # xserver-xorg-video-pvr cp -f $(CURDIR)/target_arm64/xorg.conf $(CURDIR)/build/xorg_pvr.conf + cp -f $(CURDIR)/target_arm64/libGLESv1_CM.so $(CURDIR)/build + cp -f $(CURDIR)/target_arm64/libGLESv2.so $(CURDIR)/build chmod a-x $(CURDIR)/build/*.so mv -f build/libGLESv1_CM.so build/libGLESv1_CM.so.1.1.0 mv -f build/libGLESv2.so build/libGLESv2.so.2.0.0 - for i in libpvrbm.so libPVRScopeServices.so libusc.so libpvr_dri_support.so libsrv_init.so libglslcompiler.so libPVROCL.so libsrv_um.so liboclcompiler.so libPVROGL_MESA.so libufwriter.so; do patchelf --set-rpath '$$ORIGIN' $(CURDIR)/build/$$i; done - patchelf --set-rpath '$$ORIGIN/pvr' build/libGLESv2.so.* - patchelf --set-rpath '$$ORIGIN/pvr' build/libGLESv1_CM.so.* - patchelf --set-rpath '$$ORIGIN/../../../aarch64-linux-gnu/pvr' build/pvr_drv.so - patchelf --set-rpath '$$ORIGIN/../pvr' build/pvr_dri.so + #patchelf --set-rpath '$$ORIGIN/pvr' build/libGLESv2.so.* + #patchelf --set-rpath '$$ORIGIN/pvr' build/libGLESv1_CM.so.* + #patchelf --set-rpath '$$ORIGIN/../../../aarch64-linux-gnu/pvr' build/pvr_drv.so override_dh_auto_clean: rm -rf $(CURDIR)/build diff --git a/debian/xserver-xorg-core-pvr.install b/debian/xserver-xorg-core-pvr.install new file mode 100644 index 0000000..a8aaa15 --- /dev/null +++ b/debian/xserver-xorg-core-pvr.install @@ -0,0 +1 @@ +target_arm64/usr/lib/xorg/modules/extensions/libglx.so usr/lib/xorg/modules/extensions diff --git a/debian/xserver-xorg-core-pvr.postrm b/debian/xserver-xorg-core-pvr.postrm new file mode 100644 index 0000000..8209b21 --- /dev/null +++ b/debian/xserver-xorg-core-pvr.postrm @@ -0,0 +1,44 @@ +#!/bin/sh +# postrm script for xserver-xorg-core-pvr +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see https://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + ;; + + remove|abort-install|disappear) + dpkg-divert --rename --remove /usr/lib/xorg/modules/extensions/libglx.so + ;; + + upgrade|failed-upgrade|abort-upgrade) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/xserver-xorg-core-pvr.preinst b/debian/xserver-xorg-core-pvr.preinst new file mode 100644 index 0000000..0437e4e --- /dev/null +++ b/debian/xserver-xorg-core-pvr.preinst @@ -0,0 +1,39 @@ +#!/bin/sh +# preinst script for xserver-xorg-core-pvr +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> +# for details, see https://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install) + dpkg-divert --add --rename --divert /usr/lib/xorg/modules/extensions/libglx.so.pvr /usr/lib/xorg/modules/extensions/libglx.so + ;; + + upgrade) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 |