[raspberrypi-vc] Change installation of ld.conf.d drop-in configuration file
by Damian Wrobel
commit 2f013059852a6f084fda4ff86180e901030b1f9d
Author: Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl>
Date: Tue Sep 22 20:15:15 2020 +0200
Change installation of ld.conf.d drop-in configuration file
raspberrypi-vc.spec | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/raspberrypi-vc.spec b/raspberrypi-vc.spec
index cd47ace..132c5a3 100644
--- a/raspberrypi-vc.spec
+++ b/raspberrypi-vc.spec
@@ -1,11 +1,11 @@
%global commit0 f73fca015d421b763936667a0b58fe5024d59921
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global ldconfig_file %{_sysconfdir}/ld.so.conf.d/raspberrypi-vc-libs.conf
+%global _vc_libdir %{_libdir}/vc
Name: raspberrypi-vc
Version: 20200813
-Release: 1.git%{shortcommit0}%{?dist}
+Release: 2.git%{shortcommit0}%{?dist}
Summary: VideoCore GPU libraries, utilities and demos for Raspberry Pi
License: BSD
URL: https://github.com/raspberrypi
@@ -143,8 +143,8 @@ rm -rf %{buildroot}%{_prefix}%{_sysconfdir}/init.d
rm -rf %{buildroot}%{_datadir}/install
### install ldconfig conf
-mkdir -p %{buildroot}$(dirname %{ldconfig_file})
-echo "%{_libdir}/vc" >%{buildroot}%{ldconfig_file}
+install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
+echo "%{_vc_libdir}" >%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf
### install udev rules
mkdir -p %{buildroot}%{_udevrulesdir}
@@ -164,7 +164,7 @@ ln -s %{_includedir}/vc %{buildroot}/opt/vc/include
%dir %{_libdir}/vc
%dir /opt/vc
/opt/vc/lib
-%config(noreplace) %{ldconfig_file}
+%config %{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf
%{_udevrulesdir}/10-vchiq.rules
%{_libdir}/vc/libbcm_host.so
%{_libdir}/vc/libdebug_sym.so
@@ -273,6 +273,9 @@ ln -s %{_includedir}/vc %{buildroot}/opt/vc/include
%changelog
+* Tue Sep 22 2020 Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl> - 20200813-2.gitf73fca0
+- Change installation of ld.conf.d drop-in configuration file
+
* Mon Sep 14 2020 Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl> - 20200813-1.gitf73fca0
- Update snapshot
- Fix build error on aarch64
3 years, 7 months
[raspberrypi-vc] Update snapshot - Fix build error on aarch64 - Generate raspberrypi-vc-libs.conf on the fly
by Damian Wrobel
commit 6b4d79dadb5ac371d61cc939dc0b3a1cacb792be
Author: Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl>
Date: Mon Sep 14 22:54:08 2020 +0200
Update snapshot
- Fix build error on aarch64
- Generate raspberrypi-vc-libs.conf on the fly
...all-libraries-as-per-GNU-Coding-Standards.patch | 316 +++++++++++++++++++++
raspberrypi-vc-libs.conf | 1 -
raspberrypi-vc.spec | 62 ++--
sources | 2 +-
4 files changed, 355 insertions(+), 26 deletions(-)
---
diff --git a/raspberrypi-vc-Install-libraries-as-per-GNU-Coding-Standards.patch b/raspberrypi-vc-Install-libraries-as-per-GNU-Coding-Standards.patch
new file mode 100644
index 0000000..b1367a9
--- /dev/null
+++ b/raspberrypi-vc-Install-libraries-as-per-GNU-Coding-Standards.patch
@@ -0,0 +1,316 @@
+From 9f2ba8c56e473fa05a5f216260571f4269fc16cc Mon Sep 17 00:00:00 2001
+From: Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl>
+Date: Mon, 14 Sep 2020 09:23:07 +0200
+Subject: [PATCH] Install libraries as per GNU Coding Standards
+
+Includes GNUInstallDirs and uses LIBDIR (instead of hardcoded lib)
+to install libraries.
+
+Fixes packaging on aarch64 systems where LIBDIR=lib64 (not lib).
+
+Signed-off-by: Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl>
+---
+ CMakeLists.txt | 4 +++-
+ containers/CMakeLists.txt | 2 +-
+ helpers/dtoverlay/CMakeLists.txt | 2 +-
+ host_applications/linux/libs/bcm_host/CMakeLists.txt | 2 +-
+ host_applications/linux/libs/debug_sym/CMakeLists.txt | 4 ++--
+ host_applications/linux/libs/sm/CMakeLists.txt | 2 +-
+ interface/khronos/CMakeLists.txt | 6 +++---
+ interface/mmal/CMakeLists.txt | 2 +-
+ interface/mmal/components/CMakeLists.txt | 2 +-
+ interface/mmal/core/CMakeLists.txt | 2 +-
+ interface/mmal/util/CMakeLists.txt | 2 +-
+ interface/mmal/vc/CMakeLists.txt | 2 +-
+ interface/vchiq_arm/CMakeLists.txt | 2 +-
+ interface/vcos/pthreads/CMakeLists.txt | 2 +-
+ interface/vmcs_host/CMakeLists.txt | 2 +-
+ middleware/openmaxil/CMakeLists.txt | 2 +-
+ pkgconfig/bcm_host.pc.in | 2 +-
+ pkgconfig/brcmegl.pc.in | 2 +-
+ pkgconfig/brcmglesv2.pc.in | 2 +-
+ pkgconfig/brcmvg.pc.in | 2 +-
+ pkgconfig/mmal.pc.in | 2 +-
+ pkgconfig/vcsm.pc.in | 2 +-
+ 22 files changed, 27 insertions(+), 25 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fe67fc87..035b16fa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,6 +8,8 @@ SET(PROJECT_VER_PATCH 0)
+ SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
+ SET(PROJECT_APIVER "${PROJECT_VER}")
+
++include(GNUInstallDirs)
++
+ if(ARM64)
+ set(BUILD_MMAL FALSE)
+ set(BUILD_MMAL_APPS FALSE)
+@@ -125,7 +127,7 @@ if(PKG_CONFIG_FOUND)
+ foreach(PCFILE bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc)
+ configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}"
+- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
++ DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ endforeach()
+ endif()
+ # Remove cache entry, if one added by command line
+diff --git a/containers/CMakeLists.txt b/containers/CMakeLists.txt
+index 5570038c..3578fe80 100644
+--- a/containers/CMakeLists.txt
++++ b/containers/CMakeLists.txt
+@@ -66,7 +66,7 @@ set(packetizers_SRCS ${packetizers_SRCS} ${SOURCE_DIR}/h264/avc1_packetizer.c)
+
+ add_library(containers ${LIBRARY_TYPE} ${core_SRCS} ${io_SRCS} ${net_SRCS} ${packetizers_SRCS})
+ target_link_libraries(containers vcos)
+-install(TARGETS containers DESTINATION lib)
++install(TARGETS containers DESTINATION ${LIBDIR})
+
+ set(container_readers)
+ set(container_writers)
+diff --git a/helpers/dtoverlay/CMakeLists.txt b/helpers/dtoverlay/CMakeLists.txt
+index b3bd30f1..5e1a3a4a 100644
+--- a/helpers/dtoverlay/CMakeLists.txt
++++ b/helpers/dtoverlay/CMakeLists.txt
+@@ -22,4 +22,4 @@ add_library (dtovl ${SHARED}
+
+ target_link_libraries(dtovl fdt)
+
+-install (TARGETS dtovl DESTINATION lib)
++install (TARGETS dtovl DESTINATION ${LIBDIR})
+diff --git a/host_applications/linux/libs/bcm_host/CMakeLists.txt b/host_applications/linux/libs/bcm_host/CMakeLists.txt
+index 2f4beb93..e18d611c 100644
+--- a/host_applications/linux/libs/bcm_host/CMakeLists.txt
++++ b/host_applications/linux/libs/bcm_host/CMakeLists.txt
+@@ -19,5 +19,5 @@ add_library(bcm_host ${SHARED} bcm_host.c)
+
+ target_link_libraries(bcm_host vcos vchostif)
+
+-install(TARGETS bcm_host DESTINATION lib)
++install(TARGETS bcm_host DESTINATION ${LIBDIR})
+
+diff --git a/host_applications/linux/libs/debug_sym/CMakeLists.txt b/host_applications/linux/libs/debug_sym/CMakeLists.txt
+index d437b995..40e0bc77 100644
+--- a/host_applications/linux/libs/debug_sym/CMakeLists.txt
++++ b/host_applications/linux/libs/debug_sym/CMakeLists.txt
+@@ -11,6 +11,6 @@ include_directories (
+ add_library(debug_sym ${SHARED} debug_sym.c)
+ add_library(debug_sym_static STATIC debug_sym.c)
+
+-install(TARGETS debug_sym DESTINATION lib)
+-install(TARGETS debug_sym_static DESTINATION lib)
++install(TARGETS debug_sym DESTINATION ${LIBDIR})
++install(TARGETS debug_sym_static DESTINATION ${LIBDIR})
+ install(FILES debug_sym.h DESTINATION include/interface/debug_sym)
+diff --git a/host_applications/linux/libs/sm/CMakeLists.txt b/host_applications/linux/libs/sm/CMakeLists.txt
+index 5ce5aca7..f85959bd 100644
+--- a/host_applications/linux/libs/sm/CMakeLists.txt
++++ b/host_applications/linux/libs/sm/CMakeLists.txt
+@@ -14,5 +14,5 @@ add_library(vcsm ${SHARED} user-vcsm.c)
+
+ target_link_libraries(vcsm vcos)
+
+-install(TARGETS vcsm DESTINATION lib)
++install(TARGETS vcsm DESTINATION ${LIBDIR})
+ install(FILES user-vcsm.h DESTINATION include/interface/vcsm)
+diff --git a/interface/khronos/CMakeLists.txt b/interface/khronos/CMakeLists.txt
+index 9ad615b8..97683049 100644
+--- a/interface/khronos/CMakeLists.txt
++++ b/interface/khronos/CMakeLists.txt
+@@ -78,8 +78,8 @@ 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 DESTINATION lib)
+-install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib)
++install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION ${LIBDIR})
++install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION ${LIBDIR})
+
+ # recommended names to use to avoid conflicts with mesa libs
+ add_library(brcmEGL ${SHARED} ${EGL_SOURCE})
+@@ -92,4 +92,4 @@ target_link_libraries(brcmGLESv2 brcmEGL khrn_client vcos)
+ target_link_libraries(brcmWFC brcmEGL)
+ target_link_libraries(brcmOpenVG brcmEGL)
+
+-install(TARGETS brcmEGL brcmGLESv2 brcmOpenVG brcmWFC DESTINATION lib)
++install(TARGETS brcmEGL brcmGLESv2 brcmOpenVG brcmWFC DESTINATION ${LIBDIR})
+diff --git a/interface/mmal/CMakeLists.txt b/interface/mmal/CMakeLists.txt
+index 46f149df..544f173b 100644
+--- a/interface/mmal/CMakeLists.txt
++++ b/interface/mmal/CMakeLists.txt
+@@ -16,7 +16,7 @@ add_subdirectory(client)
+
+ target_link_libraries(mmal mmal_core mmal_util mmal_vc_client vcos mmal_components)
+
+-install(TARGETS mmal DESTINATION lib)
++install(TARGETS mmal DESTINATION ${LIBDIR})
+ install(FILES
+ mmal.h
+ mmal_buffer.h
+diff --git a/interface/mmal/components/CMakeLists.txt b/interface/mmal/components/CMakeLists.txt
+index d65fa37d..5b929098 100644
+--- a/interface/mmal/components/CMakeLists.txt
++++ b/interface/mmal/components/CMakeLists.txt
+@@ -30,5 +30,5 @@ set(container_libs ${container_libs} containers)
+ target_link_libraries(mmal_components ${container_libs} mmal_util)
+ target_link_libraries(mmal_components mmal_core)
+
+-install(TARGETS mmal_components DESTINATION lib)
++install(TARGETS mmal_components DESTINATION ${LIBDIR})
+
+diff --git a/interface/mmal/core/CMakeLists.txt b/interface/mmal/core/CMakeLists.txt
+index de0bcb25..7f1adb86 100644
+--- a/interface/mmal/core/CMakeLists.txt
++++ b/interface/mmal/core/CMakeLists.txt
+@@ -13,7 +13,7 @@ add_library (mmal_core ${LIBRARY_TYPE}
+
+ target_link_libraries (mmal_core vcos)
+
+-install(TARGETS mmal_core DESTINATION lib)
++install(TARGETS mmal_core DESTINATION ${LIBDIR})
+ install(FILES
+ mmal_buffer_private.h
+ mmal_clock_private.h
+diff --git a/interface/mmal/util/CMakeLists.txt b/interface/mmal/util/CMakeLists.txt
+index b2a6858b..acabed6f 100644
+--- a/interface/mmal/util/CMakeLists.txt
++++ b/interface/mmal/util/CMakeLists.txt
+@@ -12,7 +12,7 @@ add_library (mmal_util ${LIBRARY_TYPE}
+
+ target_link_libraries (mmal_util vcos)
+
+-install(TARGETS mmal_util DESTINATION lib)
++install(TARGETS mmal_util DESTINATION ${LIBDIR})
+ install(FILES
+ mmal_component_wrapper.h
+ mmal_connection.h
+diff --git a/interface/mmal/vc/CMakeLists.txt b/interface/mmal/vc/CMakeLists.txt
+index d6e80db7..ecba8112 100644
+--- a/interface/mmal/vc/CMakeLists.txt
++++ b/interface/mmal/vc/CMakeLists.txt
+@@ -13,7 +13,7 @@ endif(BUILD_MMAL_APPS)
+
+ include_directories ( ../../../host_applications/linux/libs/sm )
+
+-install(TARGETS mmal_vc_client DESTINATION lib)
++install(TARGETS mmal_vc_client DESTINATION ${LIBDIR})
+ install(FILES
+ mmal_vc_api.h
+ mmal_vc_api_drm.h
+diff --git a/interface/vchiq_arm/CMakeLists.txt b/interface/vchiq_arm/CMakeLists.txt
+index 7af383de..75080655 100644
+--- a/interface/vchiq_arm/CMakeLists.txt
++++ b/interface/vchiq_arm/CMakeLists.txt
+@@ -5,7 +5,7 @@ add_library(vchiq_arm SHARED
+ # pull in VCHI cond variable emulation
+ target_link_libraries(vchiq_arm vcos)
+
+-install(TARGETS vchiq_arm DESTINATION lib)
++install(TARGETS vchiq_arm DESTINATION ${LIBDIR})
+ #install(FILES etc/10-vchiq.rules DESTINATION /etc/udev/rules.d)
+
+ include_directories(../..)
+diff --git a/interface/vcos/pthreads/CMakeLists.txt b/interface/vcos/pthreads/CMakeLists.txt
+index 1d81ca3c..c6a80cf3 100644
+--- a/interface/vcos/pthreads/CMakeLists.txt
++++ b/interface/vcos/pthreads/CMakeLists.txt
+@@ -43,4 +43,4 @@ endif ()
+
+
+ #install(FILES ${HEADERS} DESTINATION include)
+-install(TARGETS vcos DESTINATION lib)
++install(TARGETS vcos DESTINATION ${LIBDIR})
+diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
+index cbef80c5..f61067f0 100755
+--- a/interface/vmcs_host/CMakeLists.txt
++++ b/interface/vmcs_host/CMakeLists.txt
+@@ -32,5 +32,5 @@ target_link_libraries(vchostif vchiq_arm vcos)
+
+ #target_link_libraries(bufman WFC)
+
+-install(TARGETS ${INSTALL_TARGETS} DESTINATION lib)
++install(TARGETS ${INSTALL_TARGETS} DESTINATION ${LIBDIR})
+
+diff --git a/middleware/openmaxil/CMakeLists.txt b/middleware/openmaxil/CMakeLists.txt
+index 3e9c5f9d..6b6c36a6 100644
+--- a/middleware/openmaxil/CMakeLists.txt
++++ b/middleware/openmaxil/CMakeLists.txt
+@@ -49,4 +49,4 @@ else ()
+
+ endif ()
+
+-install (TARGETS openmaxil DESTINATION lib)
++install (TARGETS openmaxil DESTINATION ${LIBDIR})
+diff --git a/pkgconfig/bcm_host.pc.in b/pkgconfig/bcm_host.pc.in
+index c7237c53..2988b42f 100644
+--- a/pkgconfig/bcm_host.pc.in
++++ b/pkgconfig/bcm_host.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+
+ Name: bcm_host
+diff --git a/pkgconfig/brcmegl.pc.in b/pkgconfig/brcmegl.pc.in
+index 5dd3d5b9..a45bf22a 100644
+--- a/pkgconfig/brcmegl.pc.in
++++ b/pkgconfig/brcmegl.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+
+ Name: brcmEGL
+diff --git a/pkgconfig/brcmglesv2.pc.in b/pkgconfig/brcmglesv2.pc.in
+index e0e36f5a..902fbf33 100644
+--- a/pkgconfig/brcmglesv2.pc.in
++++ b/pkgconfig/brcmglesv2.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+
+ Name: brcmGLESv2
+diff --git a/pkgconfig/brcmvg.pc.in b/pkgconfig/brcmvg.pc.in
+index 763a44b0..98489ee4 100644
+--- a/pkgconfig/brcmvg.pc.in
++++ b/pkgconfig/brcmvg.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+
+ Name: brcmOpenVG
+diff --git a/pkgconfig/mmal.pc.in b/pkgconfig/mmal.pc.in
+index 37d344c4..1ffa4f51 100644
+--- a/pkgconfig/mmal.pc.in
++++ b/pkgconfig/mmal.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+
+ Name: MMAL
+diff --git a/pkgconfig/vcsm.pc.in b/pkgconfig/vcsm.pc.in
+index b12c56fc..6f762cbf 100644
+--- a/pkgconfig/vcsm.pc.in
++++ b/pkgconfig/vcsm.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+
+ Name: VCSM
diff --git a/raspberrypi-vc.spec b/raspberrypi-vc.spec
index 70dd320..cd47ace 100644
--- a/raspberrypi-vc.spec
+++ b/raspberrypi-vc.spec
@@ -1,18 +1,23 @@
-%global commit0 3e59217bd93b8024fb8fc1c6530b00cbae64bc73
+%global commit0 f73fca015d421b763936667a0b58fe5024d59921
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global ldconfig_file %{_sysconfdir}/ld.so.conf.d/raspberrypi-vc-libs.conf
+
Name: raspberrypi-vc
-Version: 20200727
+Version: 20200813
Release: 1.git%{shortcommit0}%{?dist}
Summary: VideoCore GPU libraries, utilities and demos for Raspberry Pi
License: BSD
URL: https://github.com/raspberrypi
Source0: %{url}/userland/archive/%{commit0}/raspberrypi-userland-%{shortcommit0}.tar.gz
-Source1: raspberrypi-vc-libs.conf
Source2: 10-vchiq.rules
# Patch0 fixes up paths for relocation from /opt to system directories.
# Needs rebase or dropped
#Patch0: raspberrypi-vc-demo-source-path-fixup.patch
+
+# Install libraries as per GNU Coding Standards
+# Upstream reference: https://github.com/raspberrypi/userland/pull/650
+Patch0: https://patch-diff.githubusercontent.com/raw/raspberrypi/userland/pull/65...
ExclusiveArch: armv7hl aarch64
BuildRequires: cmake
@@ -88,7 +93,7 @@ Raspberry Pi.
-DVMCS_INSTALL_PREFIX=%{_prefix} \
-DBUILD_SHARED_LIBS:BOOL=OFF \
-DBUILD_STATIC_LIBS:BOOL=ON \
-
+ -DLIBDIR="%{_lib}/vc" \
%cmake_build
@@ -106,9 +111,9 @@ EOF
touch -r LICENCE %{buildroot}%{rpmmacrodir}/macros.%{name}
### libs
-mkdir -p %{buildroot}/%{_libdir}/vc
-mv %{buildroot}/%{_libdir}/{*.so,*.a} %{buildroot}/%{_libdir}/vc
+%ifarch armv7hl
mv %{buildroot}/%{_libdir}/plugins %{buildroot}/%{_libdir}/vc
+%endif
### pkgconfig
mv %{buildroot}/%{_libdir}/pkgconfig %{buildroot}/%{_libdir}/vc
@@ -138,8 +143,8 @@ rm -rf %{buildroot}%{_prefix}%{_sysconfdir}/init.d
rm -rf %{buildroot}%{_datadir}/install
### install ldconfig conf
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-install -D -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/ld.so.conf.d/
+mkdir -p %{buildroot}$(dirname %{ldconfig_file})
+echo "%{_libdir}/vc" >%{buildroot}%{ldconfig_file}
### install udev rules
mkdir -p %{buildroot}%{_udevrulesdir}
@@ -159,28 +164,29 @@ ln -s %{_includedir}/vc %{buildroot}/opt/vc/include
%dir %{_libdir}/vc
%dir /opt/vc
/opt/vc/lib
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/raspberrypi-vc-libs.conf
+%config(noreplace) %{ldconfig_file}
%{_udevrulesdir}/10-vchiq.rules
+%{_libdir}/vc/libbcm_host.so
+%{_libdir}/vc/libdebug_sym.so
+%{_libdir}/vc/libdtovl.so
+%{_libdir}/vc/libvchiq_arm.so
+%{_libdir}/vc/libvcos.so
+%ifarch armv7hl
%{_libdir}/vc/libEGL.so
%{_libdir}/vc/libGLESv2.so
%{_libdir}/vc/libOpenVG.so
%{_libdir}/vc/libWFC.so
-%{_libdir}/vc/libbcm_host.so
%{_libdir}/vc/libbrcmEGL.so
%{_libdir}/vc/libbrcmGLESv2.so
%{_libdir}/vc/libbrcmOpenVG.so
%{_libdir}/vc/libbrcmWFC.so
%{_libdir}/vc/libcontainers.so
-%{_libdir}/vc/libdebug_sym.so
-%{_libdir}/vc/libdtovl.so
%{_libdir}/vc/libmmal.so
%{_libdir}/vc/libmmal_components.so
%{_libdir}/vc/libmmal_core.so
%{_libdir}/vc/libmmal_util.so
%{_libdir}/vc/libmmal_vc_client.so
%{_libdir}/vc/libopenmaxil.so
-%{_libdir}/vc/libvchiq_arm.so
-%{_libdir}/vc/libvcos.so
%{_libdir}/vc/libvcsm.so
%{_libdir}/vc/plugins/reader_asf.so
%{_libdir}/vc/plugins/reader_avi.so
@@ -206,7 +212,7 @@ ln -s %{_includedir}/vc %{buildroot}/opt/vc/include
%{_libdir}/vc/plugins/writer_mp4.so
%{_libdir}/vc/plugins/writer_raw_video.so
%{_libdir}/vc/plugins/writer_simple.so
-
+%endif
%files devel
%{rpmmacrodir}/macros.%{name}
@@ -217,17 +223,20 @@ ln -s %{_includedir}/vc %{buildroot}/opt/vc/include
%files static
+%ifarch armv7hl
%{_libdir}/vc/libEGL_static.a
%{_libdir}/vc/libGLESv2_static.a
-%{_libdir}/vc/libdebug_sym_static.a
%{_libdir}/vc/libkhrn_client.a
%{_libdir}/vc/libkhrn_static.a
-%{_libdir}/vc/libvchostif.a
%{_libdir}/vc/libvcilcs.a
+%endif
+%{_libdir}/vc/libdebug_sym_static.a
+%{_libdir}/vc/libvchostif.a
%files utils
+%ifarch armv7hl
%{_bindir}/containers_check_frame_int
%{_bindir}/containers_datagram_receiver
%{_bindir}/containers_datagram_sender
@@ -239,22 +248,22 @@ ln -s %{_includedir}/vc %{buildroot}/opt/vc/include
%{_bindir}/containers_test_bits
%{_bindir}/containers_test_uri
%{_bindir}/containers_uri_pipe
-%{_bindir}/dtmerge
-%{_bindir}/dtoverlay
-%{_bindir}/dtoverlay-post
-%{_bindir}/dtoverlay-pre
-%{_bindir}/dtparam
%{_bindir}/mmal_vc_diag
%{_bindir}/raspistill
%{_bindir}/raspivid
%{_bindir}/raspividyuv
%{_bindir}/raspiyuv
+%{_bindir}/vcsmem
+%endif
+%{_bindir}/dtmerge
+%{_bindir}/dtoverlay
+%{_bindir}/dtoverlay-post
+%{_bindir}/dtoverlay-pre
+%{_bindir}/dtparam
%{_bindir}/tvservice
%{_bindir}/vcgencmd
%{_bindir}/vchiq_test
%{_bindir}/vcmailbox
-%{_bindir}/vcsmem
-#{_sbindir}/vcfiled
%files demo-source
@@ -264,6 +273,11 @@ ln -s %{_includedir}/vc %{buildroot}/opt/vc/include
%changelog
+* Mon Sep 14 2020 Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl> - 20200813-1.gitf73fca0
+- Update snapshot
+- Fix build error on aarch64
+- Generate raspberrypi-vc-libs.conf on the fly
+
* Mon Aug 03 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 20200727-1.git3e59217
- Update snapshot
diff --git a/sources b/sources
index 46deb36..b430920 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (raspberrypi-userland-3e59217.tar.gz) = 8fd6ed3baa7e8e4bdbf89e38da3d268be2661b621dffcf0c5189352c999369b461b0b29005f285876bf7d47fd6ac280048074f8ee65a2b5fd8b05a8735423984
+SHA512 (raspberrypi-userland-f73fca0.tar.gz) = 2b44a82945a1cad8a01938b866363001740274364d8818d0e83b701f1597de8e016b6f1254b0788685d411e832e7d5b053224b9d09d0126ad6db9abf2f768075
3 years, 7 months
[simplescreenrecorder/el7: 5/5] Merge branch 'master' into el7
by Vasiliy Glazov
commit 4e1c338348d20a2a53d6aec3bc853e9aa73fe10a
Merge: 99da2db 2a626bd
Author: vascom <vascom2(a)gmail.com>
Date: Tue Sep 22 09:02:35 2020 +0300
Merge branch 'master' into el7
simplescreenrecorder.spec | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
---
diff --cc simplescreenrecorder.spec
index 1680822,cc773b7..689aac1
--- a/simplescreenrecorder.spec
+++ b/simplescreenrecorder.spec
@@@ -41,11 -44,9 +42,9 @@@ It's 'simple' in the sense that it's ea
%build
- mkdir build-release
- pushd build-release
- %cmake3 \
+ %cmake3 \
-DCMAKE_BUILD_TYPE=Release \
- -DWITH_QT5=TRUE \
+ -DWITH_QT5=FALSE \
%ifnarch %{ix86} x86_64
-DENABLE_X86_ASM=FALSE \
%endif
3 years, 7 months
[simplescreenrecorder] Correct build for ppc64le.
by Vasiliy Glazov
commit 2a626bd6d11fc5d14edbd04667b49e0fe5d16bee
Author: vascom <vascom2(a)gmail.com>
Date: Tue Sep 22 08:42:58 2020 +0300
Correct build for ppc64le.
simplescreenrecorder.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/simplescreenrecorder.spec b/simplescreenrecorder.spec
index cf11c67..cc773b7 100644
--- a/simplescreenrecorder.spec
+++ b/simplescreenrecorder.spec
@@ -50,7 +50,7 @@ It's 'simple' in the sense that it's easier to use than ffmpeg/avconv or VLC
%ifnarch %{ix86} x86_64
-DENABLE_X86_ASM=FALSE \
%endif
-%ifarch %{arm} aarch64
+%ifarch %{arm} aarch64 %{power64}
-DWITH_GLINJECT=FALSE \
%endif
%cmake3_build
@@ -61,7 +61,7 @@ It's 'simple' in the sense that it's easier to use than ffmpeg/avconv or VLC
rm -f %{buildroot}%{_libdir}/*.la
mkdir -p %{buildroot}%{_libdir}/%{name}/
-%ifnarch %{arm} aarch64
+%ifnarch %{arm} aarch64 %{power64}
mv %{buildroot}%{_libdir}/lib%{shortname}-glinject.so %{buildroot}%{_libdir}/%{name}/lib%{shortname}-glinject.so
%endif
3 years, 7 months
