update to 20210317git

libraspberrypi-userland-devel: move pkgconfig files to %_libdir
aarch64: workaround for brcmegl.pc to fix SDL2 build but may not be working [release 20210317git-1mamba;Wed Mar 17 2021]
This commit is contained in:
Silvan Calarco 2024-01-05 17:21:39 +01:00
parent b12ca062e5
commit 0188bbf4b2
2 changed files with 29 additions and 6 deletions

View File

@ -0,0 +1,11 @@
--- userland-20210317git/pkgconfig/brcmegl.pc.in.orig 2021-03-17 18:18:00.619027674 +0000
+++ userland-20210317git/pkgconfig/brcmegl.pc.in 2021-03-17 18:18:14.530793761 +0000
@@ -7,7 +7,7 @@
Description: Fake brcmEGL package for RPi
Version: 10
Requires: bcm_host
-Libs: -L${libdir} -lbrcmEGL -lbrcmGLESv2 -lbcm_host -lvchostif
+Libs: -L${libdir} -lbcm_host -lvchostif
Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux \
-I${includedir}/interface/vcos/pthreads

View File

@ -1,5 +1,5 @@
Name: raspberrypi-userland
Version: 20201012git
Version: 20210317git
Release: 1mamba
Summary: Libraries for interfacing to Raspberry Pi GPU
Group: System/Libraries
@ -13,6 +13,7 @@ Source2: tvservice-off
Source3: tvservice-on
Source4: tvservice-ison
Patch0: %{name}-20121028git-disable_cmake_toolchain_check.patch
Patch1: raspberrypi-userland-20210317git-aarch64-brcmegl.patch
License: BSD
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -22,7 +23,6 @@ BuildRequires: gcc-c++
BuildRequires: git
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
ExclusiveArch: arm aarch64
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
Libraries for interfacing to Raspberry Pi GPU.
@ -38,7 +38,7 @@ Source: https://github.com/raspberrypi/userland.git
%package -n libraspberrypi
Group: System/Libraries
Summary: Libraries for interfacing to Raspberry Pi GPU
Obsoletes: raspberrypi-libs
Obsoletes: raspberrypi-libs < 20210317git
Provides: raspberrypi-libs = %{?epoch:%epoch:}%{version}-%{release}
%description -n libraspberrypi
@ -48,7 +48,7 @@ This package contains shared libraries for the Raspberry Pi.
Group: Development/Libraries
Summary: Development files for the Raspberry Pi GPU
Requires: libraspberrypi = %{?epoch:%epoch:}%{version}-%{release}
Obsoletes: raspberrypi-devel
Obsoletes: raspberrypi-devel < 20210317git
Provides: raspberrypi-devel = %{?epoch:%epoch:}%{version}-%{release}
%description -n libraspberrypi-devel
@ -60,6 +60,9 @@ This package contains libraries and header files for developing applications tha
%setup -q -n userland-%{version}
#:<< _EOF
#%patch0 -p1
%ifarch aarch64
%patch1 -p1
%endif
%build
# missing -lOpenVG
@ -88,7 +91,7 @@ for lib in libfdt.so; do
done
%endif
install -D %{S:1} %{buildroot}%{_sysconfdir}/ld.so.conf.d/vmcs.conf
install -D -m0644 %{S:1} %{buildroot}%{_sysconfdir}/ld.so.conf.d/vmcs.conf
install -m0755 %{S:2} %{buildroot}/opt/vc/bin/tvservice-off
install -m0755 %{S:3} %{buildroot}/opt/vc/bin/tvservice-on
@ -103,6 +106,10 @@ rm -f %{buildroot}/opt/vc/sbin/vcfiled
rm -f %{buildroot}/opt/vc/share/install/vcfiled
rm -f %{buildroot}/etc/init.d/vcfiled
# move pkgconfig files to standard location
install -d -m0755 %{buildroot}%{_libdir}
mv %{buildroot}/opt/vc/lib/pkgconfig %{buildroot}%{_libdir}/
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -140,9 +147,14 @@ rm -f %{buildroot}/etc/init.d/vcfiled
/opt/vc/include/interface
/opt/vc/include/vcinclude
/opt/vc/include/*.h
/opt/vc/lib/pkgconfig/*.pc
%{_libdir}/pkgconfig/*.pc
%changelog
* Wed Mar 17 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 20210317git-1mamba
- update to 20210317git
- libraspberrypi-userland-devel: move pkgconfig files to %_libdir
- aarch64: workaround for brcmegl.pc to fix SDL2 build but may not be working
* Mon Oct 12 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 20201012git-1mamba
- update to 20201012git