Compare commits

..

No commits in common. "32ab028680fdf5a280b60edb88e0787877155919" and "3da33a191c401cf5c523b4f1ec8383b4f80f9971" have entirely different histories.

5 changed files with 1 additions and 92 deletions

View File

@ -1,24 +0,0 @@
From: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
Subject: fix FTBFS with GCC-11
We need to malloc line before using it.
Bug-Debian: http://bugs.debian.org/984195
Index: libomxil-bellagio-0.9.3/src/core_extensions/OMXCoreRMExt.c
===================================================================
--- libomxil-bellagio-0.9.3.orig/src/core_extensions/OMXCoreRMExt.c
+++ libomxil-bellagio-0.9.3/src/core_extensions/OMXCoreRMExt.c
@@ -169,6 +169,7 @@ OMX_ERRORTYPE readRegistryFile() {
}
free(registry_filename);
libname = malloc(OMX_MAX_STRINGNAME_SIZE * 2);
+ line = malloc(MAX_LINE_LENGTH+1);
fseek(omxregistryfp, 0, 0);
while(1) {
@@ -193,7 +194,6 @@ OMX_ERRORTYPE readRegistryFile() {
fseek(omxregistryfp, 0, 0);
qualityList = malloc(numberOfLines * sizeof (stLoaderComponentType*));
qualityListItems = numberOfLines;
- line = malloc(MAX_LINE_LENGTH);
listindex = 0;
while(1) {

View File

@ -1,33 +0,0 @@
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);

View File

@ -1,12 +0,0 @@
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) {

View File

@ -1,6 +1,6 @@
Name: libomxil-bellagio
Version: 0.9.3
Release: 25
Release: 21
Summary: OpenMAX Integration Layer
License: LGPLv2+
URL: http://omxil.sourceforge.net
@ -14,9 +14,6 @@ Patch0006: bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
Patch0007: omxil_version.patch
Patch0008: libomxil-bellagio-0.9.3-memcpy.patch
Patch0009: libomxil-bellagio-0.9.3-valgrind_register.patch
Patch0010: fix-stringop-overflow.patch
Patch0011: fix-multi-define.patch
Patch0012: Fix-FTBFS-with-gcc12.patch
BuildRequires: doxygen libtool gcc-c++
%description
@ -50,9 +47,6 @@ autoreconf -vif
%build
%ifarch riscv64 loongarch64
export CFLAGS="$CFLAGS -Wno-stringop-truncation"
%endif
%configure --disable-static
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -104,17 +98,5 @@ install -pm 0755 test/components/resource_manager/.libs/{omxprioritytest,omxrmte
%changelog
* Mon Dec 02 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 0.9.3-25
- Workaround -Wstringop-truncation error for loongarch64
* Sat Oct 07 2023 laokz <zhangkai@iscas.ac.cn> - 0.9.3-24
- Workaround -Wstringop-truncation error for riscv64
* Sat Jul 15 2023 yaoxin <yao_xin001@hoperun.com> - 0.9.3-23
- Fix build failure caused by gcc upgrade to 12.3.1
* 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
- Package init

View File

@ -1,4 +0,0 @@
version_control: github
src_repo: felipec/libomxil-bellagio
tag_prefix: ^
seperator: .