diff options
author | Shane Wang <shane.wang@intel.com> | 2011-12-28 15:59:33 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-03 12:14:35 +0000 |
commit | 76d37ba071b7e96ed026029be9fb1a90e241a751 (patch) | |
tree | fa37a4c44a00fd11dfafb941cb1984945821cfd7 /meta/recipes-multimedia/libomxil/libomxil-0.9.3 | |
parent | 5e669dd07ce7e7ba8c71a5282eb023d9de805377 (diff) | |
download | poky-76d37ba071b7e96ed026029be9fb1a90e241a751.tar.gz |
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>
Diffstat (limited to 'meta/recipes-multimedia/libomxil/libomxil-0.9.3')
3 files changed, 95 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch new file mode 100644 index 0000000000..876e80ef76 --- /dev/null +++ b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | To enable --disable-Werror for libomxil to avoid some compilers which check code strictly. | ||
2 | |||
3 | For example, at least the following errors happened to some compilers: | ||
4 | |||
5 | 1) OMX_INDEXTYPE in include/OMX_Index.h IS NOT OMX_INDEXVENDORTYPE in src/base/omx_base_component.h | ||
6 | | 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 | ||
7 | | omx_base_component.c: In function 'omx_base_component_GetParameter': | ||
8 | | omx_base_component.c:991:3: error: case value '2130706435' not in enumerated type 'OMX_INDEXTYPE' [-Werror=switch] | ||
9 | | omx_base_component.c:918:3: error: case value '2130706436' not in enumerated type 'OMX_INDEXTYPE' [-Werror=switch] | ||
10 | |||
11 | 2) | ||
12 | | 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 | ||
13 | | omxregister.c: In function 'buildComponentsList': | ||
14 | | omxregister.c:175:7: error: variable 'err' set but not used [-Werror=unused-but-set-variable] | ||
15 | | cc1: all warnings being treated as errors | ||
16 | |||
17 | Upstream-Status: Inappropriate [configuration] | ||
18 | |||
19 | Signed-off-by: Shane Wang <shane.wang@intel.com> | ||
20 | |||
21 | diff -r 82d742d3ea90 configure.ac | ||
22 | --- a/configure.ac Tue Dec 27 15:30:35 2011 +0800 | ||
23 | +++ b/configure.ac Tue Dec 27 16:26:03 2011 +0800 | ||
24 | @@ -5,7 +5,7 @@ | ||
25 | AC_PREREQ([2.59]) | ||
26 | |||
27 | AC_CONFIG_HEADERS([config.h]) | ||
28 | -CFLAGS="${CFLAGS} -Wall -Werror" | ||
29 | +CFLAGS="${CFLAGS} -Wall" | ||
30 | |||
31 | ################################################################################ | ||
32 | # Set the shared versioning info, according to section 6.3 of the libtool info # | ||
33 | @@ -122,6 +122,14 @@ | ||
34 | [with_android=$enableval], | ||
35 | [with_android=no]) | ||
36 | |||
37 | +AC_ARG_ENABLE( | ||
38 | + [Werror], | ||
39 | + [AC_HELP_STRING( | ||
40 | + [--disable-Werror], | ||
41 | + [whether to diable treating gcc warnings as errors])], | ||
42 | + [with_Werror=$enableval], | ||
43 | + [with_Werror=yes]) | ||
44 | + | ||
45 | ################################################################################ | ||
46 | # Check for programs # | ||
47 | ################################################################################ | ||
48 | @@ -193,6 +201,10 @@ | ||
49 | CFG_DEBUG_LEVEL=255 | ||
50 | fi | ||
51 | |||
52 | +if test "x$with_Werror" = "xyes"; then | ||
53 | + CFLAGS="${CFLAGS} -Werror" | ||
54 | +fi | ||
55 | + | ||
56 | AC_SUBST(CFG_DEBUG_LEVEL) | ||
57 | CFLAGS="${CFLAGS} -DCONFIG_DEBUG_LEVEL=$CFG_DEBUG_LEVEL" | ||
58 | |||
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch new file mode 100644 index 0000000000..dbe8c41f74 --- /dev/null +++ b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | This patch is to remove DESTDIR in docdir. | ||
2 | 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. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Shane Wang <shane.wang@intel.com> | ||
7 | |||
8 | diff -r 30b597e4e70d Makefile.am | ||
9 | --- a/Makefile.am Wed Dec 28 15:38:35 2011 +0800 | ||
10 | +++ b/Makefile.am Wed Dec 28 15:39:25 2011 +0800 | ||
11 | @@ -7,7 +7,7 @@ | ||
12 | pkgconfigdir = $(libdir)/pkgconfig | ||
13 | pkgconfig_DATA = libomxil-bellagio.pc | ||
14 | |||
15 | -docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@ | ||
16 | +docdir = $(prefix)/share/doc/@PACKAGE@ | ||
17 | doc_DATA = README \ | ||
18 | ChangeLog \ | ||
19 | TODO | ||
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch new file mode 100644 index 0000000000..483ca1328b --- /dev/null +++ b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | This patch is to make libomxil Makefile support "make -jN". | ||
2 | The omxregister_bellagio stuffs depend on libomxil_bellagio library. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Shane Wang <shane.wang@intel.com> | ||
7 | |||
8 | diff -r f59d077d3dd5 Makefile.am | ||
9 | --- a/src/Makefile.am Wed Dec 28 10:54:36 2011 +0800 | ||
10 | +++ b/src/Makefile.am Wed Dec 28 10:55:46 2011 +0800 | ||
11 | @@ -7,6 +7,7 @@ | ||
12 | omxregister_bellagio_SOURCES = omxregister.c common.c common.h | ||
13 | omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \ | ||
14 | -I$(top_srcdir)/include | ||
15 | +omxregister_bellagio_LDADD = $(lib_LTLIBRARIES) | ||
16 | omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) | ||
17 | |||
18 | lib_LTLIBRARIES = libomxil-bellagio.la | ||