diff --git a/.raspberrypi-vc.metadata b/.raspberrypi-vc.metadata index c37ad67..7daa7cc 100644 --- a/.raspberrypi-vc.metadata +++ b/.raspberrypi-vc.metadata @@ -1 +1 @@ -b1e91a33928b41ca8338f5bd13096f7cad9cc51e SOURCES/raspberrypi-userland-aa39775.tar.bz2 +87140043fb654b107125d28b1e0b0677ed996e55 SOURCES/raspberrypi-userland-e5803f2.tar.gz diff --git a/SOURCES/raspberrypi-vc-Install_libfdt.so.patch b/SOURCES/raspberrypi-vc-Install_libfdt.so.patch deleted file mode 100644 index 4d991a7..0000000 --- a/SOURCES/raspberrypi-vc-Install_libfdt.so.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 6852d7320d9174f63f0e4fc210dbb3cbad77991a Mon Sep 17 00:00:00 2001 -From: Guillaume GARDET -Date: Fri, 9 Sep 2016 11:17:22 +0200 -Subject: [PATCH] Install libfdt.so - ---- - opensrc/helpers/libfdt/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/opensrc/helpers/libfdt/CMakeLists.txt b/opensrc/helpers/libfdt/CMakeLists.txt -index f57c61c..11fba04 100755 ---- a/opensrc/helpers/libfdt/CMakeLists.txt -+++ b/opensrc/helpers/libfdt/CMakeLists.txt -@@ -9,5 +9,5 @@ add_library(fdt - fdt_strerror.c - fdt_wip.c) - --INSTALL(FILES) -+install (TARGETS fdt DESTINATION lib) - diff --git a/SOURCES/raspberrypi-vc-dont-copy-dtoverlay-scripts.patch b/SOURCES/raspberrypi-vc-dont-copy-dtoverlay-scripts.patch deleted file mode 100644 index 1a38ea1..0000000 --- a/SOURCES/raspberrypi-vc-dont-copy-dtoverlay-scripts.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/host_applications/linux/apps/dtoverlay/CMakeLists.txt 2016-06-13 17:13:55.000000000 +0100 -+++ b/host_applications/linux/apps/dtoverlay/CMakeLists.txt 2016-09-12 10:32:49.082078424 +0100 -@@ -22,12 +22,12 @@ - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin) - - set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post) --foreach(_script ${DTOVERLAY_SCRIPTS}) -- add_custom_command( -- TARGET dtoverlay -- COMMAND ${CMAKE_COMMAND} -- -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_script} -- ${CMAKE_BINARY_DIR}/../../bin/${_script} -- ) --endforeach() -+# foreach(_script ${DTOVERLAY_SCRIPTS}) -+# add_custom_command( -+# TARGET dtoverlay -+# COMMAND ${CMAKE_COMMAND} -+# -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_script} -+# ${CMAKE_BINARY_DIR}/../../bin/${_script} -+# ) -+# endforeach() - install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin) diff --git a/SPECS/raspberrypi-vc.spec b/SPECS/raspberrypi-vc.spec index 4dfa137..d222bfc 100644 --- a/SPECS/raspberrypi-vc.spec +++ b/SPECS/raspberrypi-vc.spec @@ -1,27 +1,22 @@ # actually, the date is the date packaged, not the commit date -%global commit_date 20170705 -%global commit_long aa3977538b04038628ff5b3a39a8e42ddcbc9176 +%global commit_date 20190115 +%global commit_long e5803f2c986cbf8c919c60278b3231dcdf4271a6 %global commit_short %(c=%{commit_long}; echo ${c:0:7}) Name: raspberrypi-vc Version: %{commit_date} -Release: 502.git%{commit_short}%{dist} +Release: 503.git%{commit_short}%{dist} Summary: VideoCore GPU libraries, utilities, and demos for Raspberry Pi License: Redistributable, with restrictions; see LICENSE.broadcom URL: https://github.com/raspberrypi -Source0: raspberrypi-userland-%{commit_short}.tar.bz2 +Source0: raspberrypi-userland-%{commit_short}.tar.gz Source1: raspberrypi-vc-libs.conf # Patch0 fixes up paths for relocation from /opt to system directories. Patch0: raspberrypi-vc-demo-source-path-fixup.patch -# Test #333 -Patch1: raspberrypi-vc-Install_libfdt.so.patch - -Patch2: raspberrypi-vc-dont-copy-dtoverlay-scripts.patch - # dtoverlay BuildRequires: libfdt-devel >= 1.4.1-501.gitbeef80b%{?dist} Requires: libfdt >= 1.4.1-501.gitbeef80b%{?dist} @@ -38,24 +33,6 @@ Libraries, utilities and demos for the Raspberry Pi BCM2835/6 SOC GPU Summary: Libraries for accessing the Raspberry Pi GPU Requires: raspberrypi2-firmware -#Provides: libEGL.so -#Provides: libGLESv1_CM.so -#Provides: libGLESv2.so -#Provides: libOpenVG.so -#Provides: libWFC.so -#Provides: libbcm_host.so -#Provides: libcontainers.so -#Provides: libdebug_sym.so -#Provides: libmmal.so -#Provides: libmmal_components.so -#Provides: libmmal_core.so -#Provides: libmmal_util.so -#Provides: libmmal_vc_client.so -#Provides: libopenmaxil.so -#Provides: libvchiq_arm.so -#Provides: libvcos.so -#Provides: libvcsm.so - %description libs Shared libraries for accessing the BCM2835/6 VideoCore GPU on the Raspberry Pi computer. @@ -66,12 +43,6 @@ Summary: Headers for libraries that access the Raspberry Pi GPU Requires: %{name}-libs = %{version} License: GPLv2+ and Freely redistributable, with restrictions; see LICENCE.broadcom and headers -#Provides: khrplatform.h -#Provides: egl.h -#Provides: eglext.h -#Provides: eglplatform.h -#Provides: gl2.h - %description libs-devel Header files for accessing the BCM2835 VideoCore GPU on the Raspberry Pi computer. @@ -107,11 +78,9 @@ on the Raspberry Pi computer. %prep -%setup -q -c -n raspberrypi-userland-%{commit_short} +%setup -q -n raspberrypi-userland-%{commit_short} %patch0 -p1 -# %%patch1 -p1 -%patch2 -p1 %build mkdir build @@ -171,9 +140,6 @@ popd # build %attr(0755,-,-) %{_libdir}/vc/libbrcmGLESv2.so %attr(0755,-,-) %{_libdir}/vc/libbrcmOpenVG.so %attr(0755,-,-) %{_libdir}/vc/libbrcmWFC.so -#%%attr(0755,-,-) %{_libdir}/vc/libEGL.so.* -#%%attr(0755,-,-) %{_libdir}/vc/libGLESv2.so.* -#%%attr(0755,-,-) %{_libdir}/vc/libOpenVG.so.* %attr(0755,-,-) %{_libdir}/vc/libEGL.so %attr(0755,-,-) %{_libdir}/vc/libGLESv2.so %attr(0755,-,-) %{_libdir}/vc/libOpenVG.so @@ -200,9 +166,6 @@ popd # build %defattr(0644,root,root,0755) %{_includedir}/* %{_libdir}/vc/pkgconfig -#%%attr(0755,-,-) %{_libdir}/vc/libEGL.so -#%%attr(0755,-,-) %{_libdir}/vc/libGLESv2.so -#%%attr(0755,-,-) %{_libdir}/vc/libOpenVG.so %doc LICENCE %files static @@ -223,6 +186,10 @@ popd # build %doc LICENCE %changelog +* Wed Feb 27 2019 Pablo Greco - 20190115-503 +- Update to newer version from upstream +- spec cleanup + * Tue Sep 12 2017 Fabian Arrotin - Changed a Requires: to raspberrypi2-firmware (one used for CentOS 7 userland)