Add mali-sunxi-utils package

This commit is contained in:
zador-blood-stained 2016-09-04 00:48:52 +03:00
parent 3e26fad975
commit 6d311d999d
8 changed files with 127 additions and 35 deletions

View File

@ -2,8 +2,8 @@
local package_name="libmali-sunxi-r3p0"
local package_repo="https://github.com/linux-sunxi/sunxi-mali.git"
local package_ref="branch:master"
local package_builddeps="xutils-dev"
local package_install_target="libmali-sunxi-r3p0"
local package_builddeps="xutils-dev libegl1-mesa-dev libgles1-mesa-dev libgles2-mesa-dev"
local package_install_target="libmali-sunxi-r3p0 mali-sunxi-utils"
local package_arch="armhf"
local package_component="${release}-desktop"

View File

@ -4,13 +4,16 @@ Maintainer: root <root@unknown>
Build-Depends:
debhelper (>= 9),
xutils-dev,
libegl1-mesa-dev,
libgles2-mesa-dev,
Standards-Version: 3.9.5
Section: libs
Homepage: https://github.com/linux-sunxi/sunxi-mali/
Package: libmali-sunxi-r3p0
Architecture: any
Pre-Depends: armbian-bsp
Pre-Depends:
armbian-bsp
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libegl1-mesa, libgles1-mesa, libgles2-mesa
Provides: sunxi-mali
@ -27,11 +30,25 @@ Depends:
libegl1-mesa-dev,
libgles1-mesa-dev,
libgles2-mesa-dev,
${misc:Depends}
Replaces: libegl1-mesa-dev, libgles1-mesa-dev, libgles2-mesa-dev
${misc:Depends},
Replaces:
libegl1-mesa-dev,
libgles1-mesa-dev,
libgles2-mesa-dev,
Provides: sunxi-mali-dev
Description: Mali userspace binary driver version r3p0
This package contains a complete set of Mali userspace drivers,
including proprietary OpenGLESv2/EGL binaries.
This package contains OpenGLESv2/EGL development headers
from Mali OpenGL ES SDK.
Package: mali-sunxi-utils
Architecture: any
Depends:
libmali-sunxi-r3p0,
${shlibs:Depends},
${misc:Depends}
Description: Mali userspace binary driver version r3p0
This package contains a complete set of Mali userspace drivers,
including proprietary OpenGLESv2/EGL binaries.
This package contains mali-triangle test application.

View File

@ -0,0 +1 @@
usr/bin

View File

