libomxil: upgrade to 0.9.3
This patch is to upgrade libomxil from 0.3.3 to 0.9.3. The following is the licence change: 2c2 < @file src/omxcore.h Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Shane Wang
Richard Purdie
parent
5e669dd07c
commit
76d37ba071
|
|
@ -0,0 +1,58 @@
|
|||
To enable --disable-Werror for libomxil to avoid some compilers which check code strictly.
|
||||
|
||||
For example, at least the following errors happened to some compilers:
|
||||
|
||||
1) OMX_INDEXTYPE in include/OMX_Index.h IS NOT OMX_INDEXVENDORTYPE in src/base/omx_base_component.h
|
||||
| i586-poky-linux-libtool: compile: i586-poky-linux-gcc -m32 -march=i586 --sysroot=/home/yocto-build5/poky/build/tmp/sysroots/qemux86 -DHAVE_Climinate-unused-debug-types -Wall -Werror -DCONFIG_DEBUG_LEVEL=0 -c OMXComponentRMExt.c -fPIC -DPIC -o .libs/libomxbase_la-OMXComponentRMExt.o
|
||||
| omx_base_component.c: In function 'omx_base_component_GetParameter':
|
||||
| omx_base_component.c:991:3: error: case value '2130706435' not in enumerated type 'OMX_INDEXTYPE' [-Werror=switch]
|
||||
| omx_base_component.c:918:3: error: case value '2130706436' not in enumerated type 'OMX_INDEXTYPE' [-Werror=switch]
|
||||
|
||||
2)
|
||||
| i586-poky-linux-gcc -m32 -march=i586 --sysroot=/home/yocto-build5/poky/build/tmp/sysroots/qemux86 -DHAVE_CONFIG_H -I. -I.. -DOMXILCOMPOminate-unused-debug-types -Wall -Werror -DCONFIG_DEBUG_LEVEL=0 -c -o omxregister_bellagio-omxregister.o `test -f 'omxregister.c' || echo './'`o
|
||||
| omxregister.c: In function 'buildComponentsList':
|
||||
| omxregister.c:175:7: error: variable 'err' set but not used [-Werror=unused-but-set-variable]
|
||||
| cc1: all warnings being treated as errors
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Shane Wang <shane.wang@intel.com>
|
||||
|
||||
diff -r 82d742d3ea90 configure.ac
|
||||
--- a/configure.ac Tue Dec 27 15:30:35 2011 +0800
|
||||
+++ b/configure.ac Tue Dec 27 16:26:03 2011 +0800
|
||||
@@ -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 #
|
||||
@@ -122,6 +122,14 @@
|
||||
[with_android=$enableval],
|
||||
[with_android=no])
|
||||
|
||||
+AC_ARG_ENABLE(
|
||||
+ [Werror],
|
||||
+ [AC_HELP_STRING(
|
||||
+ [--disable-Werror],
|
||||
+ [whether to diable treating gcc warnings as errors])],
|
||||
+ [with_Werror=$enableval],
|
||||
+ [with_Werror=yes])
|
||||
+
|
||||
################################################################################
|
||||
# Check for programs #
|
||||
################################################################################
|
||||
@@ -193,6 +201,10 @@
|
||||
CFG_DEBUG_LEVEL=255
|
||||
fi
|
||||
|
||||
+if test "x$with_Werror" = "xyes"; then
|
||||
+ CFLAGS="${CFLAGS} -Werror"
|
||||
+fi
|
||||
+
|
||||
AC_SUBST(CFG_DEBUG_LEVEL)
|
||||
CFLAGS="${CFLAGS} -DCONFIG_DEBUG_LEVEL=$CFG_DEBUG_LEVEL"
|
||||
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
This patch is to remove DESTDIR in docdir.
|
||||
Otherwise, when users install by running `make install DESTDIR=/alternate/directory' specified in the file INSTALL, the doc will go into /alternate/directory/alternate/directory, which is not expected.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Shane Wang <shane.wang@intel.com>
|
||||
|
||||
diff -r 30b597e4e70d Makefile.am
|
||||
--- a/Makefile.am Wed Dec 28 15:38:35 2011 +0800
|
||||
+++ b/Makefile.am Wed Dec 28 15:39:25 2011 +0800
|
||||
@@ -7,7 +7,7 @@
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libomxil-bellagio.pc
|
||||
|
||||
-docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@
|
||||
+docdir = $(prefix)/share/doc/@PACKAGE@
|
||||
doc_DATA = README \
|
||||
ChangeLog \
|
||||
TODO
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
This patch is to make libomxil Makefile support "make -jN".
|
||||
The omxregister_bellagio stuffs depend on libomxil_bellagio library.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Shane Wang <shane.wang@intel.com>
|
||||
|
||||
diff -r f59d077d3dd5 Makefile.am
|
||||
--- a/src/Makefile.am Wed Dec 28 10:54:36 2011 +0800
|
||||
+++ b/src/Makefile.am Wed Dec 28 10:55:46 2011 +0800
|
||||
@@ -7,6 +7,7 @@
|
||||
omxregister_bellagio_SOURCES = omxregister.c common.c common.h
|
||||
omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \
|
||||
-I$(top_srcdir)/include
|
||||
+omxregister_bellagio_LDADD = $(lib_LTLIBRARIES)
|
||||
omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir)
|
||||
|
||||
lib_LTLIBRARIES = libomxil-bellagio.la
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
DESCRIPTION = "Bellagio OpenMAX Integration Layer"
|
||||
HOMEPAGE = "http://omxil.sourceforge.net/"
|
||||
LICENSE = "LGPLv2.1+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \
|
||||
file://src/omxcore.h;beginline=1;endline=27;md5=c2e37f68ba9652ca9b2431f466944174"
|
||||
DEPENDS = "libvorbis libogg alsa-lib libmad"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/libomxil-B-${PV}.tar.gz"
|
||||
|
||||
S = "${WORKDIR}/${BPN}-B-${PV}"
|
||||
|
||||
inherit autotools
|
||||
|
||||
EXTRA_OECONF += "--disable-ffmpegcomponents"
|
||||
|
||||
FILES_${PN} += "${libdir}/omxilcomponents/*${SOLIBS} \
|
||||
${datadir}/libomxil-B"
|
||||
FILES_${PN}-staticdev += "${libdir}/omxilcomponents/*.a"
|
||||
FILES_${PN}-dev += "${libdir}/omxilcomponents/*.la \
|
||||
${libdir}/omxilcomponents/*${SOLIBSDEV}"
|
||||
FILES_${PN}-dbg += "${libdir}/omxilcomponents/.debug/"
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
DESCRIPTION = "Bellagio OpenMAX Integration Layer"
|
||||
HOMEPAGE = "http://omxil.sourceforge.net/"
|
||||
LICENSE = "LGPLv2.1+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \
|
||||
file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90"
|
||||
DEPENDS = "libvorbis libogg alsa-lib libmad"
|
||||
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/libomxil-bellagio-${PV}.tar.gz \
|
||||
file://configure-fix.patch \
|
||||
file://parallel-make.patch \
|
||||
file://makefile-docdir-fix.patch"
|
||||
|
||||
SRC_URI[md5sum] = "a1de827fdb75c02c84e55f740ca27cb8"
|
||||
SRC_URI[sha256sum] = "593c0729c8ef8c1467b3bfefcf355ec19a46dd92e31bfc280e17d96b0934d74c"
|
||||
|
||||
S = "${WORKDIR}/${BPN}-bellagio-${PV}"
|
||||
|
||||
inherit autotools
|
||||
|
||||
EXTRA_OECONF += "--disable-ffmpegcomponents --disable-Werror"
|
||||
|
||||
FILES_${PN} += "${libdir}/bellagio/*${SOLIBS} \
|
||||
${libdir}/omxloaders/*${SOLIBS}"
|
||||
FILES_${PN}-staticdev += "${libdir}/bellagio/*.a \
|
||||
${libdir}/omxloaders/*.a"
|
||||
FILES_${PN}-dev += "${libdir}/bellagio/*.la \
|
||||
${libdir}/bellagio/*${SOLIBSDEV} \
|
||||
${libdir}/omxloaders/*.la \
|
||||
${libdir}/omxloaders/*${SOLIBSDEV}"
|
||||
FILES_${PN}-dbg += "${libdir}/bellagio/.debug/ \
|
||||
${libdir}/omxloaders/.debug/"
|
||||
Loading…
Reference in New Issue