70 lines
3.1 KiB
Diff
70 lines
3.1 KiB
Diff
diff '--color=auto' -ruN old/src/dynamic_loader/Makefile.am new/src/dynamic_loader/Makefile.am
|
|
--- old/src/dynamic_loader/Makefile.am 2024-04-03 08:05:19.394779797 +0300
|
|
+++ new/src/dynamic_loader/Makefile.am 2024-04-03 08:22:06.134780704 +0300
|
|
@@ -3,7 +3,7 @@
|
|
omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la
|
|
libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h
|
|
|
|
-libomxdynamicloader_la_LDFLAGS =
|
|
+libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(abs_top_srcdir)/src/.lib
|
|
libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \
|
|
-I$(top_srcdir)/src \
|
|
-I$(top_srcdir)/src/base \
|
|
diff '--color=auto' -ruN old/src/Makefile.am new/src/Makefile.am
|
|
--- old/src/Makefile.am 2024-04-03 08:05:19.394779797 +0300
|
|
+++ new/src/Makefile.am 2024-04-03 08:24:32.288114091 +0300
|
|
@@ -8,6 +8,7 @@
|
|
omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \
|
|
-I$(top_srcdir)/include
|
|
omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir)
|
|
+omxregister_bellagio_DEPENDENCIES = libomxil-bellagio.la
|
|
|
|
lib_LTLIBRARIES = libomxil-bellagio.la
|
|
libomxil_bellagio_la_SOURCES = component_loader.h \
|
|
diff '--color=auto' -ruN old/src/omx_create_loaders_linux.c new/src/omx_create_loaders_linux.c
|
|
--- old/src/omx_create_loaders_linux.c 2024-04-03 08:05:19.384779798 +0300
|
|
+++ new/src/omx_create_loaders_linux.c 2024-04-03 08:33:08.644781012 +0300
|
|
@@ -75,7 +75,8 @@
|
|
|
|
isFileExisting = exists(omxloader_registry_filename);
|
|
|
|
- isDirExisting = exists(OMX_LOADERS_DIRNAME);
|
|
+ //Ignore loaders that are not listed in .omxloaders
|
|
+ //isDirExisting = exists(OMX_LOADERS_DIRNAME);
|
|
|
|
/* test the existence of the file */
|
|
if (!isDirExisting && !isFileExisting) {
|
|
diff '--color=auto' -ruN old/src/omx_reference_resource_manager.c new/src/omx_reference_resource_manager.c
|
|
--- old/src/omx_reference_resource_manager.c 2024-04-03 08:05:19.384779798 +0300
|
|
+++ new/src/omx_reference_resource_manager.c 2024-04-03 08:41:26.891447959 +0300
|
|
@@ -490,7 +490,6 @@
|
|
OMX_ERRORTYPE RM_removeFromWaitForResource(OMX_COMPONENTTYPE *openmaxStandComp) {
|
|
omx_base_component_PrivateType* omx_base_component_Private;
|
|
int i = 0;
|
|
- int indexComponent = -1;
|
|
|
|
DEBUG(DEB_LEV_FUNCTION_NAME, "In %s\n", __func__);
|
|
omx_base_component_Private = (omx_base_component_PrivateType*)openmaxStandComp->pComponentPrivate;
|
|
@@ -498,16 +497,13 @@
|
|
while(listOfcomponentRegistered[i].component_name != NULL ) {
|
|
if (!strcmp(listOfcomponentRegistered[i].component_name, omx_base_component_Private->name)) {
|
|
// found component in the list of the resource manager
|
|
- removeElemFromList(&globalComponentList[indexComponent], openmaxStandComp);
|
|
- break;
|
|
+ removeElemFromList(&globalComponentList[i], openmaxStandComp);
|
|
+ DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__);
|
|
+ return OMX_ErrorNone;
|
|
}
|
|
i++;
|
|
}
|
|
- if (indexComponent <0) {
|
|
- // No resource to be handled
|
|
- DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__);
|
|
- return OMX_ErrorNone;
|
|
- }
|
|
- DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__);
|
|
+ // No resource to be handled
|
|
+ DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__);
|
|
return OMX_ErrorNone;
|
|
}
|