summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-extended/libcec/libcec_git.bb10
-rw-r--r--meta-oe/recipes-support/libtinyxml/libtinyxml/enforce-use-stl.patch20
-rw-r--r--meta-oe/recipes-support/libtinyxml/libtinyxml/entity-encoding.patch62
-rw-r--r--meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb43
-rw-r--r--meta-oe/recipes-support/lockdev/lockdev_git.bb20
-rw-r--r--meta-oe/recipes-support/talloc/talloc/install-swig-interface-in-SWINGLIBDIR.patch23
-rw-r--r--meta-oe/recipes-support/talloc/talloc_2.0.1.bb17
7 files changed, 187 insertions, 8 deletions
diff --git a/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-oe/recipes-extended/libcec/libcec_git.bb
index 142b2e216f..8b1f08694d 100644
--- a/meta-oe/recipes-extended/libcec/libcec_git.bb
+++ b/meta-oe/recipes-extended/libcec/libcec_git.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "USB CEC Adaptor communication Library"
2HOMEPAGE = "http://libcec.pulse-eight.com/" 2HOMEPAGE = "http://libcec.pulse-eight.com/"
3 3
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=185ead350fec5fc223da0f65f9a802af" 5LIC_FILES_CHKSUM = "file://COPYING;md5=5e8e16396992369f73f3d28875f846da"
6 6
7DEPENDS = "udev" 7DEPENDS = "udev lockdev"
8 8
9PR = "r1" 9PV = "1.9.0"
10PV = "1.4.0" 10
11SRCREV = "2db8981f49fbd167ddbbf19c1fbadd064abc332a" 11SRCREV = "9884e9ffc5293de5bb9092db1ed581f213a678df"
12SRC_URI = "git://github.com/Pulse-Eight/libcec.git" 12SRC_URI = "git://github.com/Pulse-Eight/libcec.git"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml/enforce-use-stl.patch b/meta-oe/recipes-support/libtinyxml/libtinyxml/enforce-use-stl.patch
new file mode 100644
index 0000000000..88c962bbe1
--- /dev/null
+++ b/meta-oe/recipes-support/libtinyxml/libtinyxml/enforce-use-stl.patch
@@ -0,0 +1,20 @@
1Description: TinyXml is built with TIXML_USE_STL, so we have to
2 enforce it when the library is used.
3Author: Felix Geyer <debfx-pkg@fobos.de>
4
5Upstream-Status: Pending
6
7diff -Nur tinyxml-2.5.3/tinyxml.h tinyxml-2.5.3.patch/tinyxml.h
8--- tinyxml-2.5.3/tinyxml.h 2007-05-07 00:41:23.000000000 +0200
9+++ tinyxml-2.5.3.patch/tinyxml.h 2009-07-08 22:32:03.000000000 +0200
10@@ -26,6 +26,10 @@
11 #ifndef TINYXML_INCLUDED
12 #define TINYXML_INCLUDED
13
14+#ifndef TIXML_USE_STL
15+ #define TIXML_USE_STL
16+#endif
17+
18 #ifdef _MSC_VER
19 #pragma warning( push )
20 #pragma warning( disable : 4530 )
diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml/entity-encoding.patch b/meta-oe/recipes-support/libtinyxml/libtinyxml/entity-encoding.patch
new file mode 100644
index 0000000000..b801506eae
--- /dev/null
+++ b/meta-oe/recipes-support/libtinyxml/libtinyxml/entity-encoding.patch
@@ -0,0 +1,62 @@
1Description: TinyXML incorrectly encodes text element containing
2 an ampersand followed by either x or #.
3
4Origin: http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
5
6Upstream-Status: Pending
7
8diff -u -r1.105 tinyxml.cpp
9--- a/tinyxml.cpp
10+++ b/tinyxml.cpp
11@@ -57,30 +57,7 @@
12 {
13 unsigned char c = (unsigned char) str[i];
14
15- if ( c == '&'
16- && i < ( (int)str.length() - 2 )
17- && str[i+1] == '#'
18- && str[i+2] == 'x' )
19- {
20- // Hexadecimal character reference.
21- // Pass through unchanged.
22- // &#xA9; -- copyright symbol, for example.
23- //
24- // The -1 is a bug fix from Rob Laveaux. It keeps
25- // an overflow from happening if there is no ';'.
26- // There are actually 2 ways to exit this loop -
27- // while fails (error case) and break (semicolon found).
28- // However, there is no mechanism (currently) for
29- // this function to return an error.
30- while ( i<(int)str.length()-1 )
31- {
32- outString->append( str.c_str() + i, 1 );
33- ++i;
34- if ( str[i] == ';' )
35- break;
36- }
37- }
38- else if ( c == '&' )
39+ if ( c == '&' )
40 {
41 outString->append( entity[0].str, entity[0].strLength );
42 ++i;
43diff -u -r1.89 xmltest.cpp
44--- a/xmltest.cpp
45+++ b/xmltest.cpp
46@@ -1340,6 +1340,16 @@
47 }*/
48 }
49
50+ #ifdef TIXML_USE_STL
51+ {
52+ TiXmlDocument xml;
53+ xml.Parse("<foo>foo&amp;#xa+bar</foo>");
54+ std::string str;
55+ str << xml;
56+ XmlTest( "Entity escaping", "<foo>foo&amp;#xa+bar</foo>", str.c_str() );
57+ }
58+ #endif
59+
60 /* 1417717 experiment
61 {
62 TiXmlDocument xml;
diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
new file mode 100644
index 0000000000..fdadebdfa9
--- /dev/null
+++ b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
@@ -0,0 +1,43 @@
1# (c) Copyright 2012 Hewlett-Packard Development Company, L.P.
2
3DESCRIPTION = "a simple, small, minimal, C++ XML parser"
4HOMEPAGE = "http://www.sourceforge.net/projects/tinyxml"
5LICENSE = "Zlib"
6LIC_FILES_CHKSUM = "file://readme.txt;md5=f8f366f3370dda889f60faa7db162cf4"
7SECTION = "libs"
8
9PR = "r5"
10
11SRC_URI = "${SOURCEFORGE_MIRROR}/tinyxml/tinyxml_${@'${PV}'.replace('.', '_')}.tar.gz \
12 file://enforce-use-stl.patch \
13 file://entity-encoding.patch"
14SRC_URI[md5sum] = "c1b864c96804a10526540c664ade67f0"
15SRC_URI[sha256sum] = "15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593"
16
17S = "${WORKDIR}/tinyxml"
18
19CXXFLAGS += "-fPIC"
20
21do_compile() {
22 ${CXX} ${CXXFLAGS} -I${S} -c -o ${S}/tinyxml.o ${S}/tinyxml.cpp
23 ${CXX} ${CXXFLAGS} -I${S} -c -o ${S}/tinyxmlerror.o ${S}/tinyxmlerror.cpp
24 ${CXX} ${CXXFLAGS} -I${S} -c -o ${S}/tinyxmlparser.o ${S}/tinyxmlparser.cpp
25 ${CXX} ${CXXFLAGS} \
26 -shared \
27 -Wl,-soname,libtinyxml.so.${PV} \
28 -o ${S}/libtinyxml.so.${PV} \
29 ${LDFLAGS} \
30 ${S}/tinyxml.o \
31 ${S}/tinyxmlparser.o \
32 ${S}/tinyxmlerror.o
33}
34
35do_install() {
36 install -d ${D}${libdir}
37 install -m 0755 ${S}/libtinyxml.so.${PV} ${D}${libdir}
38 ln -sf libtinyxml.so.${PV} ${D}${libdir}/libtinyxml.so
39
40 install -d ${D}${includedir}
41 install -m 0644 ${S}/tinyxml.h ${D}${includedir}
42}
43
diff --git a/meta-oe/recipes-support/lockdev/lockdev_git.bb b/meta-oe/recipes-support/lockdev/lockdev_git.bb
new file mode 100644
index 0000000000..beec5a673b
--- /dev/null
+++ b/meta-oe/recipes-support/lockdev/lockdev_git.bb
@@ -0,0 +1,20 @@
1DESCRIPTION = "Locking devices library"
2SECTION = "libs"
3LICENSE = "LGPLv2.1"
4LIC_FILES_CHKSUM="file://COPYING;md5=4fbd65380cdd255951079008b364516c"
5
6PV = "1.0.3+git${SRCPV}"
7
8SRCREV = "16b899645d32012cc94cc9232f64d4ddaaf0b795"
9SRC_URI = "git://anonscm.debian.org/lockdev/lockdev.git;protocol=git"
10
11S = "${WORKDIR}/git"
12
13inherit lib_package autotools
14
15do_configure_prepend () {
16 ./scripts/git-version > VERSION
17
18 # Make automake happy
19 touch ChangeLog
20}
diff --git a/meta-oe/recipes-support/talloc/talloc/install-swig-interface-in-SWINGLIBDIR.patch b/meta-oe/recipes-support/talloc/talloc/install-swig-interface-in-SWINGLIBDIR.patch
new file mode 100644
index 0000000000..e1339a078e
--- /dev/null
+++ b/meta-oe/recipes-support/talloc/talloc/install-swig-interface-in-SWINGLIBDIR.patch
@@ -0,0 +1,23 @@
1Using the way swig interface is installed leads to a bad path in ${D}.
2The interface ended up in ${D}/${STAGING_DIR_NATIVE} which is wrong. The
3fix is to define a variable in recipe which is used in install rule by
4talloc.
5
6Upstream-Status: Inappropriate [build system specific]
7Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
8
9Index: talloc-2.0.1/talloc.mk
10===================================================================
11--- talloc-2.0.1.orig/talloc.mk 2009-10-11 16:42:24.000000000 +0300
12+++ talloc-2.0.1/talloc.mk 2012-09-13 23:15:05.283539702 +0300
13@@ -23,8 +23,8 @@
14 ${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
15 if [ -f talloc.3 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man3; fi
16 if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi
17- which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true
18- which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true
19+ which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)/$(SWIGLIBDIR) || true
20+ which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)/$(SWIGLIBDIR) || true
21
22 doc:: talloc.3 talloc.3.html
23
diff --git a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
index a69bd401e0..6aa5a9e80b 100644
--- a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
+++ b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
@@ -1,17 +1,19 @@
1DESCRIPTION = "Hierarchical, reference counted memory pool system with destructors" 1DESCRIPTION = "Hierarchical, reference counted memory pool system with destructors"
2HOMEPAGE = "http://talloc.samba.org" 2HOMEPAGE = "http://talloc.samba.org"
3LICENSE = "LGPL" 3LICENSE = "LGPL-3.0"
4LIC_FILES_CHKSUM = "file://NEWS;md5=5fe776b23a711c9153ee94bc87e47334" 4LIC_FILES_CHKSUM = "file://NEWS;md5=5fe776b23a711c9153ee94bc87e47334"
5 5
6inherit autotools pkgconfig 6inherit autotools pkgconfig
7 7
8SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz" 8SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz \
9 file://install-swig-interface-in-SWINGLIBDIR.patch \
10 "
9SRC_URI[md5sum] = "c6e736540145ca58cb3dcb42f91cf57b" 11SRC_URI[md5sum] = "c6e736540145ca58cb3dcb42f91cf57b"
10SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4" 12SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4"
11 13
12TARGET_CC_ARCH += "${LDFLAGS}" 14TARGET_CC_ARCH += "${LDFLAGS}"
13 15
14PR = "r1" 16PR = "r2"
15 17
16# autoreconf doesn't work well while reconfiguring included libreplace 18# autoreconf doesn't work well while reconfiguring included libreplace
17do_configure () { 19do_configure () {
@@ -19,9 +21,18 @@ do_configure () {
19 oe_runconf 21 oe_runconf
20} 22}
21 23
24do_install_prepend() {
25 # Hack the way swig interface for talloc is installed
26 # This hack is accompanied by install-swig-interface-in-SWINGLIBDIR.patch
27 type swig > /dev/null 2>&1 && SWIGLIBDIR=`swig -swiglib` && SWIGLIBDIR=${SWIGLIBDIR##${STAGING_DIR_NATIVE}} && export SWIGLIBDIR || echo "No swig found"
28}
29
22do_install_append() { 30do_install_append() {
23 install -d ${D}${libdir} 31 install -d ${D}${libdir}
24 ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0 32 ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0
25 ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2 33 ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2
26 ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so 34 ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so
27} 35}
36
37PACKAGES += "${PN}-swig"
38FILES_${PN}-swig += "${datadir}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-04 02:25:00 +0000