From b12ca062e5e01b513f61dfd0f71286c3dca39dd5 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 17:21:39 +0100 Subject: [PATCH] update to 20201012git [release 20201012git-1mamba;Mon Oct 12 2020] --- raspberrypi-userland.spec | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/raspberrypi-userland.spec b/raspberrypi-userland.spec index cb1a2df..9dde099 100644 --- a/raspberrypi-userland.spec +++ b/raspberrypi-userland.spec @@ -1,13 +1,12 @@ Name: raspberrypi-userland -Version: 20180624git +Version: 20201012git Release: 1mamba Summary: Libraries for interfacing to Raspberry Pi GPU Group: System/Libraries Vendor: openmamba Distribution: openmamba Packager: Davide Madrisan -URL: http://www.raspberrypi.org/ -## GITSOURCE git://github.com/raspberrypi/userland.git +URL: https://www.raspberrypi.org/ Source: git://github.com/raspberrypi/userland.git/master/userland-%{version}.tar.bz2 Source1: raspberrypi-userland-ldconfig Source2: tvservice-off @@ -22,7 +21,7 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: git Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} -ExclusiveArch: arm +ExclusiveArch: arm aarch64 BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -55,6 +54,8 @@ Provides: raspberrypi-devel = %{?epoch:%epoch:}%{version}-%{release} %description -n libraspberrypi-devel This package contains libraries and header files for developing applications that use Raspberry Pi GPU. +%debug_package + %prep %setup -q -n userland-%{version} #:<< _EOF @@ -64,7 +65,10 @@ This package contains libraries and header files for developing applications tha # missing -lOpenVG %cmake \ -DCMAKE_CXX_COMPILER=/usr/bin/g++ \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ +%ifarch aarch64 + -DARM64=ON +%endif %make @@ -72,9 +76,17 @@ This package contains libraries and header files for developing applications tha [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall +%ifarch arm for lib in libfdt.so libmmal_core.so libmmal_util.so libvcilcs.so; do install build/lib/$lib %{buildroot}/opt/vc/lib/$lib done +%endif + +%ifarch aarch64 +for lib in libfdt.so; do + install build/lib/$lib %{buildroot}/opt/vc/lib/$lib +done +%endif install -D %{S:1} %{buildroot}%{_sysconfdir}/ld.so.conf.d/vmcs.conf @@ -109,8 +121,10 @@ rm -f %{buildroot}/etc/init.d/vcfiled %dir /opt/vc %dir /opt/vc/lib /opt/vc/lib/lib*.so +%ifarch arm %dir /opt/vc/lib/plugins /opt/vc/lib/plugins/*.so +%endif %files -n libraspberrypi-devel %defattr(-,root,root) @@ -129,6 +143,9 @@ rm -f %{buildroot}/etc/init.d/vcfiled /opt/vc/lib/pkgconfig/*.pc %changelog +* Mon Oct 12 2020 Silvan Calarco 20201012git-1mamba +- update to 20201012git + * Sun Jun 24 2018 Silvan Calarco 20180624git-1mamba - update to 20180624git