!4 fix compile failure by update GCC-10
From: @luweitao_y Reviewed-by: @yanan-rock Signed-off-by: @yanan-rock
This commit is contained in:
commit
d85b6f0222
33
fix-multi-define.patch
Normal file
33
fix-multi-define.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
diff -urN ./src/omx_reference_resource_manager.c ./src/omx_reference_resource_manager.c
|
||||||
|
--- ./src/omx_reference_resource_manager.c 2021-08-05 18:44:02.502180627 +0800
|
||||||
|
+++ ./src/omx_reference_resource_manager.c 2021-08-05 18:47:24.151838514 +0800
|
||||||
|
@@ -30,6 +30,11 @@
|
||||||
|
#include "base/omx_base_component.h"
|
||||||
|
#include "queue.h"
|
||||||
|
|
||||||
|
+int globalIndex;
|
||||||
|
+NameIndexType *listOfcomponentRegistered;
|
||||||
|
+ComponentListType **globalComponentList;
|
||||||
|
+ComponentListType **globalWaitingComponentList;
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* This is the static base pointer of the list
|
||||||
|
*/
|
||||||
|
diff -urN ./src/omx_reference_resource_manager.h ./src/omx_reference_resource_manager.h
|
||||||
|
--- ./src/omx_reference_resource_manager.h 2011-01-12 15:53:26.000000000 +0800
|
||||||
|
+++ ./src/omx_reference_resource_manager.h 2021-08-05 18:46:51.663571188 +0800
|
||||||
|
@@ -49,10 +49,10 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
-int globalIndex;
|
||||||
|
-NameIndexType *listOfcomponentRegistered;
|
||||||
|
-ComponentListType **globalComponentList;
|
||||||
|
-ComponentListType **globalWaitingComponentList;
|
||||||
|
+extern int globalIndex;
|
||||||
|
+extern NameIndexType *listOfcomponentRegistered;
|
||||||
|
+extern ComponentListType **globalComponentList;
|
||||||
|
+extern ComponentListType **globalWaitingComponentList;
|
||||||
|
|
||||||
|
OMX_ERRORTYPE RM_RegisterComponent(char *name, int max_components);
|
||||||
|
OMX_ERRORTYPE addElemToList(ComponentListType **list, OMX_COMPONENTTYPE *openmaxStandComp, int index, OMX_BOOL bIsWaiting);
|
||||||
12
fix-stringop-overflow.patch
Normal file
12
fix-stringop-overflow.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -urN ./src/omx_create_loaders_linux.c ./src/omx_create_loaders_linux.c
|
||||||
|
--- ./src/omx_create_loaders_linux.c 2011-05-20 13:28:17.000000000 +0800
|
||||||
|
+++ ./src/omx_create_loaders_linux.c 2021-08-05 18:45:57.607126826 +0800
|
||||||
|
@@ -95,7 +95,7 @@
|
||||||
|
if (isFileExisting) {
|
||||||
|
loaderFP = fopen(omxloader_registry_filename, "r");
|
||||||
|
// dlopen all loaders defined in .omxloaders file
|
||||||
|
- libraryFileName = malloc(MAX_LINE_LENGTH);
|
||||||
|
+ libraryFileName = malloc(MAX_LINE_LENGTH + 1);
|
||||||
|
while(1) {
|
||||||
|
index_readline = 0;
|
||||||
|
while(index_readline < MAX_LINE_LENGTH) {
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: libomxil-bellagio
|
Name: libomxil-bellagio
|
||||||
Version: 0.9.3
|
Version: 0.9.3
|
||||||
Release: 21
|
Release: 22
|
||||||
Summary: OpenMAX Integration Layer
|
Summary: OpenMAX Integration Layer
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://omxil.sourceforge.net
|
URL: http://omxil.sourceforge.net
|
||||||
@ -14,6 +14,8 @@ Patch0006: bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
|
|||||||
Patch0007: omxil_version.patch
|
Patch0007: omxil_version.patch
|
||||||
Patch0008: libomxil-bellagio-0.9.3-memcpy.patch
|
Patch0008: libomxil-bellagio-0.9.3-memcpy.patch
|
||||||
Patch0009: libomxil-bellagio-0.9.3-valgrind_register.patch
|
Patch0009: libomxil-bellagio-0.9.3-valgrind_register.patch
|
||||||
|
Patch0010: fix-stringop-overflow.patch
|
||||||
|
Patch0011: fix-multi-define.patch
|
||||||
BuildRequires: doxygen libtool gcc-c++
|
BuildRequires: doxygen libtool gcc-c++
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -98,5 +100,8 @@ install -pm 0755 test/components/resource_manager/.libs/{omxprioritytest,omxrmte
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jul 31 2021 luweitao <luweitao2@huawei.com> - 0.9.3-22
|
||||||
|
- fix failure by upgrade to GCC-10
|
||||||
|
|
||||||
* Tue Dec 31 2019 zoushuangshuang <zoushuangshuang@huawei.com> - 0.9.3-21
|
* Tue Dec 31 2019 zoushuangshuang <zoushuangshuang@huawei.com> - 0.9.3-21
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user