summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortsutsui <tsutsui@pkgsrc.org>2018-12-24 02:06:59 +0000
committertsutsui <tsutsui@pkgsrc.org>2018-12-24 02:06:59 +0000
commitea469ff33d774cb683a6b8b1dcc93084716f486a (patch)
tree215d71fb2563e2d8ab25f2d4c0c2dc4278bade32
parent4f9cabd7034b66f03f2df52a9af8b0ab372e26b4 (diff)
downloadpkgsrc-ea469ff33d774cb683a6b8b1dcc93084716f486a.tar.gz
raspberrypi-userland: make libvchostif SHARED to avoid undefined refs.
Fixes PR pkg/53746 for pkgsrc/devel/SDL2 with "rpi" option. Bump PKGREVISION again for PLIST change. Ok'ed by wiz@
-rw-r--r--misc/raspberrypi-userland/Makefile4
-rw-r--r--misc/raspberrypi-userland/PLIST4
-rw-r--r--misc/raspberrypi-userland/distinfo3
-rw-r--r--misc/raspberrypi-userland/patches/patch-interface_vmcs__host_CMakeLists.txt16
4 files changed, 22 insertions, 5 deletions
diff --git a/misc/raspberrypi-userland/Makefile b/misc/raspberrypi-userland/Makefile
index b85f3d34412..e6c89beb7aa 100644
--- a/misc/raspberrypi-userland/Makefile
+++ b/misc/raspberrypi-userland/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2018/12/24 01:57:01 tsutsui Exp $
+# $NetBSD: Makefile,v 1.15 2018/12/24 02:06:59 tsutsui Exp $
#
DISTNAME= userland-20170109
-PKGREVISION= 2
+PKGREVISION= 3
PKGNAME= raspberrypi-${DISTNAME}
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GITHUB:=jaredmcneill/}
diff --git a/misc/raspberrypi-userland/PLIST b/misc/raspberrypi-userland/PLIST
index 1df15bb1827..ec473ab009b 100644
--- a/misc/raspberrypi-userland/PLIST
+++ b/misc/raspberrypi-userland/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/11/01 16:45:27 skrll Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/12/24 02:06:59 tsutsui Exp $
bin/containers_check_frame_int
bin/containers_datagram_receiver
bin/containers_datagram_sender
@@ -243,7 +243,7 @@ lib/libmmal_vc_client.so
lib/libopenmaxil.so
lib/libvcfiled_check.a
lib/libvchiq_arm.so
-lib/libvchostif.a
+lib/libvchostif.so
lib/libvcilcs.a
lib/libvcos.so
lib/libvcsm.so
diff --git a/misc/raspberrypi-userland/distinfo b/misc/raspberrypi-userland/distinfo
index cee2af71a07..d17fc9a73b8 100644
--- a/misc/raspberrypi-userland/distinfo
+++ b/misc/raspberrypi-userland/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2017/04/16 19:25:25 skrll Exp $
+$NetBSD: distinfo,v 1.10 2018/12/24 02:06:59 tsutsui Exp $
SHA1 (userland-20170109-734d76b0675685e9ec9148694f2cc00f58e5ebc0.tar.gz) = 6d5db24f38e40a2aed866c8b96cd88074a4dc93b
RMD160 (userland-20170109-734d76b0675685e9ec9148694f2cc00f58e5ebc0.tar.gz) = 0ac98329e36095fad45017d972eb0a14b7f3b30b
@@ -9,4 +9,5 @@ SHA1 (patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c) = e6605a3
SHA1 (patch-host__applications_linux_apps_tvservice_tvservice.c) = 2cc304252c102d46603f6649eb959984e9d44b1f
SHA1 (patch-interface_vchiq__arm_vchiq__lib.c) = a9535aa96ba3374f2a559899c6baff9ddc935f3f
SHA1 (patch-interface_vcos_CMakeLists.txt) = f96c052af9c1d10f3f386efc1b5d0006559e4e67
+SHA1 (patch-interface_vmcs__host_CMakeLists.txt) = 39640e8a443fb966a1d40e0d8ccfa3a6aa510814
SHA1 (patch-interface_vmcs__host_linux_vcfiled_CMakeLists.txt) = 29694762b02a75749300ebfb4fe78464f2ac20ff
diff --git a/misc/raspberrypi-userland/patches/patch-interface_vmcs__host_CMakeLists.txt b/misc/raspberrypi-userland/patches/patch-interface_vmcs__host_CMakeLists.txt
new file mode 100644
index 00000000000..1a3a6a11329
--- /dev/null
+++ b/misc/raspberrypi-userland/patches/patch-interface_vmcs__host_CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD: patch-interface_vmcs__host_CMakeLists.txt,v 1.1 2018/12/24 02:06:59 tsutsui Exp $
+
+- build libvchostif as shared lib to avoid undefined references
+ on linking libEGL.so
+
+--- interface/vmcs_host/CMakeLists.txt.orig 2017-01-07 08:24:37.000000000 +0000
++++ interface/vmcs_host/CMakeLists.txt
+@@ -9,7 +9,7 @@ add_definitions(-fno-strict-aliasing)
+
+ include_directories(${VMCS_TARGET}/vcfiled)
+
+-add_library(vchostif
++add_library(vchostif SHARED
+ ${VMCS_TARGET}/vcfilesys.c ${VMCS_TARGET}/vcmisc.c
+ vc_vchi_gencmd.c vc_vchi_filesys.c
+ vc_vchi_tvservice.c vc_vchi_cecservice.c