File project.diff of Package raspberrypi-userland

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package raspberrypi-userland

--- raspberrypi-userland.changes.orig
+++ raspberrypi-userland.changes
@@ -1,4 +1,3 @@
--------------------------------------------------------------------
 Fri Jul  5 08:28:57 UTC 2024 - Jonas Kvinge <jonaski@opensuse.org>
 
 - Update to 96a7334 (2023-10-18)
--- raspberrypi-userland.spec.orig
+++ raspberrypi-userland.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package raspberrypi-userland
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -22,7 +22,7 @@ Release:        0
 Summary:        Source for the ARM side code to interface to VideoCore
 License:        BSD-3-Clause
 Group:          System/Libraries
-Url:            https://github.com/raspberrypi/userland/
+URL:            https://github.com/raspberrypi/userland/
 Source0:        raspberrypi-userland-%{version}.tar.bz2
 Source10:       10-vchiq.rules
 BuildRequires:  cmake
@@ -34,6 +34,7 @@ BuildRequires:  pkgconfig
 # udev owns '/usr/lib/udev/rules.d' dir
 BuildRequires:  udev
 Provides:       raspberrypi-gfx
+ExclusiveArch:  %{arm} aarch64
 %ifnarch aarch64
 Provides:       Mesa-libEGL1
 Provides:       Mesa-libGLESv1_CM1
@@ -45,7 +46,6 @@ Provides:       libEGL.so.1
 Provides:       libGLESv1_CM.so.1
 Provides:       libGLESv2.so.2
 %endif
-ExclusiveArch:  %{arm} aarch64
 
 %description
 This package contains libraries built from the source code for the ARM
@@ -56,10 +56,10 @@ openmaxil, vchiq_arm, bcm_host, WFC, Ope
 Summary:        Add VideCoreIV support (EGL/GLES/OpenVG, etc) to Raspberry Pi
 Group:          Development/Libraries/Other
 Requires:       raspberrypi-userland
-Provides:       raspberrypi-gfx-devel
 Provides:       Mesa-libEGL-devel
 Provides:       Mesa-libGLESv1_CM-devel
 Provides:       Mesa-libGLESv2-devel
+Provides:       raspberrypi-gfx-devel
 Obsoletes:      Mesa-libEGL-devel
 Obsoletes:      Mesa-libGLESv1_CM-devel
 Obsoletes:      Mesa-libGLESv2-devel
@@ -79,13 +79,13 @@ cmake \
   -DCMAKE_C_FLAGS="%{optflags}" \
   -DCMAKE_CXX_FLAGS="%{optflags}" \
   -DCMAKE_BUILD_TYPE=RelWithDebinfo \
-  -DCMAKE_C_FLAGS:STRING="%optflags" \
+  -DCMAKE_C_FLAGS:STRING="%{optflags}" \
   -DVMCS_INSTALL_PREFIX=%{_prefix} \
 %ifarch aarch64
   -DARM64=ON \
 %endif
   ..
-make %{?_smp_mflags}
+%make_build
 popd
 
 %install
@@ -93,7 +93,7 @@ popd
 mkdir -p %{buildroot}/boot %{buildroot}/opt/vc/  %{buildroot}/%{_bindir} %{buildroot}/%{_includedir}
 pushd %{buildroot}/opt/vc/
 ln -s ../../%{_bindir}
-ln -s ../../usr/lib
+ln -s ../..%{_prefix}/lib
 ln -s ../../%{_includedir}
 popd
 %cmake_install
@@ -102,12 +102,12 @@ install -D -p -m 0644 %{_sourcedir}/10-v
 # Remove unneeded hello world source files
 rm -rf %{buildroot}%{_prefix}/src/hello_pi/
 # Remove *.a
-rm -rf %{buildroot}/usr/lib/*.a
+rm -rf %{buildroot}%{_prefix}/lib/*.a
 %ifarch aarch64
 # Move SO libs and pkgconfig/ from /usr/lib/ to /usr/lib64/
 mkdir -p %{buildroot}%{_libdir}
-mv %{buildroot}/usr/lib/*.so %{buildroot}%{_libdir}
-mv %{buildroot}/usr/lib/pkgconfig/ %{buildroot}%{_libdir}
+mv %{buildroot}%{_prefix}/lib/*.so %{buildroot}%{_libdir}
+mv %{buildroot}%{_prefix}/lib/pkgconfig/ %{buildroot}%{_libdir}
 %endif
 %ifnarch aarch64
 # Add version extensions to libs (help to fix Mesa packages conflicts) and add missing libGLESv1_CM.so
@@ -125,14 +125,11 @@ mv -v %{buildroot}/usr/man/man7/* %{buil
 
 %fdupes -s %{buildroot}%{_prefix}
 
-%post -n raspberrypi-userland
-/sbin/ldconfig
-
-%postun -n raspberrypi-userland
-/sbin/ldconfig
+%post -n raspberrypi-userland -p /sbin/ldconfig
+%postun -n raspberrypi-userland -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%license LICENCE
 %dir /opt/vc
 /opt/vc/bin
 /opt/vc/lib
@@ -167,7 +164,6 @@ mv -v %{buildroot}/usr/man/man7/* %{buil
 %doc LICENCE
 
 %files devel
-%defattr(-,root,root)
 /opt/vc/include
 %{_includedir}/*
 %{_libdir}/pkgconfig/*.pc

Places

File project.diff of Package raspberrypi-userland

Places