@ -0,0 +1,54 @@
diff --git a/lib/maliMakefile b/lib/mali/Makefile
index d5db8f8..2a0942d 100644
--- a/lib/mali/Makefile
+++ b/lib/mali/Makefile
@@ -1,6 +1,9 @@
include ../../Makefile.setup
include ../../config.mk
+prepare: $(MALI_VERSION)/$(MALI_LIBS_ABI)/$(MALI_EGL_TYPE)/Makefile
+ $(MAKE) -C $(MALI_VERSION)/$(MALI_LIBS_ABI)/$(MALI_EGL_TYPE)/ prepare
+
install: $(MALI_VERSION)/$(MALI_LIBS_ABI)/$(MALI_EGL_TYPE)/Makefile
$(MAKE) -C $(MALI_VERSION)/$(MALI_LIBS_ABI)/$(MALI_EGL_TYPE)/
diff --git a/Makefile.mashup b/Makefile.mashup
index 99a2539..d477be2 100644
--- a/lib/mali/Makefile.mashup
+++ b/lib/mali/Makefile.mashup
@@ -5,15 +5,35 @@ install: libMali.so
$(RM) $(libdir)libEGL.so.1.4 $(libdir)libEGL.so.1 $(libdir)libEGL.so
$(LN) libMali.so $(libdir)libEGL.so.1.4
+ $(LN) libMali.so $(libdir)libEGL.so.1.0.0
$(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
$(LN) libEGL.so.1 $(libdir)libEGL.so
$(RM) $(libdir)libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
$(LN) libMali.so $(libdir)libGLESv1_CM.so.1.1
+ $(LN) libMali.so $(libdir)libGLESv1_CM.so.1.1.0
$(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
$(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
$(RM) $(libdir)libGLESv2.so.2.0 $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
$(LN) libMali.so $(libdir)libGLESv2.so.2.0
+ $(LN) libMali.so $(libdir)libGLESv2.so.2.0.0
$(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
$(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
+
+.PHONY: prepare
+prepare:
+ $(LN) libMali.so libEGL.so.1.4
+ $(LN) libMali.so libEGL.so.1.0.0
+ $(LN) libEGL.so.1.4 libEGL.so.1
+ $(LN) libEGL.so.1 libEGL.so
+
+ $(LN) libMali.so libGLESv1_CM.so.1.1
+ $(LN) libMali.so libGLESv1_CM.so.1.1.0
+ $(LN) libGLESv1_CM.so.1.1 libGLESv1_CM.so.1
+ $(LN) libGLESv1_CM.so.1 libGLESv1_CM.so
+
+ $(LN) libMali.so libGLESv2.so.2.0
+ $(LN) libMali.so libGLESv2.so.2.0.0
+ $(LN) libGLESv2.so.2.0 libGLESv2.so.2
+ $(LN) libGLESv2.so.2 libGLESv2.so

View File

@ -8,7 +8,7 @@ index 6865abf..2f0cfe4 100644
+*.pc
+!Makefile.pc
diff --git a/Makefile b/Makefile
index 60d4a0f..ba752a8 100644
index 60d4a0f..c4ca377 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
@ -19,7 +19,7 @@ index 60d4a0f..ba752a8 100644
config:
rm -f config.mk
@@ -16,11 +17,13 @@ clean:
@@ -16,11 +17,17 @@ clean:
$(MAKE) -C test clean
$(MAKE) -C lib clean
$(MAKE) -C include clean
@ -29,9 +29,14 @@ index 60d4a0f..ba752a8 100644
install: config.mk
$(MAKE) -C lib install
$(MAKE) -C include install
+ $(MAKE) -C test install
+ $(MAKE) -f Makefile.pc install
test: config.mk
-test: config.mk
+prepare: config.mk
+ $(MAKE) -C lib prepare
+
+test: config.mk prepare
$(MAKE) -C test test
diff --git a/Makefile.pc b/Makefile.pc
new file mode 100644
@ -148,3 +153,38 @@ index 59e376c..90d96bb 100644
/* GL types for handling large vertex buffer objects */
typedef khronos_intptr_t GLintptr;
diff --git a/lib/Makefile b/lib/Makefile
index 574bc2c..1df2e2e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,6 +2,9 @@ all:
clean:
+prepare:
+ $(MAKE) -C mali prepare
+
install:
$(MAKE) -C mali install
diff --git a/test/Makefile b/test/Makefile
index 700416e..1fce02f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,11 +1,15 @@
include ../Makefile.setup
+include ../config.mk
CFLAGS ?= -Wall
all: test
test: ../config.mk test.c
- $(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2
+ $(CC) $(CFLAGS) -o $@ test.c -I../include/ -L../lib/mali/$(MALI_VERSION)/$(MALI_LIBS_ABI)/$(MALI_EGL_TYPE)/ -lEGL -lGLESv2 -lX11
+
+install:
+ $(INSTALL) -m 755 test $(DESTDIR)$(prefix)/bin/mali-triangle
clean:
rm -f test

View File

@ -1,23 +0,0 @@
diff --git a/lib/mali/Makefile.mashup b/lib/mali/Makefile.mashup
index 99a2539..643ae90 100644
--- a/lib/mali/Makefile.mashup
+++ b/lib/mali/Makefile.mashup
@@ -5,15 +5,18 @@ install: libMali.so
$(RM) $(libdir)libEGL.so.1.4 $(libdir)libEGL.so.1 $(libdir)libEGL.so
$(LN) libMali.so $(libdir)libEGL.so.1.4
+ $(LN) libMali.so $(libdir)libEGL.so.1.0.0
$(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
$(LN) libEGL.so.1 $(libdir)libEGL.so
$(RM) $(libdir)libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
$(LN) libMali.so $(libdir)libGLESv1_CM.so.1.1
+ $(LN) libMali.so $(libdir)libGLESv1_CM.so.1.1.0
$(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
$(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
$(RM) $(libdir)libGLESv2.so.2.0 $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
$(LN) libMali.so $(libdir)libGLESv2.so.2.0
+ $(LN) libMali.so $(libdir)libGLESv2.so.2.0.0
$(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
$(LN) libGLESv2.so.2 $(libdir)libGLESv2.so

View File

@ -1,2 +1,2 @@
fix-multiarch.patch
overwrite-libraries.patch
fix-makefiles.patch
fix-makefiles-submodule.patch

View File

@ -13,12 +13,15 @@ override_dh_auto_clean:
override_dh_strip:
override_dh_auto_build:
dh_auto_build -- libsubdir=$(DEB_HOST_MULTIARCH)
dh_auto_build -- libsubdir=$(DEB_HOST_MULTIARCH) all test
override_dh_auto_configure:
make config VERSION=r3p0 ABI=armhf EGL_TYPE=x11
override_dh_auto_install:
mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) debian/tmp/usr/include
mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) debian/tmp/usr/include debian/tmp/usr/bin
dh_auto_install -- libsubdir=$(DEB_HOST_MULTIARCH)
install -D -m0644 debian/sunxi-mali.conf debian/tmp/etc/modules-load.d/sunxi-mali.conf
override_dh_shlibdeps:
dh_shlibdeps -l debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/