Real-time collaboration for Jupyter Notebooks, Linux Terminals, LaTeX, VS Code, R IDE, and more,
all in one place. Commercial Alternative to JupyterHub.
Real-time collaboration for Jupyter Notebooks, Linux Terminals, LaTeX, VS Code, R IDE, and more,
all in one place. Commercial Alternative to JupyterHub.
Path: blob/next/external/packages/extras-buildpkgs/libmali-sunxi-r3p0/debian/patches/fix-makefiles.patch
Views: 3963
diff --git a/.gitignore b/.gitignore1index 6865abf..2f0cfe4 1006442--- a/.gitignore3+++ b/.gitignore4@@ -1,2 +1,4 @@5config.mk6*~7+*.pc8+!Makefile.pc9diff --git a/Makefile b/Makefile10index 60d4a0f..83b40bb 10064411--- a/Makefile12+++ b/Makefile13@@ -3,6 +3,7 @@14all: config.mk15$(MAKE) -C include16$(MAKE) -C lib17+ $(MAKE) -f Makefile.pc1819config:20rm -f config.mk21@@ -12,15 +13,21 @@ config.mk:22$(MAKE) -f Makefile.config2324clean:25+ touch config.mk26$(MAKE) -C version clean27$(MAKE) -C test clean28$(MAKE) -C lib clean29- $(MAKE) -C include clean30+ $(MAKE) -f Makefile.pc clean31rm -f config.mk3233install: config.mk34$(MAKE) -C lib install35$(MAKE) -C include install36+ $(MAKE) -C test install37+ $(MAKE) -f Makefile.pc install3839-test: config.mk40+prepare: config.mk41+ $(MAKE) -C lib prepare42+43+test: config.mk prepare44$(MAKE) -C test test45diff --git a/Makefile.pc b/Makefile.pc46new file mode 10064447index 0000000..333347a48--- /dev/null49+++ b/Makefile.pc50@@ -0,0 +1,24 @@51+include Makefile.setup52+include config.mk53+54+all:55+ echo "prefix=$(prefix)" > egl.pc56+ echo "libdir=$(prefix)lib/$(libsubdir)/$(private_dir)" >> egl.pc57+ cat egl.pc.in >> egl.pc58+ sed -i "s/MVERSION/${MALI_VERSION}/g" egl.pc59+ echo "prefix=$(prefix)" > gles_cm.pc60+ echo "libdir=$(prefix)lib/$(libsubdir)/$(private_dir)" >> gles_cm.pc61+ cat gles_cm.pc.in >> gles_cm.pc62+ sed -i "s/MVERSION/${MALI_VERSION}/g" gles_cm.pc63+ echo "prefix=$(prefix)" > glesv2.pc64+ echo "libdir=$(prefix)lib/$(libsubdir)/$(private_dir)" >> glesv2.pc65+ cat glesv2.pc.in >> glesv2.pc66+ sed -i "s/MVERSION/${MALI_VERSION}/g" glesv2.pc67+68+install: egl.pc gles_cm.pc glesv2.pc69+ $(MKDIR) $(pkgconfigdir)/pkgconfig70+ $(INSTALL_DATA) $^ $(pkgconfigdir)/pkgconfig71+72+clean:73+ $(RM) egl.pc gles_cm.pc glesv2.pc74+75diff --git a/Makefile.setup b/Makefile.setup76index 9b1ef0d..31da0d2 10064477--- a/Makefile.setup78+++ b/Makefile.setup79@@ -1,6 +1,9 @@80DESTDIR ?= /81prefix ?= /usr/82-libdir ?= $(DESTDIR)$(prefix)lib/83+libsubdir ?=84+private_dir ?=85+libdir ?= $(DESTDIR)$(prefix)lib/$(libsubdir)/$(private_dir)/86+pkgconfigdir ?= $(DESTDIR)$(prefix)lib/$(libsubdir)/87includedir ?= $(DESTDIR)$(prefix)/include8889INSTALL ?= install90diff --git a/egl.pc.in b/egl.pc.in91new file mode 10064492index 0000000..e5917b093--- /dev/null94+++ b/egl.pc.in95@@ -0,0 +1,10 @@96+exec_prefix=${prefix}97+includedir=${prefix}/include98+99+Name: egl100+Description: Mali EGL library101+Requires.private:102+Version: MVERSION103+Libs: -L${libdir} -lEGL104+Libs.private: -lm -lpthread -ldl105+Cflags: -I${includedir}106diff --git a/gles_cm.pc.in b/gles_cm.pc.in107new file mode 100644108index 0000000..86f30fb109--- /dev/null110+++ b/gles_cm.pc.in111@@ -0,0 +1,10 @@112+exec_prefix=${prefix}113+includedir=${prefix}/include114+115+Name: gles_cm116+Description: Mali OpenGL ES 1.1 CM library117+Requires.private:118+Version: MVERSION119+Libs: -L${libdir} -lGLES_CM120+Libs.private: -lm -lpthread -ldl121+Cflags: -I${includedir}122diff --git a/glesv2.pc.in b/glesv2.pc.in123new file mode 100644124index 0000000..21cc87b125--- /dev/null126+++ b/glesv2.pc.in127@@ -0,0 +1,10 @@128+exec_prefix=${prefix}129+includedir=${prefix}/include130+131+Name: glesv2132+Description: Mali OpenGL ES 2.0 library133+Requires.private:134+Version: MVERSION135+Libs: -L${libdir} -lGLESv2136+Libs.private: -lm -lpthread -ldl137+Cflags: -I${includedir}138diff --git a/include/GLES/gl.h b/include/GLES/gl.h139index 858f394..a6bb591 100644140--- a/include/GLES/gl.h141+++ b/include/GLES/gl.h142@@ -29,6 +29,7 @@ typedef float GLfloat;143typedef float GLclampf;144typedef signed int GLfixed;145typedef signed int GLclampx;146+typedef char GLchar;147148typedef int * GLintptr;149typedef int * GLsizeiptr;150diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h151index 59e376c..90d96bb 100644152--- a/include/GLES2/gl2.h153+++ b/include/GLES2/gl2.h154@@ -32,6 +32,7 @@ typedef unsigned int GLuint;155typedef khronos_float_t GLfloat;156typedef khronos_float_t GLclampf;157typedef khronos_int32_t GLfixed;158+typedef char GLchar;159160/* GL types for handling large vertex buffer objects */161typedef khronos_intptr_t GLintptr;162diff --git a/lib/Makefile b/lib/Makefile163index 574bc2c..1df2e2e 100644164--- a/lib/Makefile165+++ b/lib/Makefile166@@ -2,6 +2,9 @@ all:167168clean:169170+prepare:171+ $(MAKE) -C mali prepare172+173install:174$(MAKE) -C mali install175176diff --git a/test/Makefile b/test/Makefile177index 700416e..1fce02f 100644178--- a/test/Makefile179+++ b/test/Makefile180@@ -1,11 +1,15 @@181include ../Makefile.setup182+include ../config.mk183184CFLAGS ?= -Wall185186all: test187188test: ../config.mk test.c189- $(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2190+ $(CC) $(CFLAGS) -o $@ test.c -I../include/ -L../lib/mali/$(MALI_VERSION)/$(MALI_LIBS_ABI)/$(MALI_EGL_TYPE)/ -lEGL -lGLESv2 -lX11191+192+install:193+ $(INSTALL) -m 755 test $(DESTDIR)$(prefix)/bin/mali-triangle194195clean:196rm -f test197198199