From a103dc4e3b2e9bbadce8c436da889abb3d093cf7 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Jun 06 2020 17:04:05 +0000 Subject: Update to 20200315-6e6a2c859a17a195fbb6a97c9da584dd2b9b0178 --- diff --git a/.gitignore b/.gitignore index 0d29bc0..c117f6a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ SOURCES/raspberrypi-userland* +SOURCES/*.tar.gz BUILD/ BUILDROOT/ RPMS/ diff --git a/.raspberrypi-vc.metadata b/.raspberrypi-vc.metadata index 7daa7cc..8648290 100644 --- a/.raspberrypi-vc.metadata +++ b/.raspberrypi-vc.metadata @@ -1 +1 @@ -87140043fb654b107125d28b1e0b0677ed996e55 SOURCES/raspberrypi-userland-e5803f2.tar.gz +9bb4c6d857ded6b804d9eed3b832716a3e7cbfc6 SOURCES/6e6a2c859a17a195fbb6a97c9da584dd2b9b0178.tar.gz diff --git a/SOURCES/raspberrypi-vc-demo-source-path-fixup.patch b/SOURCES/raspberrypi-vc-demo-source-path-fixup.patch index 2d26c5a..a192682 100644 --- a/SOURCES/raspberrypi-vc-demo-source-path-fixup.patch +++ b/SOURCES/raspberrypi-vc-demo-source-path-fixup.patch @@ -45,7 +45,7 @@ diff -ur raspberrypi-userland-2fa36bf.orig/host_applications/linux/apps/hello_pi +#include #include "vgfont.h" - static const char *strnchr(const char *str, size_t len, char c) + #include "revision.h" diff -ur raspberrypi-userland-2fa36bf.orig/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.h raspberrypi-userland-2fa36bf/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.h --- raspberrypi-userland-2fa36bf.orig/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.h 2014-08-08 15:48:27.000000000 +0100 +++ raspberrypi-userland-2fa36bf/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.h 2015-03-08 11:22:19.159910374 +0000 @@ -127,8 +127,8 @@ diff -ur raspberrypi-userland-2fa36bf.orig/host_applications/linux/apps/hello_pi +# include #endif - #include "tiger.h" -@@ -479,7 +479,7 @@ + #include "revision.h" +@@ -481,7 +481,7 @@ //TODO #elif defined __RASPBERRYPI__ @@ -173,8 +173,8 @@ diff -ur raspberrypi-userland-2fa36bf.orig/host_applications/linux/apps/hello_pi +#include +#include - typedef struct - { + #include "revision.h" + diff -ur raspberrypi-userland-2fa36bf.orig/host_applications/linux/apps/hello_pi/hello_video/video.c raspberrypi-userland-2fa36bf/host_applications/linux/apps/hello_pi/hello_video/video.c --- raspberrypi-userland-2fa36bf.orig/host_applications/linux/apps/hello_pi/hello_video/video.c 2014-08-08 15:48:28.000000000 +0100 +++ raspberrypi-userland-2fa36bf/host_applications/linux/apps/hello_pi/hello_video/video.c 2015-03-08 11:14:43.528966129 +0000 @@ -329,11 +329,11 @@ diff -ur raspberrypi-userland-2fa36bf.orig/host_applications/linux/apps/hello_pi CFLAGS+=-DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -Wall -g -DHAVE_LIBOPENMAX=2 -DOMX -DOMX_SKIP64BIT -ftree-vectorize -pipe -DUSE_EXTERNAL_OMX -DHAVE_LIBBCM_HOST -DUSE_EXTERNAL_LIBBCM_HOST -DUSE_VCHIQ_ARM -Wno-psabi --LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lbrcmGLESv2 -lbrcmEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lm -L$(SDKSTAGE)/opt/vc/src/hello_pi/libs/ilclient -L$(SDKSTAGE)/opt/vc/src/hello_pi/libs/vgfont -+LDFLAGS+=-L$(SDKSTAGE)/usr/lib/vc -lbrcmGLESv2 -lbrcmEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lm -L../libs/ilclient -L../libs/vgfont +-LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lbrcmGLESv2 -lbrcmEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lm -L$(SDKSTAGE)/opt/vc/src/hello_pi/libs/ilclient -L$(SDKSTAGE)/opt/vc/src/hello_pi/libs/vgfont -L$(SDKSTAGE)/opt/vc/src/hello_pi/libs/revision ++LDFLAGS+=-L$(SDKSTAGE)/usr/lib/vc -lbrcmGLESv2 -lbrcmEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lm -L../libs/ilclient -L../libs/vgfont -L../libs/revision --INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/ilclient -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/vgfont -+INCLUDES+=-I$(SDKSTAGE)/usr/include/vc -I$(SDKSTAGE)/usr/include/vc/interface/vcos/pthreads -I$(SDKSTAGE)/usr/include/vc/interface/vmcs_host/linux -I./ -I../libs/ilclient -I../libs/vgfont +-INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/ilclient -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/vgfont -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/revision ++INCLUDES+=-I$(SDKSTAGE)/usr/include/vc -I$(SDKSTAGE)/usr/include/vc/interface/vcos/pthreads -I$(SDKSTAGE)/usr/include/vc/interface/vmcs_host/linux -I./ -I../libs/ilclient -I../libs/vgfont -I../libs/revision all: $(BIN) $(LIB) diff --git a/SPECS/raspberrypi-vc.spec b/SPECS/raspberrypi-vc.spec index d222bfc..aef7234 100644 --- a/SPECS/raspberrypi-vc.spec +++ b/SPECS/raspberrypi-vc.spec @@ -1,17 +1,17 @@ # actually, the date is the date packaged, not the commit date -%global commit_date 20190115 -%global commit_long e5803f2c986cbf8c919c60278b3231dcdf4271a6 +%global commit_date 20200315 +%global commit_long 6e6a2c859a17a195fbb6a97c9da584dd2b9b0178 %global commit_short %(c=%{commit_long}; echo ${c:0:7}) Name: raspberrypi-vc Version: %{commit_date} -Release: 503.git%{commit_short}%{dist} +Release: 504.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.gz +Source0: https://github.com/raspberrypi/userland/archive/%{commit_long}.tar.gz Source1: raspberrypi-vc-libs.conf # Patch0 fixes up paths for relocation from /opt to system directories. @@ -78,7 +78,7 @@ on the Raspberry Pi computer. %prep -%setup -q -n raspberrypi-userland-%{commit_short} +%setup -q -n userland-%{commit_long} %patch0 -p1 @@ -96,7 +96,7 @@ make install DESTDIR=%{buildroot} # /opt/vc -> /usr mkdir -p %{buildroot}/usr -mv %{buildroot}/opt/vc/{bin,sbin} %{buildroot}/usr +mv %{buildroot}/opt/vc/bin %{buildroot}/usr mkdir -p %{buildroot}/usr/lib/vc mv %{buildroot}/opt/vc/lib/* %{buildroot}/usr/lib/vc @@ -177,7 +177,6 @@ popd # build %files utils %defattr(0644,root,root,0755) %attr(4755,root,root) %{_bindir}/* -%attr(4755,root,root) %{_sbindir}/* %doc LICENCE %files demo-source @@ -186,6 +185,9 @@ popd # build %doc LICENCE %changelog +* Sun Mar 15 2020 Pablo Greco - 20200315-504 +- Update to newer version from upstream + * Wed Feb 27 2019 Pablo Greco - 20190115-503 - Update to newer version from upstream - spec cleanup