new package: bellagio

[Peter: needs C++, shouldn't force -Werror]
Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index effec38f5334dc8d2c462f9a9d115fea35a1db6b..ca6b791c729744b2c75bf85622b13ade6738a280 100644 (file)
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -3,6 +3,7 @@ source "package/multimedia/alsa-lib/Config.in"
 source "package/multimedia/alsa-utils/Config.in"
 source "package/multimedia/audiofile/Config.in"
 source "package/multimedia/aumix/Config.in"
+source "package/multimedia/bellagio/Config.in"
 source "package/multimedia/faad2/Config.in"
 source "package/multimedia/flac/Config.in"
 source "package/multimedia/ffmpeg/Config.in"

diff --git a/package/multimedia/bellagio/Config.in b/package/multimedia/bellagio/Config.in
new file mode 100644 (file)
index 0000000..1458f63
--- /dev/null
+++ b/package/multimedia/bellagio/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_BELLAGIO
+       bool "bellagio"
+       depends on BR2_INSTALL_LIBSTDCPP
+       help
+         Bellagio is an opensource implementation of the
+         OpenMAX IL API.
+
+         OpenMAX Integration Layer (IL) is a standard API
+         to access Multimedia Components on mobile platforms.
+         It has been defined by the Khronos group.
+         By means of the OpenMAX IL API, multimedia frameworks
+         can access hardware accelerators on platforms that
+         provide it.
+
+         http://omxil.sourceforge.net/
+
+comment "bellagio requires a toolchain with C++ support enabled"
+       depends on !BR2_INSTALL_LIBSTDCPP

diff --git a/package/multimedia/bellagio/bellagio-0.9.3-drop-werror.patch b/package/multimedia/bellagio/bellagio-0.9.3-drop-werror.patch
new file mode 100644 (file)
index 0000000..39baf42
--- /dev/null
+++ b/package/multimedia/bellagio/bellagio-0.9.3-drop-werror.patch
@@ -0,0 +1,22 @@
+[PATCH] don't force -Werror in CFLAGS
+
+Released software shouldn't get built with -Werror.
+
+Signed-of-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libomxil-bellagio-0.9.3/configure.ac
+===================================================================
+--- libomxil-bellagio-0.9.3.orig/configure.ac
++++ libomxil-bellagio-0.9.3/configure.ac
+@@ -5,7 +5,7 @@
+ AC_PREREQ([2.59])
+ 
+ AC_CONFIG_HEADERS([config.h])
+-CFLAGS="${CFLAGS} -Wall -Werror"
++CFLAGS="${CFLAGS} -Wall"
+ 
+ ################################################################################
+ # Set the shared versioning info, according to section 6.3 of the libtool info #

diff --git a/package/multimedia/bellagio/bellagio-0.9.3-dynamicloader-linking.patch b/package/multimedia/bellagio/bellagio-0.9.3-dynamicloader-linking.patch
new file mode 100644 (file)
index 0000000..5e4243d
--- /dev/null
+++ b/package/multimedia/bellagio/bellagio-0.9.3-dynamicloader-linking.patch
@@ -0,0 +1,16 @@
+When libomxdynamicloader.so is loaded, it complains that RM_Deinit can't be resolved.
+Link explicitly against omxil-bellagio so that ld.so can find the reference.
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+--- bellagio-0.9.3/src/dynamic_loader/Makefile.am.old  2012-03-23 15:07:47.379021034 +0000
++++ bellagio-0.9.3/src/dynamic_loader/Makefile.am      2012-03-23 15:08:47.563034818 +0000
+@@ -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/.libs
+ libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \
+                       -I$(top_srcdir)/src \
+                       -I$(top_srcdir)/src/base \

diff --git a/package/multimedia/bellagio/bellagio-0.9.3-parallel-build.patch b/package/multimedia/bellagio/bellagio-0.9.3-parallel-build.patch
new file mode 100644 (file)
index 0000000..767bbeb
--- /dev/null
+++ b/package/multimedia/bellagio/bellagio-0.9.3-parallel-build.patch
@@ -0,0 +1,16 @@
+Fix dependency issue to allow parallel build
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+Index: bellagio-0.9.3/src/Makefile.am
+===================================================================
+--- bellagio-0.9.3.orig/src/Makefile.am
++++ bellagio-0.9.3/src/Makefile.am
+@@ -8,6 +8,7 @@ omxregister_bellagio_SOURCES = omxregist
+ 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 --git a/package/multimedia/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch b/package/multimedia/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
new file mode 100644 (file)
index 0000000..f52a2c3
--- /dev/null
+++ b/package/multimedia/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
@@ -0,0 +1,37 @@
+We always access globalComponentList[] at indexComponent=-1 which causes a
+segfault. Use i as the index instead.
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+--- bellagio-0.9.3/src/omx_reference_resource_manager.c.old    2012-03-13 10:15:25.743940980 +0000
++++ bellagio-0.9.3/src/omx_reference_resource_manager.c        2012-03-13 10:18:02.201971009 +0000
+@@ -485,7 +485,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;
+@@ -493,16 +492,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;
+ }

diff --git a/package/multimedia/bellagio/bellagio.mk b/package/multimedia/bellagio/bellagio.mk
new file mode 100644 (file)
index 0000000..d013953
--- /dev/null
+++ b/package/multimedia/bellagio/bellagio.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# bellagio
+#
+#############################################################
+BELLAGIO_VERSION = 0.9.3
+BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz
+BELLAGIO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/omxil
+BELLAGIO_AUTORECONF = YES
+BELLAGIO_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS))