Request 4617 (accepted)

Overview

Request 4617 (accepted)

fix build on TW

Created by jirislaby over 4 years ago
In state accepted
Package maintainer: enzokiel

Submit avidemux3

Submit package home:jirislaby...hes:Multimedia / avidemux3 to package Multimedia / avidemux3

avidemux3.changes Changed

avidemux3.spec Changed

avidemux-cpu-detection-fix.patch Added

@@ -0,0 +1,52 @@
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Tue, 12 Nov 2019 11:28:37 +0100
+Subject: cmake: fix detection of CPUs
+Patch-mainline: yes
+Git-commit: 82ab993cbbe17c71ca20c4af7b1a4b6f9fa95c45
+References: build fix
+
+The code defines a function foo returning int, but contains no return.
+So the detection fails with "CPU not supported". As new gccs warng abotu
+missing return, it causes the detaction to fail. Switch foo to return
+void.
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ cmake/cmake_compile_check/cpu_armel_check.cpp  | 2 +-
+ cmake/cmake_compile_check/cpu_x86-64_check.cpp | 2 +-
+ cmake/cmake_compile_check/cpu_x86_check.cpp    | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/cmake_compile_check/cpu_armel_check.cpp b/cmake/cmake_compile_check/cpu_armel_check.cpp
+index 429661add08c..02f779c71b7b 100644
+--- a/cmake/cmake_compile_check/cpu_armel_check.cpp
++++ b/cmake/cmake_compile_check/cpu_armel_check.cpp
+@@ -1,4 +1,4 @@
+-int foo(void)
++void foo(void)
+ {
+ 
+ 	asm volatile ("mov lr,pc " : : );
+diff --git a/cmake/cmake_compile_check/cpu_x86-64_check.cpp b/cmake/cmake_compile_check/cpu_x86-64_check.cpp
+index 49c751b6fbe8..4f493bc5cdaf 100644
+--- a/cmake/cmake_compile_check/cpu_x86-64_check.cpp
++++ b/cmake/cmake_compile_check/cpu_x86-64_check.cpp
+@@ -1,4 +1,4 @@
+-int foo(void)
++void foo(void)
+ {
+ 	asm volatile ("movdqa %xmm8, 0");
+ }
+diff --git a/cmake/cmake_compile_check/cpu_x86_check.cpp b/cmake/cmake_compile_check/cpu_x86_check.cpp
+index c4e8f7f432a5..cd00b66c0524 100644
+--- a/cmake/cmake_compile_check/cpu_x86_check.cpp
++++ b/cmake/cmake_compile_check/cpu_x86_check.cpp
+@@ -1,4 +1,4 @@
+-int foo(void)
++void foo(void)
+ {
+ 	asm volatile ("movdqa %xmm7, 0");
+ }
+-- 
+2.24.0
+

avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch Added

@@ -0,0 +1,30 @@
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Tue, 12 Nov 2019 11:47:21 +0100
+Subject: [ivtcDupeRemover] return true from ivtcDupeRemover::getNextFrame
+Patch-mainline: submitted as PR#182
+References: build fix
+
+It is declared as returning a bool, but returns nothing. But the callers
+expect something to be returned: true in case it succeeded.
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ .../ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp   | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp b/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
+index 754fd3ad3807..4ba1eae90c9a 100644
+--- a/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
++++ b/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
+@@ -375,6 +375,8 @@ bool ivtcDupeRemover::getNextFrame(uint32_t *fn,ADMImage *image)
+               break;
+ 
+       }
++
++      return true;
+ }
+ /**
+     \fn getCoupledConf
+-- 
+2.24.0
+

Build Results
RPM Lint

Refresh

Comments for request 4617 0

Request History

jirislaby created request over 4 years ago

fix build on TW

enzokiel accepted request over 4 years ago