Fixes for packages configuration

chroot-buildpackages.sh

@@ -25,9 +25,12 @@ create_chroot()
 	declare -A qemu_binary
 	qemu_binary['armhf']='qemu-arm-static'
 	qemu_binary['arm64']='qemu-aarch64-static'
+	declare -A apt_mirror
+	apt_mirror['jessie']='httpredir.debian.org/debian'
+	apt_mirror['xenial']='archive.ubuntu.com/ubuntu'
 	display_alert "Creating build chroot" "$release" "info"
 	local includes="ccache,locales,git,ca-certificates,devscripts,libfile-fcntllock-perl,debhelper,rsync,python3"
-	debootstrap --variant=buildd --arch=$arch --foreign --include="$includes" $release $target_dir "http://localhost:3142/$APT_MIRROR"
+	debootstrap --variant=buildd --arch=$arch --foreign --include="$includes" $release $target_dir "http://localhost:3142/${apt_mirror[$release]}"
 	[[ $? -ne 0 || ! -f $target_dir/debootstrap/debootstrap ]] && exit_with_error "Create chroot first stage failed"
 	cp /usr/bin/${qemu_binary[$arch]} $target_dir/usr/bin/
 	[[ ! -f $target_dir/usr/share/keyrings/debian-archive-keyring.gpg ]] && \

extras-buildpkgs/libglshim/debian/patches/add-install-target.patch

@@ -26,10 +26,25 @@ index 4859875..ac23371 100755
  
  include_directories(include)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4cb3b30..1e42ecd 100755
+index 4cb3b30..21cffcc 100755
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -27,3 +27,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+@@ -16,9 +16,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+     target_link_libraries(GL X11 m dl)
+ endif()
+ 
+-if(CMAKE_SHARED_LIBRARY_SUFFIX MATCHES ".so")
+-    set_target_properties(GL PROPERTIES SUFFIX ".so.1")
+-endif()
++SET_TARGET_PROPERTIES (GL
++  PROPERTIES
++  VERSION 1.2.0
++  SOVERSION 1
++)
+ 
+ aux_source_directory(preload PRELOAD_SOURCES)
+ add_library(preload SHARED ${PRELOAD_SOURCES})
+@@ -27,3 +29,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  endif()
  
  add_subdirectory(proxy)

extras-buildpkgs/libmali-sunxi-r3p0/debian/control

@@ -22,7 +22,12 @@ Description: Mali userspace binary driver version r3p0
 Package: libmali-sunxi-dev
 Section: libdevel
 Architecture: any
-Depends: libmali-sunxi-r3p0 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libmali-sunxi-r3p0 (= ${binary:Version}),
+ 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

extras-buildpkgs/libmali-sunxi-r3p0/debian/patches/overwrite-libraries.patch

@@ -0,0 +1,23 @@
+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

extras-buildpkgs/libmali-sunxi-r3p0/debian/patches/series

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