diff -Nru raspberrypi-userland-0~20200520+git2fe4ca3/debian/changelog raspberrypi-userland-0~20200520+git2fe4ca3/debian/changelog --- raspberrypi-userland-0~20200520+git2fe4ca3/debian/changelog 2020-07-28 12:09:02.000000000 +0100 +++ raspberrypi-userland-0~20200520+git2fe4ca3/debian/changelog 2020-08-14 12:50:20.000000000 +0100 @@ -1,3 +1,11 @@ +raspberrypi-userland (0~20200520+git2fe4ca3-0ubuntu2) groovy; urgency=medium + + * Don't build libGL/EGL/GLES/etc. libraries with names conflicting with the + mesa copies (LP: #1891613) + * Tidied up some lintian warnings in armhf build + + -- Dave Jones Fri, 14 Aug 2020 12:50:20 +0100 + raspberrypi-userland (0~20200520+git2fe4ca3-0ubuntu1) groovy; urgency=medium * Ubuntu port (LP: #1883111) diff -Nru raspberrypi-userland-0~20200520+git2fe4ca3/debian/libraspberrypi0.lintian-overrides raspberrypi-userland-0~20200520+git2fe4ca3/debian/libraspberrypi0.lintian-overrides --- raspberrypi-userland-0~20200520+git2fe4ca3/debian/libraspberrypi0.lintian-overrides 2020-07-28 12:09:02.000000000 +0100 +++ raspberrypi-userland-0~20200520+git2fe4ca3/debian/libraspberrypi0.lintian-overrides 2020-08-14 12:50:20.000000000 +0100 @@ -12,16 +12,25 @@ libraspberrypi0 binary: dev-pkg-without-shlib-symlink usr/lib/*/libvcos.so libraspberrypi0 binary: dev-pkg-without-shlib-symlink usr/lib/*/libvcsm.so libraspberrypi0 binary: dev-pkg-without-shlib-symlink usr/lib/*/libvcsm.so -libraspberrypi0 binary: package-name-doesnt-match-sonames libbcm-host libcontainers libdebug-sym libdtovl libmmal libmmal-components libmmal-core libmmal-util libmmal-vc-client libvchiq-arm libvcos libvcsm -libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/aarch64-linux-gnu/libbcm_host.so libbcm_host.so -libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/aarch64-linux-gnu/libcontainers.so libcontainers.so -libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/aarch64-linux-gnu/libdebug_sym.so libdebug_sym.so -libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/aarch64-linux-gnu/libdtovl.so libdtovl.so -libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/aarch64-linux-gnu/libmmal.so libmmal.so -libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/aarch64-linux-gnu/libmmal_components.so libmmal_components.so -libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/aarch64-linux-gnu/libmmal_core.so libmmal_core.so -libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/aarch64-linux-gnu/libmmal_util.so libmmal_util.so -libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/aarch64-linux-gnu/libmmal_vc_client.so libmmal_vc_client.so -libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/aarch64-linux-gnu/libvchiq_arm.so libvchiq_arm.so -libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/aarch64-linux-gnu/libvcos.so libvcos.so -libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/aarch64-linux-gnu/libvcsm.so libvcsm.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libbcm_host.so libbcm_host.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libcontainers.so libcontainers.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libdebug_sym.so libdebug_sym.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libdtovl.so libdtovl.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libmmal.so libmmal.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libmmal_components.so libmmal_components.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libmmal_core.so libmmal_core.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libmmal_util.so libmmal_util.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libmmal_vc_client.so libmmal_vc_client.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libvchiq_arm.so libvchiq_arm.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libvcos.so libvcos.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libvcsm.so libvcsm.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libbrcmEGL.so libbrcmEGL.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libbrcmGLESv2.so libbrcmGLESv2.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libbrcmOpenVG.so libbrcmOpenVG.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libbrcmWFC.so libbrcmWFC.so +libraspberrypi0 binary: shlib-without-versioned-soname usr/lib/*/libopenmaxil.so libopenmaxil.so + +# The package includes numerous libraries and certain libraries (libEGL, +# libGLESv2, etc.) are only built on armhf, not arm64, hence the "*"s in the +# suffix below +libraspberrypi0 binary: package-name-doesnt-match-sonames libbcm-host *libcontainers libdebug-sym libdtovl libmmal libmmal-components libmmal-core libmmal-util libmmal-vc-client *libvchiq-arm libvcos libvcsm diff -Nru raspberrypi-userland-0~20200520+git2fe4ca3/debian/libraspberrypi-bin.lintian-overrides raspberrypi-userland-0~20200520+git2fe4ca3/debian/libraspberrypi-bin.lintian-overrides --- raspberrypi-userland-0~20200520+git2fe4ca3/debian/libraspberrypi-bin.lintian-overrides 2020-07-28 12:09:02.000000000 +0100 +++ raspberrypi-userland-0~20200520+git2fe4ca3/debian/libraspberrypi-bin.lintian-overrides 2020-08-14 12:50:20.000000000 +0100 @@ -15,3 +15,4 @@ libraspberrypi-bin binary: binary-without-manpage usr/bin/dtoverlay-post libraspberrypi-bin binary: binary-without-manpage usr/bin/vchiq_test libraspberrypi-bin binary: binary-without-manpage usr/bin/mmal_vc_diag +libraspberrypi-bin binary: binary-without-manpage usr/bin/vcsmem diff -Nru raspberrypi-userland-0~20200520+git2fe4ca3/debian/libraspberrypi-dev.lintian-overrides raspberrypi-userland-0~20200520+git2fe4ca3/debian/libraspberrypi-dev.lintian-overrides --- raspberrypi-userland-0~20200520+git2fe4ca3/debian/libraspberrypi-dev.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ raspberrypi-userland-0~20200520+git2fe4ca3/debian/libraspberrypi-dev.lintian-overrides 2020-08-14 12:50:20.000000000 +0100 @@ -0,0 +1,3 @@ +# That's just the way they are... +libraspberrypi-dev binary: national-encoding usr/include/IL/OMX_Other.h +libraspberrypi-dev binary: national-encoding usr/include/interface/vmcs_host/khronos/IL/OMX_Other.h diff -Nru raspberrypi-userland-0~20200520+git2fe4ca3/debian/patches/dont-build-mesa-libs.patch raspberrypi-userland-0~20200520+git2fe4ca3/debian/patches/dont-build-mesa-libs.patch --- raspberrypi-userland-0~20200520+git2fe4ca3/debian/patches/dont-build-mesa-libs.patch 1970-01-01 01:00:00.000000000 +0100 +++ raspberrypi-userland-0~20200520+git2fe4ca3/debian/patches/dont-build-mesa-libs.patch 2020-08-14 12:50:20.000000000 +0100 @@ -0,0 +1,51 @@ +Author: Dave Jones +Forwarded: not-needed +Description: Do not build GL/EGL/GLES/etc. with mesa-incompatible names + By default the upstream code builds two (identical) copies of each of various + GL-related libraries (on armhf only): one with the usual "mesa" name, e.g. + libEGL.so and one with a broadcom-specific name, e.g. libbrcmEGL.so. We + only wish to include the broadcom-specific named libs in our package so that + this will not conflict with other packages. + +--- a/interface/khronos/CMakeLists.txt ++++ b/interface/khronos/CMakeLists.txt +@@ -55,15 +55,9 @@ + common/khrn_int_hash_asm.s + common/khrn_client_cache.c) + +-add_library(EGL ${SHARED} ${EGL_SOURCE}) +-add_library(GLESv2 ${SHARED} ${GLES_SOURCE}) +-add_library(OpenVG ${SHARED} ${VG_SOURCE}) +-add_library(WFC ${SHARED} ${WFC_SOURCE}) + add_library(khrn_client ${CLIENT_SOURCE}) + + # TODO do we need EGL_static and GLESv2_static now that khrn_static exists? +-add_library(EGL_static STATIC ${EGL_SOURCE}) +-add_library(GLESv2_static STATIC ${GLES_SOURCE}) + add_library(khrn_static STATIC + ${EGL_SOURCE} ${GLES_SOURCE} ${VG_SOURCE} ${WFC_SOURCE} ${CLIENT_SOURCE}) + +@@ -73,13 +67,8 @@ + add_definitions(-DKHRONOS_HAVE_VCSM) + endif() + +-target_link_libraries(EGL khrn_client vchiq_arm vcos bcm_host ${VCSM_LIBS} -lm) +-target_link_libraries(GLESv2 EGL khrn_client vcos) +-target_link_libraries(WFC EGL) +-target_link_libraries(OpenVG EGL) +- +-install(TARGETS EGL GLESv2 OpenVG WFC khrn_client) +-install(TARGETS EGL_static GLESv2_static khrn_static) ++install(TARGETS khrn_client) ++install(TARGETS khrn_static) + + # recommended names to use to avoid conflicts with mesa libs + add_library(brcmEGL ${SHARED} ${EGL_SOURCE}) +--- a/host_applications/android/apps/vidtex/CMakeLists.txt ++++ b/host_applications/android/apps/vidtex/CMakeLists.txt +@@ -15,4 +15,4 @@ + svp.c + vidtex.c) + add_executable(vidtex ${VIDTEX_SOURCES}) +-target_link_libraries(vidtex GLESv2 EGL m bcm_host mmal_core mmal_components mmal_util mmal_vc_client vcos) ++target_link_libraries(vidtex brcmGLESv2 brcmEGL m bcm_host mmal_core mmal_components mmal_util mmal_vc_client vcos) diff -Nru raspberrypi-userland-0~20200520+git2fe4ca3/debian/patches/fix-format-overflow.patch raspberrypi-userland-0~20200520+git2fe4ca3/debian/patches/fix-format-overflow.patch --- raspberrypi-userland-0~20200520+git2fe4ca3/debian/patches/fix-format-overflow.patch 2020-07-28 12:09:02.000000000 +0100 +++ raspberrypi-userland-0~20200520+git2fe4ca3/debian/patches/fix-format-overflow.patch 2020-08-14 12:50:20.000000000 +0100 @@ -1,5 +1,6 @@ Author: Dave Jones Description: Patches a potential NULL string used in a %s format +Forwarded: https://github.com/raspberrypi/userland/pull/644 --- a/interface/vmcs_host/linux/vcfilesys.c +++ b/interface/vmcs_host/linux/vcfilesys.c diff -Nru raspberrypi-userland-0~20200520+git2fe4ca3/debian/patches/series raspberrypi-userland-0~20200520+git2fe4ca3/debian/patches/series --- raspberrypi-userland-0~20200520+git2fe4ca3/debian/patches/series 2020-07-28 12:09:02.000000000 +0100 +++ raspberrypi-userland-0~20200520+git2fe4ca3/debian/patches/series 2020-08-14 12:50:20.000000000 +0100 @@ -2,3 +2,4 @@ add-custom-bootdir.patch no-dma-buf.patch fix-format-overflow.patch +dont-build-mesa-libs.patch