[libomxil-bellagio] Initial import of libomxil-bellagio
Nicolas Chauvet
kwizart at fedoraproject.org
Wed Jul 25 14:23:27 UTC 2012
commit 7701f2a09e3a31b04af79eefb987d0610571dfc9
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Wed Jul 25 16:23:13 2012 +0200
Initial import of libomxil-bellagio
.gitignore | 1 +
libomxil-bellagio-0.9.3-fix_Werror.patch | 112 ++++++++++++++++++++++
libomxil-bellagio-0.9.3-nodoc.patch | 11 ++
libomxil-bellagio.spec | 153 ++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 278 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..6ccbb91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/libomxil-bellagio-0.9.3.tar.gz
diff --git a/libomxil-bellagio-0.9.3-fix_Werror.patch b/libomxil-bellagio-0.9.3-fix_Werror.patch
new file mode 100644
index 0000000..39fc3b3
--- /dev/null
+++ b/libomxil-bellagio-0.9.3-fix_Werror.patch
@@ -0,0 +1,112 @@
+@@ -, +, @@
+ OMX_INDEXTYPE/OMX_INDEXVENDORTYPE in one switch
+ src/base/omx_base_component.c | 54 ++++++++++++++++++++++-------------------
+ 1 files changed, 29 insertions(+), 25 deletions(-)
+--- a/src/base/omx_base_component.c
++++ a/src/base/omx_base_component.c
+@@ -915,14 +915,6 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter(
+ return OMX_ErrorBadParameter;
+ }
+ switch(nParamIndex) {
+- case OMX_IndexParameterThreadsID:
+- if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) {
+- break;
+- }
+- threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure;
+- threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID;
+- threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID;
+- break;
+ case OMX_IndexParamAudioInit:
+ case OMX_IndexParamVideoInit:
+ case OMX_IndexParamImageInit:
+@@ -988,28 +980,40 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter(
+ }
+ }
+ break;
+- case OMX_IndexVendorCompPropTunnelFlags:
+- pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure;
++ default:
++ /* additional switch statement for extended OMX_INDEXTYPE */
++ switch((OMX_INDEXVENDORTYPE) nParamIndex) {
++ case OMX_IndexParameterThreadsID:
++ if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) {
++ break;
++ }
++ threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure;
++ threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID;
++ threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID;
++ break;
++ case OMX_IndexVendorCompPropTunnelFlags:
++ pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure;
+
+- if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts +
+- omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts +
+- omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts +
+- omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) {
++ if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts +
++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts +
++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts +
++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) {
+
+- DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n",
+- __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__);
++ DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n",
++ __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__);
+
+- return OMX_ErrorBadPortIndex;
+- }
++ return OMX_ErrorBadPortIndex;
++ }
+
+- pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex];
++ pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex];
+
+- pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags;
+- pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier;
+- break;
+- default:
+- err = OMX_ErrorUnsupportedIndex;
+- break;
++ pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags;
++ pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier;
++ break;
++ default:
++ err = OMX_ErrorUnsupportedIndex;
++ break;
++ }
+ }
+ DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s for component %p\n", __func__, hComponent);
+ return err;
+ src/omxregister.c | 7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+--- a/src/omxregister.c
++++ a/src/omxregister.c
+@@ -172,7 +172,6 @@ static int buildComponentsList(FILE* omxregistryfp, char *componentspath, int ve
+ int index;
+ char* currentpath = componentspath;
+ char* actual;
+- int err;
+ nameList *allNames = NULL;
+ nameList *currentName = NULL;
+ nameList *tempName = NULL;
+@@ -247,8 +246,8 @@ static int buildComponentsList(FILE* omxregistryfp, char *componentspath, int ve
+ stComponents[i]->multiResourceLevel = NULL;
+ }
+ fptr(stComponents);
+- err = fwrite(lib_absolute_path, 1, strlen(lib_absolute_path), omxregistryfp);
+- err = fwrite("\n", 1, 1, omxregistryfp);
++ fwrite(lib_absolute_path, 1, strlen(lib_absolute_path), omxregistryfp);
++ fwrite("\n", 1, 1, omxregistryfp);
+
+
+ for (i = 0; i<num_of_comp; i++) {
+@@ -323,7 +322,7 @@ static int buildComponentsList(FILE* omxregistryfp, char *componentspath, int ve
+ }
+ qualityString[0] = '\0';
+ strcat(buffer, "\n");
+- err = fwrite(buffer, 1, strlen(buffer), omxregistryfp);
++ fwrite(buffer, 1, strlen(buffer), omxregistryfp);
+ ncomponents++;
+ }
+ for (i = 0; i < num_of_comp; i++) {
+
diff --git a/libomxil-bellagio-0.9.3-nodoc.patch b/libomxil-bellagio-0.9.3-nodoc.patch
new file mode 100644
index 0000000..3da2e47
--- /dev/null
+++ b/libomxil-bellagio-0.9.3-nodoc.patch
@@ -0,0 +1,11 @@
+diff -up libomxil-bellagio-0.9.3/Makefile.am.nodoc libomxil-bellagio-0.9.3/Makefile.am
+--- libomxil-bellagio-0.9.3/Makefile.am.nodoc 2011-01-12 08:53:26.000000000 +0100
++++ libomxil-bellagio-0.9.3/Makefile.am 2012-04-23 13:46:15.410823381 +0200
+@@ -7,7 +7,6 @@ EXTRA_DIST = libomxil-bellagio.spec
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libomxil-bellagio.pc
+
+-docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@
+ doc_DATA = README \
+ ChangeLog \
+ TODO
diff --git a/libomxil-bellagio.spec b/libomxil-bellagio.spec
new file mode 100644
index 0000000..4690b12
--- /dev/null
+++ b/libomxil-bellagio.spec
@@ -0,0 +1,153 @@
+Name: libomxil-bellagio
+Version: 0.9.3
+Release: 3%{?dist}
+Summary: OpenMAX Integration Layer
+
+Group: System Environment/Libraries
+License: LGPLv2+
+URL: http://omxil.sourceforge.net
+Source0: http://downloads.sourceforge.net/omxil/%{name}-%{version}.tar.gz
+#https://sourceforge.net/tracker/?func=detail&aid=3477869&group_id=160680&atid=816817
+Patch0: libomxil-bellagio-0.9.3-fix_Werror.patch
+#https://sourceforge.net/tracker/?func=detail&aid=3477871&group_id=160680&atid=816817
+Patch1: libomxil-bellagio-0.9.3-nodoc.patch
+BuildRequires: doxygen
+#BuildRequires: libtool
+
+
+%description
+The OpenMAX IL API defines a standardized media component interface to
+enable developers and platform providers to integrate and communicate
+with multimedia codecs implemented in hardware or software.
+
+The libomxil shared library implements the OpenMAX IL Core functionalities.
+Three dynamically loadable components are also included: OMX alsa sink
+component, OMX mp3,aac,ogg decoder component and OMX volume control component.
+
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%package test
+Summary: Test cases for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description test
+The %{name}-test package contains binaries for testing %{name}.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .fix_werror
+%patch1 -p1 -b .nodoc
+#Avoid the use of autoreconf
+sed -i -e "s|^docdir.*|docdir=%{_datadir}/doc/%{name}-%{version}|" Makefile.in
+touch -r config.h.in Makefile.am Makefile.in
+
+%build
+%configure --disable-static \
+ --docdir=%{_datadir}/doc/%{name}-%{version}
+
+# remove rpath from libtool
+sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+#Race condition with the library creation
+make %{?_smp_mflags} || make %{?_smp_mflags}
+
+#Build the tests files so they can be installed later
+ln -sf src bellagio
+make check "LDFLAGS=-L$PWD/src/.libs" \
+ "CFLAGS=-I$PWD/include -I$PWD"
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+
+#Manually install test binaries
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+for f in audio_effects/.libs/{omxaudiomixertest,omxvolcontroltest} resource_manager/.libs/{omxprioritytest,omxrmtest} ; do
+ install -pm 0755 test/components/${f} $RPM_BUILD_ROOT%{_bindir}
+done
+
+#Avoid docdir
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{_bindir}/omxregister-bellagio
+%{_libdir}/*.so.*
+%dir %{_libdir}/bellagio
+%{_libdir}/bellagio/*.so*
+%dir %{_libdir}/omxloaders
+%{_libdir}/omxloaders/*.so*
+%{_mandir}/man1/omxregister-bellagio.1.*
+
+%files devel
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/libomxil-bellagio.pc
+
+%files test
+%{_bindir}/omxaudiomixertest
+%{_bindir}/omxprioritytest
+%{_bindir}/omxrmtest
+%{_bindir}/omxvolcontroltest
+
+
+%changelog
+* Tue Jul 24 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.9.3-3
+- Avoid running autoreconf
+- Avoid running make check
+- Fix manual building of test binaries
+
+* Mon Apr 23 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.9.3-2
+- Fix build with -Werror - patch from Niels de Vos
+- Convert nodoc fix to a patch
+- Add BR doxygen
+- Enable make check and create a -test subpackage
+
+* Wed Jan 18 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.9.3-1
+- Fedora spec file
+
+* Wed Sep 17 2008 Giulio Urlini
+- added jpeg encoder/decoder
+* Mon Jul 07 2008 Giulio Urlini
+- added clock source, video source, camera, frame buffer writer
+* Thu Mar 06 2008 Marc-Andre Lureau
+- copy&pasted some good practices from some other .spec.in
+- changed components directory
+- remove unnecessary plugins .la and .a files
+- untested
+* Wed Feb 27 2008 Giulio Urlini
+- changed the library list.
+* Fri Oct 19 2007 Giulio Urlini
+- removed fbdev from file list. It is experimental,
+ and not installed on any platform
+* Tue Oct 01 2007 Giulio Urlini
+- Minor update and name change of this file
+* Tue Jun 04 2007 Giulio Urlini
+- Bellagio 0.3.2 release
+* Tue May 22 2007 Giulio Urlini
+- Bellagio 0.3.1 release
+* Fri Apr 06 2007 Giulio Urlini
+- Bellagio 0.3 release
+* Fri Feb 24 2006 David Siorpaes
+- Fixed some minor issues in build process
+* Mon Feb 6 2006 Giulio Urlini
+- First build attempt
diff --git a/sources b/sources
index e69de29..08d3456 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a1de827fdb75c02c84e55f740ca27cb8 libomxil-bellagio-0.9.3.tar.gz
More information about the scm-commits
mailing list