[oe] [meta-oe][PATCH v2] jq: upgrade to 1.4
Signed-off-by: Matthieu Crapet --- .../jq/files/automake-once-fix.patch | 29 -- meta-oe/recipes-devtools/jq/jq_1.3.bb | 23 - meta-oe/recipes-devtools/jq/jq_1.4.bb | 22 3 files changed, 22 insertions(+), 52 deletions(-) delete mode 100644 meta-oe/recipes-devtools/jq/files/automake-once-fix.patch delete mode 100644 meta-oe/recipes-devtools/jq/jq_1.3.bb create mode 100644 meta-oe/recipes-devtools/jq/jq_1.4.bb diff --git a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch b/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch deleted file mode 100644 index 0a1d1a2..000 --- a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: Applied -https://github.com/stedolan/jq/commit/f0d1c39b5bbb4ccc517773eb635ba7f38ec7da1a - -Fixes build with automake-1.14 - -diff --git a/configure.ac b/configure.ac -index 76a49a9..d6d2d38 100644 a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,7 @@ AC_INIT([jq], [1.3], [m...@netsoc.tcd.ie], - dnl Created autoconf implementation thompson@dtosolutions, 26NOV12 - AC_PREREQ([2.61]) - AC_CONFIG_AUX_DIR([config]) --AM_INIT_AUTOMAKE([parallel-tests foreign]) -+AM_INIT_AUTOMAKE([parallel-tests foreign -Wall]) - AM_SILENT_RULES([yes]) - AC_PROG_CC - AC_PROG_CC_STDC -@@ -66,7 +66,6 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"]) - - dnl AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADERS(config.h) --AM_INIT_AUTOMAKE([-Wall]) - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT - --- -1.8.5.4 - diff --git a/meta-oe/recipes-devtools/jq/jq_1.3.bb b/meta-oe/recipes-devtools/jq/jq_1.3.bb deleted file mode 100644 index c58b472..000 --- a/meta-oe/recipes-devtools/jq/jq_1.3.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Lightweight and flexible command-line JSON processor" -DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \ - filter and map and transform structured data with the same \ - ease that sed, awk, grep and friends let you play with text." -HOMEPAGE = "http://stedolan.github.io/jq/"; -BUGTRACKER = "https://github.com/stedolan/jq/issues"; -SECTION = "utils" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653" - -DEPENDS = "flex-native bison-native" - -SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \ - file://automake-once-fix.patch \ -" -SRC_URI[md5sum] = "26081b05d22525eca5cbdd8f9f4db17d" -SRC_URI[sha256sum] = "623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7" - -inherit autotools - -# Don't build documentation (generation requires ruby) -EXTRA_OECONF = "--disable-docs" diff --git a/meta-oe/recipes-devtools/jq/jq_1.4.bb b/meta-oe/recipes-devtools/jq/jq_1.4.bb new file mode 100644 index 000..6e50803 --- /dev/null +++ b/meta-oe/recipes-devtools/jq/jq_1.4.bb @@ -0,0 +1,22 @@ +SUMMARY = "Lightweight and flexible command-line JSON processor" +DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \ + filter and map and transform structured data with the same \ + ease that sed, awk, grep and friends let you play with text." +HOMEPAGE = "http://stedolan.github.io/jq/"; +BUGTRACKER = "https://github.com/stedolan/jq/issues"; +SECTION = "utils" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653" + +DEPENDS = "flex-native bison-native" + +SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \ +" +SRC_URI[md5sum] = "e3c75a4f805bb5342c9f4b3603fb248f" +SRC_URI[sha256sum] = "998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d" + +inherit autotools + +# Don't build documentation (generation requires ruby) +EXTRA_OECONF = "--disable-docs" -- 2.0.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] jq: upgrade to 1.4
Martin, Sorry I forgot a git diff. Please replace with patch v2 in master-next. Thanks for your work. Matthieu -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] libvpx: upgrade to version 1.3.0
Removed libvpx.inc , since there was no need for it (there aren't multiple .bb files for different versions that could share the .inc) Signed-off-by: Carlos Rafael Giani --- meta-oe/recipes-multimedia/webm/libvpx.inc | 38 .../0001-configure.sh-quote-local-variables.patch | 40 + .../webm/libvpx/CVE-2010-4203.patch| 69 -- .../libvpx/do-not-hardcode-softfp-float-api.patch | 28 - meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb| 19 -- meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb| 55 + 6 files changed, 95 insertions(+), 154 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/webm/libvpx.inc create mode 100644 meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch delete mode 100644 meta-oe/recipes-multimedia/webm/libvpx/CVE-2010-4203.patch delete mode 100644 meta-oe/recipes-multimedia/webm/libvpx/do-not-hardcode-softfp-float-api.patch delete mode 100644 meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb create mode 100644 meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb diff --git a/meta-oe/recipes-multimedia/webm/libvpx.inc b/meta-oe/recipes-multimedia/webm/libvpx.inc deleted file mode 100644 index 4d8ba9d..000 --- a/meta-oe/recipes-multimedia/webm/libvpx.inc +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "vpx Multi-Format Codec SDK" -LICENSE = "BSD" - -INC_PR = "r3" - -SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2"; -S = "${WORKDIR}/libvpx-v${PV}" - -# ffmpeg links with this and fails -# sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4' -ARM_INSTRUCTION_SET = "arm" - -CFLAGS += "-fPIC" - -export CC -export LD = "${CC}" - -VPXTARGET_armv5te = "armv5te-linux-gcc" -VPXTARGET_armv6 = "armv6-linux-gcc" -VPXTARGET_armv7a = "armv7-linux-gcc" -VPXTARGET ?= "generic-gnu" - -CONFIGUREOPTS = " \ ---target=${VPXTARGET} \ ---enable-vp8 \ ---enable-libs \ ---disable-install-docs \ -" -do_configure() { -${S}/configure ${CONFIGUREOPTS} -} -do_compile() { -oe_runmake -} -do_install() { -oe_runmake install DESTDIR=${D} -} - diff --git a/meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch b/meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch new file mode 100644 index 000..bf94b2d --- /dev/null +++ b/meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch @@ -0,0 +1,40 @@ +From f45fe1668401d72c2937a52385b492216715c0f9 Mon Sep 17 00:00:00 2001 +From: James Zern +Date: Thu, 6 Mar 2014 15:58:37 -0800 +Subject: [PATCH] configure.sh: quote local variables + +fixes issue #711 + +specifying a multiword CC, e.g., CC='gcc -m32', would cause the failure +under dash + +reported in +https://bugs.gentoo.org/show_bug.cgi?id=498136 + +patch by floppymaster at gmail dot com + +Upstream-Status: Backport [f45fe1668401d72c2937a52385b492216715c0f9] + +Change-Id: I2ba246f765646161538622739961ec0f6c2d8c2d +--- + build/make/configure.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 449d1b9..43f8e77 100755 +--- a/build/make/configure.sh b/build/make/configure.sh +@@ -405,8 +405,8 @@ true + } + + write_common_target_config_mk() { +-local CC=${CC} +-local CXX=${CXX} ++local CC="${CC}" ++local CXX="${CXX}" + enabled ccache && CC="ccache ${CC}" + enabled ccache && CXX="ccache ${CXX}" + print_webm_license $1 "##" "" +-- +1.8.3.2 + diff --git a/meta-oe/recipes-multimedia/webm/libvpx/CVE-2010-4203.patch b/meta-oe/recipes-multimedia/webm/libvpx/CVE-2010-4203.patch deleted file mode 100644 index 37f5108..000 --- a/meta-oe/recipes-multimedia/webm/libvpx/CVE-2010-4203.patch +++ /dev/null @@ -1,69 +0,0 @@ -From: John Koleszar -Date: Thu, 4 Nov 2010 20:59:26 + (-0400) -Subject: fix integer promotion bug in partition size check -X-Git-Url: https://review.webmproject.org/gitweb?p=libvpx.git;a=commitdiff_plain;h=9fb80f7170ec48e23c3c7b477149eeb37081c699 - -fix integer promotion bug in partition size check - -The check '(user_data_end - partition < partition_size)' must be -evaluated as a signed comparison, but because partition_size was -unsigned, the LHS was promoted to unsigned, causing an incorrect -result on 32-bit. Instead, check the upper and lower bounds of -the segment separately. - -Change-Id: I6266aba7fd7de084268712a3d2a81424ead7aa06 - -diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c -index 2d81d61..f5e49a1 100644 a/vp8/decoder/decodframe.c -+++ b/vp8/decoder/decodframe.c -@@ -462,7 +462,8 @@ static void setup_token_decoder(VP8D_COMP *pbi, - partition_size = user_data_end - partition; - } - --if (user_data_end - partition < partition_size) -+if (parti
Re: [oe] [meta-oe] Issues while building gpsd
On Wed, Jul 30, 2014 at 8:00 PM, Khem Raj wrote: > On Wed, Jul 30, 2014 at 5:56 AM, Andrei Gherzan wrote: > > | //usr/lib/libpthread.so.0: undefined reference to > `__uname@GLIBC_PRIVATE' > > | //usr/lib/libpthread.so.0: undefined reference to > > `__getrlimit@GLIBC_PRIVATE' > > | collect2: error: ld returned 1 exit status > > | //usr/lib/libpthread.so.0: undefined reference to > `__uname@GLIBC_PRIVATE' > > | //usr/lib/libpthread.so.0: undefined reference to > > `__getrlimit@GLIBC_PRIVATE' > > | collect2: error: ld returned 1 exit status > > well gpsd's own build system seems to be not so cross compile > friendly. Figure out why it decided to poke > at your host thread library instead of one from target sysroot > Ok. Thanks. Hoped somebody already saw this before. No luck. -- *Andrei Gherzan* m: +40.744.478.414 | f: +40.31.816.28.12 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] jq: upgrade to 1.4
On Thu, Jul 31, 2014 at 08:56:04AM +, Matthieu CRAPET wrote: > Martin, > > Sorry I forgot a git diff. Please replace with patch v2 in master-next. > Thanks for your work. Was it sent with -M? It doesn't look so. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] meta-oe: Add OML lincence and recipe for fastcgi
Fastcgi version: 2.4.0 Upstream-Status: Submitted [openembedded-devel@lists.openembedded.org] Signed-off-by: Yang Haibo --- meta-oe/licenses/OML | 28 ++ meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb | 16 + .../fcgi/files/Fix_EOF_not_declared_issue.patch| 15 3 files changed, 59 insertions(+) create mode 100644 meta-oe/licenses/OML create mode 100644 meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb create mode 100644 meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch diff --git a/meta-oe/licenses/OML b/meta-oe/licenses/OML new file mode 100644 index 000..7e6bdfd --- /dev/null +++ b/meta-oe/licenses/OML @@ -0,0 +1,28 @@ +This FastCGI application library source and object code (the +"Software") and its documentation (the "Documentation") are +copyrighted by Open Market, Inc ("Open Market"). The following terms +apply to all files associated with the Software and Documentation +unless explicitly disclaimed in individual files. + +Open Market permits you to use, copy, modify, distribute, and license +this Software and the Documentation for any purpose, provided that +existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written +agreement, license, or royalty fee is required for any of the +authorized uses. Modifications to this Software and Documentation may +be copyrighted by their authors and need not follow the licensing +terms described here. If modifications to this Software and +Documentation have new licensing terms, the new terms must be clearly +indicated on the first page of each file where they apply. + +OPEN MARKET MAKES NO EXPRESS OR IMPLIED WARRANTY WITH RESPECT TO THE +SOFTWARE OR THE DOCUMENTATION, INCLUDING WITHOUT LIMITATION ANY +WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN +NO EVENT SHALL OPEN MARKET BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY +DAMAGES ARISING FROM OR RELATING TO THIS SOFTWARE OR THE +DOCUMENTATION, INCLUDING, WITHOUT LIMITATION, ANY INDIRECT, SPECIAL OR +CONSEQUENTIAL DAMAGES OR SIMILAR DAMAGES, INCLUDING LOST PROFITS OR +LOST DATA, EVEN IF OPEN MARKET HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. THE SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS". +OPEN MARKET HAS NO LIABILITY IN CONTRACT, TORT, NEGLIGENCE OR +OTHERWISE ARISING OUT OF THIS SOFTWARE OR THE DOCUMENTATION. diff --git a/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb new file mode 100644 index 000..ceb5909 --- /dev/null +++ b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "FastCGI is a protocol for interfacing interactive programs with a web server." +HOMEPAGE = "http://www.fastcgi.com"; +LICENSE = "OML" +LIC_FILES_CHKSUM = "file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a" + +SRC_URI = "http://fossies.org/linux/www/fcgi-2.4.0.tar.gz \ + file://Fix_EOF_not_declared_issue.patch \ +" +SRC_URI[md5sum] = "d15060a813b91383a9f3c66faf84867e" +SRC_URI[sha256sum] = "66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9" + +S = "${WORKDIR}/${BPN}-${PV}/" + +inherit autotools + +PARALLEL_MAKE = "" diff --git a/meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch b/meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch new file mode 100644 index 000..f382142 --- /dev/null +++ b/meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch @@ -0,0 +1,15 @@ +Fix EOF not declared issue + +Error like: +fcgio.cpp:70:72: error: 'EOF' was not declared in this scope + if (FCGX_PutStr(pbase(), plen, this->fcgx) != plen) return EOF; +--- fcgi-ori/libfcgi/fcgio.cpp 2014-07-28 18:01:00.0 +0800 fcgi-2.4.0/libfcgi/fcgio.cpp 2014-07-28 18:01:22.0 +0800 +@@ -22,6 +22,7 @@ + #define DLLAPI __declspec(dllexport) + #endif + ++#include + #include + #include "fcgio.h" + -- 1.9.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH v2] fcgi: integrate fcgi-2.4.0 and add OML license file
--- meta-oe/licenses/OML | 28 ++ meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb | 16 + .../fcgi/files/Fix_EOF_not_declared_issue.patch| 17 + 3 files changed, 61 insertions(+) create mode 100644 meta-oe/licenses/OML create mode 100644 meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb create mode 100644 meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch diff --git a/meta-oe/licenses/OML b/meta-oe/licenses/OML new file mode 100644 index 000..7e6bdfd --- /dev/null +++ b/meta-oe/licenses/OML @@ -0,0 +1,28 @@ +This FastCGI application library source and object code (the +"Software") and its documentation (the "Documentation") are +copyrighted by Open Market, Inc ("Open Market"). The following terms +apply to all files associated with the Software and Documentation +unless explicitly disclaimed in individual files. + +Open Market permits you to use, copy, modify, distribute, and license +this Software and the Documentation for any purpose, provided that +existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written +agreement, license, or royalty fee is required for any of the +authorized uses. Modifications to this Software and Documentation may +be copyrighted by their authors and need not follow the licensing +terms described here. If modifications to this Software and +Documentation have new licensing terms, the new terms must be clearly +indicated on the first page of each file where they apply. + +OPEN MARKET MAKES NO EXPRESS OR IMPLIED WARRANTY WITH RESPECT TO THE +SOFTWARE OR THE DOCUMENTATION, INCLUDING WITHOUT LIMITATION ANY +WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN +NO EVENT SHALL OPEN MARKET BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY +DAMAGES ARISING FROM OR RELATING TO THIS SOFTWARE OR THE +DOCUMENTATION, INCLUDING, WITHOUT LIMITATION, ANY INDIRECT, SPECIAL OR +CONSEQUENTIAL DAMAGES OR SIMILAR DAMAGES, INCLUDING LOST PROFITS OR +LOST DATA, EVEN IF OPEN MARKET HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. THE SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS". +OPEN MARKET HAS NO LIABILITY IN CONTRACT, TORT, NEGLIGENCE OR +OTHERWISE ARISING OUT OF THIS SOFTWARE OR THE DOCUMENTATION. diff --git a/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb new file mode 100644 index 000..ceb5909 --- /dev/null +++ b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "FastCGI is a protocol for interfacing interactive programs with a web server." +HOMEPAGE = "http://www.fastcgi.com"; +LICENSE = "OML" +LIC_FILES_CHKSUM = "file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a" + +SRC_URI = "http://fossies.org/linux/www/fcgi-2.4.0.tar.gz \ + file://Fix_EOF_not_declared_issue.patch \ +" +SRC_URI[md5sum] = "d15060a813b91383a9f3c66faf84867e" +SRC_URI[sha256sum] = "66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9" + +S = "${WORKDIR}/${BPN}-${PV}/" + +inherit autotools + +PARALLEL_MAKE = "" diff --git a/meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch b/meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch new file mode 100644 index 000..b4cf080 --- /dev/null +++ b/meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch @@ -0,0 +1,17 @@ +Upstream-Status: Pending + +Fix EOF not declared issue, following is the error log. +fcgio.cpp:70:72: error: 'EOF' was not declared in this scope + if (FCGX_PutStr(pbase(), plen, this->fcgx) != plen) return EOF; + +Signed-off-by: Yang Haibo +--- fcgi-ori/libfcgi/fcgio.cpp 2014-07-28 18:01:00.0 +0800 fcgi-2.4.0/libfcgi/fcgio.cpp 2014-07-28 18:01:22.0 +0800 +@@ -22,6 +22,7 @@ + #define DLLAPI __declspec(dllexport) + #endif + ++#include + #include + #include "fcgio.h" + -- 1.9.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] meta-oe: Add OML lincence and recipe for fastcgi
Send a new patch: [meta-webserver][PATCH v2] fcgi: integrate fcgi-2.4.0 and add OML license file From: YangHaibo Sent: Thursday, July 31, 2014 6:14 PM To: openembedded-devel@lists.openembedded.org Cc: Yang Haibo-B40869 Subject: [meta-oe][PATCH] meta-oe: Add OML lincence and recipe for fastcgi Fastcgi version: 2.4.0 Upstream-Status: Submitted [openembedded-devel@lists.openembedded.org] Signed-off-by: Yang Haibo --- meta-oe/licenses/OML | 28 ++ meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb | 16 + .../fcgi/files/Fix_EOF_not_declared_issue.patch| 15 3 files changed, 59 insertions(+) create mode 100644 meta-oe/licenses/OML create mode 100644 meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb create mode 100644 meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch diff --git a/meta-oe/licenses/OML b/meta-oe/licenses/OML new file mode 100644 index 000..7e6bdfd --- /dev/null +++ b/meta-oe/licenses/OML @@ -0,0 +1,28 @@ +This FastCGI application library source and object code (the +"Software") and its documentation (the "Documentation") are +copyrighted by Open Market, Inc ("Open Market"). The following terms +apply to all files associated with the Software and Documentation +unless explicitly disclaimed in individual files. + +Open Market permits you to use, copy, modify, distribute, and license +this Software and the Documentation for any purpose, provided that +existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written +agreement, license, or royalty fee is required for any of the +authorized uses. Modifications to this Software and Documentation may +be copyrighted by their authors and need not follow the licensing +terms described here. If modifications to this Software and +Documentation have new licensing terms, the new terms must be clearly +indicated on the first page of each file where they apply. + +OPEN MARKET MAKES NO EXPRESS OR IMPLIED WARRANTY WITH RESPECT TO THE +SOFTWARE OR THE DOCUMENTATION, INCLUDING WITHOUT LIMITATION ANY +WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN +NO EVENT SHALL OPEN MARKET BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY +DAMAGES ARISING FROM OR RELATING TO THIS SOFTWARE OR THE +DOCUMENTATION, INCLUDING, WITHOUT LIMITATION, ANY INDIRECT, SPECIAL OR +CONSEQUENTIAL DAMAGES OR SIMILAR DAMAGES, INCLUDING LOST PROFITS OR +LOST DATA, EVEN IF OPEN MARKET HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. THE SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS". +OPEN MARKET HAS NO LIABILITY IN CONTRACT, TORT, NEGLIGENCE OR +OTHERWISE ARISING OUT OF THIS SOFTWARE OR THE DOCUMENTATION. diff --git a/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb new file mode 100644 index 000..ceb5909 --- /dev/null +++ b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "FastCGI is a protocol for interfacing interactive programs with a web server." +HOMEPAGE = "http://www.fastcgi.com"; +LICENSE = "OML" +LIC_FILES_CHKSUM = "file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a" + +SRC_URI = "http://fossies.org/linux/www/fcgi-2.4.0.tar.gz \ + file://Fix_EOF_not_declared_issue.patch \ +" +SRC_URI[md5sum] = "d15060a813b91383a9f3c66faf84867e" +SRC_URI[sha256sum] = "66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9" + +S = "${WORKDIR}/${BPN}-${PV}/" + +inherit autotools + +PARALLEL_MAKE = "" diff --git a/meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch b/meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch new file mode 100644 index 000..f382142 --- /dev/null +++ b/meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch @@ -0,0 +1,15 @@ +Fix EOF not declared issue + +Error like: +fcgio.cpp:70:72: error: 'EOF' was not declared in this scope + if (FCGX_PutStr(pbase(), plen, this->fcgx) != plen) return EOF; +--- fcgi-ori/libfcgi/fcgio.cpp 2014-07-28 18:01:00.0 +0800 fcgi-2.4.0/libfcgi/fcgio.cpp 2014-07-28 18:01:22.0 +0800 +@@ -22,6 +22,7 @@ + #define DLLAPI __declspec(dllexport) + #endif + ++#include + #include + #include "fcgio.h" + -- 1.9.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3] jq: upgrade to 1.4
Signed-off-by: Matthieu Crapet --- .../jq/files/automake-once-fix.patch | 29 -- .../recipes-devtools/jq/{jq_1.3.bb => jq_1.4.bb} | 5 ++-- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 meta-oe/recipes-devtools/jq/files/automake-once-fix.patch rename meta-oe/recipes-devtools/jq/{jq_1.3.bb => jq_1.4.bb} (79%) diff --git a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch b/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch deleted file mode 100644 index 0a1d1a2..000 --- a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: Applied -https://github.com/stedolan/jq/commit/f0d1c39b5bbb4ccc517773eb635ba7f38ec7da1a - -Fixes build with automake-1.14 - -diff --git a/configure.ac b/configure.ac -index 76a49a9..d6d2d38 100644 a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,7 @@ AC_INIT([jq], [1.3], [m...@netsoc.tcd.ie], - dnl Created autoconf implementation thompson@dtosolutions, 26NOV12 - AC_PREREQ([2.61]) - AC_CONFIG_AUX_DIR([config]) --AM_INIT_AUTOMAKE([parallel-tests foreign]) -+AM_INIT_AUTOMAKE([parallel-tests foreign -Wall]) - AM_SILENT_RULES([yes]) - AC_PROG_CC - AC_PROG_CC_STDC -@@ -66,7 +66,6 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"]) - - dnl AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADERS(config.h) --AM_INIT_AUTOMAKE([-Wall]) - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT - --- -1.8.5.4 - diff --git a/meta-oe/recipes-devtools/jq/jq_1.3.bb b/meta-oe/recipes-devtools/jq/jq_1.4.bb similarity index 79% rename from meta-oe/recipes-devtools/jq/jq_1.3.bb rename to meta-oe/recipes-devtools/jq/jq_1.4.bb index c58b472..6e50803 100644 --- a/meta-oe/recipes-devtools/jq/jq_1.3.bb +++ b/meta-oe/recipes-devtools/jq/jq_1.4.bb @@ -12,10 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653" DEPENDS = "flex-native bison-native" SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \ - file://automake-once-fix.patch \ " -SRC_URI[md5sum] = "26081b05d22525eca5cbdd8f9f4db17d" -SRC_URI[sha256sum] = "623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7" +SRC_URI[md5sum] = "e3c75a4f805bb5342c9f4b3603fb248f" +SRC_URI[sha256sum] = "998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d" inherit autotools -- 2.0.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-webserver][PATCH v2] fcgi: integrate fcgi-2.4.0 and add OML license file
On Thu, Jul 31, 2014 at 06:41:07PM +0800, YangHaibo wrote: > --- > meta-oe/licenses/OML | 28 > ++ > meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb | 16 + > .../fcgi/files/Fix_EOF_not_declared_issue.patch| 17 + > 3 files changed, 61 insertions(+) > create mode 100644 meta-oe/licenses/OML > create mode 100644 meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb > create mode 100644 > meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch In general I would prefer "fcgi" as BPN instead of "files" directory for a bit faster lookup. > diff --git a/meta-oe/licenses/OML b/meta-oe/licenses/OML > new file mode 100644 > index 000..7e6bdfd > --- /dev/null > +++ b/meta-oe/licenses/OML > @@ -0,0 +1,28 @@ > +This FastCGI application library source and object code (the > +"Software") and its documentation (the "Documentation") are > +copyrighted by Open Market, Inc ("Open Market"). The following terms > +apply to all files associated with the Software and Documentation > +unless explicitly disclaimed in individual files. > + > +Open Market permits you to use, copy, modify, distribute, and license > +this Software and the Documentation for any purpose, provided that > +existing copyright notices are retained in all copies and that this > +notice is included verbatim in any distributions. No written > +agreement, license, or royalty fee is required for any of the > +authorized uses. Modifications to this Software and Documentation may > +be copyrighted by their authors and need not follow the licensing > +terms described here. If modifications to this Software and > +Documentation have new licensing terms, the new terms must be clearly > +indicated on the first page of each file where they apply. > + > +OPEN MARKET MAKES NO EXPRESS OR IMPLIED WARRANTY WITH RESPECT TO THE > +SOFTWARE OR THE DOCUMENTATION, INCLUDING WITHOUT LIMITATION ANY > +WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN > +NO EVENT SHALL OPEN MARKET BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY > +DAMAGES ARISING FROM OR RELATING TO THIS SOFTWARE OR THE > +DOCUMENTATION, INCLUDING, WITHOUT LIMITATION, ANY INDIRECT, SPECIAL OR > +CONSEQUENTIAL DAMAGES OR SIMILAR DAMAGES, INCLUDING LOST PROFITS OR > +LOST DATA, EVEN IF OPEN MARKET HAS BEEN ADVISED OF THE POSSIBILITY OF > +SUCH DAMAGES. THE SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS". > +OPEN MARKET HAS NO LIABILITY IN CONTRACT, TORT, NEGLIGENCE OR > +OTHERWISE ARISING OUT OF THIS SOFTWARE OR THE DOCUMENTATION. > diff --git a/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb > b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb > new file mode 100644 > index 000..ceb5909 > --- /dev/null > +++ b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb > @@ -0,0 +1,16 @@ > +DESCRIPTION = "FastCGI is a protocol for interfacing interactive programs > with a web server." > +HOMEPAGE = "http://www.fastcgi.com"; > +LICENSE = "OML" > +LIC_FILES_CHKSUM = > "file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a" > + > +SRC_URI = "http://fossies.org/linux/www/fcgi-2.4.0.tar.gz \ > + file://Fix_EOF_not_declared_issue.patch \ > +" > +SRC_URI[md5sum] = "d15060a813b91383a9f3c66faf84867e" > +SRC_URI[sha256sum] = > "66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9" > + > +S = "${WORKDIR}/${BPN}-${PV}/" > + > +inherit autotools > + > +PARALLEL_MAKE = "" > diff --git > a/meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch > b/meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch > new file mode 100644 > index 000..b4cf080 > --- /dev/null > +++ b/meta-webserver/recipes-fcgi/fcgi/files/Fix_EOF_not_declared_issue.patch > @@ -0,0 +1,17 @@ > +Upstream-Status: Pending > + > +Fix EOF not declared issue, following is the error log. > +fcgio.cpp:70:72: error: 'EOF' was not declared in this scope > + if (FCGX_PutStr(pbase(), plen, this->fcgx) != plen) return EOF; > + > +Signed-off-by: Yang Haibo > +--- fcgi-ori/libfcgi/fcgio.cpp 2014-07-28 18:01:00.0 +0800 > fcgi-2.4.0/libfcgi/fcgio.cpp 2014-07-28 18:01:22.0 +0800 > +@@ -22,6 +22,7 @@ > + #define DLLAPI __declspec(dllexport) > + #endif > + > ++#include > + #include > + #include "fcgio.h" > + > -- > 1.9.2 > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] QtGstreamer recipe with patches for IMX6 support.
--- recipes-qt/qt5/qtgstreamer.inc | 12 + ...-i.MX6-zero-copy-rendering-implementation.patch | 249 + ...-s-flags-as-native-video-audio-in-case-of.patch | 60 + recipes-qt/qt5/qtgstreamer_git.bb | 44 4 files changed, 365 insertions(+) create mode 100644 recipes-qt/qt5/qtgstreamer.inc create mode 100644 recipes-qt/qt5/qtgstreamer/0001-Added-i.MX6-zero-copy-rendering-implementation.patch create mode 100644 recipes-qt/qt5/qtgstreamer/0002-Set-playbin-s-flags-as-native-video-audio-in-case-of.patch create mode 100644 recipes-qt/qt5/qtgstreamer_git.bb diff --git a/recipes-qt/qt5/qtgstreamer.inc b/recipes-qt/qt5/qtgstreamer.inc new file mode 100644 index 000..6a8bd57 --- /dev/null +++ b/recipes-qt/qt5/qtgstreamer.inc @@ -0,0 +1,12 @@ +require qt5.inc + +LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1" +SECTION = "multimedia" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ +file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS += "qtbase qtdeclarative boost" + +PACKAGECONFIG ??= "examples" +PACKAGECONFIG[examples] = "-DQTGSTREAMER_EXAMPLES=ON, -DQTGSTREAMER_EXAMPLES=OFF" diff --git a/recipes-qt/qt5/qtgstreamer/0001-Added-i.MX6-zero-copy-rendering-implementation.patch b/recipes-qt/qt5/qtgstreamer/0001-Added-i.MX6-zero-copy-rendering-implementation.patch new file mode 100644 index 000..dd5658a --- /dev/null +++ b/recipes-qt/qt5/qtgstreamer/0001-Added-i.MX6-zero-copy-rendering-implementation.patch @@ -0,0 +1,249 @@ +From c36ea48f3f4f0ad1b07a18c3717bd049ac24e32c Mon Sep 17 00:00:00 2001 +From: Benjamin Federau +Date: Mon, 12 May 2014 17:31:12 +0200 +Subject: [PATCH] Added i.MX6 zero-copy rendering implementation + +--- + CMakeLists.txt | 11 +++ + elements/gstqtvideosink/CMakeLists.txt |4 + + elements/gstqtvideosink/painters/videomaterial.cpp | 84 + elements/gstqtvideosink/painters/videomaterial.h |8 ++ + 4 files changed, 107 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9304fc3..86dbd46 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -19,6 +19,8 @@ option(USE_QT_PLUGIN_DIR "Install qt plugins at the system location" ON) + include(GNUInstallDirs) + include(MacroLogFeature) + ++set(HW_PLATFORM "none" CACHE STRING "Specific hardware platform used for the build") ++ + set(Qt4_MIN_VERSION 4.7) + set(Qt5_MIN_VERSION 5.0.0) + find_package(Qt4or5 COMPONENTS Core Gui Widgets OPTIONAL_COMPONENTS OpenGL Quick1 Quick2 Qml Test) +@@ -173,6 +175,15 @@ else() + endif() + endif() + ++# Enable hardware specific functionality ++if (${HW_PLATFORM} STREQUAL "imx6") ++message(STATUS "Enabled hardware platform: Freescale i.MX6") ++set(USE_HW_PLATFORM TRUE) ++set(QTGSTREAMER_HW_PLATFORM "-DHW_PLATFORM_IMX6") ++else() ++set(USE_HW_PLATFORM FALSE) ++endif() ++ + + if (QTGSTREAMER_CODEGEN AND FLEX_FOUND AND BISON_FOUND) + add_subdirectory(codegen) +diff --git a/elements/gstqtvideosink/CMakeLists.txt b/elements/gstqtvideosink/CMakeLists.txt +index ddb3da9..307c434 100644 +--- a/elements/gstqtvideosink/CMakeLists.txt b/elements/gstqtvideosink/CMakeLists.txt +@@ -57,6 +57,10 @@ add_definitions( + -DQWIDGETVIDEOSINK_NAME="${QWIDGETVIDEOSINK_NAME}" + ) + ++if (USE_HW_PLATFORM) ++add_definitions(${QTGSTREAMER_HW_PLATFORM}) ++endif() ++ + if (GstQtVideoSink_LINK_OPENGL) + if (OPENGLES2_FOUND) + set(GstQtVideoSink_GL_LIBS ${OPENGLES2_LIBRARY}) +diff --git a/elements/gstqtvideosink/painters/videomaterial.cpp b/elements/gstqtvideosink/painters/videomaterial.cpp +index 7711415..b9a83f7 100644 +--- a/elements/gstqtvideosink/painters/videomaterial.cpp b/elements/gstqtvideosink/painters/videomaterial.cpp +@@ -95,6 +95,18 @@ inline const char * const qtvideosink_glsl_yuvPlanarFragmentShader() + "}\n"; + } + ++inline const char * const qtvideosink_glsl_vivanteFragmentShader() ++{ ++return ++"uniform sampler2D texture;\n" ++"uniform lowp float opacity;\n" ++"varying highp vec2 qt_TexCoord;\n" ++"void main(void)\n" ++"{\n" ++"gl_FragColor = texture2D( texture, qt_TexCoord ) * opacity;\n" ++"}\n"; ++} ++ + class VideoMaterialShader : public QSGMaterialShader + { + public: +@@ -104,6 +116,10 @@ public: + Q_UNUSED(oldMaterial); + + VideoMaterial *material = static_cast(newMaterial); ++ ++#ifdef HW_PLATFORM_IMX6 ++program()->setUniformValue(m_id_texture, 0); ++#else + if (m_id_rgbTexture > 0) { + program()->setUniformValue(m_id_rgbTexture, 0); + } else { +@@ -111,6 +127,7 @@ public: + program()->setUniformValue(m_id_uTexture, 1); + program()->setUniformValue(m_id_vTexture, 2); + } ++#endif + + if (state.isOpacityDirty()) { +
Re: [oe] [meta-oe][dylan][PATCH 1/1] x264: fix SRCREV after upstream repository change
Hi Paul, Le Wed, 30 Jul 2014 12:28:42 +0100, Paul Eggleton a écrit : > > On Monday 09 June 2014 17:24:30 Paul Eggleton wrote: > > The upstream x264 project has re-imported all of their old history, > > meaning that all of the hashes have changed. Update SRCREV based on the > > mapping list they have provided at: > > > > http://sprunge.us/dGOU > > > > Signed-off-by: Paul Eggleton > > --- > > meta-oe/recipes-multimedia/x264/x264_git.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta-oe/recipes-multimedia/x264/x264_git.bb > > b/meta-oe/recipes-multimedia/x264/x264_git.bb index c767ffd..4da24cc 100644 > > --- a/meta-oe/recipes-multimedia/x264/x264_git.bb > > +++ b/meta-oe/recipes-multimedia/x264/x264_git.bb > > @@ -11,7 +11,7 @@ DEPENDS = "yasm-native" > > SRC_URI = "git://git.videolan.org/x264.git \ > > file://don-t-default-to-cortex-a9-with-neon.patch \ > > " > > -SRCREV = "1cffe9f406cc54f4759fc9eeb85598fb8cae66c7" > > +SRCREV = "bfed708c5358a2b4ef65923fb0683cefa9184e6f" > > > > PV = "r2230+git" > > ping > pushed, thanks and sorry for the delay Eric -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] add support for opendataplane
support build opendataplane from linaro. The OpenDataPlane (ODP) project provides a data plane application programming environment that is easy to use, high performance, and portable between networking SoCs. Signed-off-by: Yao Zhao --- ...inux-dpdk-remove-unnecessary-include-path.patch | 29 ++ .../opendataplane/opendataplane.inc| 21 .../opendataplane/opendataplane_0.2.bb | 25 +++ .../opendataplane/opendataplane_git.bb | 14 +++ 4 files changed, 89 insertions(+) create mode 100644 meta-networking/recipes-support/opendataplane/files/0001-linux-dpdk-remove-unnecessary-include-path.patch create mode 100644 meta-networking/recipes-support/opendataplane/opendataplane.inc create mode 100644 meta-networking/recipes-support/opendataplane/opendataplane_0.2.bb create mode 100644 meta-networking/recipes-support/opendataplane/opendataplane_git.bb diff --git a/meta-networking/recipes-support/opendataplane/files/0001-linux-dpdk-remove-unnecessary-include-path.patch b/meta-networking/recipes-support/opendataplane/files/0001-linux-dpdk-remove-unnecessary-include-path.patch new file mode 100644 index 000..a0ef7ce --- /dev/null +++ b/meta-networking/recipes-support/opendataplane/files/0001-linux-dpdk-remove-unnecessary-include-path.patch @@ -0,0 +1,29 @@ +From 72b8eacc2985f054cadc5d0b48351a658998b8d6 Mon Sep 17 00:00:00 2001 +From: Yao Zhao +Date: Wed, 30 Jul 2014 16:02:14 -0400 +Subject: [PATCH] linux-dpdk: remove unnecessary include path + +for dpdk include/arch and include/exec-env is only included +by generic rte_xxx.h header, can't be included directly. + +Signed-off-by: Yao Zhao +--- + platform/linux-dpdk/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am +index 4aa568f..dfcaadb 100644 +--- a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am +@@ -12,8 +12,6 @@ PLAT_CFLAGS = -msse4.2 + if SDK_INSTALL_PATH_ + PLAT_CFLAGS += -include $(SDK_INSTALL_PATH)/include/rte_config.h + PLAT_CFLAGS += -I$(SDK_INSTALL_PATH)/include +-PLAT_CFLAGS += -I$(SDK_INSTALL_PATH)/include/arch +-PLAT_CFLAGS += -I$(SDK_INSTALL_PATH)/include/exec-env + + AM_LDFLAGS += -L$(SDK_INSTALL_PATH)/lib + endif +-- +1.9.1 + diff --git a/meta-networking/recipes-support/opendataplane/opendataplane.inc b/meta-networking/recipes-support/opendataplane/opendataplane.inc new file mode 100644 index 000..c4b184e --- /dev/null +++ b/meta-networking/recipes-support/opendataplane/opendataplane.inc @@ -0,0 +1,21 @@ +SUMMARY = "Cross platform OpenDataPlane application APIs" + +DESCRIPTION = "The OpenDataPlane project has been established to \ +produce an open-source, cross-platform set of application \ +programming interfaces (APIs) for the networking data plane." + +HOMEPAGE = "http://www.opendataplane.org"; +SECTION = "networking" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4ccfa994aa96974cfcd39a59faee20a2" + +SRC_URI = "git://git.linaro.org/lng/odp.git" + +COMPATIBLE_HOST = "^((?!mips).*)$" + +PACKAGECONFIG ??= "platform_linux_generic" +PACKAGECONFIG[netmap] = "--enable-netmap,,," +PACKAGECONFIG[platform_linux_generic] = "--with-platform=linux-generic,,," + +S = "${WORKDIR}/git" + diff --git a/meta-networking/recipes-support/opendataplane/opendataplane_0.2.bb b/meta-networking/recipes-support/opendataplane/opendataplane_0.2.bb new file mode 100644 index 000..74b6c2f --- /dev/null +++ b/meta-networking/recipes-support/opendataplane/opendataplane_0.2.bb @@ -0,0 +1,25 @@ +require ${BPN}.inc + +#odp-0.2 tag +SRCREV = "6007d8833a6880abedf98f792586c0cfb9f10de0" +PV = "0.2" + +#0.2 still using pure Makefile + +#override the Makefile DESTDIR +export DESTDIR="${D}${exec_prefix}" + +do_install () { +oe_runmake install + +#move DESTDIR/share/odp/odp_x usr/bin +install -d ${D}${bindir} +for i in ${DESTDIR}/share/odp/*; do +filename=`basename $i` +mv ${DESTDIR}/share/odp/${filename} ${D}${bindir}/${filename} +done +rm -rf ${DESTDIR}/share +} + +#non standard doc install location +FILES_${PN}-doc += "/usr/doc/*" diff --git a/meta-networking/recipes-support/opendataplane/opendataplane_git.bb b/meta-networking/recipes-support/opendataplane/opendataplane_git.bb new file mode 100644 index 000..7415993 --- /dev/null +++ b/meta-networking/recipes-support/opendataplane/opendataplane_git.bb @@ -0,0 +1,14 @@ +require ${BPN}.inc + +SRC_URI += "file://0001-linux-dpdk-remove-unnecessary-include-path.patch" + +SRCREV = "${AUTOREV}" +#8f4f080625e2db810da3f13770ba418c72b08ede will support --with-sdk-install-path +PV = "0.2+git${SRCPV}" + +PACKAGECONFIG[platform_linux_generic] = "--with-platform=linux-generic,,openssl,libcrypto" +#need meta-intel layer's common/recipes-extended/dpdk/dpdk recipe +PACKAGECONFIG[platform_linux_dpdk] = '--with-platform=linux-dpdk --with
Re: [oe] [meta-qt5][PATCH] QtGstreamer recipe with patches for IMX6 support.
The patches are imx6 specific, so they should not be part of meta-qt5. Instead, add them to meta-fsl-arm , write a .bbappend for them. Also, I am confused. The summary at the beginning lists: "0002-Set-playbin-s-flags-as-native-video-audio-in-case-of.patch" , but in the recipe I see "0002-qtgstreamer-Temporarry-set-native-video-playbin-s-fl.patch" ? On 07/31/2014 06:37 PM, Ilya Smelykh wrote: --- recipes-qt/qt5/qtgstreamer.inc | 12 + ...-i.MX6-zero-copy-rendering-implementation.patch | 249 + ...-s-flags-as-native-video-audio-in-case-of.patch | 60 + recipes-qt/qt5/qtgstreamer_git.bb | 44 4 files changed, 365 insertions(+) create mode 100644 recipes-qt/qt5/qtgstreamer.inc create mode 100644 recipes-qt/qt5/qtgstreamer/0001-Added-i.MX6-zero-copy-rendering-implementation.patch create mode 100644 recipes-qt/qt5/qtgstreamer/0002-Set-playbin-s-flags-as-native-video-audio-in-case-of.patch create mode 100644 recipes-qt/qt5/qtgstreamer_git.bb diff --git a/recipes-qt/qt5/qtgstreamer.inc b/recipes-qt/qt5/qtgstreamer.inc new file mode 100644 index 000..6a8bd57 --- /dev/null +++ b/recipes-qt/qt5/qtgstreamer.inc @@ -0,0 +1,12 @@ +require qt5.inc + +LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1" +SECTION = "multimedia" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ +file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS += "qtbase qtdeclarative boost" + +PACKAGECONFIG ??= "examples" +PACKAGECONFIG[examples] = "-DQTGSTREAMER_EXAMPLES=ON, -DQTGSTREAMER_EXAMPLES=OFF" diff --git a/recipes-qt/qt5/qtgstreamer/0001-Added-i.MX6-zero-copy-rendering-implementation.patch b/recipes-qt/qt5/qtgstreamer/0001-Added-i.MX6-zero-copy-rendering-implementation.patch new file mode 100644 index 000..dd5658a --- /dev/null +++ b/recipes-qt/qt5/qtgstreamer/0001-Added-i.MX6-zero-copy-rendering-implementation.patch @@ -0,0 +1,249 @@ +From c36ea48f3f4f0ad1b07a18c3717bd049ac24e32c Mon Sep 17 00:00:00 2001 +From: Benjamin Federau +Date: Mon, 12 May 2014 17:31:12 +0200 +Subject: [PATCH] Added i.MX6 zero-copy rendering implementation + +--- + CMakeLists.txt | 11 +++ + elements/gstqtvideosink/CMakeLists.txt |4 + + elements/gstqtvideosink/painters/videomaterial.cpp | 84 + elements/gstqtvideosink/painters/videomaterial.h |8 ++ + 4 files changed, 107 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9304fc3..86dbd46 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -19,6 +19,8 @@ option(USE_QT_PLUGIN_DIR "Install qt plugins at the system location" ON) + include(GNUInstallDirs) + include(MacroLogFeature) + ++set(HW_PLATFORM "none" CACHE STRING "Specific hardware platform used for the build") ++ + set(Qt4_MIN_VERSION 4.7) + set(Qt5_MIN_VERSION 5.0.0) + find_package(Qt4or5 COMPONENTS Core Gui Widgets OPTIONAL_COMPONENTS OpenGL Quick1 Quick2 Qml Test) +@@ -173,6 +175,15 @@ else() + endif() + endif() + ++# Enable hardware specific functionality ++if (${HW_PLATFORM} STREQUAL "imx6") ++message(STATUS "Enabled hardware platform: Freescale i.MX6") ++set(USE_HW_PLATFORM TRUE) ++set(QTGSTREAMER_HW_PLATFORM "-DHW_PLATFORM_IMX6") ++else() ++set(USE_HW_PLATFORM FALSE) ++endif() ++ + + if (QTGSTREAMER_CODEGEN AND FLEX_FOUND AND BISON_FOUND) + add_subdirectory(codegen) +diff --git a/elements/gstqtvideosink/CMakeLists.txt b/elements/gstqtvideosink/CMakeLists.txt +index ddb3da9..307c434 100644 +--- a/elements/gstqtvideosink/CMakeLists.txt b/elements/gstqtvideosink/CMakeLists.txt +@@ -57,6 +57,10 @@ add_definitions( + -DQWIDGETVIDEOSINK_NAME="${QWIDGETVIDEOSINK_NAME}" + ) + ++if (USE_HW_PLATFORM) ++add_definitions(${QTGSTREAMER_HW_PLATFORM}) ++endif() ++ + if (GstQtVideoSink_LINK_OPENGL) + if (OPENGLES2_FOUND) + set(GstQtVideoSink_GL_LIBS ${OPENGLES2_LIBRARY}) +diff --git a/elements/gstqtvideosink/painters/videomaterial.cpp b/elements/gstqtvideosink/painters/videomaterial.cpp +index 7711415..b9a83f7 100644 +--- a/elements/gstqtvideosink/painters/videomaterial.cpp b/elements/gstqtvideosink/painters/videomaterial.cpp +@@ -95,6 +95,18 @@ inline const char * const qtvideosink_glsl_yuvPlanarFragmentShader() + "}\n"; + } + ++inline const char * const qtvideosink_glsl_vivanteFragmentShader() ++{ ++return ++"uniform sampler2D texture;\n" ++"uniform lowp float opacity;\n" ++"varying highp vec2 qt_TexCoord;\n" ++"void main(void)\n" ++"{\n" ++"gl_FragColor = texture2D( texture, qt_TexCoord ) * opacity;\n" ++"}\n"; ++} ++ + class VideoMaterialShader : public QSGMaterialShader + { + public: +@@ -104,6 +116,10 @@ public: + Q_UNUSED(oldMaterial); + + VideoMaterial *material = static_cast(newMaterial); ++ ++#ifdef HW_PLATFO
[oe] [meta-oe][PATCH] swig: Update to 3.0.2
Signed-off-by: Otavio Salvador --- meta-oe/recipes-devtools/swig/{swig_2.0.12.bb => swig_3.0.2.bb} |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) rename meta-oe/recipes-devtools/swig/{swig_2.0.12.bb => swig_3.0.2.bb} (57%) diff --git a/meta-oe/recipes-devtools/swig/swig_2.0.12.bb b/meta-oe/recipes-devtools/swig/swig_3.0.2.bb similarity index 57% rename from meta-oe/recipes-devtools/swig/swig_2.0.12.bb rename to meta-oe/recipes-devtools/swig/swig_3.0.2.bb index d3707ee..ac41914 100644 --- a/meta-oe/recipes-devtools/swig/swig_2.0.12.bb +++ b/meta-oe/recipes-devtools/swig/swig_3.0.2.bb @@ -4,7 +4,5 @@ SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.pat file://0001-configure-use-pkg-config-for-pcre-detection.patch \ " - -SRC_URI[md5sum] = "c3fb0b2d710cc82ed0154b91e43085a4" -SRC_URI[sha256sum] = "65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7" - +SRC_URI[md5sum] = "62f9b0d010cef36a13a010dc530d0d41" +SRC_URI[sha256sum] = "a2669657cabcedc371f63c0457407a183e0b6b2ef4e7e303c1ec9a3964cc7813" -- 1.7.10.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] add support for opendataplane
On Thu, Jul 31, 2014 at 12:15 PM, Yao Zhao wrote: > support build opendataplane from linaro. > > The OpenDataPlane (ODP) project provides a data plane application > programming environment that is easy to use, high performance, > and portable between networking SoCs. > > Signed-off-by: Yao Zhao > --- > ...inux-dpdk-remove-unnecessary-include-path.patch | 29 > ++ > .../opendataplane/opendataplane.inc| 21 > .../opendataplane/opendataplane_0.2.bb | 25 +++ > .../opendataplane/opendataplane_git.bb | 14 +++ > 4 files changed, 89 insertions(+) > create mode 100644 > meta-networking/recipes-support/opendataplane/files/0001-linux-dpdk-remove-unnecessary-include-path.patch > create mode 100644 > meta-networking/recipes-support/opendataplane/opendataplane.inc > create mode 100644 > meta-networking/recipes-support/opendataplane/opendataplane_0.2.bb > create mode 100644 > meta-networking/recipes-support/opendataplane/opendataplane_git.bb > > diff --git > a/meta-networking/recipes-support/opendataplane/files/0001-linux-dpdk-remove-unnecessary-include-path.patch > > b/meta-networking/recipes-support/opendataplane/files/0001-linux-dpdk-remove-unnecessary-include-path.patch > new file mode 100644 > index 000..a0ef7ce > --- /dev/null > +++ > b/meta-networking/recipes-support/opendataplane/files/0001-linux-dpdk-remove-unnecessary-include-path.patch > @@ -0,0 +1,29 @@ > +From 72b8eacc2985f054cadc5d0b48351a658998b8d6 Mon Sep 17 00:00:00 2001 > +From: Yao Zhao > +Date: Wed, 30 Jul 2014 16:02:14 -0400 > +Subject: [PATCH] linux-dpdk: remove unnecessary include path > + > +for dpdk include/arch and include/exec-env is only included > +by generic rte_xxx.h header, can't be included directly. > + > +Signed-off-by: Yao Zhao > +--- > + platform/linux-dpdk/Makefile.am | 2 -- > + 1 file changed, 2 deletions(-) > + > +diff --git a/platform/linux-dpdk/Makefile.am > b/platform/linux-dpdk/Makefile.am > +index 4aa568f..dfcaadb 100644 > +--- a/platform/linux-dpdk/Makefile.am > b/platform/linux-dpdk/Makefile.am > +@@ -12,8 +12,6 @@ PLAT_CFLAGS = -msse4.2 > + if SDK_INSTALL_PATH_ > + PLAT_CFLAGS += -include $(SDK_INSTALL_PATH)/include/rte_config.h > + PLAT_CFLAGS += -I$(SDK_INSTALL_PATH)/include > +-PLAT_CFLAGS += -I$(SDK_INSTALL_PATH)/include/arch > +-PLAT_CFLAGS += -I$(SDK_INSTALL_PATH)/include/exec-env is this patch upstreamed ? > + > + AM_LDFLAGS += -L$(SDK_INSTALL_PATH)/lib > + endif > +-- > +1.9.1 > + > diff --git a/meta-networking/recipes-support/opendataplane/opendataplane.inc > b/meta-networking/recipes-support/opendataplane/opendataplane.inc > new file mode 100644 > index 000..c4b184e > --- /dev/null > +++ b/meta-networking/recipes-support/opendataplane/opendataplane.inc > @@ -0,0 +1,21 @@ > +SUMMARY = "Cross platform OpenDataPlane application APIs" > + > +DESCRIPTION = "The OpenDataPlane project has been established to \ > +produce an open-source, cross-platform set of application \ > +programming interfaces (APIs) for the networking data plane." > + > +HOMEPAGE = "http://www.opendataplane.org"; > +SECTION = "networking" > +LICENSE = "BSD-3-Clause" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=4ccfa994aa96974cfcd39a59faee20a2" > + > +SRC_URI = "git://git.linaro.org/lng/odp.git" > + > +COMPATIBLE_HOST = "^((?!mips).*)$" > + > +PACKAGECONFIG ??= "platform_linux_generic" > +PACKAGECONFIG[netmap] = "--enable-netmap,,," > +PACKAGECONFIG[platform_linux_generic] = "--with-platform=linux-generic,,," > + > +S = "${WORKDIR}/git" > + > diff --git > a/meta-networking/recipes-support/opendataplane/opendataplane_0.2.bb > b/meta-networking/recipes-support/opendataplane/opendataplane_0.2.bb > new file mode 100644 > index 000..74b6c2f > --- /dev/null > +++ b/meta-networking/recipes-support/opendataplane/opendataplane_0.2.bb > @@ -0,0 +1,25 @@ > +require ${BPN}.inc > + > +#odp-0.2 tag > +SRCREV = "6007d8833a6880abedf98f792586c0cfb9f10de0" > +PV = "0.2" > + > +#0.2 still using pure Makefile > + > +#override the Makefile DESTDIR > +export DESTDIR="${D}${exec_prefix}" > + > +do_install () { > +oe_runmake install > + > +#move DESTDIR/share/odp/odp_x usr/bin > +install -d ${D}${bindir} > +for i in ${DESTDIR}/share/odp/*; do > +filename=`basename $i` > +mv ${DESTDIR}/share/odp/${filename} ${D}${bindir}/${filename} > +done > +rm -rf ${DESTDIR}/share > +} > + > +#non standard doc install location > +FILES_${PN}-doc += "/usr/doc/*" hardcoding /usr can be removed. > diff --git > a/meta-networking/recipes-support/opendataplane/opendataplane_git.bb > b/meta-networking/recipes-support/opendataplane/opendataplane_git.bb > new file mode 100644 > index 000..7415993 > --- /dev/null > +++ b/meta-networking/recipes-support/opendataplane/opendataplane_git.bb > @@ -0,0 +1,14 @@ > +require ${BPN}.inc > + > +SRC_URI += "file://0001-linux-dpdk-remove-unnecessary-include-path.patch" > +
[oe] [meta-handheld][PATCH] linux-yocto-tiny-kexecboot: change KERNEL_IMAGE_MAXSIZE from bytes to KB
Match the changes done by commit 7384d2831c713ac5999aca83c312154dc15cec56 in oe-core. Signed-off-by: Andrea Adami --- .../linux/linux-yocto-tiny-kexecboot_3.10.bbappend | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bbappend b/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bbappend index 70d8a4a..53c2924 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bbappend +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bbappend @@ -3,12 +3,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.10:${THISDIR}/linux-yocto-3.10:${ COMPATIBLE_MACHINE .= "|akita|c7x0|collie|poodle|spitz|tosa" # Zaurus machines need kernel size-check. -KERNEL_IMAGE_MAXSIZE_akita = "1294336" -KERNEL_IMAGE_MAXSIZE_c7x0 = "1294336" -KERNEL_IMAGE_MAXSIZE_collie = "1048576" -KERNEL_IMAGE_MAXSIZE_poodle = "1294336" -KERNEL_IMAGE_MAXSIZE_spitz = "1294336" -KERNEL_IMAGE_MAXSIZE_tosa = "1294336" +KERNEL_IMAGE_MAXSIZE_akita = "1264" +KERNEL_IMAGE_MAXSIZE_c7x0 = "1264" +KERNEL_IMAGE_MAXSIZE_collie = "1024" +KERNEL_IMAGE_MAXSIZE_poodle = "1264" +KERNEL_IMAGE_MAXSIZE_spitz = "1264" +KERNEL_IMAGE_MAXSIZE_tosa = "1264" KMACHINE_akita = "akita" KMACHINE_c7x0 = "c7x0" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-initramfs][PATCH] kexecboot: remove trailing slash in do_install
Signed-off-by: Andrea Adami --- meta-initramfs/recipes-bsp/kexecboot/kexecboot_0.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_0.6.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_0.6.bb index d0176c5..1fb5f0d 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_0.6.bb +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_0.6.bb @@ -48,7 +48,7 @@ EXTRA_OECONF = "--enable-delay=2 --enable-evdev-rate=1000,250" do_install () { install -d ${D}${bindir} -install -m 0755 kexecboot ${D}${bindir}/ +install -m 0755 kexecboot ${D}${bindir} install -d ${D}/proc install -d ${D}/mnt install -d ${D}/dev -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-initramfs][PATCH] kexecboot: remove trailing slash in do_install
On 2014-07-31 16:46, Andrea Adami wrote: Signed-off-by: Andrea Adami --- meta-initramfs/recipes-bsp/kexecboot/kexecboot_0.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_0.6.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_0.6.bb index d0176c5..1fb5f0d 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_0.6.bb +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_0.6.bb @@ -48,7 +48,7 @@ EXTRA_OECONF = "--enable-delay=2 --enable-evdev-rate=1000,250" do_install () { install -d ${D}${bindir} -install -m 0755 kexecboot ${D}${bindir}/ +install -m 0755 kexecboot ${D}${bindir} install -d ${D}/proc install -d ${D}/mnt install -d ${D}/dev What is the reason for this change. Using XXX/ is quite common in OE recipes. -- Gary Thomas | Consulting for the MLB Associates |Embedded world -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-initramfs][PATCH] kexec_tools_klibc_2.0.2: update x86_vfscanf.patch
fgets in while loops is expected to check for != NULL Signed-off-by: Andrea Adami --- .../recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch index 14f4d2a..cad6951 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch @@ -16,7 +16,7 @@ - retno = vfscanf(fp, scanf_line, argptr); + + line = xmalloc(sizeof(line) * line_size); -+ while(fgets(line, sizeof(line), fp) != 0 ) { ++ while(fgets(line, sizeof(line), fp) != NULL ) { + line_size += MAX_LINE; + line = xrealloc(line,line_size); + } -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-initramfs][PATCH] kexec_tools_klibc_2.0.2: update x86_vfscanf.patch
On Thu, Jul 31, 2014 at 3:58 PM, Andrea Adami wrote: > fgets in while loops is expected to check for != NULL I think the message could be slightly changes, saying that fgets returns NULL on error thats why we check for NULL and not 0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH v3] integrate fcgi-2.4.0 and add OML license file
--- meta-oe/licenses/OML | 28 ++ .../fcgi/fcgi/Fix_EOF_not_declared_issue.patch | 17 + meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb | 16 + 3 files changed, 61 insertions(+) create mode 100644 meta-oe/licenses/OML create mode 100644 meta-webserver/recipes-fcgi/fcgi/fcgi/Fix_EOF_not_declared_issue.patch create mode 100644 meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb diff --git a/meta-oe/licenses/OML b/meta-oe/licenses/OML new file mode 100644 index 000..7e6bdfd --- /dev/null +++ b/meta-oe/licenses/OML @@ -0,0 +1,28 @@ +This FastCGI application library source and object code (the +"Software") and its documentation (the "Documentation") are +copyrighted by Open Market, Inc ("Open Market"). The following terms +apply to all files associated with the Software and Documentation +unless explicitly disclaimed in individual files. + +Open Market permits you to use, copy, modify, distribute, and license +this Software and the Documentation for any purpose, provided that +existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written +agreement, license, or royalty fee is required for any of the +authorized uses. Modifications to this Software and Documentation may +be copyrighted by their authors and need not follow the licensing +terms described here. If modifications to this Software and +Documentation have new licensing terms, the new terms must be clearly +indicated on the first page of each file where they apply. + +OPEN MARKET MAKES NO EXPRESS OR IMPLIED WARRANTY WITH RESPECT TO THE +SOFTWARE OR THE DOCUMENTATION, INCLUDING WITHOUT LIMITATION ANY +WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN +NO EVENT SHALL OPEN MARKET BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY +DAMAGES ARISING FROM OR RELATING TO THIS SOFTWARE OR THE +DOCUMENTATION, INCLUDING, WITHOUT LIMITATION, ANY INDIRECT, SPECIAL OR +CONSEQUENTIAL DAMAGES OR SIMILAR DAMAGES, INCLUDING LOST PROFITS OR +LOST DATA, EVEN IF OPEN MARKET HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. THE SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS". +OPEN MARKET HAS NO LIABILITY IN CONTRACT, TORT, NEGLIGENCE OR +OTHERWISE ARISING OUT OF THIS SOFTWARE OR THE DOCUMENTATION. diff --git a/meta-webserver/recipes-fcgi/fcgi/fcgi/Fix_EOF_not_declared_issue.patch b/meta-webserver/recipes-fcgi/fcgi/fcgi/Fix_EOF_not_declared_issue.patch new file mode 100644 index 000..b4cf080 --- /dev/null +++ b/meta-webserver/recipes-fcgi/fcgi/fcgi/Fix_EOF_not_declared_issue.patch @@ -0,0 +1,17 @@ +Upstream-Status: Pending + +Fix EOF not declared issue, following is the error log. +fcgio.cpp:70:72: error: 'EOF' was not declared in this scope + if (FCGX_PutStr(pbase(), plen, this->fcgx) != plen) return EOF; + +Signed-off-by: Yang Haibo +--- fcgi-ori/libfcgi/fcgio.cpp 2014-07-28 18:01:00.0 +0800 fcgi-2.4.0/libfcgi/fcgio.cpp 2014-07-28 18:01:22.0 +0800 +@@ -22,6 +22,7 @@ + #define DLLAPI __declspec(dllexport) + #endif + ++#include + #include + #include "fcgio.h" + diff --git a/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb new file mode 100644 index 000..ceb5909 --- /dev/null +++ b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "FastCGI is a protocol for interfacing interactive programs with a web server." +HOMEPAGE = "http://www.fastcgi.com"; +LICENSE = "OML" +LIC_FILES_CHKSUM = "file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a" + +SRC_URI = "http://fossies.org/linux/www/fcgi-2.4.0.tar.gz \ + file://Fix_EOF_not_declared_issue.patch \ +" +SRC_URI[md5sum] = "d15060a813b91383a9f3c66faf84867e" +SRC_URI[sha256sum] = "66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9" + +S = "${WORKDIR}/${BPN}-${PV}/" + +inherit autotools + +PARALLEL_MAKE = "" -- 1.9.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel