[raspberrypi-vc] Update cmake macro
by Nicolas Chauvet
commit 728a6b3a22f4c1836d679bdd2b1bcf2ca0475f16
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Aug 3 21:02:01 2020 +0200
Update cmake macro
raspberrypi-vc.spec | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/raspberrypi-vc.spec b/raspberrypi-vc.spec
index c0dbda9..973c396 100644
--- a/raspberrypi-vc.spec
+++ b/raspberrypi-vc.spec
@@ -1,8 +1,6 @@
%global commit0 3e59217bd93b8024fb8fc1c6530b00cbae64bc73
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global __cmake_in_source_build 1
-
Name: raspberrypi-vc
Version: 20200727
Release: 1.git%{shortcommit0}%{?dist}
@@ -80,8 +78,6 @@ Raspberry Pi.
%build
-mkdir build
-pushd build
# Must set BUILD_SHARED_LIBS=OFF and BUILD_STATIC_LIBS=ON
# See for details: https://github.com/raspberrypi/userland/pull/333
%cmake \
@@ -90,15 +86,13 @@ pushd build
-DCMAKE_C_FLAGS=%{optflags} \
-DBUILD_SHARED_LIBS:BOOL=OFF \
-DBUILD_STATIC_LIBS:BOOL=ON \
- ..
-%make_build
-popd
+
+
+%cmake_build
%install
-pushd build
-%make_install
-popd
+%cmake_install
#RPM Macros support
mkdir -p %{buildroot}%{rpmmacrodir}
4 years, 3 months
[ffmpeg] Add patch to fix x86_64 LTO build issue
by Leigh Scott
commit c1bf93215d88c24e6f159a718c8b5e243a8a76b5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 3 17:19:48 2020 +0100
Add patch to fix x86_64 LTO build issue
...5-fix-build-with-flto-and-inline-assembly.patch | 183 +++++++++++++++++++++
ffmpeg.spec | 8 +-
2 files changed, 190 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg-2.5-fix-build-with-flto-and-inline-assembly.patch b/ffmpeg-2.5-fix-build-with-flto-and-inline-assembly.patch
new file mode 100644
index 0000000..a39bb04
--- /dev/null
+++ b/ffmpeg-2.5-fix-build-with-flto-and-inline-assembly.patch
@@ -0,0 +1,183 @@
+diff -up ffmpeg-4.3/libavcodec/cabac.c.flto_inline_asm~ ffmpeg-4.3/libavcodec/cabac.c
+--- ffmpeg-4.3/libavcodec/cabac.c.flto_inline_asm~ 2020-06-15 20:54:24.000000000 +0200
++++ ffmpeg-4.3/libavcodec/cabac.c 2020-06-21 02:01:43.471722832 +0200
+@@ -31,7 +31,7 @@
+ #include "cabac.h"
+ #include "cabac_functions.h"
+
+-DECLARE_ASM_ALIGNED(1, const uint8_t, ff_h264_cabac_tables)[512 + 4*2*64 + 4*64 + 63] = {
++__attribute__((used)) __attribute__((visibility("protected"))) DECLARE_ASM_ALIGNED(1, const uint8_t, ff_h264_cabac_tables)[512 + 4*2*64 + 4*64 + 63] = {
+ 9,8,7,7,6,6,6,6,5,5,5,5,5,5,5,5,
+ 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+ 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+diff -up ffmpeg-4.3/libavcodec/x86/lpc.c.flto_inline_asm~ ffmpeg-4.3/libavcodec/x86/lpc.c
+--- ffmpeg-4.3/libavcodec/x86/lpc.c.flto_inline_asm~ 2020-05-21 17:55:31.000000000 +0200
++++ ffmpeg-4.3/libavcodec/x86/lpc.c 2020-06-21 02:01:43.471722832 +0200
+@@ -26,8 +26,8 @@
+ #include "libavutil/x86/cpu.h"
+ #include "libavcodec/lpc.h"
+
+-DECLARE_ASM_CONST(16, double, pd_1)[2] = { 1.0, 1.0 };
+-DECLARE_ASM_CONST(16, double, pd_2)[2] = { 2.0, 2.0 };
++DECLARE_ASM_CONST_VISIBLE(16, double, pd_1)[2] = { 1.0, 1.0 };
++DECLARE_ASM_CONST_VISIBLE(16, double, pd_2)[2] = { 2.0, 2.0 };
+
+ #if HAVE_SSE2_INLINE
+
+diff -up ffmpeg-4.3/libavutil/mem.h.flto_inline_asm~ ffmpeg-4.3/libavutil/mem.h
+--- ffmpeg-4.3/libavutil/mem.h.flto_inline_asm~ 2020-05-21 17:55:31.000000000 +0200
++++ ffmpeg-4.3/libavutil/mem.h 2020-06-21 02:01:43.471722832 +0200
+@@ -104,14 +104,16 @@
+ #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v
+ #define DECLARE_ASM_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v
+ #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v
++ #define DECLARE_ASM_CONST_VISIBLE(n,t,v) __attribute__ ((externally_visible)) DECLARE_ASM_CONST(n,t,v)
+ #elif defined(__DJGPP__)
+ #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (FFMIN(n, 16)))) v
+ #define DECLARE_ASM_ALIGNED(n,t,v) t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v
+ #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v
+ #elif defined(__GNUC__) || defined(__clang__)
+- #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v
++ #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) __attribute__((used)) __attribute__((visibility("default"))) v
+ #define DECLARE_ASM_ALIGNED(n,t,v) t av_used __attribute__ ((aligned (n))) v
+ #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v
++ #define DECLARE_ASM_CONST_VISIBLE(n,t,v) __attribute__ ((externally_visible)) const t av_used __attribute__ ((aligned (n))) v
+ #elif defined(_MSC_VER)
+ #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v
+ #define DECLARE_ASM_ALIGNED(n,t,v) __declspec(align(n)) t v
+@@ -120,6 +122,7 @@
+ #define DECLARE_ALIGNED(n,t,v) t v
+ #define DECLARE_ASM_ALIGNED(n,t,v) t v
+ #define DECLARE_ASM_CONST(n,t,v) static const t v
++ #define DECLARE_ASM_CONST_VISIBLE(n,t,v) __attribute__((externally_visible)) const t v
+ #endif
+
+ /**
+diff -up ffmpeg-4.3/libpostproc/postprocess.c.flto_inline_asm~ ffmpeg-4.3/libpostproc/postprocess.c
+--- ffmpeg-4.3/libpostproc/postprocess.c.flto_inline_asm~ 2020-06-15 20:54:24.000000000 +0200
++++ ffmpeg-4.3/libpostproc/postprocess.c 2020-06-21 02:01:43.471722832 +0200
+@@ -118,17 +118,17 @@ const char *postproc_license(void)
+ //#define NUM_BLOCKS_AT_ONCE 16 //not used yet
+
+ #if ARCH_X86 && HAVE_INLINE_ASM
+-DECLARE_ASM_CONST(8, uint64_t, w05)= 0x0005000500050005LL;
+-DECLARE_ASM_CONST(8, uint64_t, w04)= 0x0004000400040004LL;
+-DECLARE_ASM_CONST(8, uint64_t, w20)= 0x0020002000200020LL;
+-DECLARE_ASM_CONST(8, uint64_t, b00)= 0x0000000000000000LL;
+-DECLARE_ASM_CONST(8, uint64_t, b01)= 0x0101010101010101LL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, w05)= 0x0005000500050005LL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, w04)= 0x0004000400040004LL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, w20)= 0x0020002000200020LL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, b00)= 0x0000000000000000LL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, b01)= 0x0101010101010101LL;
+ DECLARE_ASM_CONST(8, uint64_t, b02)= 0x0202020202020202LL;
+-DECLARE_ASM_CONST(8, uint64_t, b08)= 0x0808080808080808LL;
+-DECLARE_ASM_CONST(8, uint64_t, b80)= 0x8080808080808080LL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, b08)= 0x0808080808080808LL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, b80)= 0x8080808080808080LL;
+ #endif
+
+-DECLARE_ASM_CONST(8, int, deringThreshold)= 20;
++DECLARE_ASM_CONST_VISIBLE(8, int, deringThreshold)= 20;
+
+
+ static const struct PPFilter filters[]=
+diff -up ffmpeg-4.3/libswscale/x86/rgb2rgb.c.flto_inline_asm~ ffmpeg-4.3/libswscale/x86/rgb2rgb.c
+--- ffmpeg-4.3/libswscale/x86/rgb2rgb.c.flto_inline_asm~ 2020-05-21 17:55:31.000000000 +0200
++++ ffmpeg-4.3/libswscale/x86/rgb2rgb.c 2020-06-21 02:01:43.471722832 +0200
+@@ -36,7 +36,7 @@
+
+ #if HAVE_INLINE_ASM
+
+-DECLARE_ASM_CONST(8, uint64_t, mmx_ff) = 0x00000000000000FFULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, mmx_ff) = 0x00000000000000FFULL;
+ DECLARE_ASM_CONST(8, uint64_t, mmx_null) = 0x0000000000000000ULL;
+ DECLARE_ASM_CONST(8, uint64_t, mmx_one) = 0xFFFFFFFFFFFFFFFFULL;
+ DECLARE_ASM_CONST(8, uint64_t, mask32b) = 0x000000FF000000FFULL;
+@@ -49,11 +49,11 @@ DECLARE_ASM_CONST(8, uint64_t, mask3216g
+ DECLARE_ASM_CONST(8, uint64_t, mask3215g) = 0x0000F8000000F800ULL;
+ DECLARE_ASM_CONST(8, uint64_t, mul3216) = 0x2000000420000004ULL;
+ DECLARE_ASM_CONST(8, uint64_t, mul3215) = 0x2000000820000008ULL;
+-DECLARE_ASM_CONST(8, uint64_t, mask24b) = 0x00FF0000FF0000FFULL;
+-DECLARE_ASM_CONST(8, uint64_t, mask24g) = 0xFF0000FF0000FF00ULL;
+-DECLARE_ASM_CONST(8, uint64_t, mask24r) = 0x0000FF0000FF0000ULL;
+-DECLARE_ASM_CONST(8, uint64_t, mask24l) = 0x0000000000FFFFFFULL;
+-DECLARE_ASM_CONST(8, uint64_t, mask24h) = 0x0000FFFFFF000000ULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, mask24b) = 0x00FF0000FF0000FFULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, mask24g) = 0xFF0000FF0000FF00ULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, mask24r) = 0x0000FF0000FF0000ULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, mask24l) = 0x0000000000FFFFFFULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, mask24h) = 0x0000FFFFFF000000ULL;
+ DECLARE_ASM_CONST(8, uint64_t, mask24hh) = 0xffff000000000000ULL;
+ DECLARE_ASM_CONST(8, uint64_t, mask24hhh) = 0xffffffff00000000ULL;
+ DECLARE_ASM_CONST(8, uint64_t, mask24hhhh) = 0xffffffffffff0000ULL;
+@@ -71,9 +71,9 @@ DECLARE_ASM_CONST(8, uint64_t, blue_16ma
+ DECLARE_ASM_CONST(8, uint64_t, red_15mask) = 0x00007c0000007c00ULL;
+ DECLARE_ASM_CONST(8, uint64_t, green_15mask) = 0x000003e0000003e0ULL;
+ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL;
+-DECLARE_ASM_CONST(8, uint64_t, mul15_mid) = 0x4200420042004200ULL;
+-DECLARE_ASM_CONST(8, uint64_t, mul15_hi) = 0x0210021002100210ULL;
+-DECLARE_ASM_CONST(8, uint64_t, mul16_mid) = 0x2080208020802080ULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, mul15_mid) = 0x4200420042004200ULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, mul15_hi) = 0x0210021002100210ULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, mul16_mid) = 0x2080208020802080ULL;
+
+ DECLARE_ALIGNED(8, extern const uint64_t, ff_bgr2YOffset);
+ DECLARE_ALIGNED(8, extern const uint64_t, ff_w1111);
+diff -up ffmpeg-4.3/libswscale/x86/swscale.c.flto_inline_asm~ ffmpeg-4.3/libswscale/x86/swscale.c
+--- ffmpeg-4.3/libswscale/x86/swscale.c.flto_inline_asm~ 2020-06-15 20:54:24.000000000 +0200
++++ ffmpeg-4.3/libswscale/x86/swscale.c 2020-06-21 02:01:43.471722832 +0200
+@@ -41,8 +41,8 @@ const DECLARE_ALIGNED(8, uint64_t, ff_di
+
+ #define DITHER1XBPP
+
+-DECLARE_ASM_CONST(8, uint64_t, bF8)= 0xF8F8F8F8F8F8F8F8LL;
+-DECLARE_ASM_CONST(8, uint64_t, bFC)= 0xFCFCFCFCFCFCFCFCLL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, bF8)= 0xF8F8F8F8F8F8F8F8LL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, bFC)= 0xFCFCFCFCFCFCFCFCLL;
+ DECLARE_ASM_CONST(8, uint64_t, w10)= 0x0010001000100010LL;
+ DECLARE_ASM_CONST(8, uint64_t, w02)= 0x0002000200020002LL;
+
+@@ -53,13 +53,13 @@ DECLARE_ASM_CONST(8, uint64_t, b15Mask)=
+ DECLARE_ASM_CONST(8, uint64_t, g15Mask)= 0x03E003E003E003E0LL;
+ DECLARE_ASM_CONST(8, uint64_t, r15Mask)= 0x7C007C007C007C00LL;
+
+-DECLARE_ASM_ALIGNED(8, const uint64_t, ff_M24A) = 0x00FF0000FF0000FFLL;
+-DECLARE_ASM_ALIGNED(8, const uint64_t, ff_M24B) = 0xFF0000FF0000FF00LL;
+-DECLARE_ASM_ALIGNED(8, const uint64_t, ff_M24C) = 0x0000FF0000FF0000LL;
+-
+-DECLARE_ASM_ALIGNED(8, const uint64_t, ff_bgr2YOffset) = 0x1010101010101010ULL;
+-DECLARE_ASM_ALIGNED(8, const uint64_t, ff_bgr2UVOffset) = 0x8080808080808080ULL;
+-DECLARE_ASM_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL;
++DECLARE_ASM_ALIGNED(8, __attribute__ ((externally_visible)) const uint64_t, ff_M24A) = 0x00FF0000FF0000FFLL;
++DECLARE_ASM_ALIGNED(8, __attribute__ ((externally_visible)) const uint64_t, ff_M24B) = 0xFF0000FF0000FF00LL;
++DECLARE_ASM_ALIGNED(8, __attribute__ ((externally_visible)) const uint64_t, ff_M24C) = 0x0000FF0000FF0000LL;
++
++DECLARE_ASM_ALIGNED(8, __attribute__ ((externally_visible)) const uint64_t, ff_bgr2YOffset) = 0x1010101010101010ULL;
++DECLARE_ASM_ALIGNED(8, __attribute__ ((externally_visible)) const uint64_t, ff_bgr2UVOffset) = 0x8080808080808080ULL;
++DECLARE_ASM_ALIGNED(8, __attribute__ ((externally_visible)) const uint64_t, ff_w1111) = 0x0001000100010001ULL;
+
+
+ //MMX versions
+diff -up ffmpeg-4.3/libswscale/x86/yuv2rgb.c.flto_inline_asm~ ffmpeg-4.3/libswscale/x86/yuv2rgb.c
+--- ffmpeg-4.3/libswscale/x86/yuv2rgb.c.flto_inline_asm~ 2020-06-21 02:01:43.471722832 +0200
++++ ffmpeg-4.3/libswscale/x86/yuv2rgb.c 2020-06-21 02:03:04.922671766 +0200
+@@ -42,12 +42,12 @@
+ #define DITHER1XBPP // only for MMX
+
+ /* hope these constant values are cache line aligned */
+-DECLARE_ASM_CONST(8, uint64_t, mmx_00ffw) = 0x00ff00ff00ff00ffULL;
+-DECLARE_ASM_CONST(8, uint64_t, mmx_redmask) = 0xf8f8f8f8f8f8f8f8ULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, mmx_00ffw) = 0x00ff00ff00ff00ffULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, mmx_redmask) = 0xf8f8f8f8f8f8f8f8ULL;
+ DECLARE_ASM_CONST(8, uint64_t, mmx_grnmask) = 0xfcfcfcfcfcfcfcfcULL;
+-DECLARE_ASM_CONST(8, uint64_t, pb_e0) = 0xe0e0e0e0e0e0e0e0ULL;
+-DECLARE_ASM_CONST(8, uint64_t, pb_03) = 0x0303030303030303ULL;
+-DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, pb_e0) = 0xe0e0e0e0e0e0e0e0ULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, pb_03) = 0x0303030303030303ULL;
++DECLARE_ASM_CONST_VISIBLE(8, uint64_t, pb_07) = 0x0707070707070707ULL;
+
+ //MMX versions
+ #if HAVE_MMX
+diff -up ffmpeg-4.3/libswscale/x86/yuv2rgb_template.c.flto_inline_asm~ ffmpeg-4.3/libswscale/x86/yuv2rgb_template.c
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 3888a1a..89750db 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -97,7 +97,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.3.1
-Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 4%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -106,6 +106,9 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
Patch0: fix-vmaf-model-path.patch
+# Fix for LTO build
+# https://github.com/OpenMandrivaAssociation/ffmpeg/blob/master/ffmpeg-2.5-...
+Patch1: ffmpeg-2.5-fix-build-with-flto-and-inline-assembly.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}
@@ -452,6 +455,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Mon Aug 03 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3.1-4
+- Add patch to fix x86_64 LTO build issue
+
* Wed Jul 15 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3.1-3
- Enabled libopenmpt
4 years, 3 months
[raspberrypi-vc] old cmake
by Nicolas Chauvet
commit 6df53359e02b91b2a11ca2b7b34d28a9bff810a2
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Aug 3 17:41:26 2020 +0200
old cmake
raspberrypi-vc.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/raspberrypi-vc.spec b/raspberrypi-vc.spec
index 41765f8..c0dbda9 100644
--- a/raspberrypi-vc.spec
+++ b/raspberrypi-vc.spec
@@ -1,6 +1,8 @@
%global commit0 3e59217bd93b8024fb8fc1c6530b00cbae64bc73
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global __cmake_in_source_build 1
+
Name: raspberrypi-vc
Version: 20200727
Release: 1.git%{shortcommit0}%{?dist}
4 years, 3 months
[gpac] Make build verbose
by Leigh Scott
commit 71c8976f0a03dcf8e32c85c59e1c621d35413d35
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 3 15:23:37 2020 +0100
Make build verbose
gpac.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/gpac.spec b/gpac.spec
index f9a7b9a..15fd3f1 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -116,7 +116,8 @@ sed -i 's/dh_link/ln -s -r/' Makefile
--disable-oss-audio \
%{?_with_amr:--enable-amr} \
--disable-static \
- --use-js=no
+ --use-js=no \
+ --verbose
#Avoid mess with setup.h
cp -p config.h include/gpac
4 years, 3 months
[raspberrypi-vc] Update snapshot
by Nicolas Chauvet
commit ff74d7b5834a0dbf3becbb440cff6772ca0808b2
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Aug 3 15:05:43 2020 +0200
Update snapshot
raspberrypi-vc.spec | 18 +++++++++++-------
sources | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/raspberrypi-vc.spec b/raspberrypi-vc.spec
index 92a5a4c..41765f8 100644
--- a/raspberrypi-vc.spec
+++ b/raspberrypi-vc.spec
@@ -1,17 +1,18 @@
-%global commit_long ff2bd4552145e8dc190276d8fbdbadc7e8e0da78
-%global commit_short %(c=%{commit_long}; echo ${c:0:7})
+%global commit0 3e59217bd93b8024fb8fc1c6530b00cbae64bc73
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Name: raspberrypi-vc
-Version: 20190415
-Release: 2.git%{commit_short}%{?dist}
+Version: 20200727
+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/%{commit_long}.tar.gz#/raspberrypi-userland-%{commit_short}.tar.gz
+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.
-Patch0: raspberrypi-vc-demo-source-path-fixup.patch
+# Needs rebase or dropped
+#Patch0: raspberrypi-vc-demo-source-path-fixup.patch
ExclusiveArch: armv7hl
BuildRequires: cmake
@@ -73,7 +74,7 @@ Raspberry Pi.
%prep
-%autosetup -p1 -n userland-%{commit_long}
+%autosetup -p1 -n userland-%{commit0}
%build
@@ -266,6 +267,9 @@ ln -s %{_includedir}/vc %{buildroot}/opt/vc/include
%changelog
+* Mon Aug 03 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 20200727-1.git3e59217
+- Update snapshot
+
* Mon May 06 2019 Leigh Scott <leigh123linux(a)gmail.com> - 20190415-2.gitff2bd45
- Rebuild to fix rpi release tag
diff --git a/sources b/sources
index a19904a..46deb36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-84a008c79ce4456313d47107c72ceb14 raspberrypi-userland-ff2bd45.tar.gz
+SHA512 (raspberrypi-userland-3e59217.tar.gz) = 8fd6ed3baa7e8e4bdbf89e38da3d268be2661b621dffcf0c5189352c999369b461b0b29005f285876bf7d47fd6ac280048074f8ee65a2b5fd8b05a8735423984
4 years, 3 months
[megasync/f31] (3 commits) ...Update to 4.3.3.0.
by Vasiliy Glazov
Summary of changes:
68aaeba... Prepare for EPEL 8 build. (*)
3ad7714... Rebuild for new libraw version (*)
c6cacde... Update to 4.3.3.0. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[megasync/f32] (3 commits) ...Update to 4.3.3.0.
by Vasiliy Glazov
Summary of changes:
68aaeba... Prepare for EPEL 8 build. (*)
3ad7714... Rebuild for new libraw version (*)
c6cacde... Update to 4.3.3.0. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[megasync] Update to 4.3.3.0.
by Vasiliy Glazov
commit c6cacde502b38065b2648fc1c2e65fda50e24da9
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Mon Aug 3 13:34:42 2020 +0300
Update to 4.3.3.0.
.gitignore | 2 ++
megasync.spec | 30 ++++++++++++++++++++----------
sources | 4 ++--
3 files changed, 24 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a3ed79..fae9bb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
/v3.6.8.tar.gz
/v4.3.0.8_Linux.tar.gz
/v4.3.1.0_Linux.tar.gz
+/v3.7.1.tar.gz
+/v4.3.3.0_Linux.tar.gz
diff --git a/megasync.spec b/megasync.spec
index 37de804..f26d5d2 100644
--- a/megasync.spec
+++ b/megasync.spec
@@ -1,4 +1,4 @@
-%global sdk_version 3.6.8
+%global sdk_version 3.7.1
%bcond_without dolphin
%bcond_without nautilus
@@ -8,11 +8,11 @@
%bcond_without nemo
%endif
-%global enable_lto 1
+%global enable_lto 0
Name: megasync
-Version: 4.3.1.0
-Release: 2%{?dist}
+Version: 4.3.3.0
+Release: 1%{?dist}
Summary: Easy automated syncing between your computers and your MEGA cloud drive
# MEGAsync is under a proprietary license, except the SDK which is BSD
License: Proprietary and BSD
@@ -39,6 +39,7 @@ BuildRequires: desktop-file-utils
BuildRequires: qt5-qtbase-devel >= 5.6
BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qtsvg-devel
+BuildRequires: qt5-qtx11extras-devel
BuildRequires: terminus-fonts
BuildRequires: fontpackages-filesystem
BuildRequires: LibRaw-devel
@@ -119,6 +120,10 @@ sed -i 's|static int tgkill|int tgkill|' src/MEGASync/google_breakpad/client/lin
# Disable pdfium
sed -i '/DEFINES += REQUIRE_HAVE_PDFIUM/d' src/MEGASync/MEGASync.pro
+# Fix build with new glibc
+# https://github.com/meganz/MEGAsync/pull/477
+sed -i 's|sys_siglist\[sig\]|strsignal(sig)|' src/MEGASync/control/CrashHandler.cpp
+
%build
#Enable FFMPEG
@@ -150,7 +155,7 @@ pushd src/MEGAShellExtDolphin/build
rm ../megasync-plugin.moc
mv ../CMakeLists_kde5.txt ../CMakeLists.txt
%cmake_kf5 ..
- %make_build
+ %cmake_build
popd
%endif
@@ -185,13 +190,14 @@ popd
%if %{with dolphin}
pushd src/MEGAShellExtDolphin/build
- %make_install
+ %cmake_install
popd
%endif
%if %{with nautilus}
+sed -i 's|$(INSTALL_ROOT)/builddir|/builddir|' src/MEGAShellExtNautilus/build/Makefile
pushd src/MEGAShellExtNautilus/build
- %make_install
+ %make_install INSTALL_ROOT=%{buildroot} DESKTOP_DESTDIR=%{_prefix}
mkdir -p %{buildroot}%{_libdir}/nautilus/extensions-3.0
install -pm 755 libMEGAShellExtNautilus.so \
%{buildroot}%{_libdir}/nautilus/extensions-3.0/libMEGAShellExtNautilus.so
@@ -200,8 +206,9 @@ popd
%endif
%if %{with nemo}
+sed -i 's|$(INSTALL_ROOT)/builddir|/builddir|' src/MEGAShellExtNemo/build/Makefile
pushd src/MEGAShellExtNemo/build
- %make_install
+ %make_install INSTALL_ROOT=%{buildroot} DESKTOP_DESTDIR=%{_prefix}
mkdir -p %{buildroot}%{_libdir}/nemo/extensions-3.0
install -pm 755 libMEGAShellExtNemo.so \
%{buildroot}%{_libdir}/nemo/extensions-3.0/libMEGAShellExtNemo.so
@@ -227,7 +234,7 @@ popd
%if %{with nautilus}
%files -n nautilus-%{name}
-%{_libdir}/nautilus/extensions-3.0/libMEGAShellExtNautilus.so
+%{_libdir}/nautilus/extensions-3.0/libMEGAShellExtNautilus.so*
%exclude %{_datadir}/icons/hicolor/*/emblems/mega-dolphin-*.png
%exclude %{_datadir}/icons/hicolor/*/emblems/mega-nemo*.png
%{_datadir}/icons/hicolor/*/*/mega-*.icon
@@ -236,12 +243,15 @@ popd
%if %{with nemo}
%files -n nemo-%{name}
-%{_libdir}/nemo/extensions-3.0/libMEGAShellExtNemo.so
+%{_libdir}/nemo/extensions-3.0/libMEGAShellExtNemo.so*
%{_datadir}/icons/hicolor/*/*/mega-nemo*.icon
%{_datadir}/icons/hicolor/*/*/mega-nemo*.png
%endif
%changelog
+* Mon Jul 27 2020 Vasiliy N. Glazov <vascom2(a)gmail.com> - 4.3.3.0-1
+- Update to 4.3.3.0
+
* Sun May 24 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3.1.0-2
- Rebuild for new libraw version
diff --git a/sources b/sources
index d7076c9..fec6404 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (v4.3.1.0_Linux.tar.gz) = cccae88a8453f56c4a6702496dc38a176774e0dcd68adb7d9ada744af9eb8e04c9a044fa55bbe40ef414b87a9219e10e2c359189c2d37819ce983a3681e0f333
-SHA512 (v3.6.8.tar.gz) = 056fa7aca1721bbd045f1dbd4a0aba4be4f6ba70b51e56fe0f0733d17b76918a86a17cc607584a95bfb012f33b08c28d685e552437f7a6fd30858f01d435499e
+SHA512 (v3.7.1.tar.gz) = f6ce9e286e69c1560d1f7a7b13b28e8e2ba77802e777a29bef132a09f32f5fc379e5c7f64845424081d682723c53760593442e0a71d01a497b83723c875b2d9a
+SHA512 (v4.3.3.0_Linux.tar.gz) = 0d9cec15c6b9258d2f579f98c156798456d3eb3b8ab707718cc78c7fc55c213dbe04844e99a0a618b93e8c2dde0179c71dbc8357b6943c467719a9b2299812e6
4 years, 3 months
[kodi] Disable lto as appropriate
by Nicolas Chauvet
commit 10fbac1e77805de87d1e66afea62242cf502a9ae
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Aug 3 12:16:50 2020 +0200
Disable lto as appropriate
kodi.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/kodi.spec b/kodi.spec
index 5794d79..e0c4c7b 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -8,6 +8,8 @@
#global DIRVERSION %{version}%{PRERELEASE}
%global _hardened_build 1
%ifarch %{arm}
+# Disable LTO for arm, see http://koji.rpmfusion.org/koji/taskinfo?taskID=424139
+%global _lto_cflags %{nil}
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
4 years, 3 months