diff options
Diffstat (limited to 'meta-oe')
127 files changed, 0 insertions, 6641 deletions
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/fix-lib64-can-not-be-shiped-in-64bit-target.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/fix-lib64-can-not-be-shiped-in-64bit-target.patch deleted file mode 100644 index 676fa8a7a..000000000 --- a/meta-oe/recipes-benchmark/libhugetlbfs/files/fix-lib64-can-not-be-shiped-in-64bit-target.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [oe-core specific] | ||
2 | |||
3 | |||
4 | fix the below error: | ||
5 | ERROR: QA Issue: libhugetlbfs: Files/directories were installed but not shipped | ||
6 | /usr/lib64 | ||
7 | /usr/lib64/libhugetlbfs.so | ||
8 | /usr/lib64/libhugetlbfs.a | ||
9 | /usr/lib64/libhugetlbfs_privutils.so | ||
10 | /usr/lib64/perl5 | ||
11 | /usr/lib64/perl5/TLBC | ||
12 | /usr/lib64/perl5/TLBC/PerfCollect.pm | ||
13 | /usr/lib64/perl5/TLBC/Report.pm | ||
14 | /usr/lib64/perl5/TLBC/DataCollect.pm | ||
15 | /usr/lib64/perl5/TLBC/OpCollect.pm | ||
16 | $<50>ERROR: QA run found fatal errors. Please consider fixing them. | ||
17 | |||
18 | |||
19 | Signed-off-by: Guo Chunrong <B40290@freescale.com> | ||
20 | |||
21 | --- a/Makefile 2013-09-23 02:28:57.340566998 -0500 | ||
22 | +++ b/Makefile 2013-09-23 02:31:05.344569896 -0500 | ||
23 | @@ -33,7 +33,6 @@ | ||
24 | CPPFLAGS += -D__LIBHUGETLBFS__ -DPPC_NO_SEGMENTS | ||
25 | |||
26 | ARCH = $(shell uname -m | sed -e s/i.86/i386/) | ||
27 | -CC = gcc | ||
28 | |||
29 | CUSTOM_LDSCRIPTS = yes | ||
30 | |||
31 | @@ -59,9 +58,9 @@ | ||
32 | CUSTOM_LDSCRIPTS = no | ||
33 | else | ||
34 | ifeq ($(ARCH),aarch64) | ||
35 | -CC64 = gcc | ||
36 | +CC64 = $(CC) | ||
37 | ELF64 = aarch64elf | ||
38 | -TMPLIB64 = lib64 | ||
39 | +TMPLIB64 = lib | ||
40 | CUSTOM_LDSCRIPTS = no | ||
41 | else | ||
42 | ifeq ($(ARCH),i386) | ||
43 | @@ -72,7 +71,7 @@ | ||
44 | ifeq ($(ARCH),x86_64) | ||
45 | CC64 = $(CC) -m64 | ||
46 | ELF64 = elf_x86_64 | ||
47 | -TMPLIB64 = lib64 | ||
48 | +TMPLIB64 = lib | ||
49 | TMPLIB32 = lib | ||
50 | ifneq ($(BUILDTYPE),NATIVEONLY) | ||
51 | CC32 = $(CC) -m32 | ||
52 | @@ -172,11 +171,23 @@ | ||
53 | BINDIR = $(PREFIX)/share/libhugetlbfs | ||
54 | EXEDIR = $(PREFIX)/bin | ||
55 | DOCDIR = $(PREFIX)/share/doc/libhugetlbfs | ||
56 | + | ||
57 | ifdef CC32 | ||
58 | PMDIR = $(PREFIX)/lib/perl5/TLBC | ||
59 | +endif | ||
60 | + | ||
61 | +ifdef CC64 | ||
62 | +ifeq ($(ARCH),x86_64) | ||
63 | +PMDIR = $(PREFIX)/lib/perl5/TLBC | ||
64 | +else | ||
65 | +ifeq ($(ARCH),aarch64) | ||
66 | +PMDIR = $(PREFIX)/lib/perl5/TLBC | ||
67 | else | ||
68 | PMDIR = $(PREFIX)/lib64/perl5/TLBC | ||
69 | endif | ||
70 | +endif | ||
71 | +endif | ||
72 | + | ||
73 | MANDIR1 = $(PREFIX)/share/man/man1 | ||
74 | MANDIR3 = $(PREFIX)/share/man/man3 | ||
75 | MANDIR7 = $(PREFIX)/share/man/man7 | ||
diff --git a/meta-oe/recipes-benchmark/pmbw/pmbw_git.bb b/meta-oe/recipes-benchmark/pmbw/pmbw_git.bb deleted file mode 100644 index 8113da76d..000000000 --- a/meta-oe/recipes-benchmark/pmbw/pmbw_git.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | SUMMERY = "Parallel Memory Bandwidth Measurement / Benchmark" | ||
2 | DESCRIPTION = "\ | ||
3 | The tool pmbw is a set of assembler routines to measure the parallel memory \ | ||
4 | (cache and RAM) bandwidth of modern multi-core machines." | ||
5 | HOMEPAGE = "http://panthema.net/2013/pmbw/" | ||
6 | SECTION = "benchmark/tests" | ||
7 | AUTHOR = "Timo Bingmann" | ||
8 | LICENSE = "GPLv3" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
10 | |||
11 | SRC_URI = "git://github.com/bingmann/pmbw;protocol=https" | ||
12 | |||
13 | PV = "0.6.2+git${SRCPV}" | ||
14 | SRCREV = "4a3b37728060a8aba06fc83f157a1965088d79d6" | ||
15 | |||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | inherit autotools | ||
19 | |||
20 | # the hand coded asm uses r11, which therefore cannot be used for storing | ||
21 | # the frame pointer when debugging on arm | ||
22 | SELECTED_OPTIMIZATION_remove_arm = "-fno-omit-frame-pointer" | ||
23 | |||
24 | PACKAGES =+ "${PN}-stats2gnuplot" | ||
25 | |||
26 | FILES_${PN}-stats2gnuplot = "${bindir}/stats2gnuplot" | ||
27 | |||
28 | RRECOMMENDS_${PN} = "${PN}-stats2gnuplot" | ||
29 | |||
30 | PNBLACKLIST[pmbw] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130568/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch deleted file mode 100644 index 0c77f1a20..000000000 --- a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Upstream-Status: Pending [package obsolete/not maintained by upstream] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd bluez-hcidump-2.5/configure.ac bluez-hcidump-2.5/configure.ac | ||
5 | --- bluez-hcidump-2.5/configure.ac 2012-11-30 10:29:41.000000000 +0200 | ||
6 | +++ bluez-hcidump-2.5/configure.ac 2013-01-12 10:02:10.609511463 +0200 | ||
7 | @@ -2,7 +2,7 @@ | ||
8 | AC_INIT(bluez-hcidump, 2.5) | ||
9 | |||
10 | AM_INIT_AUTOMAKE([foreign subdir-objects]) | ||
11 | -AM_CONFIG_HEADER(config.h) | ||
12 | +AC_CONFIG_HEADERS(config.h) | ||
13 | |||
14 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4.inc b/meta-oe/recipes-connectivity/bluez/bluez4.inc deleted file mode 100644 index 5240ccfd8..000000000 --- a/meta-oe/recipes-connectivity/bluez/bluez4.inc +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | SUMMARY = "Linux Bluetooth Stack Userland V4" | ||
2 | DESCRIPTION = "Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries." | ||
3 | HOMEPAGE = "http://www.bluez.org" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "GPLv2+ & LGPLv2.1+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | ||
7 | file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ | ||
8 | file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ | ||
9 | file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" | ||
10 | |||
11 | RPROVIDES_${PN} += "${PN}-systemd" | ||
12 | RREPLACES_${PN} += "${PN}-systemd" | ||
13 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
14 | |||
15 | DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1" | ||
16 | RDEPENDS_${PN}-dev = "bluez-hcidump" | ||
17 | |||
18 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pie systemd', d)}" | ||
19 | PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" | ||
20 | PACKAGECONFIG[pie] = "--enable-pie,--disable-pie," | ||
21 | PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" | ||
22 | |||
23 | ASNEEDED = "" | ||
24 | |||
25 | SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz" | ||
26 | S = "${WORKDIR}/bluez-${PV}" | ||
27 | |||
28 | inherit autotools-brokensep pkgconfig systemd | ||
29 | |||
30 | EXTRA_OECONF = "\ | ||
31 | --disable-gstreamer \ | ||
32 | --enable-usb \ | ||
33 | --enable-tools \ | ||
34 | --enable-bccmd \ | ||
35 | --enable-hid2hci \ | ||
36 | --enable-dfutool \ | ||
37 | --disable-hidd \ | ||
38 | --disable-pand \ | ||
39 | --disable-dund \ | ||
40 | --disable-cups \ | ||
41 | --enable-test \ | ||
42 | --enable-datafiles \ | ||
43 | --with-udevdir=`pkg-config --variable=udevdir udev` \ | ||
44 | --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \ | ||
45 | " | ||
46 | |||
47 | EXCLUDE_FROM_WORLD = "1" | ||
diff --git a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb deleted file mode 100644 index b6098d84a..000000000 --- a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | SUMMARY = "Cellphone tools and driver software" | ||
2 | SECTION = "console/network" | ||
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | ||
5 | |||
6 | SRC_URI = "http://www.gnokii.org/download/gnokii/gnokii-${PV}.tar.bz2" | ||
7 | |||
8 | DEPENDS = "glib-2.0 intltool-native" | ||
9 | X11DEPENDS = " libxpm gtk+" | ||
10 | |||
11 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | ||
12 | PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" | ||
13 | PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical" | ||
14 | PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite" | ||
15 | PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" | ||
16 | PACKAGECONFIG[usb] = "--enable-libusb,--disable-libusb,virtual/libusb0" | ||
17 | PACKAGECONFIG[x11] = ",--without-x,${X11DEPENDS}" | ||
18 | |||
19 | inherit autotools pkgconfig | ||
20 | |||
21 | PACKAGES += "libgnokii libgnokii-dev" | ||
22 | |||
23 | EXTRA_OECONF = "--disable-smsd" | ||
24 | |||
25 | FILES_${PN} = "${bindir} ${sbindir}" | ||
26 | FILES_libgnokii-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ | ||
27 | ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ | ||
28 | /lib/*.a /lib/*.o ${datadir}/aclocal \ | ||
29 | " | ||
30 | FILES_${PN}-dev = "" | ||
31 | FILES_libgnokii = "${libdir}/libgnokii.so.*" | ||
32 | |||
33 | SRC_URI[md5sum] = "d9627f4a1152d3ea7806df4532850d5f" | ||
34 | SRC_URI[sha256sum] = "8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501" | ||
35 | |||
36 | PNBLACKLIST[gnokii] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130662/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-connectivity/soft66/files/fix-ar.patch b/meta-oe/recipes-connectivity/soft66/files/fix-ar.patch deleted file mode 100644 index bf1ffdfc6..000000000 --- a/meta-oe/recipes-connectivity/soft66/files/fix-ar.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | --- | ||
2 | configure.ac | 1 + | ||
3 | 1 file changed, 1 insertion(+) | ||
4 | |||
5 | --- git.orig/configure.ac | ||
6 | +++ git/configure.ac | ||
7 | @@ -7,5 +7,6 @@ AC_PROG_CC | ||
8 | AC_CONFIG_HEADERS([config.h]) | ||
9 | AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile]) | ||
10 | PKG_CHECK_MODULES([FTDI], [libftdi >= 0.13]) | ||
11 | AC_OUTPUT | ||
12 | AM_PROG_CC_C_O | ||
13 | +AM_PROG_AR | ||
diff --git a/meta-oe/recipes-connectivity/soft66/soft66_git.bb b/meta-oe/recipes-connectivity/soft66/soft66_git.bb deleted file mode 100644 index 816f58350..000000000 --- a/meta-oe/recipes-connectivity/soft66/soft66_git.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | SUMMARY = "Library and tools for Soft66ADD and related SDR radio receivers" | ||
2 | LICENSE = "GPLv3 & LGPLv3+" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ | ||
4 | file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 " | ||
5 | |||
6 | PNBLACKLIST[soft66] ?= "BROKEN: depends on broken libftdi - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
7 | |||
8 | DEPENDS = "libftdi" | ||
9 | |||
10 | PV = "0.1.3+gitr${SRCPV}" | ||
11 | PR = "r1" | ||
12 | |||
13 | SRCREV = "a1dab25e73896c90c98227ac8055f227b830d512" | ||
14 | SRC_URI = "git://home.horsten.com/soft66 \ | ||
15 | file://fix-ar.patch" | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | inherit autotools pkgconfig | ||
20 | |||
diff --git a/meta-oe/recipes-connectivity/telepathy/libtelepathy/doublefix.patch b/meta-oe/recipes-connectivity/telepathy/libtelepathy/doublefix.patch deleted file mode 100644 index a7737fbf0..000000000 --- a/meta-oe/recipes-connectivity/telepathy/libtelepathy/doublefix.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Fix double reference to this file to work with recent autoconf+automake | ||
2 | |||
3 | RP 1/2/10 | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | Index: libtelepathy-0.3.3/src/Makefile.am | ||
8 | =================================================================== | ||
9 | --- libtelepathy-0.3.3.orig/src/Makefile.am 2010-02-01 13:13:50.869038984 +0000 | ||
10 | +++ libtelepathy-0.3.3/src/Makefile.am 2010-02-01 13:14:23.267789456 +0000 | ||
11 | @@ -27,7 +27,6 @@ | ||
12 | tp-chan-type-text-gen.h \ | ||
13 | tp-chan-type-tubes-gen.h \ | ||
14 | tp-conn-iface-aliasing-gen.h \ | ||
15 | - tp-conn-iface-avatars-gen.h \ | ||
16 | tp-conn-iface-capabilities-gen.h \ | ||
17 | tp-conn-iface-contact-info-gen.h \ | ||
18 | tp-conn-iface-forwarding-gen.h \ | ||
diff --git a/meta-oe/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch b/meta-oe/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch deleted file mode 100644 index 37679ab76..000000000 --- a/meta-oe/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: libtelepathy-0.3.1/configure.ac | ||
4 | =================================================================== | ||
5 | --- libtelepathy-0.3.1.orig/configure.ac 2007-11-22 19:05:56.000000000 +0000 | ||
6 | +++ libtelepathy-0.3.1/configure.ac 2008-01-04 12:07:28.000000000 +0000 | ||
7 | @@ -51,7 +51,7 @@ | ||
8 | AC_MSG_ERROR([xsltproc (from the libxslt source package) is required]) | ||
9 | fi | ||
10 | |||
11 | -AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python]) | ||
12 | +AC_CHECK_PROGS([PYTHON], [python2.5 python2.4 python2.3 python]) | ||
13 | if test -z "$PYTHON"; then | ||
14 | AC_MSG_ERROR([Python is required to compile this package]) | ||
15 | fi | ||
diff --git a/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb b/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb deleted file mode 100644 index 783bd5d73..000000000 --- a/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | SUMMARY = "Telepathy framework" | ||
2 | DESCRIPTION = "Telepathy is a D-Bus framework for unifying real time \ | ||
3 | communication, including instant messaging, voice calls and video calls. It \ | ||
4 | abstracts differences between protocols to provide a unified interface for \ | ||
5 | applications." | ||
6 | HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" | ||
7 | DEPENDS = "glib-2.0 dbus dbus-glib telepathy-glib libxslt-native" | ||
8 | LICENSE = "LGPLv2.1+" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | ||
10 | file://src/tp-conn.c;beginline=1;endline=19;md5=4c58069f77d601cc59200bce5396c7cb" | ||
11 | PR = "r5" | ||
12 | |||
13 | SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \ | ||
14 | file://prefer_python_2.5.patch \ | ||
15 | file://doublefix.patch \ | ||
16 | " | ||
17 | |||
18 | SRC_URI[md5sum] = "490ca1a0c614d4466394b72d43bf7370" | ||
19 | SRC_URI[sha256sum] = "e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed115878" | ||
20 | |||
21 | inherit autotools pkgconfig pythonnative | ||
22 | |||
23 | FILES_${PN} += "${datadir}/telepathy \ | ||
24 | ${datadir}/dbus-1" | ||
25 | |||
26 | PNBLACKLIST[libtelepathy] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130609/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch b/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch deleted file mode 100644 index ece1da6bc..000000000 --- a/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | From: Robert Yang <liezhi.yang@windriver.com> | ||
2 | Date: Sun, 22 Sep 2013 23:21:01 -0400 | ||
3 | Subject: [PATCH] src/Makefile.am: fix race issue for _gen/gtypes.h and _gen/gtypes-body.h | ||
4 | |||
5 | There might be an error when parallel build: | ||
6 | |||
7 | [snip] | ||
8 | Traceback (most recent call last): | ||
9 | File "/path/to/tools/glib-gtypes-generator.py", line 304, in <module> | ||
10 | GTypesGenerator(dom, argv[1], argv[2])() | ||
11 | File "/path/to/tools/glib-gtypes-generator.py", line 295, in __call__ | ||
12 | file_set_contents(self.output + '.h', ''.join(self.header)) | ||
13 | File "/path/to/tools/libtpcodegen.py", line 42, in file_set_contents | ||
14 | os.rename(filename + '.tmp', filename) | ||
15 | OSError: [Errno 2] No such file or directory | ||
16 | [snip] | ||
17 | |||
18 | This is a race issue, the _gen/gtypes.h and _gen/gtypes-body.h may | ||
19 | write(remove/rename) _gen/gtypes.tmp at the same time, then there would | ||
20 | be the error. | ||
21 | |||
22 | There was a similar bug in telepathy-glib which was already fixed, we use the | ||
23 | similar patch to fix it. | ||
24 | |||
25 | Upstream-Status: Pending | ||
26 | |||
27 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
28 | --- | ||
29 | src/Makefile.am | 18 +++++++++++++++--- | ||
30 | 1 file changed, 15 insertions(+), 3 deletions(-) | ||
31 | |||
32 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
33 | --- a/src/Makefile.am | ||
34 | +++ b/src/Makefile.am | ||
35 | @@ -288,7 +288,11 @@ _gen/interfaces-body.h: _gen/mcd.xml \ | ||
36 | $(tools_dir)/glib-interfaces-body-generator.xsl \ | ||
37 | $< > $@ | ||
38 | |||
39 | -_gen/gtypes.h _gen/gtypes-body.h: _gen/mcd.xml \ | ||
40 | +# do nothing, output as a side-effect | ||
41 | +_gen/gtypes.h: _gen/gtypes-body.h | ||
42 | + @: | ||
43 | + | ||
44 | +_gen/gtypes-body.h: _gen/mcd.xml \ | ||
45 | $(top_srcdir)/tools/glib-gtypes-generator.py | ||
46 | $(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \ | ||
47 | $< _gen/gtypes mc | ||
48 | @@ -309,7 +313,11 @@ _gen/%.xml: %.xml $(wildcard $(top_srcdir)/xml/*.xml) Makefile.am | ||
49 | $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ | ||
50 | $< > $@ | ||
51 | |||
52 | -_gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \ | ||
53 | +# do nothing, output as a side-effect | ||
54 | +_gen/cli-%.h: _gen/cli-%-body.h | ||
55 | + @: | ||
56 | + | ||
57 | +_gen/cli-%-body.h: _gen/%.xml \ | ||
58 | $(tools_dir)/glib-client-gen.py Makefile.am | ||
59 | $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \ | ||
60 | --group=`echo $* | tr x- x_` \ | ||
61 | @@ -317,7 +325,11 @@ _gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \ | ||
62 | --tp-proxy-api=0.7.6 \ | ||
63 | $< Mc_Cli _gen/cli-$* | ||
64 | |||
65 | -_gen/svc-%.c _gen/svc-%.h: _gen/%.xml \ | ||
66 | +# do nothing, output as a side-effect | ||
67 | +_gen/svc-%.h: _gen/svc-%.c | ||
68 | + @: | ||
69 | + | ||
70 | +_gen/svc-%.c: _gen/%.xml \ | ||
71 | $(tools_dir)/glib-ginterface-gen.py Makefile.am | ||
72 | $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ | ||
73 | --filename=_gen/svc-$* \ | ||
74 | -- | ||
75 | 1.7.10.4 | ||
76 | |||
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb deleted file mode 100644 index 6a4d5d006..000000000 --- a/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | SUMMARY = "Central control for Telepathy IM connection managers" | ||
2 | HOMEPAGE = "http://telepathy.freedesktop.org/wiki/Mission_Control/" | ||
3 | LICENSE = "LGPLv2.1+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ | ||
5 | file://src/request.h;beginline=1;endline=21;md5=f80534d9af1c33291b3b79609f196eb2" | ||
6 | SECTION = "libs" | ||
7 | DEPENDS = "libtelepathy dbus-glib gconf libxslt-native" | ||
8 | |||
9 | SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-mission-control/${BP}.tar.gz \ | ||
10 | file://tmc-Makefile-fix-race.patch \ | ||
11 | " | ||
12 | SRC_URI[md5sum] = "421115a35b9e427807326877f86e7f43" | ||
13 | SRC_URI[sha256sum] = "14ceb7d53535b43d44b8271ad11319d1d0fe6d193d154636b9e62b42799b9723" | ||
14 | |||
15 | inherit autotools-brokensep pkgconfig pythonnative | ||
16 | |||
17 | PACKAGECONFIG ??= "" | ||
18 | PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,upower" | ||
19 | |||
20 | # to select connman or nm you need to use "connectivity" and "connman" or "nm", default is to disable both | ||
21 | PACKAGECONFIG[connectivity] = ",--with-connectivity=no" | ||
22 | PACKAGECONFIG[connman] = "--with-connectivity=connman,,connman" | ||
23 | PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager" | ||
24 | |||
25 | PACKAGES =+ " \ | ||
26 | libmissioncontrol \ | ||
27 | libmissioncontrol-config \ | ||
28 | libmissioncontrol-server \ | ||
29 | libmissioncontrol-dev \ | ||
30 | libmissioncontrol-config-dev \ | ||
31 | libmissioncontrol-server-dev \ | ||
32 | libmissioncontrol-dbg \ | ||
33 | libmissioncontrol-config-dbg \ | ||
34 | libmissioncontrol-server-dbg \ | ||
35 | " | ||
36 | |||
37 | FILES_${PN} += "${datadir}/dbus* ${datadir}/glib-2.0/schemas" | ||
38 | |||
39 | FILES_libmissioncontrol = "${libdir}/libmissioncontrol.so.*" | ||
40 | FILES_libmissioncontrol-config = "${libdir}/libmissioncontrol-config.so.*" | ||
41 | FILES_libmissioncontrol-server = "${libdir}/libmissioncontrol-server.so.*" | ||
42 | |||
43 | FILES_libmissioncontrol-dev = "${libdir}/libmissioncontrol.* \ | ||
44 | ${includedir}/libmissioncontrol/ \ | ||
45 | ${libdir}/pkgconfig/libmissioncontrol.pc" | ||
46 | FILES_libmissioncontrol-config-dev = "${libdir}/libmissioncontrol-config.*" | ||
47 | FILES_libmissioncontrol-server-dev = "${libdir}/libmissioncontrol-server.*" | ||
48 | |||
49 | FILES_libmissioncontrol-dbg = "${libdir}/.debug/libmissioncontrol.so.*" | ||
50 | FILES_libmissioncontrol-config-dbg = "${libdir}/.debug/libmissioncontrol-config.so.*" | ||
51 | FILES_libmissioncontrol-server-dbg = "${libdir}/.debug/libmissioncontrol-server.so.*" | ||
52 | |||
53 | PNBLACKLIST[telepathy-mission-control] ?= "Depends on blacklisted libtelepathy - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice-3.5.1/0002-Modify-Makefile-for-cross-compile.patch b/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice-3.5.1/0002-Modify-Makefile-for-cross-compile.patch deleted file mode 100644 index 43096d2bc..000000000 --- a/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice-3.5.1/0002-Modify-Makefile-for-cross-compile.patch +++ /dev/null | |||
@@ -1,292 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate | ||
2 | |||
3 | This patch lets you build Ice with OpenEmbedded. I doubt you could do | ||
4 | a regular build after applying this patch. | ||
5 | |||
6 | From bc622ce74fa03a935278d21736a5a251466e1798 Mon Sep 17 00:00:00 2001 | ||
7 | From: Tom Rondeau <tom@trondeau.com> | ||
8 | Date: Wed, 16 Apr 2014 14:34:51 -0400 | ||
9 | Subject: [PATCH] Modify Makefiles for cross compile | ||
10 | |||
11 | --- | ||
12 | config/Make.common.rules | 20 +++++++------ | ||
13 | cpp/Makefile | 9 +++--- | ||
14 | cpp/config/Make.rules | 32 ++++++++++++-------- | ||
15 | cpp/config/Make.rules.Linux | 18 ++--------- | ||
16 | cpp/src/IceStorm/FreezeDB/Makefile | 2 +- | ||
17 | py/config/Make.rules | 58 +++++++++++++++++++----------------- | ||
18 | 6 files changed, 70 insertions(+), 69 deletions(-) | ||
19 | |||
20 | diff --git a/config/Make.common.rules b/config/Make.common.rules | ||
21 | index d7b1d59..a3fb17e 100644 | ||
22 | --- a/config/Make.common.rules | ||
23 | +++ b/config/Make.common.rules | ||
24 | @@ -65,9 +65,9 @@ ifeq ($(UNAME),Linux) | ||
25 | # | ||
26 | # Some Linux distributions like Debian/Ubuntu don't use /usr/lib64. | ||
27 | # | ||
28 | - ifeq ($(shell test -d /usr/lib64 && echo 0),0) | ||
29 | - lp64suffix = 64 | ||
30 | - endif | ||
31 | + #ifeq ($(shell test -d /usr/lib64 && echo 0),0) | ||
32 | + # lp64suffix = 64 | ||
33 | + #endif | ||
34 | ifeq ($(LP64),) | ||
35 | LP64 = yes | ||
36 | endif | ||
37 | @@ -244,12 +244,13 @@ else | ||
38 | slicedir = $(ice_dir)/slice | ||
39 | endif | ||
40 | |||
41 | -ifeq ($(prefix), /usr) | ||
42 | - install_slicedir = /usr/share/Ice-$(VERSION)/slice | ||
43 | -else | ||
44 | - install_slicedir = $(prefix)/slice | ||
45 | -endif | ||
46 | +#ifeq ($(prefix), /usr) | ||
47 | +# install_slicedir = /usr/share/Ice-$(VERSION)/slice | ||
48 | +#else | ||
49 | +# install_slicedir = $(prefix)/slice | ||
50 | +#endif | ||
51 | |||
52 | +install_slicedir = $(prefix)/slice | ||
53 | # | ||
54 | # Set environment variables for the Slice translator. | ||
55 | # | ||
56 | @@ -265,7 +266,8 @@ ifneq ($(ice_dir), /usr) | ||
57 | endif | ||
58 | |||
59 | ifeq ($(UNAME),Linux) | ||
60 | - export LD_LIBRARY_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH) | ||
61 | + #export LD_LIBRARY_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH) | ||
62 | + export LD_LIBRARY_PATH := $(ICE_HOME)/lib:$(LD_LIBRARY_PATH) | ||
63 | endif | ||
64 | |||
65 | ifeq ($(UNAME),SunOS) | ||
66 | diff --git a/cpp/Makefile b/cpp/Makefile | ||
67 | index a68f113..1f44f57 100644 | ||
68 | --- a/cpp/Makefile | ||
69 | +++ b/cpp/Makefile | ||
70 | @@ -11,11 +11,12 @@ top_srcdir = . | ||
71 | |||
72 | include $(top_srcdir)/config/Make.rules | ||
73 | |||
74 | -SUBDIRS = config src include test | ||
75 | +#SUBDIRS = config src include test | ||
76 | +SUBDIRS = config src include | ||
77 | |||
78 | -ifeq ($(shell uname | grep MINGW),) | ||
79 | -SUBDIRS := $(SUBDIRS) demo | ||
80 | -endif | ||
81 | +#ifeq ($(shell uname | grep MINGW),) | ||
82 | +#SUBDIRS := $(SUBDIRS) demo | ||
83 | +#endif | ||
84 | |||
85 | INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) \ | ||
86 | $(install_configdir) $(install_mandir) | ||
87 | diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules | ||
88 | index 37461ae..197c5e8 100644 | ||
89 | --- a/cpp/config/Make.rules | ||
90 | +++ b/cpp/config/Make.rules | ||
91 | @@ -175,11 +175,12 @@ headerdir = $(top_srcdir)/include | ||
92 | # includedir is not handled the same as bindir and libdir | ||
93 | # because it is used in the .depend files | ||
94 | # | ||
95 | -ifdef ice_src_dist | ||
96 | - includedir = $(top_srcdir)/include | ||
97 | -else | ||
98 | - includedir = $(ice_dir)/include | ||
99 | -endif | ||
100 | +#ifdef ice_src_dist | ||
101 | +# includedir = $(top_srcdir)/include | ||
102 | +#else | ||
103 | +# includedir = $(ice_dir)/include | ||
104 | +#endif | ||
105 | +includedir = $(top_srcdir)/include | ||
106 | |||
107 | # | ||
108 | # Platform specific definitions | ||
109 | @@ -277,14 +278,17 @@ ICECPPFLAGS = -I$(slicedir) | ||
110 | SLICE2CPPFLAGS = $(ICECPPFLAGS) | ||
111 | |||
112 | ifeq ($(ice_dir), /usr) | ||
113 | - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) | ||
114 | + LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS) | ||
115 | else | ||
116 | CPPFLAGS += -I$(includedir) | ||
117 | - ifdef ice_src_dist | ||
118 | - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) | ||
119 | - else | ||
120 | - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11suffix) | ||
121 | - endif | ||
122 | +# We must always build using the libraries in the source tree, the host's are obviously | ||
123 | +# not what we want for the target | ||
124 | + LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) $(call rpathlink,$(libdir)) | ||
125 | +# ifdef ice_src_dist | ||
126 | +# LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) | ||
127 | +# else | ||
128 | +# LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11suffix) | ||
129 | +# endif | ||
130 | endif | ||
131 | |||
132 | ifeq ($(FLEX_NOLINE),yes) | ||
133 | @@ -313,8 +317,10 @@ endif | ||
134 | |||
135 | ifdef ice_src_dist | ||
136 | SLICEPARSERLIB = $(libdir)/$(call mklibfilename,Slice,$(VERSION)) | ||
137 | - SLICE2CPP = $(bindir)/slice2cpp | ||
138 | - SLICE2FREEZE = $(bindir)/slice2freeze | ||
139 | +# SLICE2CPP = $(bindir)/slice2cpp | ||
140 | +# SLICE2FREEZE = $(bindir)/slice2freeze | ||
141 | + SLICE2CPP = $(ICE_HOME)/bin/slice2cpp | ||
142 | + SLICE2FREEZE = $(ICE_HOME)/bin/slice2freeze | ||
143 | else | ||
144 | SLICEPARSERLIB = $(ice_dir)/$(libsubdir)$(cpp11suffix)/$(call mklibfilename,Slice,$(VERSION)) | ||
145 | SLICE2CPP = $(ice_dir)/$(binsubdir)$(cpp11suffix)/slice2cpp | ||
146 | diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux | ||
147 | index 5d5717c..8363c6e 100644 | ||
148 | --- a/cpp/config/Make.rules.Linux | ||
149 | +++ b/cpp/config/Make.rules.Linux | ||
150 | @@ -31,7 +31,7 @@ ifeq ($(CXX),c++) | ||
151 | CXX = g++ | ||
152 | endif | ||
153 | |||
154 | -ifeq ($(CXX),g++) | ||
155 | +#ifeq ($(CXX),g++) | ||
156 | |||
157 | ifneq ($(SUSE_i586),) | ||
158 | CXXARCHFLAGS += -march=i586 | ||
159 | @@ -71,14 +71,6 @@ ifeq ($(CXX),g++) | ||
160 | CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED | ||
161 | endif | ||
162 | |||
163 | - ifeq ($(MACHINE),x86_64) | ||
164 | - ifeq ($(LP64),yes) | ||
165 | - CXXARCHFLAGS += -m64 | ||
166 | - else | ||
167 | - CXXARCHFLAGS += -m32 | ||
168 | - endif | ||
169 | - endif | ||
170 | - | ||
171 | CXXFLAGS = $(CXXARCHFLAGS) -Wall -Werror -pthread | ||
172 | |||
173 | ifneq ($(GENPIC),no) | ||
174 | @@ -102,15 +94,11 @@ ifeq ($(CXX),g++) | ||
175 | |||
176 | rpathlink = -Wl,-rpath-link,$(1) | ||
177 | |||
178 | - ifneq ($(embedded_runpath_prefix),) | ||
179 | - LDPLATFORMFLAGS = -Wl,--enable-new-dtags -Wl,-rpath,$(runpath_libdir) | ||
180 | - else | ||
181 | - LDPLATFORMFLAGS = -Wl,--enable-new-dtags | ||
182 | - endif | ||
183 | + LDPLATFORMFLAGS = -Wl,--enable-new-dtags -Wl,-rpath,../../../lib | ||
184 | |||
185 | LDPLATFORMFLAGS += -rdynamic | ||
186 | |||
187 | -endif | ||
188 | +#endif | ||
189 | |||
190 | ifeq ($(CXX),icpc) | ||
191 | $(warning ===================================================================) | ||
192 | diff --git a/cpp/src/IceStorm/FreezeDB/Makefile b/cpp/src/IceStorm/FreezeDB/Makefile | ||
193 | index 7c844b7..cf15cb1 100644 | ||
194 | --- a/cpp/src/IceStorm/FreezeDB/Makefile | ||
195 | +++ b/cpp/src/IceStorm/FreezeDB/Makefile | ||
196 | @@ -66,7 +66,7 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) | ||
197 | |||
198 | $(MIGRATE): $(MOBJS) | ||
199 | rm -f $@ | ||
200 | - $(CXX) $(LDFLAGS) -o $@ $(MOBJS) $(DB_RPATH_LINK) -lIceStormService -lIceStorm -lFreeze $(LIBS) | ||
201 | + $(CXX) $(LDFLAGS) -o $@ $(MOBJS) $(DB_RPATH_LINK) -lIceStormService -lIceStorm -lFreeze $(LIBS) -ldb_cxx | ||
202 | |||
203 | # The slice2freeze rules are structured like this to avoid issues with | ||
204 | # parallel make. | ||
205 | diff --git a/py/config/Make.rules b/py/config/Make.rules | ||
206 | index 43ce01b..1349342 100644 | ||
207 | --- a/py/config/Make.rules | ||
208 | +++ b/py/config/Make.rules | ||
209 | @@ -92,21 +92,23 @@ ifeq ($(shell test -f $(top_srcdir)/config/Make.rules.$(UNAME) && echo 0),0) | ||
210 | include $(top_srcdir)/config/Make.rules.$(UNAME) | ||
211 | else | ||
212 | include $(top_srcdir)/../cpp/config/Make.rules.$(UNAME) | ||
213 | -endif | ||
214 | +endif | ||
215 | |||
216 | libdir = $(top_srcdir)/python | ||
217 | -ifneq ($(prefix), /usr) | ||
218 | -install_pythondir = $(prefix)/python | ||
219 | -install_libdir = $(prefix)/python | ||
220 | -else | ||
221 | - ifeq ($(shell test -d $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages && echo 0),0) | ||
222 | - install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages | ||
223 | - install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages | ||
224 | - else | ||
225 | - install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages | ||
226 | - install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages | ||
227 | - endif | ||
228 | -endif | ||
229 | +#ifneq ($(prefix), /usr) | ||
230 | +#install_pythondir = $(prefix)/python | ||
231 | +#install_libdir = $(prefix)/python | ||
232 | +#else | ||
233 | +# ifeq ($(shell test -d $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages && echo 0),0) | ||
234 | +# install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages | ||
235 | +# install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages | ||
236 | +# else | ||
237 | +# install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages | ||
238 | +# install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages | ||
239 | +# endif | ||
240 | +#endif | ||
241 | +install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages | ||
242 | +install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages | ||
243 | |||
244 | ifeq ($(UNAME),SunOS) | ||
245 | ifeq ($(LP64),yes) | ||
246 | @@ -115,19 +117,21 @@ ifeq ($(UNAME),SunOS) | ||
247 | endif | ||
248 | endif | ||
249 | |||
250 | -ifdef ice_src_dist | ||
251 | - ifeq ($(ice_cpp_dir), $(ice_dir)/cpp) | ||
252 | - ICE_LIB_DIR = -L$(ice_cpp_dir)/lib | ||
253 | - else | ||
254 | - ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir) | ||
255 | - endif | ||
256 | - ICE_LIB_DIR = -L$(ice_cpp_dir)/lib | ||
257 | - ICE_FLAGS = -I$(ice_cpp_dir)/include | ||
258 | -endif | ||
259 | -ifdef ice_bin_dist | ||
260 | - ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir) | ||
261 | - ICE_FLAGS = -I$(ice_dir)/include | ||
262 | -endif | ||
263 | +#ifdef ice_src_dist | ||
264 | +# ifeq ($(ice_cpp_dir), $(ice_dir)/cpp) | ||
265 | +# ICE_LIB_DIR = -L$(ice_cpp_dir)/lib | ||
266 | +# else | ||
267 | +# ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir) | ||
268 | +# endif | ||
269 | +# ICE_LIB_DIR = -L$(ice_cpp_dir)/lib | ||
270 | +# ICE_FLAGS = -I$(ice_cpp_dir)/include | ||
271 | +#endif | ||
272 | +#ifdef ice_bin_dist | ||
273 | +# ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir) | ||
274 | +# ICE_FLAGS = -I$(ice_dir)/include | ||
275 | +#endif | ||
276 | +ICE_LIB_DIR = -L$(top_srcdir)/../cpp/lib | ||
277 | +ICE_FLAGS = -I$(ice_cpp_dir)/include | ||
278 | ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil | ||
279 | |||
280 | ifneq ($(embedded_runpath_prefix),) | ||
281 | @@ -137,7 +141,7 @@ endif | ||
282 | CPPFLAGS = | ||
283 | ICECPPFLAGS = -I$(slicedir) | ||
284 | SLICE2PYFLAGS = $(ICECPPFLAGS) | ||
285 | -LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) | ||
286 | +LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) | ||
287 | |||
288 | ifdef ice_src_dist | ||
289 | ifeq ($(ice_cpp_dir), $(ice_dir)/cpp) | ||
290 | -- | ||
291 | 1.7.9.5 | ||
292 | |||
diff --git a/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb b/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb deleted file mode 100644 index 7c833b0eb..000000000 --- a/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | DESCRIPTION = "The Internet Communications Engine" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://ICE_LICENSE;md5=3dc3037023cc2ae6b2c5b995da529515" | ||
4 | DEPENDS = "bzip2 expat openssl python db mcpp" | ||
5 | DEPENDS_prepend_class-target = "zeroc-ice-native " | ||
6 | |||
7 | SRC_URI = "http://www.zeroc.com/download/Ice/3.5/Ice-${PV}.tar.gz \ | ||
8 | file://0002-Modify-Makefile-for-cross-compile.patch \ | ||
9 | " | ||
10 | SRC_URI[md5sum] = "f00c59983cc904bca977133c0a9b3e80" | ||
11 | SRC_URI[sha256sum] = "989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392" | ||
12 | |||
13 | #| MapDb.cpp: In constructor 'Freeze::MapDb::MapDb(const ConnectionIPtr&, const string&, const string&, const string&, const KeyCompareBasePtr&, const std::vector<IceUtil::Handle<Freeze::MapIndexBase> >&, bool)': | ||
14 | #| MapDb.cpp:138:46: error: call of overloaded 'set_bt_compare(int (*)(DB*, const DBT*, const DBT*))' is ambiguous | ||
15 | #| MapDb.cpp:138:46: note: candidates are: | ||
16 | #| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:272:14: note: virtual int Db::set_bt_compare(bt_compare_fcn_type) <near match> | ||
17 | #| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:272:14: note: no known conversion for argument 1 from 'int (*)(DB*, const DBT*, const DBT*) {aka int (*)(__db*, const __db_dbt*, const __db_dbt*)}' to 'bt_compare_fcn_type {aka int (*)(__db*, const __db_dbt*, const __db_dbt*, long unsigned int*)}' | ||
18 | #| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:273:14: note: virtual int Db::set_bt_compare(int (*)(Db*, const Dbt*, const Dbt*, size_t*)) <near match> | ||
19 | #| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:273:14: note: no known conversion for argument 1 from 'int (*)(DB*, const DBT*, const DBT*) {aka int (*)(__db*, const __db_dbt*, const __db_dbt*)}' to 'int (*)(Db*, const Dbt*, const Dbt*, size_t*) {aka int (*)(Db*, const Dbt*, const Dbt*, long unsigned int*)}' | ||
20 | #| make[3]: *** [MapDb.o] Error 1 | ||
21 | PNBLACKLIST[zeroc-ice] ?= "BROKEN: not compatible with default db version - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
22 | |||
23 | S = "${WORKDIR}/Ice-${PV}" | ||
24 | |||
25 | inherit python-dir pkgconfig | ||
26 | |||
27 | export PYTHON_VERSION = "python2.7" | ||
28 | |||
29 | do_configure() { | ||
30 | : | ||
31 | } | ||
32 | |||
33 | do_compile_prepend_class-target () { | ||
34 | export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}" | ||
35 | export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}" | ||
36 | export ICE_HOME="${STAGING_DIR_NATIVE}/usr" | ||
37 | } | ||
38 | |||
39 | do_compile_prepend_class-nativesdk () { | ||
40 | export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}" | ||
41 | export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}" | ||
42 | export ICE_HOME="${STAGING_DIR_NATIVE}/usr" | ||
43 | } | ||
44 | |||
45 | do_compile_prepend_class-native () { | ||
46 | export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}" | ||
47 | export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}" | ||
48 | export ICE_HOME="${S}/cpp" | ||
49 | } | ||
50 | |||
51 | do_compile() { | ||
52 | oe_runmake -C ${S} cpp | ||
53 | oe_runmake -C ${S} py | ||
54 | } | ||
55 | |||
56 | do_install_prepend_class-target () { | ||
57 | export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}" | ||
58 | export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}" | ||
59 | export ICE_HOME="${STAGING_DIR_NATIVE}/usr" | ||
60 | } | ||
61 | |||
62 | do_install_prepend_class-nativesdk () { | ||
63 | export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}" | ||
64 | export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}" | ||
65 | export ICE_HOME="${STAGING_DIR_NATIVE}/usr" | ||
66 | } | ||
67 | |||
68 | do_install_prepend_class-native () { | ||
69 | export ICE_HOME="${S}/cpp" | ||
70 | } | ||
71 | |||
72 | do_install() { | ||
73 | oe_runmake -C ${S}/cpp prefix=${D}${prefix} install install-common | ||
74 | oe_runmake -C ${S}/py prefix=${D}${prefix} install | ||
75 | } | ||
76 | |||
77 | PACKAGES += "${PN}-python ${PN}-python-dev ${PN}-python-dbg" | ||
78 | |||
79 | FILES_${PN}-doc += "${prefix}/man/man1" | ||
80 | FILES_${PN} += "${prefix}/*LICENSE ${libdir}/ImportKey.class ${prefix}/RELEASE_NOTES ${prefix}/CHANGES" | ||
81 | FILES_${PN}-dev += "${includedir} ${prefix}/slice ${prefix}/config" | ||
82 | FILES_${PN}-python-dev = "${PYTHON_SITEPACKAGES_DIR}/IcePy.so" | ||
83 | FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.py ${PYTHON_SITEPACKAGES_DIR}/IcePy.so.* ${PYTHON_SITEPACKAGES_DIR}/Ice*/*.py" | ||
84 | FILES_${PN}-python-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug" | ||
85 | FILES_${PN}-dev += "${bindir}/slice* ${datadir}/Ice-${PV}/slice/*" | ||
86 | |||
87 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb b/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb deleted file mode 100644 index 9d50ea44a..000000000 --- a/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | require fakeroot_${PV}.bb | ||
2 | |||
3 | S = "${WORKDIR}/fakeroot-${PV}" | ||
4 | |||
5 | inherit native | ||
6 | |||
7 | EXTRA_OECONF = "--program-prefix=" | ||
8 | |||
9 | # Compatability for the rare systems not using or having SYSV | ||
10 | python () { | ||
11 | if d.getVar('HOST_NONSYSV') and d.getVar('HOST_NONSYSV') != '0': | ||
12 | d.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ') | ||
13 | } | ||
14 | |||
15 | RDEPENDS_${PN} = "util-linux-native" | ||
diff --git a/meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb b/meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb deleted file mode 100644 index 0a787e3ea..000000000 --- a/meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | SUMMARY = "Gives a fake root environment" | ||
2 | HOMEPAGE = "http://fakeroot.alioth.debian.org" | ||
3 | SECTION = "base" | ||
4 | LICENSE = "GPLv3" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" | ||
6 | |||
7 | SRC_URI = "\ | ||
8 | ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \ | ||
9 | " | ||
10 | |||
11 | inherit autotools | ||
12 | |||
13 | do_configure_prepend() { | ||
14 | mkdir -p ${S}/build-aux | ||
15 | } | ||
16 | |||
17 | do_install_append() { | ||
18 | install -d ${D}${includedir}/fakeroot | ||
19 | install -m 644 *.h ${D}${includedir}/fakeroot | ||
20 | } | ||
21 | |||
22 | # fakeroot needs getopt which is provided by the util-linux package | ||
23 | RDEPENDS_${PN} = "util-linux" | ||
24 | |||
25 | |||
26 | SRC_URI[md5sum] = "706171d8d520b1ca1576ac73f2ceb4f3" | ||
27 | SRC_URI[sha256sum] = "0a359efa3e9496c33234b3e9c89306a09bb4da9d33de43c261f1d8447e6ebea2" | ||
28 | |||
29 | # http://errors.yoctoproject.org/Errors/Details/35143/ | ||
30 | PNBLACKLIST[fakeroot] ?= "BROKEN: QA Issue: -dev package contains non-symlink .so - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb deleted file mode 100644 index 697f9bfa5..000000000 --- a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | SUMMARY = "A set of useful command line tools" | ||
2 | SUMMARY_${PN}-debug = "A set of command line tools useful for debugging" | ||
3 | SECTION = "console" | ||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
6 | PV = "1.0" | ||
7 | PR = "r21" | ||
8 | |||
9 | inherit packagegroup allarch | ||
10 | |||
11 | PACKAGES += "${PN}-debug" | ||
12 | |||
13 | RDEPENDS_${PN} = "\ | ||
14 | dbus-daemon-proxy \ | ||
15 | dosfstools \ | ||
16 | htop \ | ||
17 | iptables \ | ||
18 | lsof \ | ||
19 | mbuffer \ | ||
20 | mtd-utils \ | ||
21 | nano \ | ||
22 | nfs-utils-client \ | ||
23 | nmon \ | ||
24 | powertop \ | ||
25 | screen \ | ||
26 | socat \ | ||
27 | sysstat \ | ||
28 | " | ||
29 | |||
30 | RDEPENDS_${PN}-debug = "\ | ||
31 | evtest \ | ||
32 | devmem2 \ | ||
33 | i2c-tools \ | ||
34 | gdb \ | ||
35 | procps \ | ||
36 | pxaregs \ | ||
37 | s3c24xx-gpio \ | ||
38 | s3c64xx-gpio \ | ||
39 | serial-forward \ | ||
40 | strace \ | ||
41 | " | ||
42 | |||
43 | RRECOMMENDS_${PN}-debug = "\ | ||
44 | ltrace \ | ||
45 | " | ||
46 | |||
47 | PNBLACKLIST[packagegroup-cli-tools] ?= "Runtime depends on blacklisted dbus-daemon-proxy - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
48 | |||
49 | PNBLACKLIST[packagegroup-cli-tools] ?= "Runtime depends on blacklisted packagegroup-cli-tools - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/soname.patch b/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/soname.patch deleted file mode 100644 index 0df232d25..000000000 --- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/soname.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Index: proxy-libintl-20080418-r6/src/proxy-libintl/Makefile | ||
2 | =================================================================== | ||
3 | --- proxy-libintl-20080418-r6.orig/src/proxy-libintl/Makefile 2010-07-25 08:40:22.893620001 -0700 | ||
4 | +++ proxy-libintl-20080418-r6/src/proxy-libintl/Makefile 2010-07-25 10:51:29.573620000 -0700 | ||
5 | @@ -6,16 +6,13 @@ CFLAGS = -Wall -I ../../include | ||
6 | |||
7 | all : ../../lib/libintl.so ../../lib/intl.lib | ||
8 | |||
9 | -../../lib/libintl.so : libintl.o | ||
10 | - $(CC) -shared -o $@ libintl.o | ||
11 | +../../lib/libintl.so : libintl.c | ||
12 | + $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libintl.so -o $@ $< | ||
13 | |||
14 | ../../lib/intl.lib : ../../lib/libintl.so | ||
15 | cp ../../lib/libintl.so $@ | ||
16 | $(STRIP) --strip-unneeded $@ | ||
17 | |||
18 | -libintl.o : libintl.c | ||
19 | - $(CC) $(CFLAGS) -c libintl.c | ||
20 | - | ||
21 | clean : | ||
22 | rm -f *.o ../../lib/libintl.so ../../$(ZIPFILE) | ||
23 | |||
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch b/meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch deleted file mode 100644 index b32311a82..000000000 --- a/meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From ac1953d04f3f26d6aa5d8f53a9397d3ba0e96fa3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@circuitco.com> | ||
3 | Date: Fri, 11 May 2012 15:23:02 +0000 | ||
4 | Subject: [PATCH] ide: use 'node' as interpreter for sketches instead of | ||
5 | argv[0] | ||
6 | |||
7 | This enables running scripts with node 0.6.x instead of 0.4.x | ||
8 | |||
9 | Signed-off-by: root <root@beaglebone.(none)> | ||
10 | --- | ||
11 | server/cloud9/ide.js | 2 +- | ||
12 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
13 | |||
14 | diff --git a/server/cloud9/ide.js b/server/cloud9/ide.js | ||
15 | index ce782f5..6c4e0f7 100644 | ||
16 | --- a/server/cloud9/ide.js | ||
17 | +++ b/server/cloud9/ide.js | ||
18 | @@ -53,7 +53,7 @@ var Ide = module.exports = function(options, httpServer, exts, socket) { | ||
19 | }; | ||
20 | |||
21 | this.$users = {}; | ||
22 | - this.nodeCmd = process.argv[0]; | ||
23 | + this.nodeCmd = "node"; | ||
24 | |||
25 | var davOptions = { | ||
26 | node: this.options.mountDir, | ||
27 | -- | ||
28 | 1.7.7 | ||
29 | |||
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb deleted file mode 100644 index c6d78905d..000000000 --- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb +++ /dev/null | |||
@@ -1,118 +0,0 @@ | |||
1 | SUMMARY = "Meet Cloud9, development-as-a-service for Javascripters and other developers" | ||
2 | HOMEPAGE = "http://c9.io" | ||
3 | LICENSE = "GPLv3" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018" | ||
5 | |||
6 | PR = "r5" | ||
7 | |||
8 | # Nodejs-native for node-waf, nodejs4-native for the headers | ||
9 | DEPENDS = "libxml2 nodejs-native nodejs4-native" | ||
10 | |||
11 | PNBLACKLIST[cloud9] ?= "Not comatible with current nodejs 0.12, but upstream is working on it for v3 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
12 | inherit systemd | ||
13 | |||
14 | SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \ | ||
15 | git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \ | ||
16 | git://github.com/ajaxorg/ace.git;destsuffix=git/support/ace;name=ace \ | ||
17 | git://github.com/ajaxorg/ace.wiki.git;destsuffix=git/support/ace/doc/wiki;name=acewiki \ | ||
18 | git://github.com/ajaxorg/apf.git;destsuffix=git/support/apf;name=apf \ | ||
19 | git://github.com/ajaxorg/async.js.git;destsuffix=git/support/asyncjs;name=asyncjs \ | ||
20 | git://github.com/ajaxorg/connect.git;destsuffix=git/support/connect;name=connect;branch=ajaxorg \ | ||
21 | git://github.com/jashkenas/coffee-script.git;destsuffix=git/support/connect/support/coffee-script;name=coffee-script \ | ||
22 | git://github.com/visionmedia/expresso.git;destsuffix=git/support/connect/support/expresso;name=expresso \ | ||
23 | git://github.com/visionmedia/node-jscoverage.git;destsuffix=git/support/connect/support/expresso/deps/jscoverage;name=jscoverage \ | ||
24 | git://github.com/cloudhead/less.js.git;destsuffix=git/support/connect/support/less;name=less \ | ||
25 | git://github.com/matehat/sass.js.git;destsuffix=git/support/connect/support/sass;name=sass \ | ||
26 | git://github.com/ajaxorg/jsDAV.git;destsuffix=git/support/jsdav;name=jsdav \ | ||
27 | git://github.com/fjakobs/async.js.git;destsuffix=git/support/jsdav/support/async.js;name=async-js \ | ||
28 | git://github.com/felixge/node-formidable.git;destsuffix=git/support/jsdav/support/formidable;name=formidable \ | ||
29 | git://github.com/ajaxorg/jsftp.git;destsuffix=git/support/jsdav/support/jsftp;name=jsftp \ | ||
30 | git://github.com/Gozala/streamer.git;destsuffix=git/support/jsdav/support/jsftp/support/streamer;name=streamer \ | ||
31 | git://github.com/ajaxorg/node-sftp.git;destsuffix=git/support/jsdav/support/node-sftp;name=sftp \ | ||
32 | git://github.com/ajaxorg/lib-v8debug.git;destsuffix=git/support/lib-v8debug;name=lib-v8debug \ | ||
33 | git://github.com/ajaxorg/socket.io.git;destsuffix=git/support/socket.io;name=socketio;branch=cadorn-upstream \ | ||
34 | git://github.com/LearnBoost/socket.io-client.git;destsuffix=git/support/socket.io-client;name=socketio-client \ | ||
35 | git://github.com/ajaxorg/treehugger.git;destsuffix=git/support/treehugger;name=treehugger \ | ||
36 | git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \ | ||
37 | file://index.js \ | ||
38 | file://cloud9-avahi.service \ | ||
39 | file://cloud9.service \ | ||
40 | file://0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch \ | ||
41 | " | ||
42 | |||
43 | SRCREV_cloud9ide = "c4e2574896a22bb749f0500b25f41c888d346bed" | ||
44 | SRCREV_o3 = "d66d4e3252e505f44ada6804c8cab39915ce8afd" | ||
45 | SRCREV_ace = "0fc5392cbe46fb134052c3065a238ad8e3b31cfd" | ||
46 | SRCREV_acewiki = "d2a65d0addc2e5ab922bbff9cb6022a4652b4f13" | ||
47 | SRCREV_apf = "2560b762b2b0e5a8b46f8a4062f927a9a9d239f4" | ||
48 | SRCREV_asyncjs = "d36ead408e2959b1e99572114ef3a1b6a48c1072" | ||
49 | SRCREV_connect = "6bec95b51f2286b942bc7f340d62d816bcdc13d4" | ||
50 | SRCREV_coffee-script = "a53c104db16d3ac9d13cf9f16834edec250b9749" | ||
51 | SRCREV_expresso = "7f10ab7fa655299b4e2f519065b0495e6ac34ef2" | ||
52 | SRCREV_jscoverage = "0d4608a6b4275b020ba665389aa75897d5d4a584" | ||
53 | SRCREV_less = "a2807288008587b95c6c2f8ba5cac16f1bcab98f" | ||
54 | SRCREV_sass = "4dfd4c699e7a8baf226215ab044854c4507f4420" | ||
55 | SRCREV_jsdav = "f04ebf3d012cc8aeabfcfb2b8fab8966d52929e9" | ||
56 | SRCREV_async-js = "92fb710a70efd3cdc2376ebfba71a7fb3a4f1651" | ||
57 | SRCREV_formidable = "a37292d4b7d6d76a38909ed670334c9068d40871" | ||
58 | SRCREV_jsftp = "e3f10c8927347c170cdd0150ef38e18272acf942" | ||
59 | SRCREV_streamer = "1a7f75d4065819171ac91a09974199b932dbe17d" | ||
60 | SRCREV_sftp = "a0539345134970d7535a19cb2608e3d1bc119d71" | ||
61 | SRCREV_lib-v8debug = "7c11897f4bc77c7275c2b6dff5becc72ac018662" | ||
62 | SRCREV_socketio = "735d5239b325df2ba67d2b9bb4ec32442283bc06" | ||
63 | SRCREV_socketio-client = "4375ef1344ecb8ad75a3848a00af6b391822f86b" | ||
64 | SRCREV_treehugger = "436d0d6dd0ce43782e6be08ad12c356730626996" | ||
65 | SRCREV_uglify-js = "941c845c4a01e4e47a158458fe846eb36d0828ad" | ||
66 | |||
67 | SRCREV_FORMAT = "cloud9ide" | ||
68 | |||
69 | S = "${WORKDIR}/git" | ||
70 | |||
71 | do_configure () { | ||
72 | cd ${WORKDIR}/o3 | ||
73 | node-waf -vv configure | ||
74 | } | ||
75 | |||
76 | EXTRA_CXXFLAGS = "-Idefault/include -I../include -Idefault/hosts -I../hosts -Idefault/modules -I../modules -Idefault/deps -I../deps -I${STAGING_DIR_NATIVE}/usr/include/node4 -fPIC -DPIC" | ||
77 | |||
78 | do_compile () { | ||
79 | cd ${WORKDIR}/o3 | ||
80 | node4 tools/gluegen.js | ||
81 | cd hosts | ||
82 | ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node.o node-o3/sh_node.cc | ||
83 | ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node_libs.o node-o3/sh_node_libs.cc | ||
84 | cd .. | ||
85 | ${CXX} ${TARGET_LDFLAGS} hosts/sh_node.o hosts/sh_node_libs.o -o o3.node -shared -Wl,-Bdynamic -lxml2 | ||
86 | } | ||
87 | |||
88 | do_install () { | ||
89 | install -m 0755 -d ${D}${datadir}/cloud9 ${D}${bindir} ${D}/var/lib/cloud9 | ||
90 | rsync -r --exclude=".*" ${S}/* ${D}${datadir}/cloud9 | ||
91 | |||
92 | touch ${D}${bindir}/cloud9 | ||
93 | echo "#!/bin/sh" > ${D}${bindir}/cloud9 | ||
94 | echo "node4 ${datadir}/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000" >> ${D}${bindir}/cloud9 | ||
95 | chmod 0755 ${D}${bindir}/cloud9 | ||
96 | |||
97 | install -m 0755 -d ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml | ||
98 | install -m 0644 ${WORKDIR}/index.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/index.js | ||
99 | install -m 0644 ${WORKDIR}/o3/modules/o3.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js | ||
100 | install -m 0755 ${WORKDIR}/o3/o3.node ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node | ||
101 | |||
102 | install -m 0755 -d ${D}${sysconfdir}/avahi/services/ | ||
103 | install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/ | ||
104 | |||
105 | install -d ${D}${systemd_unitdir}/system | ||
106 | install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system | ||
107 | } | ||
108 | |||
109 | FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/.debug \ | ||
110 | ${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \ | ||
111 | " | ||
112 | |||
113 | RDEPENDS_${PN} = "nodejs4 nodejs gzip" | ||
114 | |||
115 | RPROVIDES_${PN} += "${PN}-systemd" | ||
116 | RREPLACES_${PN} += "${PN}-systemd" | ||
117 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
118 | SYSTEMD_SERVICE_${PN} = "cloud9.service" | ||
diff --git a/meta-oe/recipes-devtools/dt/dt/Stop-using-relative-path-for-scsilib.c-link.patch b/meta-oe/recipes-devtools/dt/dt/Stop-using-relative-path-for-scsilib.c-link.patch deleted file mode 100644 index ccb9a02da..000000000 --- a/meta-oe/recipes-devtools/dt/dt/Stop-using-relative-path-for-scsilib.c-link.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 4cf7e16fe9b773e2e7763d4b773854eefe2aa9ab Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Tue, 12 Jan 2016 09:59:55 -0200 | ||
4 | Subject: [PATCH] Stop using relative path for scsilib.c link | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
10 | --- | ||
11 | Makefile.linux | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/Makefile.linux b/Makefile.linux | ||
15 | index 78333ff..e210564 100644 | ||
16 | --- a/Makefile.linux | ||
17 | +++ b/Makefile.linux | ||
18 | @@ -129,7 +129,7 @@ scsilib.c: | ||
19 | echo "Please specify OS={aix,linux,hpux,solaris,windows}"; \ | ||
20 | exit 1; \ | ||
21 | fi; \ | ||
22 | - ln -sf ../scsilib-$(OS).c scsilib.c | ||
23 | + ln -sf scsilib-$(OS).c scsilib.c | ||
24 | |||
25 | print:; | ||
26 | @$(PRINTER) $(PRINTFLAGS) $(ALL_CFILES) | ||
27 | -- | ||
28 | 2.1.4 | ||
29 | |||
diff --git a/meta-oe/recipes-devtools/dt/dt/Use-tcsh-shell.patch b/meta-oe/recipes-devtools/dt/dt/Use-tcsh-shell.patch deleted file mode 100644 index 0c00fdf41..000000000 --- a/meta-oe/recipes-devtools/dt/dt/Use-tcsh-shell.patch +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | From e3c6eb8776f659eb9e6eeccf90d785eff18ecf74 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Mon, 15 Feb 2016 18:00:05 -0200 | ||
4 | Subject: [PATCH] Use 'tcsh' shell | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
10 | --- | ||
11 | Scripts/dta | 2 +- | ||
12 | Scripts/dtc | 2 +- | ||
13 | Scripts/dtf | 2 +- | ||
14 | Scripts/dtr | 2 +- | ||
15 | Scripts/dts | 2 +- | ||
16 | Scripts/dtt | 2 +- | ||
17 | Scripts/dtw | 2 +- | ||
18 | 7 files changed, 7 insertions(+), 7 deletions(-) | ||
19 | |||
20 | diff --git a/Scripts/dta b/Scripts/dta | ||
21 | index ebc7072..4f90247 100755 | ||
22 | --- a/Scripts/dta | ||
23 | +++ b/Scripts/dta | ||
24 | @@ -1,4 +1,4 @@ | ||
25 | -#!/bin/csh | ||
26 | +#!/bin/tcsh | ||
27 | # | ||
28 | # Script file to test asynchronous communication lines. | ||
29 | # | ||
30 | diff --git a/Scripts/dtc b/Scripts/dtc | ||
31 | index da69c2e..89d48c2 100755 | ||
32 | --- a/Scripts/dtc | ||
33 | +++ b/Scripts/dtc | ||
34 | @@ -1,4 +1,4 @@ | ||
35 | -#!/bin/csh | ||
36 | +#!/bin/tcsh | ||
37 | # %Z%%M% %I% %E% | ||
38 | # | ||
39 | # Date: August 7, 1990 | ||
40 | diff --git a/Scripts/dtf b/Scripts/dtf | ||
41 | index 9f8cd87..321d261 100755 | ||
42 | --- a/Scripts/dtf | ||
43 | +++ b/Scripts/dtf | ||
44 | @@ -1,4 +1,4 @@ | ||
45 | -#! /bin/csh | ||
46 | +#! /bin/tcsh | ||
47 | # | ||
48 | # Script file to gather floppy disk performance data. | ||
49 | # | ||
50 | diff --git a/Scripts/dtr b/Scripts/dtr | ||
51 | index ddb7947..1ff5a0b 100755 | ||
52 | --- a/Scripts/dtr | ||
53 | +++ b/Scripts/dtr | ||
54 | @@ -1,4 +1,4 @@ | ||
55 | -#!/bin/csh | ||
56 | +#!/bin/tcsh | ||
57 | # %Z%%M% %I% %E% | ||
58 | # | ||
59 | # Date: August 21, 1990 | ||
60 | diff --git a/Scripts/dts b/Scripts/dts | ||
61 | index 6b8a167..42d2312 100755 | ||
62 | --- a/Scripts/dts | ||
63 | +++ b/Scripts/dts | ||
64 | @@ -1,4 +1,4 @@ | ||
65 | -#!/bin/csh | ||
66 | +#!/bin/tcsh | ||
67 | # %Z%%M% %I% %E% | ||
68 | # | ||
69 | # Date: August 7, 1990 | ||
70 | diff --git a/Scripts/dtt b/Scripts/dtt | ||
71 | index 36cc6bd..df19d2f 100755 | ||
72 | --- a/Scripts/dtt | ||
73 | +++ b/Scripts/dtt | ||
74 | @@ -1,4 +1,4 @@ | ||
75 | -#! /bin/csh | ||
76 | +#! /bin/tcsh | ||
77 | # %Z%%M% %I% %E% | ||
78 | # | ||
79 | # Date: August 7, 1990 | ||
80 | diff --git a/Scripts/dtw b/Scripts/dtw | ||
81 | index 8a4ac39..c58e304 100755 | ||
82 | --- a/Scripts/dtw | ||
83 | +++ b/Scripts/dtw | ||
84 | @@ -1,4 +1,4 @@ | ||
85 | -#!/bin/csh | ||
86 | +#!/bin/tcsh | ||
87 | # %Z%%M% %I% %E% | ||
88 | # | ||
89 | # Date: August 21, 1990 | ||
90 | -- | ||
91 | 2.1.4 | ||
92 | |||
diff --git a/meta-oe/recipes-devtools/dt/dt/dt-default-source-define.patch b/meta-oe/recipes-devtools/dt/dt/dt-default-source-define.patch deleted file mode 100644 index 87016edf0..000000000 --- a/meta-oe/recipes-devtools/dt/dt/dt-default-source-define.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Patch from http://pkgs.fedoraproject.org/git/rpms/dt.git | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
6 | |||
7 | diff -rupN dt.v18.32.old/common.h dt.v18.32/common.h | ||
8 | --- dt.v18.32.old/common.h 2013-03-01 23:52:30.000000000 +0100 | ||
9 | +++ dt.v18.32/common.h 2014-09-24 17:41:40.777604710 +0200 | ||
10 | @@ -127,7 +127,7 @@ typedef volatile slarge_t v_slarge; | ||
11 | |||
12 | #endif /* defined(_WIN64) */ | ||
13 | |||
14 | -#elif defined(__GNUC__) && defined(_BSD_SOURCE) || defined(SCO) || defined(__QNXNTO__) || defined(SOLARIS) || defined(HP_UX) || defined(AIX) || defined(_NT_SOURCE) | ||
15 | +#elif defined(__GNUC__) && defined(_BSD_SOURCE) || defined (_DEFAULT_SOURCE) || defined(SCO) || defined(__QNXNTO__) || defined(SOLARIS) || defined(HP_UX) || defined(AIX) || defined(_NT_SOURCE) | ||
16 | |||
17 | #define QuadIsLongLong | ||
18 | typedef unsigned long long int large_t; | ||
diff --git a/meta-oe/recipes-devtools/dt/dt/dt-wformat-security.patch b/meta-oe/recipes-devtools/dt/dt/dt-wformat-security.patch deleted file mode 100644 index b6780c196..000000000 --- a/meta-oe/recipes-devtools/dt/dt/dt-wformat-security.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | Patch from http://pkgs.fedoraproject.org/git/rpms/dt.git | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
6 | |||
7 | diff -rupN dt.v18.32.old/dt.c dt.v18.32/dt.c | ||
8 | --- dt.v18.32.old/dt.c 2014-08-18 14:45:53.242351115 +0200 | ||
9 | +++ dt.v18.32/dt.c 2014-08-18 15:11:36.367719880 +0200 | ||
10 | @@ -4378,7 +4378,7 @@ report_error( | ||
11 | (void)sprintf(dip->di_msg_buffer, "(%d): '%s', errno = %d - %s\n", | ||
12 | dip->di_process_id, error_info, errno, emsg); | ||
13 | } | ||
14 | - syslog(LOG_ERR, dip->di_msg_buffer); | ||
15 | + syslog(LOG_ERR, "%s", dip->di_msg_buffer); | ||
16 | } | ||
17 | #endif /* defined(SYSLOG) */ | ||
18 | |||
19 | diff -rupN dt.v18.32.old/dtutil.c dt.v18.32/dtutil.c | ||
20 | --- dt.v18.32.old/dtutil.c 2014-08-18 14:45:53.354350779 +0200 | ||
21 | +++ dt.v18.32/dtutil.c 2014-08-18 15:13:53.835307311 +0200 | ||
22 | @@ -5180,7 +5180,7 @@ ReportDeviceInfo ( | ||
23 | bp += Sprintf(bp, | ||
24 | "(%d) Device name: %s\n", | ||
25 | dip->di_process_id, dip->di_dname); | ||
26 | - syslog(LOG_ERR, dip->di_msg_buffer); | ||
27 | + syslog(LOG_ERR, "%s", dip->di_msg_buffer); | ||
28 | bp = dip->di_msg_buffer; | ||
29 | # if defined(SCSI) | ||
30 | if (dip->di_serial_number) { | ||
31 | @@ -5193,7 +5193,7 @@ ReportDeviceInfo ( | ||
32 | dip->di_process_id, dip->di_device_id); | ||
33 | } | ||
34 | # endif /* defined(SCSI) */ | ||
35 | - syslog(LOG_ERR, dip->di_msg_buffer); | ||
36 | + syslog(LOG_ERR, "%s", dip->di_msg_buffer); | ||
37 | bp = dip->di_msg_buffer; | ||
38 | bp += Sprintf(bp, | ||
39 | "(%d) Relative block number where the error occurred is " LUF "," | ||
40 | @@ -5203,7 +5203,7 @@ ReportDeviceInfo ( | ||
41 | } else { | ||
42 | bp += Sprintf(bp, "\n"); | ||
43 | } | ||
44 | - syslog(LOG_ERR, dip->di_msg_buffer); | ||
45 | + syslog(LOG_ERR, "%s", dip->di_msg_buffer); | ||
46 | } | ||
47 | #endif /* defined(SYSLOG) */ | ||
48 | |||
diff --git a/meta-oe/recipes-devtools/dt/dt_18.32.bb b/meta-oe/recipes-devtools/dt/dt_18.32.bb deleted file mode 100644 index 0234f765a..000000000 --- a/meta-oe/recipes-devtools/dt/dt_18.32.bb +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | SUMMARY = "Generic data test program" | ||
2 | DESCRIPTION = "The Data Test Program (dt) is a generic data test program used to verify proper \ | ||
3 | operation of peripherals, file systems, device drivers, or any data stream supported by the \ | ||
4 | operating system." | ||
5 | HOMEPAGE = "http://www.scsifaq.org/RMiller_Tools/dt.html" | ||
6 | |||
7 | SECTION = "console/tests" | ||
8 | |||
9 | LICENSE = "MIT" | ||
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=be8bb25bbcfaa0725710d188e5152668" | ||
11 | |||
12 | # Source URI taken from Fedora RPM spec file at: | ||
13 | # http://pkgs.fedoraproject.org/git/rpms/dt.git | ||
14 | SRC_URI = "http://dl.dropboxusercontent.com/u/32363629/Datatest/dt-source-v${PV}.tar.gz \ | ||
15 | file://dt-default-source-define.patch \ | ||
16 | file://dt-wformat-security.patch \ | ||
17 | file://Stop-using-relative-path-for-scsilib.c-link.patch \ | ||
18 | file://Use-tcsh-shell.patch \ | ||
19 | " | ||
20 | |||
21 | SRC_URI[md5sum] = "3054aeaaba047a1dbe90c2132a382ee2" | ||
22 | SRC_URI[sha256sum] = "10d164676e918a4d07f233bcd11e4cb6bfd1052c996182cd1827ccd0c063fcc6" | ||
23 | |||
24 | S = "${WORKDIR}/dt.v${PV}" | ||
25 | |||
26 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
27 | |||
28 | EXTRA_OEMAKE += "-f Makefile.linux \ | ||
29 | OS=linux \ | ||
30 | CFLAGS="-I.. -DAIO -DFIFO -DMMAP -D__linux__ -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DTHREADS -DSCSI"" | ||
31 | |||
32 | do_compile() { | ||
33 | oe_runmake | ||
34 | } | ||
35 | |||
36 | do_install() { | ||
37 | install -Dm755 dt ${D}${sbindir}/dt | ||
38 | install -Dm644 Documentation/dt.man ${D}${mandir}/man8/dt.8 | ||
39 | |||
40 | install -d ${D}${datadir}/dt/ | ||
41 | install -d ${D}${docdir}/dt/html/ | ||
42 | install -m755 Scripts/dt? ${D}${datadir}/dt/ | ||
43 | install -m644 data/pattern_* ${D}${datadir}/dt/ | ||
44 | install -m644 html/* ${D}${docdir}/dt/html/ | ||
45 | } | ||
46 | |||
47 | RDEPENDS_${PN} += "tcsh" | ||
48 | |||
49 | PNBLACKLIST[dt] ?= "Rdepends on blacklisted tcsh - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt/ltp-Do-not-link-against-libfl.patch b/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt/ltp-Do-not-link-against-libfl.patch deleted file mode 100644 index 3e4aa7308..000000000 --- a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt/ltp-Do-not-link-against-libfl.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 5bda9c0af56869c6ff2c25d38ea087179c946bc6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chong Lu <Chong.Lu@windriver.com> | ||
3 | Date: Tue, 11 Mar 2014 14:47:22 +0800 | ||
4 | Subject: [PATCH] ltp: Don't link against libfl | ||
5 | |||
6 | We have already defined yywrap function in scan.l file. After this, we no longer need to | ||
7 | link against libfl and so no longer get errors about undefined references to yylex. | ||
8 | |||
9 | Upstream-status: Pending | ||
10 | |||
11 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
12 | --- | ||
13 | pan/Makefile | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/pan/Makefile b/pan/Makefile | ||
17 | index 4cc6466..a4b575b 100644 | ||
18 | --- a/pan/Makefile | ||
19 | +++ b/pan/Makefile | ||
20 | @@ -31,7 +31,7 @@ CPPFLAGS += -Wno-error | ||
21 | |||
22 | CPPFLAGS += -I$(abs_srcdir) | ||
23 | |||
24 | -LDLIBS += -lm $(LEXLIB) | ||
25 | +LDLIBS += -lm | ||
26 | |||
27 | LFLAGS += -l | ||
28 | |||
29 | -- | ||
30 | 1.7.9.5 | ||
31 | |||
diff --git a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb b/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb deleted file mode 100644 index b13bd7bcc..000000000 --- a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb +++ /dev/null | |||
@@ -1,97 +0,0 @@ | |||
1 | SUMMARY = "Embedded Linux Device Driver Tests based on Linux Test Project" | ||
2 | HOMEPAGE = "http://arago-project.org/git/projects/test-automation/ltp-ddt.git" | ||
3 | SECTION = "console/utils" | ||
4 | LICENSE = "GPLv2" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | ||
6 | |||
7 | PROVIDES += "ltp" | ||
8 | DEPENDS += "zip-native virtual/kernel alsa-lib" | ||
9 | |||
10 | RDEPENDS_${PN} += "pm-qa serialcheck" | ||
11 | |||
12 | inherit autotools module-base kernel-module-split | ||
13 | |||
14 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
15 | |||
16 | SRCREV = "f086bed6cc88bf102eaad0e96cb7ebe79944a8ad" | ||
17 | BRANCH ?= "master" | ||
18 | |||
19 | SRC_URI = "git://arago-project.org/git/projects/test-automation/ltp-ddt.git;branch=${BRANCH} \ | ||
20 | file://ltp-Do-not-link-against-libfl.patch \ | ||
21 | " | ||
22 | |||
23 | S = "${WORKDIR}/git" | ||
24 | |||
25 | LTPROOT = "/opt/ltp" | ||
26 | |||
27 | EXTRA_OEMAKE_append = " \ | ||
28 | prefix=${LTPROOT} \ | ||
29 | CROSS_COMPILE=${HOST_PREFIX} \ | ||
30 | SKIP_IDCHECK=1 \ | ||
31 | KERNEL_PATH=${STAGING_KERNEL_DIR} \ | ||
32 | KERNEL_INC=${STAGING_KERNEL_DIR} \ | ||
33 | KERNEL_USR_INC=${STAGING_INCDIR} \ | ||
34 | ALSA_INCPATH=${STAGING_INCDIR} \ | ||
35 | ALSA_LIBPATH=${STAGING_LIBDIR} \ | ||
36 | PLATFORM=${MACHINE} \ | ||
37 | RANLIB=${RANLIB} \ | ||
38 | DESTDIR=${D} \ | ||
39 | CC='${CC}' \ | ||
40 | KERNEL_CC='${KERNEL_CC}' \ | ||
41 | " | ||
42 | |||
43 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
44 | |||
45 | FILES_${PN}-dbg += " \ | ||
46 | ${LTPROOT}/.debug \ | ||
47 | ${LTPROOT}/bin/.debug \ | ||
48 | ${LTPROOT}/runtest/.debug \ | ||
49 | ${LTPROOT}/testcases/bin/.debug \ | ||
50 | ${LTPROOT}/testcases/bin/*/bin/.debug \ | ||
51 | ${LTPROOT}/testcases/bin/*/test/.debug \ | ||
52 | ${LTPROOT}/testcases/bin/ddt/.debug \ | ||
53 | ${LTPROOT}/testcases/bin/ddt/*/bin/.debug \ | ||
54 | ${LTPROOT}/testcases/bin/ddt/*/test/.debug \ | ||
55 | ${LTPROOT}/testcases/realtime/*/*/.debug \ | ||
56 | " | ||
57 | |||
58 | FILES_${PN}-staticdev += "${LTPROOT}/lib" | ||
59 | FILES_${PN} += "${LTPROOT}/*" | ||
60 | |||
61 | KERNEL_MODULES_META_PACKAGE = "${PN}" | ||
62 | |||
63 | kmoddir = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/ddt" | ||
64 | |||
65 | # ltp doesn't regenerate ffsb-6.0-rc2 configure and hardcode configure call. | ||
66 | # we explicitly force regeneration of that directory and pass configure options. | ||
67 | do_configure_append() { | ||
68 | (cd utils/ffsb-6.0-rc2; autoreconf -fvi; ./configure ${CONFIGUREOPTS}) | ||
69 | } | ||
70 | |||
71 | # The makefiles make excessive use of make -C and several include testcases.mk | ||
72 | # which triggers a build of the syscall header. To reproduce, build ltp, | ||
73 | # then delete the header, then "make -j XX" and watch regen.sh run multiple | ||
74 | # times. Its easier to generate this once here instead. | ||
75 | do_compile_prepend () { | ||
76 | ( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h ) | ||
77 | } | ||
78 | |||
79 | do_compile_append () { | ||
80 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | ||
81 | oe_runmake modules | ||
82 | } | ||
83 | |||
84 | do_install() { | ||
85 | oe_runmake install | ||
86 | install -d ${D}${datadir} | ||
87 | install -d ${D}${kmoddir} | ||
88 | mv ${D}${LTPROOT}/testcases/bin/ddt/*.ko ${D}${kmoddir} | ||
89 | } | ||
90 | |||
91 | # do_make_scripts should be a separate task for the lock to work | ||
92 | addtask make_scripts before do_compile | ||
93 | do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" | ||
94 | do_make_scripts[deptask] = "do_populate_sysroot" | ||
95 | |||
96 | # http://errors.yoctoproject.org/Errors/Details/56327/ | ||
97 | PNBLACKLIST[ltp-ddt] ?= "BROKEN: fails since last autotools.bbclass changes - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/0001-Don-t-call-deprecated-glib-functions-and-use-the-new.patch b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/0001-Don-t-call-deprecated-glib-functions-and-use-the-new.patch deleted file mode 100644 index ecf8e7493..000000000 --- a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/0001-Don-t-call-deprecated-glib-functions-and-use-the-new.patch +++ /dev/null | |||
@@ -1,166 +0,0 @@ | |||
1 | From 869e52a9055c72970fed036a1510f676e6ce0824 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 13 Jun 2013 01:24:19 -0700 | ||
4 | Subject: [PATCH] Don't call deprecated glib functions and use the new gthread | ||
5 | API. | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Upstream-Status: Inappropriate[version Unmaintained Upstream] | ||
10 | --- | ||
11 | client/pk-console.c | 3 ++- | ||
12 | client/pk-generate-pack.c | 3 ++- | ||
13 | client/pk-monitor.c | 3 ++- | ||
14 | contrib/command-not-found/PackageKit.sh | 2 +- | ||
15 | contrib/command-not-found/pk-command-not-found.c | 4 ++-- | ||
16 | contrib/debuginfo-install/pk-debuginfo-install.c | 4 ++-- | ||
17 | src/pk-backend.c | 7 +++++++ | ||
18 | src/pk-main.c | 4 ++-- | ||
19 | 10 files changed, 20 insertions(+), 10 deletions(-) | ||
20 | |||
21 | diff --git a/client/pk-console.c b/client/pk-console.c | ||
22 | index de927e1..2435f27 100644 | ||
23 | --- a/client/pk-console.c | ||
24 | +++ b/client/pk-console.c | ||
25 | @@ -1264,11 +1264,12 @@ main (int argc, char *argv[]) | ||
26 | bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); | ||
27 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | ||
28 | textdomain (GETTEXT_PACKAGE); | ||
29 | - | ||
30 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
31 | if (! g_thread_supported ()) | ||
32 | g_thread_init (NULL); | ||
33 | g_type_init (); | ||
34 | dbus_g_thread_init (); | ||
35 | +#endif | ||
36 | |||
37 | /* do stuff on ctrl-c */ | ||
38 | signal (SIGINT, pk_console_sigint_cb); | ||
39 | diff --git a/client/pk-generate-pack.c b/client/pk-generate-pack.c | ||
40 | index 0b2b40f..20d7e8d 100644 | ||
41 | --- a/client/pk-generate-pack.c | ||
42 | +++ b/client/pk-generate-pack.c | ||
43 | @@ -251,12 +251,13 @@ main (int argc, char *argv[]) | ||
44 | bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); | ||
45 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | ||
46 | textdomain (GETTEXT_PACKAGE); | ||
47 | - | ||
48 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
49 | if (! g_thread_supported ()) | ||
50 | g_thread_init (NULL); | ||
51 | |||
52 | g_type_init (); | ||
53 | dbus_g_thread_init (); | ||
54 | +#endif | ||
55 | |||
56 | /* do stuff on ctrl-c */ | ||
57 | signal (SIGINT, pk_generate_pack_sigint_cb); | ||
58 | diff --git a/client/pk-monitor.c b/client/pk-monitor.c | ||
59 | index f230f7a..d43007f 100644 | ||
60 | --- a/client/pk-monitor.c | ||
61 | +++ b/client/pk-monitor.c | ||
62 | @@ -285,11 +285,12 @@ main (int argc, char *argv[]) | ||
63 | bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); | ||
64 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | ||
65 | textdomain (GETTEXT_PACKAGE); | ||
66 | - | ||
67 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
68 | if (! g_thread_supported ()) | ||
69 | g_thread_init (NULL); | ||
70 | g_type_init (); | ||
71 | dbus_g_thread_init (); | ||
72 | +#endif | ||
73 | |||
74 | context = g_option_context_new (NULL); | ||
75 | /* TRANSLATORS: this is a program that monitors PackageKit */ | ||
76 | diff --git a/contrib/command-not-found/PackageKit.sh b/contrib/command-not-found/PackageKit.sh | ||
77 | index d08989c..d708fff 100644 | ||
78 | --- a/contrib/command-not-found/PackageKit.sh | ||
79 | +++ b/contrib/command-not-found/PackageKit.sh | ||
80 | @@ -18,7 +18,7 @@ command_not_found_handle () { | ||
81 | |||
82 | # run the command, or just print a warning | ||
83 | if [ $runcnf -eq 1 ]; then | ||
84 | - /home/hughsie/.root/libexec/pk-command-not-found $1 | ||
85 | + /usr/lib/packagekit/pk-command-not-found $1 | ||
86 | retval=$? | ||
87 | else | ||
88 | echo "bash: $1: command not found" | ||
89 | diff --git a/contrib/command-not-found/pk-command-not-found.c b/contrib/command-not-found/pk-command-not-found.c | ||
90 | index 70679c0..9f81ce4 100644 | ||
91 | --- a/contrib/command-not-found/pk-command-not-found.c | ||
92 | +++ b/contrib/command-not-found/pk-command-not-found.c | ||
93 | @@ -659,12 +659,12 @@ main (int argc, char *argv[]) | ||
94 | bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); | ||
95 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | ||
96 | textdomain (GETTEXT_PACKAGE); | ||
97 | - | ||
98 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
99 | if (! g_thread_supported ()) | ||
100 | g_thread_init (NULL); | ||
101 | dbus_g_thread_init (); | ||
102 | g_type_init (); | ||
103 | - | ||
104 | +#endif | ||
105 | context = g_option_context_new (NULL); | ||
106 | /* TRANSLATORS: tool that gets called when the command is not found */ | ||
107 | g_option_context_set_summary (context, _("PackageKit Command Not Found")); | ||
108 | diff --git a/contrib/debuginfo-install/pk-debuginfo-install.c b/contrib/debuginfo-install/pk-debuginfo-install.c | ||
109 | index c12aca5..b0e1e7c 100644 | ||
110 | --- a/contrib/debuginfo-install/pk-debuginfo-install.c | ||
111 | +++ b/contrib/debuginfo-install/pk-debuginfo-install.c | ||
112 | @@ -532,11 +532,11 @@ main (int argc, char *argv[]) | ||
113 | bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); | ||
114 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | ||
115 | textdomain (GETTEXT_PACKAGE); | ||
116 | - | ||
117 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
118 | if (! g_thread_supported ()) | ||
119 | g_thread_init (NULL); | ||
120 | g_type_init (); | ||
121 | - | ||
122 | +#endif | ||
123 | context = g_option_context_new (NULL); | ||
124 | /* TRANSLATORS: tool that gets called when the command is not found */ | ||
125 | g_option_context_set_summary (context, _("PackageKit Debuginfo Installer")); | ||
126 | diff --git a/src/pk-backend.c b/src/pk-backend.c | ||
127 | index 5216b63..5b83ae4 100644 | ||
128 | --- a/src/pk-backend.c | ||
129 | +++ b/src/pk-backend.c | ||
130 | @@ -2103,7 +2103,14 @@ pk_backend_thread_create (PkBackend *backend, PkBackendThreadFunc func) | ||
131 | egg_warning ("already has thread"); | ||
132 | return FALSE; | ||
133 | } | ||
134 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
135 | backend->priv->thread = g_thread_create ((GThreadFunc) func, backend, FALSE, NULL); | ||
136 | +#else | ||
137 | + backend->priv->thread = g_thread_try_new ("daemon thread", (GThreadFunc) func, backend, NULL); | ||
138 | + if (backend->priv->thread != NULL) { | ||
139 | + g_thread_unref(backend->priv->thread); | ||
140 | + } | ||
141 | +#endif | ||
142 | if (backend->priv->thread == NULL) { | ||
143 | egg_warning ("failed to create thread"); | ||
144 | return FALSE; | ||
145 | diff --git a/src/pk-main.c b/src/pk-main.c | ||
146 | index 4c758cd..8fa2482 100644 | ||
147 | --- a/src/pk-main.c | ||
148 | +++ b/src/pk-main.c | ||
149 | @@ -219,12 +219,12 @@ main (int argc, char *argv[]) | ||
150 | bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); | ||
151 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | ||
152 | textdomain (GETTEXT_PACKAGE); | ||
153 | - | ||
154 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
155 | if (! g_thread_supported ()) | ||
156 | g_thread_init (NULL); | ||
157 | dbus_g_thread_init (); | ||
158 | g_type_init (); | ||
159 | - | ||
160 | +#endif | ||
161 | /* TRANSLATORS: describing the service that is running */ | ||
162 | context = g_option_context_new (_("PackageKit service")); | ||
163 | g_option_context_add_main_entries (context, options, NULL); | ||
164 | -- | ||
165 | 1.7.9.5 | ||
166 | |||
diff --git a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch deleted file mode 100644 index 48f959186..000000000 --- a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: PackageKit-0.6.0/configure.ac | ||
2 | =================================================================== | ||
3 | --- PackageKit-0.6.0.orig/configure.ac 2010-01-04 16:32:18.000000000 +0000 | ||
4 | +++ PackageKit-0.6.0/configure.ac 2010-01-29 11:33:48.000000000 +0000 | ||
5 | @@ -90,7 +90,7 @@ | ||
6 | enable_strict=$default_strict) | ||
7 | if test x$enable_strict != xno; then | ||
8 | if test "$GCC" = "yes"; then | ||
9 | - WARNINGFLAGS_CPP="$WARNINGFLAGS_CPP -Werror" | ||
10 | + : | ||
11 | fi | ||
12 | fi | ||
13 | |||
diff --git a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch deleted file mode 100644 index 5a73a19d5..000000000 --- a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch +++ /dev/null | |||
@@ -1,422 +0,0 @@ | |||
1 | Index: PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c | ||
2 | =================================================================== | ||
3 | --- PackageKit-0.6.0.orig/backends/opkg/pk-backend-opkg.c 2010-01-29 09:39:33.000000000 +0000 | ||
4 | +++ PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c 2010-01-29 11:30:51.000000000 +0000 | ||
5 | @@ -29,8 +29,7 @@ | ||
6 | |||
7 | +#include <stdio.h> | ||
8 | #include <libopkg/opkg.h> | ||
9 | |||
10 | -static opkg_t *opkg; | ||
11 | - | ||
12 | enum { | ||
13 | SEARCH_NAME, | ||
14 | SEARCH_DESCRIPTION, | ||
15 | @@ -62,7 +60,7 @@ | ||
16 | * check an opkg package for known GUI dependancies | ||
17 | */ | ||
18 | static gboolean | ||
19 | -opkg_is_gui_pkg (opkg_package_t *pkg) | ||
20 | +opkg_is_gui_pkg (pkg_t *pkg) | ||
21 | { | ||
22 | |||
23 | /* TODO: check appropriate tag */ | ||
24 | @@ -84,7 +82,7 @@ | ||
25 | * check an opkg package to determine if it is a development package | ||
26 | */ | ||
27 | static gboolean | ||
28 | -opkg_is_devel_pkg (opkg_package_t *pkg) | ||
29 | +opkg_is_devel_pkg (pkg_t *pkg) | ||
30 | { | ||
31 | if (g_strrstr (pkg->name, "-dev")) | ||
32 | return TRUE; | ||
33 | @@ -105,7 +103,7 @@ | ||
34 | * returns true if the tag is present | ||
35 | */ | ||
36 | static gboolean | ||
37 | -opkg_check_tag (opkg_package_t *pkg, const gchar *tag) | ||
38 | +opkg_check_tag (pkg_t *pkg, const gchar *tag) | ||
39 | { | ||
40 | if (pkg->tags && tag) | ||
41 | return (g_strrstr (pkg->tags, tag) != NULL); | ||
42 | @@ -118,7 +116,7 @@ | ||
43 | { | ||
44 | switch (err) | ||
45 | { | ||
46 | - case OPKG_NO_ERROR: | ||
47 | +/* case OPKG_NO_ERROR: | ||
48 | break; | ||
49 | case OPKG_PACKAGE_NOT_INSTALLED: | ||
50 | pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL); | ||
51 | @@ -140,7 +138,7 @@ | ||
52 | break; | ||
53 | case OPKG_PACKAGE_NOT_AVAILABLE: | ||
54 | pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL); | ||
55 | - break; | ||
56 | + break;*/ | ||
57 | default: | ||
58 | opkg_unknown_error (backend, err, "Update package"); | ||
59 | } | ||
60 | @@ -152,7 +150,7 @@ | ||
61 | static void | ||
62 | backend_initialize (PkBackend *backend) | ||
63 | { | ||
64 | - opkg = opkg_new (); | ||
65 | + int opkg = opkg_new (); | ||
66 | |||
67 | if (!opkg) { | ||
68 | pk_backend_error_code (backend, | ||
69 | @@ -162,8 +160,8 @@ | ||
70 | } | ||
71 | |||
72 | #ifdef OPKG_OFFLINE_ROOT | ||
73 | - opkg_set_option (opkg, (char *) "offline_root", OPKG_OFFLINE_ROOT); | ||
74 | - opkg_re_read_config_files (opkg); | ||
75 | + opkg_set_option ((char *) "offline_root", OPKG_OFFLINE_ROOT); | ||
76 | + opkg_re_read_config_files (); | ||
77 | #endif | ||
78 | |||
79 | } | ||
80 | @@ -174,22 +172,22 @@ | ||
81 | static void | ||
82 | backend_destroy (PkBackend *backend) | ||
83 | { | ||
84 | - opkg_free (opkg); | ||
85 | + opkg_free (); | ||
86 | } | ||
87 | |||
88 | |||
89 | static void | ||
90 | -pk_opkg_progress_cb (opkg_t *_opkg, const opkg_progress_data_t *pdata, void *data) | ||
91 | +pk_opkg_progress_cb (const opkg_progress_data_t *pdata, void *data) | ||
92 | { | ||
93 | - PkBackend *backend = PK_BACKEND (data); | ||
94 | + PkBackend *backend = (PkBackend*) data; | ||
95 | if (!backend) | ||
96 | return; | ||
97 | |||
98 | pk_backend_set_percentage (backend, pdata->percentage); | ||
99 | - if (pdata->package) | ||
100 | + if (pdata->pkg) | ||
101 | { | ||
102 | gchar *uid; | ||
103 | - opkg_package_t *pkg = pdata->package; | ||
104 | + pkg_t *pkg = pdata->pkg; | ||
105 | gint status = PK_INFO_ENUM_UNKNOWN; | ||
106 | |||
107 | uid = g_strdup_printf ("%s;%s;%s;", | ||
108 | @@ -225,12 +223,12 @@ | ||
109 | { | ||
110 | int ret; | ||
111 | |||
112 | - ret = opkg_update_package_lists (opkg, pk_opkg_progress_cb, backend); | ||
113 | + ret = opkg_update_package_lists (pk_opkg_progress_cb, backend); | ||
114 | |||
115 | if (ret) { | ||
116 | - if (ret == OPKG_DOWNLOAD_FAILED) | ||
117 | - pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL); | ||
118 | - else | ||
119 | +// if (ret == OPKG_DOWNLOAD_FAILED) | ||
120 | +// pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL); | ||
121 | +// else | ||
122 | opkg_unknown_error (backend, ret, "Refreshing cache"); | ||
123 | } | ||
124 | pk_backend_finished (backend); | ||
125 | @@ -256,7 +254,7 @@ | ||
126 | */ | ||
127 | |||
128 | static void | ||
129 | -pk_opkg_package_list_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data) | ||
130 | +pk_opkg_package_list_cb (pkg_t *pkg, void *data) | ||
131 | { | ||
132 | SearchParams *params = (SearchParams*) data; | ||
133 | gchar *uid; | ||
134 | @@ -298,7 +296,7 @@ | ||
135 | uid = g_strdup_printf ("%s;%s;%s;", | ||
136 | pkg->name, pkg->version, pkg->architecture); | ||
137 | |||
138 | - if (pkg->installed) | ||
139 | + if (pkg->state_status == SS_INSTALLED) | ||
140 | status = PK_INFO_ENUM_INSTALLED; | ||
141 | else | ||
142 | status = PK_INFO_ENUM_AVAILABLE; | ||
143 | @@ -318,10 +316,10 @@ | ||
144 | opkg_is_gui_pkg (pkg)) | ||
145 | goto end_handle; | ||
146 | if (pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED) && | ||
147 | - (!pkg->installed)) | ||
148 | + (pkg->state_status != SS_INSTALLED)) | ||
149 | goto end_handle; | ||
150 | if (pk_bitfield_contain(filters, PK_FILTER_ENUM_NOT_INSTALLED) && | ||
151 | - (pkg->installed)) | ||
152 | + (pkg->state_status == SS_INSTALLED)) | ||
153 | goto end_handle; | ||
154 | |||
155 | pk_backend_package (params->backend, status, uid, pkg->description); | ||
156 | @@ -338,7 +336,7 @@ | ||
157 | |||
158 | params = pk_backend_get_pointer (backend, "search-params"); | ||
159 | |||
160 | - opkg_list_packages (opkg, pk_opkg_package_list_cb, params); | ||
161 | + opkg_list_packages (pk_opkg_package_list_cb, params); | ||
162 | |||
163 | pk_backend_finished (params->backend); | ||
164 | |||
165 | @@ -349,7 +347,7 @@ | ||
166 | } | ||
167 | |||
168 | static void | ||
169 | -backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search) | ||
170 | +backend_search_name (PkBackend *backend, PkBitfield filters, gchar **search) | ||
171 | { | ||
172 | SearchParams *params; | ||
173 | |||
174 | @@ -360,7 +358,7 @@ | ||
175 | params = g_new0 (SearchParams, 1); | ||
176 | params->filters = filters; | ||
177 | params->search_type = SEARCH_NAME; | ||
178 | - params->needle = g_utf8_strdown (search, -1); | ||
179 | + params->needle = g_utf8_strdown (search[0], -1); | ||
180 | params->backend = backend; | ||
181 | |||
182 | pk_backend_set_pointer (backend, "search-params", params); | ||
183 | @@ -371,7 +369,7 @@ | ||
184 | * backend_search_description: | ||
185 | */ | ||
186 | static void | ||
187 | -backend_search_description (PkBackend *backend, PkBitfield filters, const gchar *search) | ||
188 | +backend_search_description (PkBackend *backend, PkBitfield filters, gchar **search) | ||
189 | { | ||
190 | SearchParams *params; | ||
191 | |||
192 | @@ -382,7 +380,7 @@ | ||
193 | params = g_new0 (SearchParams, 1); | ||
194 | params->filters = filters; | ||
195 | params->search_type = SEARCH_DESCRIPTION; | ||
196 | - params->needle = g_utf8_strdown (search, -1); | ||
197 | + params->needle = g_utf8_strdown (search[0], -1); | ||
198 | params->backend = backend; | ||
199 | |||
200 | pk_backend_set_pointer (backend, "search-params", params); | ||
201 | @@ -390,7 +388,7 @@ | ||
202 | } | ||
203 | |||
204 | static void | ||
205 | -backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *search) | ||
206 | +backend_search_group (PkBackend *backend, PkBitfield filters, gchar **search) | ||
207 | { | ||
208 | SearchParams *params; | ||
209 | |||
210 | @@ -401,7 +399,7 @@ | ||
211 | params = g_new0 (SearchParams, 1); | ||
212 | params->filters = filters; | ||
213 | params->search_type = SEARCH_TAG; | ||
214 | - params->needle = g_strdup_printf ("group::%s", search); | ||
215 | + params->needle = g_strdup_printf ("group::%s", search[0]); | ||
216 | params->backend = backend; | ||
217 | |||
218 | pk_backend_set_pointer (backend, "search-params", params); | ||
219 | @@ -412,9 +410,9 @@ | ||
220 | static gboolean | ||
221 | backend_install_packages_thread (PkBackend *backend) | ||
222 | { | ||
223 | - PkPackageId *pi; | ||
224 | gint err, i; | ||
225 | gchar **package_ids; | ||
226 | + gchar **parts; | ||
227 | |||
228 | package_ids = pk_backend_get_strv (backend, "pkids"); | ||
229 | |||
230 | @@ -424,13 +422,13 @@ | ||
231 | { | ||
232 | pk_backend_package (backend, PK_INFO_ENUM_INSTALLING, package_ids[i], NULL); | ||
233 | |||
234 | - pi = pk_package_id_new_from_string (package_ids[i]); | ||
235 | + parts = pk_package_id_split (package_ids[i]); | ||
236 | |||
237 | - err = opkg_install_package (opkg, pi->name, pk_opkg_progress_cb, backend); | ||
238 | + err = opkg_install_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend); | ||
239 | if (err) | ||
240 | handle_install_error (backend, err); | ||
241 | |||
242 | - pk_package_id_free (pi); | ||
243 | + g_strfreev (parts); | ||
244 | if (err != 0) | ||
245 | break; | ||
246 | } | ||
247 | @@ -453,9 +451,9 @@ | ||
248 | static gboolean | ||
249 | backend_remove_packages_thread (PkBackend *backend) | ||
250 | { | ||
251 | - PkPackageId *pi; | ||
252 | gint err, i; | ||
253 | gchar **package_ids; | ||
254 | + gchar **parts; | ||
255 | gboolean allow_deps; | ||
256 | gboolean autoremove; | ||
257 | gpointer *data; | ||
258 | @@ -467,29 +465,30 @@ | ||
259 | autoremove = GPOINTER_TO_INT (data[2]); | ||
260 | g_free (data); | ||
261 | |||
262 | - opkg_set_option (opkg, (char *)"autoremove", &autoremove); | ||
263 | - opkg_set_option (opkg, (char *)"force_removal_of_dependent_packages", &allow_deps); | ||
264 | + opkg_set_option ((char *)"autoremove", &autoremove); | ||
265 | + opkg_set_option ((char *)"force_removal_of_dependent_packages", &allow_deps); | ||
266 | |||
267 | err = 0; | ||
268 | |||
269 | for (i = 0; package_ids[i]; i++) | ||
270 | { | ||
271 | - pi = pk_package_id_new_from_string (package_ids[i]); | ||
272 | pk_backend_package (backend, PK_INFO_ENUM_REMOVING, package_ids[i], NULL); | ||
273 | |||
274 | - err = opkg_remove_package (opkg, pi->name, pk_opkg_progress_cb, backend); | ||
275 | + parts = pk_package_id_split (package_ids[i]); | ||
276 | + | ||
277 | + err = opkg_remove_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend); | ||
278 | |||
279 | switch (err) | ||
280 | { | ||
281 | - case OPKG_NO_ERROR: | ||
282 | - break; | ||
283 | - case OPKG_PACKAGE_NOT_INSTALLED: | ||
284 | - pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL); | ||
285 | - break; | ||
286 | + //case OPKG_NO_ERROR: | ||
287 | + // break; | ||
288 | + //case OPKG_PACKAGE_NOT_INSTALLED: | ||
289 | + // pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL); | ||
290 | + // break; | ||
291 | default: | ||
292 | opkg_unknown_error (backend, err, "Remove"); | ||
293 | } | ||
294 | - pk_package_id_free (pi); | ||
295 | + g_strfreev (parts); | ||
296 | |||
297 | if (err != 0) | ||
298 | break; | ||
299 | @@ -540,7 +539,7 @@ | ||
300 | gint err; | ||
301 | |||
302 | /* FIXME: support only_trusted */ | ||
303 | - err = opkg_upgrade_all (opkg, pk_opkg_progress_cb, backend); | ||
304 | + err = opkg_upgrade_all (pk_opkg_progress_cb, backend); | ||
305 | |||
306 | if (err) | ||
307 | opkg_unknown_error (backend, err, "Upgrading system"); | ||
308 | @@ -564,29 +563,28 @@ | ||
309 | static gboolean | ||
310 | backend_update_package_thread (PkBackend *backend) | ||
311 | { | ||
312 | - PkPackageId *pi; | ||
313 | + gchar **parts; | ||
314 | gint err = 0; | ||
315 | const gchar *package_id; | ||
316 | |||
317 | /* FIXME: support only_trusted */ | ||
318 | package_id = pk_backend_get_string (backend, "pkgid"); | ||
319 | - pi = pk_package_id_new_from_string (package_id); | ||
320 | + parts = pk_package_id_split (package_id); | ||
321 | |||
322 | - if (!pi->name || !pi->version) | ||
323 | + if (!parts) | ||
324 | { | ||
325 | pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, | ||
326 | "Package not found"); | ||
327 | - pk_package_id_free (pi); | ||
328 | pk_backend_finished (backend); | ||
329 | return FALSE; | ||
330 | } | ||
331 | |||
332 | - err = opkg_upgrade_package (opkg, pi->name, pk_opkg_progress_cb, backend); | ||
333 | + err = opkg_upgrade_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend); | ||
334 | if (err) | ||
335 | handle_install_error (backend, err); | ||
336 | |||
337 | |||
338 | - pk_package_id_free (pi); | ||
339 | + g_strfreev (parts); | ||
340 | pk_backend_finished (backend); | ||
341 | return (err != 0); | ||
342 | } | ||
343 | @@ -610,13 +608,13 @@ | ||
344 | */ | ||
345 | |||
346 | static void | ||
347 | -pk_opkg_list_upgradable_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data) | ||
348 | +pk_opkg_list_upgradable_cb (pkg_t *pkg, void *data) | ||
349 | { | ||
350 | - PkBackend *backend = PK_BACKEND (data); | ||
351 | + PkBackend *backend = (PkBackend*) data; | ||
352 | gchar *uid; | ||
353 | gint status; | ||
354 | |||
355 | - if (pkg->installed) | ||
356 | + if (pkg->state_status == SS_INSTALLED) | ||
357 | status = PK_INFO_ENUM_INSTALLED; | ||
358 | else | ||
359 | status = PK_INFO_ENUM_AVAILABLE; | ||
360 | @@ -631,7 +629,7 @@ | ||
361 | static gboolean | ||
362 | backend_get_updates_thread (PkBackend *backend) | ||
363 | { | ||
364 | - opkg_list_upgradable_packages (opkg, pk_opkg_list_upgradable_cb, backend); | ||
365 | + opkg_list_upgradable_packages (pk_opkg_list_upgradable_cb, backend); | ||
366 | pk_backend_finished (backend); | ||
367 | return TRUE; | ||
368 | } | ||
369 | @@ -668,16 +666,18 @@ | ||
370 | static gboolean | ||
371 | backend_get_details_thread (PkBackend *backend) | ||
372 | { | ||
373 | - PkPackageId *pi; | ||
374 | gchar **package_ids; | ||
375 | + gchar **parts; | ||
376 | int group_index; | ||
377 | PkGroupEnum group = 0; | ||
378 | - opkg_package_t *pkg; | ||
379 | + pkg_t *pkg; | ||
380 | gchar *newid; | ||
381 | |||
382 | package_ids = pk_backend_get_strv(backend, "package_ids"); | ||
383 | - pi = pk_package_id_new_from_string (package_ids[0]); | ||
384 | - if (pi == NULL) | ||
385 | + parts = pk_package_id_split (package_ids[0]); | ||
386 | + | ||
387 | + | ||
388 | + if (!parts) | ||
389 | { | ||
390 | pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id"); | ||
391 | pk_backend_finished (backend); | ||
392 | @@ -685,8 +685,8 @@ | ||
393 | } | ||
394 | |||
395 | |||
396 | - pkg = opkg_find_package (opkg, pi->name, pi->version, pi->arch, pi->data); | ||
397 | - pk_package_id_free (pi); | ||
398 | + pkg = opkg_find_package (parts[PK_PACKAGE_ID_NAME], parts[PK_PACKAGE_ID_VERSION], parts[PK_PACKAGE_ID_ARCH], parts[PK_PACKAGE_ID_DATA]); | ||
399 | + g_strfreev (parts); | ||
400 | |||
401 | if (!pkg) | ||
402 | { | ||
403 | @@ -695,7 +695,7 @@ | ||
404 | return FALSE; | ||
405 | } | ||
406 | |||
407 | - newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->repository); | ||
408 | + newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->src->name); | ||
409 | |||
410 | if (pkg->tags) { | ||
411 | for (group_index = 0; group < PK_GROUP_ENUM_LAST; group_index++) { | ||
412 | @@ -706,9 +706,8 @@ | ||
413 | } | ||
414 | } | ||
415 | |||
416 | - pk_backend_details (backend, newid, NULL, group, pkg->description, pkg->url, pkg->size); | ||
417 | + pk_backend_details (backend, newid, NULL, group, pkg->description, NULL, pkg->size); | ||
418 | g_free (newid); | ||
419 | - opkg_package_free(pkg); | ||
420 | pk_backend_finished (backend); | ||
421 | return TRUE; | ||
422 | } | ||
diff --git a/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb b/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb deleted file mode 100644 index 1b60c470d..000000000 --- a/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | SUMMARY = "PackageKit package management abstraction" | ||
2 | SECTION = "libs" | ||
3 | LICENSE = "GPL-2.0+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
5 | DEPENDS = "gtk+ python polkit dbus dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native" | ||
6 | RDEPENDS_${PN} = "opkg bash" | ||
7 | |||
8 | inherit gnome pythonnative | ||
9 | |||
10 | SRC_URI = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${PV}.tar.bz2;name=archive \ | ||
11 | file://configurefix.patch \ | ||
12 | file://opkgfixes.patch \ | ||
13 | file://0001-Don-t-call-deprecated-glib-functions-and-use-the-new.patch \ | ||
14 | " | ||
15 | |||
16 | SRC_URI[archive.md5sum] = "33a3127e9ed41e26671786aee9fe56ff" | ||
17 | SRC_URI[archive.sha256sum] = "8dae41493dfb011442746d252b3435bf3204e17bf7c47e396f90fbd215260e14" | ||
18 | |||
19 | S = "${WORKDIR}/PackageKit-${PV}" | ||
20 | |||
21 | PACKAGECONFIG ??= "" | ||
22 | PACKAGECONFIG[service-packs] = "--enable-service-packs,--disable-service-packs,libarchive" | ||
23 | |||
24 | EXTRA_OECONF = "--with-security-framework=dummy \ | ||
25 | --with-default-backend=opkg \ | ||
26 | --enable-opkg \ | ||
27 | --disable-tests \ | ||
28 | --disable-ruck \ | ||
29 | --disable-qt \ | ||
30 | --disable-gstreamer-plugin \ | ||
31 | --disable-local \ | ||
32 | --disable-networkmanager \ | ||
33 | --disable-device-rebind \ | ||
34 | ac_cv_path_XMLTO=no \ | ||
35 | " | ||
36 | |||
37 | #do_configure_prepend() { | ||
38 | # mkdir -p m4 | ||
39 | # echo "EXTRA_DIST=" > gtk-doc.make | ||
40 | #} | ||
41 | |||
42 | do_configure_append() { | ||
43 | for i in $(find . -name Makefile) ; do | ||
44 | sed -i -e s:${STAGING_DIR_NATIVE}::g \ | ||
45 | -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \ | ||
46 | $i | ||
47 | done | ||
48 | } | ||
49 | |||
50 | PACKAGES =+ "${PN}-website" | ||
51 | FILES_${PN}-website = "${datadir}/PackageKit/website" | ||
52 | |||
53 | PACKAGES =+ "${PN}-python" | ||
54 | FILES_${PN}-python = "${libdir}/python*" | ||
55 | |||
56 | PACKAGES =+ "${PN}-gtkmodule" | ||
57 | FILES_${PN}-gtkmodule = "${libdir}/gtk-2.0/*/*.so" | ||
58 | |||
59 | FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit ${datadir}/PackageKit" | ||
60 | FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so ${libdir}/gtk-2.0/*/.debug" | ||
61 | FILES_${PN}-dev += "${libdir}/packagekit-backend/*.la ${libdir}/gtk-2.0/*/*.la" | ||
62 | FILES_${PN}-staticdev += "${libdir}/packagekit-backend/*.a ${libdir}/gtk-2.0/*/*.a" | ||
63 | |||
64 | # PackageKit-0.5.6/backends/opkg/pk-backend-opkg.c:31:26: fatal error: libopkg/opkg.h: No such file or directory | ||
65 | PNBLACKLIST[packagekit] ?= "BROKEN: depends on old deprecated libopkg which is currently disabled and will be removed soon - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc deleted file mode 100644 index f7d480f17..000000000 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | DESCRIPTION = "Vala DBus Binding Tool" | ||
2 | SECTION = "devel" | ||
3 | DEPENDS = "vala libgee libxml2" | ||
4 | HOMEPAGE = "http://wiki.freesmartphone.org/index.php/Implementations/vala-dbus-binding-tool" | ||
5 | LICENSE = "GPLv3" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
7 | PE = "1" | ||
8 | INC_PR = "r3" | ||
9 | |||
10 | export XDG_DATA_DIRS = "${STAGING_DATADIR}" | ||
11 | |||
12 | SRC_URI = "${SOURCEFORGE_MIRROR}/freesmartphone/sources/${BP}.tar.bz2" | ||
13 | |||
14 | inherit autotools perlnative pkgconfig | ||
15 | |||
16 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool/0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool/0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch deleted file mode 100644 index 14d84ae8a..000000000 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool/0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 8abed2e5bf8e7815b11df6d22042d5f0ac8efcb0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 5 May 2015 13:43:35 +0200 | ||
4 | Subject: [PATCH] configure.ac: don't use dash in m4 macro names | ||
5 | |||
6 | * otherwise it doesn't get expanded and vala-dbus-binding-tool ends with version 'vala-dbus-binding-tool_version' | ||
7 | |||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | configure.ac | 10 +++++----- | ||
11 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 48f007c..18d0bde 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -1,9 +1,9 @@ | ||
18 | -m4_define([vala-dbus-binding-tool_released], [0]) | ||
19 | -m4_define([vala-dbus-binding-tool_base_version], [1.0]) | ||
20 | -m4_define([vala-dbus-binding-tool_maybe_gitrev], m4_if(vala-dbus-binding-tool_released, [1], [], [m4_esyscmd([git show-ref --hash=5 HEAD | tr -d '\n\r'])])) | ||
21 | -m4_define([vala-dbus-binding-tool_version], m4_if(vala-dbus-binding-tool_released, [1], [vala-dbus-binding-tool_base_version], [vala-dbus-binding-tool_base_version-vala-dbus-binding-tool_maybe_gitrev])) | ||
22 | +m4_define([vala_dbus_binding_tool_released], [0]) | ||
23 | +m4_define([vala_dbus_binding_tool_base_version], [1.0]) | ||
24 | +m4_define([vala_dbus_binding_tool_maybe_gitrev], m4_if(vala_dbus_binding_tool_released, [1], [], [m4_esyscmd([git show-ref --hash=5 HEAD | tr -d '\n\r'])])) | ||
25 | +m4_define([vala_dbus_binding_tool_version], m4_if(vala_dbus_binding_tool_released, [1], [vala_dbus_binding_tool_base_version], [vala_dbus_binding_tool_base_version-vala_dbus_binding_tool_maybe_gitrev])) | ||
26 | |||
27 | -AC_INIT([vala-dbus-binding-tool], [vala-dbus-binding-tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool]) | ||
28 | +AC_INIT([vala-dbus-binding-tool], [vala_dbus_binding_tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool]) | ||
29 | AC_CONFIG_SRCDIR([src/Makefile.am]) | ||
30 | AC_CONFIG_HEADERS(config.h) | ||
31 | AM_INIT_AUTOMAKE([dist-bzip2]) | ||
32 | -- | ||
33 | 2.3.5 | ||
34 | |||
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb deleted file mode 100644 index 19e3dceca..000000000 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require vala-dbus-binding-tool.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "59eab7abf38f35355d3786803bd2441f" | ||
4 | SRC_URI[sha256sum] = "1e37ab2e6238eaef9f573560ea7379e6955570f7c9503083e50c4c185c1956df" | ||
5 | |||
6 | PNBLACKLIST[vala-dbus-binding-tool] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/131628/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb deleted file mode 100644 index 32f34550d..000000000 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | require vala-dbus-binding-tool.inc | ||
2 | |||
3 | # Temporary remove negative preference, because there are 2 versions of 0.4.0 archives: | ||
4 | # the original one depending on libgee1.0 from | ||
5 | # http://downloads.freesmartphone.org/sources/${BPN}/${BP}.tar.bz2 | ||
6 | # and new one depending on libgee0.8 from | ||
7 | # http://sourceforge.net/projects/freesmartphone/files/sources/ | ||
8 | # The original one can be already deployed on various premirrors, | ||
9 | # so prefer the git recipe which doesn't suffer from this issue | ||
10 | # DEFAULT_PREFERENCE = "-1" | ||
11 | |||
12 | SRCREV = "742c04c2bb0743891904522ce47e50f9e5c99b12" | ||
13 | PV = "0.4.0+gitr${SRCPV}" | ||
14 | |||
15 | SRC_URI = "git://github.com/freesmartphone/vala-dbus-binding-tool.git;protocol=https \ | ||
16 | file://0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch \ | ||
17 | " | ||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | PNBLACKLIST[vala-dbus-binding-tool] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130581/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-networking/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch b/meta-oe/recipes-extended/openlmi/openlmi-networking/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch deleted file mode 100644 index c23820094..000000000 --- a/meta-oe/recipes-extended/openlmi/openlmi-networking/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 336bb5a031077461ec6b2e5438738bf100f0dd2f Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
3 | Date: Mon, 3 Aug 2015 02:37:46 +0900 | ||
4 | Subject: [PATCH] fix lib64 can not be shiped in 64bit target | ||
5 | |||
6 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
7 | --- | ||
8 | CMakeLists.txt | 7 ------- | ||
9 | 1 file changed, 7 deletions(-) | ||
10 | |||
11 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
12 | index 1ba3cd3..2411745 100644 | ||
13 | --- a/CMakeLists.txt | ||
14 | +++ b/CMakeLists.txt | ||
15 | @@ -35,13 +35,6 @@ if (DEBUG) | ||
16 | add_definitions("-DDEBUG_ENABLED") | ||
17 | endif (DEBUG) | ||
18 | |||
19 | -# Set LIB_SUFFIX to 64 on 64bit architectures | ||
20 | -if(CMAKE_SIZEOF_VOID_P EQUAL 4) | ||
21 | - set(LIB_SUFFIX "") | ||
22 | -else(CMAKE_SIZEOF_VOID_P EQUAL 4) | ||
23 | - SET(LIB_SUFFIX 64) | ||
24 | -endif(CMAKE_SIZEOF_VOID_P EQUAL 4) | ||
25 | - | ||
26 | # Find OpenLMIMacros when installed in other prefix than /usr (e.g. /usr/local) | ||
27 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_INSTALL_PREFIX}) | ||
28 | include(OpenLMIMacros RESULT_VARIABLE LMIMACROS) | ||
29 | -- | ||
30 | 1.8.4.2 | ||
31 | |||
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb b/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb deleted file mode 100644 index 081bd3bc0..000000000 --- a/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | SUMMARY = "CIM providers for network management" | ||
2 | DESCRIPTION = "\ | ||
3 | openlmi-networking is set of CMPI providers for network management using \ | ||
4 | Common Information Model (CIM)." | ||
5 | HOMEPAGE = "http://www.openlmi.org/" | ||
6 | LICENSE = "LGPL-2.1+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" | ||
8 | SECTION = "System/Management" | ||
9 | DEPENDS = "openlmi-providers konkretcmpi konkretcmpi-native sblim-cmpi-devel cim-schema-exper networkmanager dbus libcheck glib-2.0" | ||
10 | |||
11 | SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \ | ||
12 | file://0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch \ | ||
13 | " | ||
14 | SRC_URI[md5sum] = "f20de8c76fb6a80001b14c1eb035953e" | ||
15 | SRC_URI[sha256sum] = "578eaa5c65fe924b5d7aeb635509dd46443166cd6a88b019bc42646e3518a460" | ||
16 | |||
17 | inherit cmake | ||
18 | |||
19 | EXTRA_OECMAKE = "${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ | ||
20 | ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ | ||
21 | " | ||
22 | |||
23 | |||
24 | do_configure_prepend() { | ||
25 | export CMAKE_INSTALL_DATDIR="${STAGING_DATADIR}" | ||
26 | } | ||
27 | |||
28 | |||
29 | FILES_${PN} =+ "${libdir}/cmpi/libcmpiLMI_Networking.so ${prefix}/libexec*" | ||
30 | FILES_${PN}-dbg =+ "${libdir}/cmpi/.debug*" | ||
31 | |||
32 | PNBLACKLIST[openlmi-networking] ?= "Depends on blacklisted openlmi-providers - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-error.patch b/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-error.patch deleted file mode 100644 index 4bcd1c4d9..000000000 --- a/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-error.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 764171866b84e0198b67538f63022abde3e628ad Mon Sep 17 00:00:00 2001 | ||
2 | From: Qian Lei <qianl.fnst@cn.fujitsu.com> | ||
3 | Date: Fri, 16 Jan 2015 14:15:25 +0800 | ||
4 | Subject: [PATCH] fix error | ||
5 | |||
6 | Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> | ||
7 | --- | ||
8 | cmake/modules/OpenLMIMacros.cmake | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/cmake/modules/OpenLMIMacros.cmake b/cmake/modules/OpenLMIMacros.cmake | ||
12 | index d55f983..dbc32ec 100644 | ||
13 | --- a/cmake/modules/OpenLMIMacros.cmake | ||
14 | +++ b/cmake/modules/OpenLMIMacros.cmake | ||
15 | @@ -89,7 +89,7 @@ macro(konkretcmpi_generate MOFS CIM_PROVIDERS CIM_HEADERS CIM_CLASSES) | ||
16 | endforeach(CLASS ${CIM_CLASS_NAMES}) | ||
17 | |||
18 | # Generate headers for CIM classes | ||
19 | - set(ENV{KONKRET_SCHEMA_DIR} "/usr/share/mof/cim-current") | ||
20 | + set(ENV{KONKRET_SCHEMA_DIR} "$ENV{CMAKE_INSTALL_DATDIR}/mof/cim-current") | ||
21 | execute_process(COMMAND ${KONKRETCMPI_KONKRET} | ||
22 | ${KONKRET_MOF_FILES} | ||
23 | ${GENERATE_PROVIDERS} | ||
24 | -- | ||
25 | 1.8.3.1 | ||
26 | |||
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch b/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch deleted file mode 100644 index 9c8ebe4c0..000000000 --- a/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 7cecfa95f033b33a1c3260c214b2d0e5e81b4fd3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
3 | Date: Mon, 3 Aug 2015 02:05:56 +0900 | ||
4 | Subject: [PATCH] fix lib64 can not be shiped in 64bit target | ||
5 | |||
6 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
7 | --- | ||
8 | CMakeLists.txt | 7 ------- | ||
9 | 1 file changed, 7 deletions(-) | ||
10 | |||
11 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
12 | index 48ae206..3ead9c6 100644 | ||
13 | --- a/CMakeLists.txt | ||
14 | +++ b/CMakeLists.txt | ||
15 | @@ -21,13 +21,6 @@ else(HAS_STACK_PROTECTOR_STRONG) | ||
16 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector") | ||
17 | endif() | ||
18 | |||
19 | -# Set LIB_SUFFIX to 64 on 64bit architectures | ||
20 | -if(CMAKE_SIZEOF_VOID_P EQUAL 4) | ||
21 | - set(LIB_SUFFIX "") | ||
22 | -else(CMAKE_SIZEOF_VOID_P EQUAL 4) | ||
23 | - SET(LIB_SUFFIX 64) | ||
24 | -endif(CMAKE_SIZEOF_VOID_P EQUAL 4) | ||
25 | - | ||
26 | if(NOT SYSCONF_INSTALL_DIR) | ||
27 | set(SYSCONF_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/etc) | ||
28 | endif(NOT SYSCONF_INSTALL_DIR) | ||
29 | -- | ||
30 | 1.8.4.2 | ||
31 | |||
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb b/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb deleted file mode 100644 index 2eda65320..000000000 --- a/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | SUMMARY = "Set of basic CIM providers" | ||
2 | DESCRIPTION = "\ | ||
3 | openlmi-providers is set of (usually) small CMPI providers (agents) for \ | ||
4 | basic monitoring and management of host system using Common Information \ | ||
5 | Model (CIM)." | ||
6 | HOMEPAGE = "http://www.openlmi.org/" | ||
7 | LICENSE = "LGPLv2+" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" | ||
9 | SECTION = "System/Management" | ||
10 | DEPENDS = "konkretcmpi-native konkretcmpi sblim-sfcb sblim-cmpi-devel cim-schema-exper lmsensors libuser swig swig-native dbus udev systemd-systemctl-native pciutils" | ||
11 | |||
12 | SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \ | ||
13 | file://0001-fix-error.patch \ | ||
14 | file://0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch \ | ||
15 | " | ||
16 | SRC_URI[md5sum] = "5904f23cf494946237cfbbdbe644a3cd" | ||
17 | SRC_URI[sha256sum] = "e2b2fbeaec45a83905d0da3b87da83904d9cd94c1b86312f844587b3fff11f56" | ||
18 | |||
19 | inherit cmake | ||
20 | LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | ||
21 | EXTRA_OECMAKE = " \ | ||
22 | -DWITH-DEVASSISTANT=OFF \ | ||
23 | -DWITH-JOURNALD=OFF \ | ||
24 | -DWITH-SERVICE=OFF \ | ||
25 | -DWITH-SERVICE-LEGACY=ON \ | ||
26 | -DWITH-ACCOUNT=OFF \ | ||
27 | -DWITH-PCP=OFF \ | ||
28 | -DWITH-REALMD=OFF \ | ||
29 | -DWITH-FAN=OFF \ | ||
30 | -DWITH-LOCALE=OFF \ | ||
31 | -DWITH-INDSENDER=OFF \ | ||
32 | -DWITH-JOBMANAGER=OFF \ | ||
33 | -DWITH-SSSD=OFF \ | ||
34 | -DWITH-SELINUX=OFF \ | ||
35 | -DWITH-SOFTWARE-DBUS=ON \ | ||
36 | ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ | ||
37 | ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ | ||
38 | " | ||
39 | |||
40 | do_configure_prepend() { | ||
41 | export CMAKE_INSTALL_DATDIR="${STAGING_DATADIR}" | ||
42 | } | ||
43 | |||
44 | do_install_append() { | ||
45 | if [ -d ${D}${prefix}${sysconfidr} ]; then | ||
46 | mv ${D}${prefix}${sysconfdir} ${D}${sysconfdir} | ||
47 | fi | ||
48 | } | ||
49 | |||
50 | FILES_${PN} =+ "${libdir}/cmpi/libcmpiLMI* ${prefix}/libexec*" | ||
51 | FILES_${PN}-dev =+ "${datadir}/cmake*" | ||
52 | FILES_${PN}-dbg =+ "${libdir}/cmpi/.debug*" | ||
53 | |||
54 | RDEPENDS_${PN} = "python" | ||
55 | |||
56 | PNBLACKLIST[openlmi-providers] ?= "Depends on blacklisted lmsensors - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-storage_0.8.1.bb b/meta-oe/recipes-extended/openlmi/openlmi-storage_0.8.1.bb deleted file mode 100644 index f99b77ca4..000000000 --- a/meta-oe/recipes-extended/openlmi/openlmi-storage_0.8.1.bb +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | SUMMARY = "CIM providers for storage management" | ||
2 | DESCRIPTION = "\ | ||
3 | The openlmi-storage package contains CMPI providers for management of storage \ | ||
4 | using Common Information Managemen (CIM) protocol. \ | ||
5 | \ | ||
6 | The providers can be registered in any CMPI-aware CIMOM, both OpenPegasus and \ | ||
7 | SFCB were tested." | ||
8 | HOMEPAGE = "http://www.openlmi.org/" | ||
9 | LICENSE = "LGPL-2.1+" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
11 | SECTION = "System/Management" | ||
12 | DEPENDS = "openlmi-providers pywbem cmpi-bindings" | ||
13 | RDEPENDS_${PN} += "bash" | ||
14 | |||
15 | SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz" | ||
16 | SRC_URI[md5sum] = "898cf0d8c03b8ad6b45d65f335ddee0d" | ||
17 | SRC_URI[sha256sum] = "4a1ba9957750f94ea58a89cea28985564f38d7cc9aa00fcae20c51e7b32bd0a8" | ||
18 | |||
19 | inherit setuptools | ||
20 | |||
21 | do_install_append() { | ||
22 | install -m 755 -d ${D}${datadir}/${BPN} | ||
23 | install -m 644 ${S}/mof/* ${D}${datadir}/${BPN}/ | ||
24 | |||
25 | install -m 755 -d ${D}${sysconfdir}/openlmi/storage | ||
26 | install -m 644 storage.conf ${D}${sysconfdir}/openlmi/storage/storage.conf | ||
27 | |||
28 | install -m 755 -d ${D}${libexecdir}/pegasus | ||
29 | install -m 755 pycmpiLMI_Storage-cimprovagt ${D}${libexecdir}/pegasus/ | ||
30 | } | ||
31 | |||
32 | FILES_${PN} =+ "${sysconfdir}/openlmi/storage/storage.conf ${datadir}/${BPN}/*" | ||
33 | |||
34 | PNBLACKLIST[openlmi-storage] ?= "Depends on blacklisted pywbem - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-extended/subsurface/subsurface_git.bb b/meta-oe/recipes-extended/subsurface/subsurface_git.bb deleted file mode 100644 index 90adaf487..000000000 --- a/meta-oe/recipes-extended/subsurface/subsurface_git.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SUMMARY = "Subsurface is an open source dive log program" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
4 | |||
5 | DEPENDS = "libdivecomputer gtk+ libxml2 glib-2.0 gconf" | ||
6 | |||
7 | PNBLACKLIST[subsurface] ?= "Needs to be upgraded for compatibility with new libdivecomputer - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
8 | |||
9 | inherit gtk-icon-cache cmake | ||
10 | |||
11 | inherit gitpkgv | ||
12 | PKGV = "${GITPKGVTAG}" | ||
13 | PV = "4.2" | ||
14 | |||
15 | SRCREV = "f61ee20ba356ecfc4c5b247f548f52d588179c94" | ||
16 | SRC_URI = "git://subsurface.hohndel.org/subsurface.git" | ||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | #FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/subsurface.svg" | ||
20 | RRECOMMENDS_${PN}_append_libc-glibc = " glibc-gconv-iso8859-15" | ||
21 | |||
diff --git a/meta-oe/recipes-gnome/gtkextra/files/remove-tutorial.patch b/meta-oe/recipes-gnome/gtkextra/files/remove-tutorial.patch deleted file mode 100644 index da4f3f441..000000000 --- a/meta-oe/recipes-gnome/gtkextra/files/remove-tutorial.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | diff --git a/docs/Makefile.am b/docs/Makefile.am | ||
4 | index f5375f5..c306f23 100644 | ||
5 | --- a/docs/Makefile.am | ||
6 | +++ b/docs/Makefile.am | ||
7 | @@ -1,4 +1,4 @@ | ||
8 | -SUBDIRS = reference tutorial | ||
9 | +SUBDIRS = reference | ||
10 | |||
11 | EXTRA_DIST = \ | ||
12 | COPYING \ | ||
diff --git a/meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb b/meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb deleted file mode 100644 index 34b7aa64a..000000000 --- a/meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | SUMMARY = "Gtk+Extra is a set of custom widget for plots and images" | ||
2 | HOMEPAGE = "http://gtkextra.sourceforge.net/" | ||
3 | |||
4 | LICENSE = "LGPLv2" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | ||
6 | |||
7 | SRC_URI = "${SOURCEFORGE_MIRROR}/gtkextra/${BP}.tar.gz \ | ||
8 | file://remove-tutorial.patch \ | ||
9 | " | ||
10 | |||
11 | SRC_URI[md5sum] = "486cea93666020f85f101ed8341baf41" | ||
12 | SRC_URI[sha256sum] = "9cab6c5d6b792eb828d17cec2b9c1baba2ef57f789a290464afab80b53969e65" | ||
13 | |||
14 | DEPENDS = "gtk+" | ||
15 | |||
16 | inherit autotools pkgconfig gobject-introspection | ||
17 | |||
18 | # | ./.libs/libgtkextra-x11-3.0.so: error: undefined reference to 'roundint' | ||
19 | PNBLACKLIST[gtkextra] ?= "BROKEN: Fails to build with gcc-5 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch b/meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch deleted file mode 100644 index b3eb3960c..000000000 --- a/meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 4b17eed4b8588569d11ec4bd2b6fa3c063830e6e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Thu, 16 May 2013 18:44:50 +0200 | ||
4 | Subject: [PATCH] tests/main.c: fix build with glib 2.36 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: project seems dead | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
12 | --- | ||
13 | tests/main.c | 2 ++ | ||
14 | 1 files changed, 2 insertions(+), 0 deletions(-) | ||
15 | |||
16 | diff --git a/tests/main.c b/tests/main.c | ||
17 | index 61cce82..18165ed 100644 | ||
18 | --- a/tests/main.c | ||
19 | +++ b/tests/main.c | ||
20 | @@ -30,7 +30,9 @@ main (gint argc, gchar **argv) | ||
21 | { | ||
22 | GtkWidget *browser; | ||
23 | |||
24 | +#if !GLIB_CHECK_VERSION (2, 36, 0) | ||
25 | g_thread_init(NULL); | ||
26 | +#endif | ||
27 | |||
28 | gtk_init (&argc, &argv); | ||
29 | |||
30 | -- | ||
31 | 1.7.6.5 | ||
32 | |||
diff --git a/meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb b/meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb deleted file mode 100644 index 021b077de..000000000 --- a/meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | SECTION = "libs" | ||
2 | DEPENDS = "gtk+ glib-2.0 libxml2" | ||
3 | SUMMARY = "A GTK+ HTML rendering library" | ||
4 | LICENSE = "LGPLv2" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" | ||
6 | |||
7 | SRCREV = "1161" | ||
8 | PV = "2.11.0+svnr${SRCPV}" | ||
9 | PR = "r5" | ||
10 | |||
11 | SRC_URI = "svn://svn.gnome.org/svn/gtkhtml2/;module=trunk;protocol=http \ | ||
12 | http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/css-stylesheet-user.patch;striplevel=0;name=patch2 \ | ||
13 | http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/css-media.patch;striplevel=0;name=patch3 \ | ||
14 | http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/add-end-element-signal.patch;striplevel=0;name=patch4 \ | ||
15 | http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/add-dom-functions.patch;striplevel=0;name=patch5 \ | ||
16 | http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/iain-mem-leak.patch;striplevel=0;name=patch6 \ | ||
17 | file://0001-tests-main.c-fix-build-with-glib-2.36.patch \ | ||
18 | " | ||
19 | |||
20 | SRC_URI[patch2.md5sum] = "05fc3627ca364095702dc804f41c8391" | ||
21 | SRC_URI[patch2.sha256sum] = "df5cca50a8f95333505d7920929fea251daea3be25be6834a1c50a742d9eb674" | ||
22 | |||
23 | SRC_URI[patch3.md5sum] = "d3fe4cda3545f3e4718f1acc186608ab" | ||
24 | SRC_URI[patch3.sha256sum] = "3aefaa17ffa38143bf5df1161c51ab402d35bfbee41ab4643c313edf569165d5" | ||
25 | |||
26 | SRC_URI[patch4.md5sum] = "651b1601d8a1b21c8a3040fadb729043" | ||
27 | SRC_URI[patch4.sha256sum] = "d067e8331bf9c6851f1c6067d991a7f54327f532900b405ebdf8e149c071f381" | ||
28 | |||
29 | SRC_URI[patch5.md5sum] = "041be9711a16e629d01487664ba97152" | ||
30 | SRC_URI[patch5.sha256sum] = "42956fb41341cf82ae8bce18b4cf96a7e2aa631b1b60657afb6d7e9be7cd138c" | ||
31 | |||
32 | SRC_URI[patch6.md5sum] = "4e11dc7899d68f2be2e06ccee01d296d" | ||
33 | SRC_URI[patch6.sha256sum] = "1e2cc080e654c1839c5cb4b4adf4c62a23e7da208427f3ba0b16cfed9e5cfa98" | ||
34 | |||
35 | S = "${WORKDIR}/trunk" | ||
36 | |||
37 | inherit pkgconfig autotools | ||
38 | |||
39 | EXTRA_OECONF = " --disable-accessibility" | ||
40 | |||
41 | PNBLACKLIST[gtkhtml2] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130633/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-graphics/clutter/clutter-box2d.inc b/meta-oe/recipes-graphics/clutter/clutter-box2d.inc deleted file mode 100644 index 646b785ca..000000000 --- a/meta-oe/recipes-graphics/clutter/clutter-box2d.inc +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | DESCRIPTION = "Clutter Box2D" | ||
2 | HOMEPAGE = "http://www.clutter-project.org/" | ||
3 | LICENSE = "LGPLv2.1+" | ||
4 | |||
5 | # The main clutter lib is machine specific so we need to be too | ||
6 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
7 | |||
8 | inherit autotools pkgconfig gtk-doc | ||
9 | |||
10 | do_install_append () { | ||
11 | install -d ${D}${bindir} | ||
12 | install ${S}/examples/.libs/blockbox ${D}${bindir} | ||
13 | } | ||
14 | |||
15 | FILESPATH = "${FILE_DIRNAME}/clutter-box2d" | ||
diff --git a/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb b/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb deleted file mode 100644 index d73e2f15e..000000000 --- a/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | require clutter-box2d.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://box2d/License.txt;md5=e5d39ad91f7dc4692dcdb1d85139ec6b" | ||
4 | |||
5 | # 0.12.1+gitAUTOINC+de5452e56b-r1/git/clutter-box2d/clutter-box2d.h:226:47: | ||
6 | # fatal error: clutter-box2d/clutter-box2d-child.h: No such file or directory | ||
7 | # | #include <clutter-box2d/clutter-box2d-child.h> | ||
8 | PNBLACKLIST[clutter-box2d] ?= "BROKEN: doesn't build with B!=S - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
9 | |||
10 | SRCREV = "de5452e56b537a11fd7f9453d048ff4b4793b5a2" | ||
11 | PV = "0.12.1+git${SRCPV}" | ||
12 | PR = "r1" | ||
13 | |||
14 | SRC_URI = "git://git.gnome.org/clutter-box2d.git" | ||
15 | |||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | DEPENDS += "clutter-1.0" | ||
19 | PROVIDES = "clutter-box2d-1.6" | ||
diff --git a/meta-oe/recipes-graphics/fim/files/cross_cc.patch b/meta-oe/recipes-graphics/fim/files/cross_cc.patch deleted file mode 100644 index 85ab1ef4a..000000000 --- a/meta-oe/recipes-graphics/fim/files/cross_cc.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 9b0b322d86c7b2d2cddaa62f7dab4aa669739a48 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthieu Crapet <Matthieu.Crapet@ingenico.com> | ||
3 | Date: Wed, 19 Mar 2014 13:18:21 +0100 | ||
4 | Subject: [PATCH] Upstream-Status: Pending | ||
5 | |||
6 | b2ba should be built by BUILD_CC in cross environment | ||
7 | This is only used when configured with --enable-hardcoded-font | ||
8 | |||
9 | Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> | ||
10 | --- | ||
11 | src/Makefile.am | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
15 | index a1d4330..a8150b9 100644 | ||
16 | --- a/src/Makefile.am | ||
17 | +++ b/src/Makefile.am | ||
18 | @@ -63,7 +63,7 @@ help-acm.cpp: fim.h | ||
19 | $(ECHO) '//#endif' >> $@ | ||
20 | |||
21 | b2ba: | ||
22 | - $(CC) -o b2ba b2ba.c | ||
23 | + $(BUILD_CC) -o b2ba b2ba.c | ||
24 | |||
25 | if FIM_WANT_CUSTOM_HARDCODED_CONSOLEFONT | ||
26 | default_font_byte_array.h: $(FIM_CUSTOM_HARDCODED_CONSOLEFONT) b2ba | ||
27 | -- | ||
28 | 1.8.5.4 | ||
29 | |||
diff --git a/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb b/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb deleted file mode 100644 index 7d1a3aaa8..000000000 --- a/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | SUMMARY = "Framebuffer (scriptable) image viewer" | ||
2 | DESCRIPTION = "FIM (Fbi IMproved) aims to be a highly customizable and scriptable \ | ||
3 | image viewer targeted at users who are comfortable with software \ | ||
4 | like the Vim text editor or the Mutt mail user agent." | ||
5 | SECTION = "utils" | ||
6 | HOMEPAGE = "http://www.autistici.org/dezperado/fim/" | ||
7 | |||
8 | LICENSE = "GPLv2" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=fa01bff138cc98a62b8840a157951c88" | ||
10 | |||
11 | PNBLACKLIST[fim] ?= "BROKEN: doesn't build with B!=S (flex: can't open lex.lex) - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
12 | |||
13 | # flex with provide /usr/include/FlexLexer.h | ||
14 | DEPENDS = "flex-native bison-native flex" | ||
15 | |||
16 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/fbi-improved/${BPN}-${PV}.tar.gz \ | ||
17 | file://cross_cc.patch" | ||
18 | SRC_URI[md5sum] = "d7362dde5541c2b6439c35c6e2bd5046" | ||
19 | SRC_URI[sha256sum] = "3f6bf2de2952b9adcbeb3db12c2a979e999a81dd1e314a03bc58e24f1ea9f686" | ||
20 | |||
21 | PARALLEL_MAKE = "" | ||
22 | |||
23 | inherit autotools pkgconfig | ||
24 | |||
25 | # Don't use provided regex.c | ||
26 | EXTRA_OECONF = "fim_cv_regex=no fim_cv_regex_broken=no \ | ||
27 | --enable-framebuffer \ | ||
28 | --disable-djvu \ | ||
29 | --disable-ps \ | ||
30 | --disable-xcftopnm \ | ||
31 | --disable-convert \ | ||
32 | --disable-inkscape \ | ||
33 | --disable-xfig \ | ||
34 | --disable-dia \ | ||
35 | --disable-aa \ | ||
36 | --disable-sdl \ | ||
37 | --enable-read-dirs \ | ||
38 | --enable-recursive-dirs \ | ||
39 | --enable-custom-status-bar \ | ||
40 | " | ||
41 | |||
42 | # Note: imlib2 is located in meta-efl layer. | ||
43 | PACKAGECONFIG ?= "jpeg rl hf" | ||
44 | PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" | ||
45 | PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" | ||
46 | PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" | ||
47 | PACKAGECONFIG[gif] = "--enable-gif,--disable-gif,giflib" | ||
48 | PACKAGECONFIG[pdf] = "--enable-poppler,--disable-poppler,poppler" | ||
49 | PACKAGECONFIG[magick] = "--enable-graphicsmagick,--disable-graphicsmagick,imagemagick" | ||
50 | PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" | ||
51 | PACKAGECONFIG[rl] = "--enable-readline,--disable-readline,readline" | ||
52 | PACKAGECONFIG[hf] = "--enable-hardcoded-font,--disable-hardcoded-font" | ||
diff --git a/meta-oe/recipes-graphics/libsexy/libsexy.inc b/meta-oe/recipes-graphics/libsexy/libsexy.inc deleted file mode 100644 index 5a11ca06a..000000000 --- a/meta-oe/recipes-graphics/libsexy/libsexy.inc +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" | ||
2 | HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" | ||
3 | AUTHOR = "Christian Hammond <chipx86@chipx86.com>" | ||
4 | SECTION = "x11/libs" | ||
5 | |||
6 | LICENSE = "LGPLv2.1" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | ||
8 | |||
9 | DEPENDS = "gtk+ enchant libxml2" | ||
10 | |||
11 | SRC_URI = "http://releases.chipx86.com/libsexy/${BPN}/${BP}.tar.gz \ | ||
12 | file://libsexy-pkgconfig-fixes.patch" | ||
13 | |||
14 | inherit autotools pkgconfig | ||
15 | |||
diff --git a/meta-oe/recipes-graphics/libsexy/libsexy/libsexy-pkgconfig-fixes.patch b/meta-oe/recipes-graphics/libsexy/libsexy/libsexy-pkgconfig-fixes.patch deleted file mode 100644 index 61da9474d..000000000 --- a/meta-oe/recipes-graphics/libsexy/libsexy/libsexy-pkgconfig-fixes.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Index: libsexy-0.1.11/libsexy.pc.in | ||
2 | =================================================================== | ||
3 | --- libsexy-0.1.11.orig/libsexy.pc.in 2005-11-10 10:21:18.000000000 +0000 | ||
4 | +++ libsexy-0.1.11/libsexy.pc.in 2008-03-05 14:36:39.000000000 +0000 | ||
5 | @@ -6,7 +6,8 @@ | ||
6 | Name: libsexy | ||
7 | Description: Doing naughty things to good widgets | ||
8 | Version: @VERSION@ | ||
9 | -Libs: -L${libdir} -lsexy @PACKAGE_LIBS@ | ||
10 | -Cflags: -I${includedir} @PACKAGE_CFLAGS@ | ||
11 | |||
12 | +Requires: pango glib-2.0 gtk+-2.0 libxml-2.0 | ||
13 | +Libs: -L${libdir} -lsexy | ||
14 | +Cflags: -I${includedir} | ||
15 | |||
diff --git a/meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb b/meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb deleted file mode 100644 index 2ba1ebbb7..000000000 --- a/meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | require libsexy.inc | ||
2 | |||
3 | PR = "r2" | ||
4 | |||
5 | SRC_URI[md5sum] = "33c079a253270ec8bfb9508e4bb30754" | ||
6 | SRC_URI[sha256sum] = "8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e" | ||
7 | |||
8 | PNBLACKLIST[libsexy] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130607/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-format_string.patch b/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-format_string.patch deleted file mode 100644 index 566a2087c..000000000 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-format_string.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | From: Luca Falavigna <dktrkranz@debian.org> | ||
2 | Date: Tue, 27 Jan 2015 01:26:04 +0000 | ||
3 | Subject: format_string | ||
4 | |||
5 | --- | ||
6 | client_examples/gtkvncviewer.c | 2 +- | ||
7 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
8 | |||
9 | diff --git a/client_examples/gtkvncviewer.c b/client_examples/gtkvncviewer.c | ||
10 | index 261b2da..861e4e3 100644 | ||
11 | --- a/client_examples/gtkvncviewer.c | ||
12 | +++ b/client_examples/gtkvncviewer.c | ||
13 | @@ -588,7 +588,7 @@ static void GtkDefaultLog (const char *format, ...) | ||
14 | |||
15 | time (&log_clock); | ||
16 | strftime (buf, 255, "%d/%m/%Y %X ", localtime (&log_clock)); | ||
17 | - fprintf (stdout, buf); | ||
18 | + fprintf (stdout, "%s", buf); | ||
19 | |||
20 | vfprintf (stdout, format, args); | ||
21 | fflush (stdout); | ||
diff --git a/meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch b/meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch deleted file mode 100644 index de82d6303..000000000 --- a/meta-oe/recipes-graphics/slim/slim/0002-Fix-image-handling-integer-overflows.patch +++ /dev/null | |||
@@ -1,343 +0,0 @@ | |||
1 | From 24e548a222f0aab4313d5ba8b04f0840b173000f Mon Sep 17 00:00:00 2001 | ||
2 | From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> | ||
3 | Date: Mon, 30 Aug 2010 01:24:54 +0000 | ||
4 | Subject: [PATCH 2/8] Fix image handling integer overflows | ||
5 | |||
6 | Image loading memory allocation is based on the image width and height: | ||
7 | malloc(heigth * width * 3). Providing an image with large height and | ||
8 | width values can cause the result of this calculation to exceed the | ||
9 | maximum value of an unsigned int and thus causes an integer overflow. | ||
10 | The result: too little memory is allocated and an heap overflow occurs. | ||
11 | |||
12 | This patch was based by Niels Heinen <niels@freebsd.org> | ||
13 | Thanks! | ||
14 | |||
15 | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | ||
16 | |||
17 | git-svn-id: svn://svn.berlios.de/slim/trunk@176 7c53e7cc-98ea-0310-8f1f-a0b24da60408 | ||
18 | --- | ||
19 | const.h | 3 ++ | ||
20 | jpeg.c | 51 +++++++++++++++----------- | ||
21 | png.c | 122 ++++++++++++++++++++++++++++++++------------------------------ | ||
22 | 3 files changed, 96 insertions(+), 80 deletions(-) | ||
23 | |||
24 | diff --git a/const.h b/const.h | ||
25 | index df0989c..a18c6f3 100644 | ||
26 | --- a/const.h | ||
27 | +++ b/const.h | ||
28 | @@ -42,4 +42,7 @@ | ||
29 | // variables replaced in pre-session_cmd and post-session_cmd | ||
30 | #define USER_VAR "%user" | ||
31 | |||
32 | +// max height/width for images | ||
33 | +#define MAX_DIMENSION 10000 | ||
34 | + | ||
35 | #endif | ||
36 | diff --git a/jpeg.c b/jpeg.c | ||
37 | index 1cf106c..e1f8352 100644 | ||
38 | --- a/jpeg.c | ||
39 | +++ b/jpeg.c | ||
40 | @@ -22,16 +22,22 @@ | ||
41 | #include <string.h> | ||
42 | |||
43 | #include <jpeglib.h> | ||
44 | +#include "const.h" | ||
45 | |||
46 | int | ||
47 | read_jpeg(const char *filename, int *width, int *height, unsigned char **rgb) | ||
48 | { | ||
49 | + int ret = 0; | ||
50 | struct jpeg_decompress_struct cinfo; | ||
51 | struct jpeg_error_mgr jerr; | ||
52 | unsigned char *ptr = NULL; | ||
53 | unsigned int i, ipos; | ||
54 | |||
55 | FILE *infile = fopen(filename, "rb"); | ||
56 | + if (infile == NULL) { | ||
57 | + fprintf(stderr, "Can not fopen file: %s\n",filename); | ||
58 | + return ret; | ||
59 | + } | ||
60 | |||
61 | cinfo.err = jpeg_std_error(&jerr); | ||
62 | jpeg_create_decompress(&cinfo); | ||
63 | @@ -39,43 +45,39 @@ read_jpeg(const char *filename, int *width, int *height, unsigned char **rgb) | ||
64 | jpeg_read_header(&cinfo, TRUE); | ||
65 | jpeg_start_decompress(&cinfo); | ||
66 | |||
67 | + /* Prevent against integer overflow */ | ||
68 | + if(cinfo.output_width >= MAX_DIMENSION || cinfo.output_height >= MAX_DIMENSION) { | ||
69 | + fprintf(stderr, "Unreasonable dimension found in file: %s\n",filename); | ||
70 | + goto close_file; | ||
71 | + } | ||
72 | + | ||
73 | *width = cinfo.output_width; | ||
74 | *height = cinfo.output_height; | ||
75 | |||
76 | rgb[0] = malloc(3 * cinfo.output_width * cinfo.output_height); | ||
77 | - if (rgb[0] == NULL) | ||
78 | - { | ||
79 | + if (rgb[0] == NULL) { | ||
80 | fprintf(stderr, "Can't allocate memory for JPEG file.\n"); | ||
81 | - fclose(infile); | ||
82 | - return(0); | ||
83 | + goto close_file; | ||
84 | } | ||
85 | |||
86 | - if (cinfo.output_components == 3) | ||
87 | - { | ||
88 | + if (cinfo.output_components == 3) { | ||
89 | ptr = rgb[0]; | ||
90 | - while (cinfo.output_scanline < cinfo.output_height) | ||
91 | - { | ||
92 | + while (cinfo.output_scanline < cinfo.output_height) { | ||
93 | jpeg_read_scanlines(&cinfo, &ptr, 1); | ||
94 | ptr += 3 * cinfo.output_width; | ||
95 | } | ||
96 | - } | ||
97 | - else if (cinfo.output_components == 1) | ||
98 | - { | ||
99 | + } else if (cinfo.output_components == 1) { | ||
100 | ptr = malloc(cinfo.output_width); | ||
101 | - if (ptr == NULL) | ||
102 | - { | ||
103 | + if (ptr == NULL) { | ||
104 | fprintf(stderr, "Can't allocate memory for JPEG file.\n"); | ||
105 | - fclose(infile); | ||
106 | - return(0); | ||
107 | + goto rgb_free; | ||
108 | } | ||
109 | |||
110 | ipos = 0; | ||
111 | - while (cinfo.output_scanline < cinfo.output_height) | ||
112 | - { | ||
113 | + while (cinfo.output_scanline < cinfo.output_height) { | ||
114 | jpeg_read_scanlines(&cinfo, &ptr, 1); | ||
115 | |||
116 | - for (i = 0; i < cinfo.output_width; i++) | ||
117 | - { | ||
118 | + for (i = 0; i < cinfo.output_width; i++) { | ||
119 | memset(rgb[0] + ipos, ptr[i], 3); | ||
120 | ipos += 3; | ||
121 | } | ||
122 | @@ -85,9 +87,16 @@ read_jpeg(const char *filename, int *width, int *height, unsigned char **rgb) | ||
123 | } | ||
124 | |||
125 | jpeg_finish_decompress(&cinfo); | ||
126 | - jpeg_destroy_decompress(&cinfo); | ||
127 | |||
128 | + ret = 1; | ||
129 | + goto close_file; | ||
130 | + | ||
131 | +rgb_free: | ||
132 | + free(rgb[0]); | ||
133 | + | ||
134 | +close_file: | ||
135 | + jpeg_destroy_decompress(&cinfo); | ||
136 | fclose(infile); | ||
137 | |||
138 | - return(1); | ||
139 | + return(ret); | ||
140 | } | ||
141 | diff --git a/png.c b/png.c | ||
142 | index a2661c6..5c086c6 100644 | ||
143 | --- a/png.c | ||
144 | +++ b/png.c | ||
145 | @@ -22,12 +22,13 @@ | ||
146 | #include <stdlib.h> | ||
147 | |||
148 | #include <png.h> | ||
149 | +#include "const.h" | ||
150 | |||
151 | int | ||
152 | read_png(const char *filename, int *width, int *height, unsigned char **rgb, | ||
153 | unsigned char **alpha) | ||
154 | { | ||
155 | - FILE *infile = fopen(filename, "rb"); | ||
156 | + int ret = 0; | ||
157 | |||
158 | png_structp png_ptr; | ||
159 | png_infop info_ptr; | ||
160 | @@ -38,31 +39,27 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb, | ||
161 | int bit_depth, color_type, interlace_type; | ||
162 | int i; | ||
163 | |||
164 | + FILE *infile = fopen(filename, "rb"); | ||
165 | + if (infile == NULL) { | ||
166 | + fprintf(stderr, "Can not fopen file: %s\n",filename); | ||
167 | + return ret; | ||
168 | + } | ||
169 | + | ||
170 | png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, | ||
171 | (png_voidp) NULL, | ||
172 | (png_error_ptr) NULL, | ||
173 | (png_error_ptr) NULL); | ||
174 | - if (!png_ptr) | ||
175 | - { | ||
176 | - fclose(infile); | ||
177 | - return(0); | ||
178 | - } | ||
179 | + if (!png_ptr) | ||
180 | + goto file_close; | ||
181 | |||
182 | info_ptr = png_create_info_struct(png_ptr); | ||
183 | - if (!info_ptr) | ||
184 | - { | ||
185 | + if (!info_ptr) { | ||
186 | png_destroy_read_struct(&png_ptr, (png_infopp) NULL, | ||
187 | (png_infopp) NULL); | ||
188 | - fclose(infile); | ||
189 | - return(0); | ||
190 | } | ||
191 | |||
192 | if (setjmp(png_ptr->jmpbuf)) | ||
193 | - { | ||
194 | - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); | ||
195 | - fclose(infile); | ||
196 | - return(0); | ||
197 | - } | ||
198 | + goto png_destroy; | ||
199 | |||
200 | png_init_io(png_ptr, infile); | ||
201 | png_read_info(png_ptr, info_ptr); | ||
202 | @@ -70,18 +67,23 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb, | ||
203 | png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, | ||
204 | &interlace_type, (int *) NULL, (int *) NULL); | ||
205 | |||
206 | + /* Prevent against integer overflow */ | ||
207 | + if(w >= MAX_DIMENSION || h >= MAX_DIMENSION) { | ||
208 | + fprintf(stderr, "Unreasonable dimension found in file: %s\n",filename); | ||
209 | + goto png_destroy; | ||
210 | + } | ||
211 | + | ||
212 | *width = (int) w; | ||
213 | *height = (int) h; | ||
214 | |||
215 | if (color_type == PNG_COLOR_TYPE_RGB_ALPHA | ||
216 | - || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) | ||
217 | - { | ||
218 | - alpha[0] = malloc(*width * *height); | ||
219 | - if (alpha[0] == NULL) | ||
220 | - { | ||
221 | - fprintf(stderr, "Can't allocate memory for alpha channel in PNG file.\n"); | ||
222 | - return(0); | ||
223 | - } | ||
224 | + || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { | ||
225 | + alpha[0] = malloc(*width * *height); | ||
226 | + if (alpha[0] == NULL) | ||
227 | + { | ||
228 | + fprintf(stderr, "Can't allocate memory for alpha channel in PNG file.\n"); | ||
229 | + goto png_destroy; | ||
230 | + } | ||
231 | } | ||
232 | |||
233 | /* Change a paletted/grayscale image to RGB */ | ||
234 | @@ -94,68 +96,70 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb, | ||
235 | png_set_gray_to_rgb(png_ptr); | ||
236 | |||
237 | /* If the PNG file has 16 bits per channel, strip them down to 8 */ | ||
238 | - if (bit_depth == 16) png_set_strip_16(png_ptr); | ||
239 | + if (bit_depth == 16) | ||
240 | + png_set_strip_16(png_ptr); | ||
241 | |||
242 | /* use 1 byte per pixel */ | ||
243 | png_set_packing(png_ptr); | ||
244 | |||
245 | row_pointers = malloc(*height * sizeof(png_bytep)); | ||
246 | - if (row_pointers == NULL) | ||
247 | - { | ||
248 | + if (row_pointers == NULL) { | ||
249 | fprintf(stderr, "Can't allocate memory for PNG file.\n"); | ||
250 | - return(0); | ||
251 | + goto png_destroy; | ||
252 | } | ||
253 | |||
254 | - for (i = 0; i < *height; i++) | ||
255 | - { | ||
256 | + for (i = 0; i < *height; i++) { | ||
257 | row_pointers[i] = malloc(4 * *width); | ||
258 | - if (row_pointers == NULL) | ||
259 | - { | ||
260 | + if (row_pointers == NULL) { | ||
261 | fprintf(stderr, "Can't allocate memory for PNG line.\n"); | ||
262 | - return(0); | ||
263 | + goto rows_free; | ||
264 | } | ||
265 | } | ||
266 | |||
267 | png_read_image(png_ptr, row_pointers); | ||
268 | |||
269 | rgb[0] = malloc(3 * *width * *height); | ||
270 | - if (rgb[0] == NULL) | ||
271 | - { | ||
272 | + if (rgb[0] == NULL) { | ||
273 | fprintf(stderr, "Can't allocate memory for PNG file.\n"); | ||
274 | - return(0); | ||
275 | + goto rows_free; | ||
276 | } | ||
277 | |||
278 | if (alpha[0] == NULL) | ||
279 | { | ||
280 | - ptr = rgb[0]; | ||
281 | - for (i = 0; i < *height; i++) | ||
282 | - { | ||
283 | - memcpy(ptr, row_pointers[i], 3 * *width); | ||
284 | - ptr += 3 * *width; | ||
285 | - } | ||
286 | - } | ||
287 | - else | ||
288 | - { | ||
289 | - int j; | ||
290 | - ptr = rgb[0]; | ||
291 | - for (i = 0; i < *height; i++) | ||
292 | - { | ||
293 | - int ipos = 0; | ||
294 | - for (j = 0; j < *width; j++) | ||
295 | - { | ||
296 | - *ptr++ = row_pointers[i][ipos++]; | ||
297 | - *ptr++ = row_pointers[i][ipos++]; | ||
298 | - *ptr++ = row_pointers[i][ipos++]; | ||
299 | - alpha[0][i * *width + j] = row_pointers[i][ipos++]; | ||
300 | + ptr = rgb[0]; | ||
301 | + for (i = 0; i < *height; i++) { | ||
302 | + memcpy(ptr, row_pointers[i], 3 * *width); | ||
303 | + ptr += 3 * *width; | ||
304 | + } | ||
305 | + } else { | ||
306 | + int j; | ||
307 | + ptr = rgb[0]; | ||
308 | + for (i = 0; i < *height; i++) { | ||
309 | + int ipos = 0; | ||
310 | + for (j = 0; j < *width; j++) { | ||
311 | + *ptr++ = row_pointers[i][ipos++]; | ||
312 | + *ptr++ = row_pointers[i][ipos++]; | ||
313 | + *ptr++ = row_pointers[i][ipos++]; | ||
314 | + alpha[0][i * *width + j] = row_pointers[i][ipos++]; | ||
315 | + } | ||
316 | } | ||
317 | - } | ||
318 | } | ||
319 | |||
320 | - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); | ||
321 | + ret = 1; /* data reading is OK */ | ||
322 | + | ||
323 | +rows_free: | ||
324 | + for (i = 0; i < *height; i++) { | ||
325 | + if (row_pointers[i] != NULL ) { | ||
326 | + free(row_pointers[i]); | ||
327 | + } | ||
328 | + } | ||
329 | |||
330 | - for (i = 0; i < *height; i++) free(row_pointers[i]); | ||
331 | free(row_pointers); | ||
332 | |||
333 | +png_destroy: | ||
334 | + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); | ||
335 | + | ||
336 | +file_close: | ||
337 | fclose(infile); | ||
338 | - return(1); | ||
339 | + return(ret); | ||
340 | } | ||
341 | -- | ||
342 | 1.6.6.1 | ||
343 | |||
diff --git a/meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch b/meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch deleted file mode 100644 index 471c4f51e..000000000 --- a/meta-oe/recipes-graphics/slim/slim/0003-Fix-build-failure-with-ld-as-needed.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 6aad913ddd5cdb473db9fa21a5e8ecec58de172b Mon Sep 17 00:00:00 2001 | ||
2 | From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> | ||
3 | Date: Wed, 12 Jan 2011 04:41:02 +0000 | ||
4 | Subject: [PATCH 3/8] Fix build failure with ld --as-needed. | ||
5 | |||
6 | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | ||
7 | |||
8 | git-svn-id: svn://svn.berlios.de/slim/trunk@177 7c53e7cc-98ea-0310-8f1f-a0b24da60408 | ||
9 | --- | ||
10 | Makefile | 4 ++-- | ||
11 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/Makefile b/Makefile | ||
14 | index 1219de4..fafa0ef 100644 | ||
15 | --- a/Makefile | ||
16 | +++ b/Makefile | ||
17 | @@ -4,7 +4,7 @@ | ||
18 | # to fit into your operating system / distribution | ||
19 | ####################################################### | ||
20 | CXX=/usr/bin/g++ | ||
21 | -CC=/usr/bin/gcc | ||
22 | +CC=/usr/bin/gcc-4.5 | ||
23 | CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include | ||
24 | CXXFLAGS=$(CFLAGS) | ||
25 | LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt | ||
26 | @@ -33,7 +33,7 @@ endif | ||
27 | all: slim | ||
28 | |||
29 | slim: $(OBJECTS) | ||
30 | - $(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME) | ||
31 | + $(CXX) $(OBJECTS) $(LDFLAGS) -o $(NAME) | ||
32 | |||
33 | .cpp.o: | ||
34 | $(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@ | ||
35 | -- | ||
36 | 1.6.6.1 | ||
37 | |||
diff --git a/meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch b/meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch deleted file mode 100644 index f2087c010..000000000 --- a/meta-oe/recipes-graphics/slim/slim/0004-Add-support-libpng15.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From c2067e8c16bfb721d339718ae0c99c70a994936b Mon Sep 17 00:00:00 2001 | ||
2 | From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> | ||
3 | Date: Fri, 17 Jun 2011 20:35:07 +0000 | ||
4 | Subject: [PATCH 4/8] Add support libpng15 | ||
5 | |||
6 | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | ||
7 | |||
8 | git-svn-id: svn://svn.berlios.de/slim/trunk@178 7c53e7cc-98ea-0310-8f1f-a0b24da60408 | ||
9 | --- | ||
10 | Makefile | 4 ++-- | ||
11 | png.c | 6 +++++- | ||
12 | 2 files changed, 7 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/Makefile b/Makefile | ||
15 | index fafa0ef..1202614 100644 | ||
16 | --- a/Makefile | ||
17 | +++ b/Makefile | ||
18 | @@ -5,9 +5,9 @@ | ||
19 | ####################################################### | ||
20 | CXX=/usr/bin/g++ | ||
21 | CC=/usr/bin/gcc-4.5 | ||
22 | -CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include | ||
23 | +CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include | ||
24 | CXXFLAGS=$(CFLAGS) | ||
25 | -LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt | ||
26 | +LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt | ||
27 | CUSTOM=-DHAVE_SHADOW | ||
28 | ifdef USE_PAM | ||
29 | LDFLAGS+= -lpam | ||
30 | diff --git a/png.c b/png.c | ||
31 | index 5c086c6..aa0f5e5 100644 | ||
32 | --- a/png.c | ||
33 | +++ b/png.c | ||
34 | @@ -57,8 +57,12 @@ read_png(const char *filename, int *width, int *height, unsigned char **rgb, | ||
35 | png_destroy_read_struct(&png_ptr, (png_infopp) NULL, | ||
36 | (png_infopp) NULL); | ||
37 | } | ||
38 | - | ||
39 | + | ||
40 | +#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 | ||
41 | + if (setjmp(png_jmpbuf((data->png_ptr)))) | ||
42 | +#else | ||
43 | if (setjmp(png_ptr->jmpbuf)) | ||
44 | +#endif | ||
45 | goto png_destroy; | ||
46 | |||
47 | png_init_io(png_ptr, infile); | ||
48 | -- | ||
49 | 1.6.6.1 | ||
50 | |||
diff --git a/meta-oe/recipes-graphics/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch b/meta-oe/recipes-graphics/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch deleted file mode 100644 index 566ae355e..000000000 --- a/meta-oe/recipes-graphics/slim/slim/0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 4f69eb1aa85fbb395a0474b1f376505fab81ee22 Mon Sep 17 00:00:00 2001 | ||
2 | From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> | ||
3 | Date: Fri, 17 Jun 2011 20:35:10 +0000 | ||
4 | Subject: [PATCH 5/8] Remove path of gcc amd g++, and version of g++ | ||
5 | |||
6 | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | ||
7 | |||
8 | git-svn-id: svn://svn.berlios.de/slim/trunk@179 7c53e7cc-98ea-0310-8f1f-a0b24da60408 | ||
9 | --- | ||
10 | Makefile | 4 ++-- | ||
11 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/Makefile b/Makefile | ||
14 | index 1202614..5c5fde1 100644 | ||
15 | --- a/Makefile | ||
16 | +++ b/Makefile | ||
17 | @@ -3,8 +3,8 @@ | ||
18 | # Edit the following section to adjust the options | ||
19 | # to fit into your operating system / distribution | ||
20 | ####################################################### | ||
21 | -CXX=/usr/bin/g++ | ||
22 | -CC=/usr/bin/gcc-4.5 | ||
23 | +CXX=g++ | ||
24 | +CC=gcc | ||
25 | CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include | ||
26 | CXXFLAGS=$(CFLAGS) | ||
27 | LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt | ||
28 | -- | ||
29 | 1.6.6.1 | ||
30 | |||
diff --git a/meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch b/meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch deleted file mode 100644 index a5b812584..000000000 --- a/meta-oe/recipes-graphics/slim/slim/0006-Remove-localhost-from-Authenticator-of-pam.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From e188d5fd3e3c0e40c3e35729fd8b81b138191a75 Mon Sep 17 00:00:00 2001 | ||
2 | From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> | ||
3 | Date: Fri, 17 Jun 2011 20:35:13 +0000 | ||
4 | Subject: [PATCH 6/8] Remove localhost from Authenticator of pam | ||
5 | |||
6 | http://bugs.gentoo.org/346037 | ||
7 | https://developer.berlios.de/bugs/?func=detailbug&bug_id=17757&group_id=2663 | ||
8 | http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch?view=log | ||
9 | |||
10 | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | ||
11 | |||
12 | git-svn-id: svn://svn.berlios.de/slim/trunk@180 7c53e7cc-98ea-0310-8f1f-a0b24da60408 | ||
13 | --- | ||
14 | app.cpp | 2 -- | ||
15 | 1 files changed, 0 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/app.cpp b/app.cpp | ||
18 | index c80a73e..7177363 100644 | ||
19 | --- a/app.cpp | ||
20 | +++ b/app.cpp | ||
21 | @@ -236,8 +236,6 @@ void App::Run() { | ||
22 | pam.start("slim"); | ||
23 | pam.set_item(PAM::Authenticator::TTY, DisplayName); | ||
24 | pam.set_item(PAM::Authenticator::Requestor, "root"); | ||
25 | - pam.set_item(PAM::Authenticator::Host, "localhost"); | ||
26 | - | ||
27 | } | ||
28 | catch(PAM::Exception& e){ | ||
29 | cerr << APPNAME << ": " << e << endl; | ||
30 | -- | ||
31 | 1.6.6.1 | ||
32 | |||
diff --git a/meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch b/meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch deleted file mode 100644 index fa2502bf0..000000000 --- a/meta-oe/recipes-graphics/slim/slim/0007-Fix-tty-slowness.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From da172fd6234b3b2b487ab36d63da72758829cb1d Mon Sep 17 00:00:00 2001 | ||
2 | From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> | ||
3 | Date: Fri, 17 Jun 2011 20:35:15 +0000 | ||
4 | Subject: [PATCH 7/8] Fix tty slowness | ||
5 | |||
6 | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | ||
7 | |||
8 | git-svn-id: svn://svn.berlios.de/slim/trunk@181 7c53e7cc-98ea-0310-8f1f-a0b24da60408 | ||
9 | --- | ||
10 | app.cpp | 10 ++++++---- | ||
11 | 1 files changed, 6 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/app.cpp b/app.cpp | ||
14 | index 7177363..44ab099 100644 | ||
15 | --- a/app.cpp | ||
16 | +++ b/app.cpp | ||
17 | @@ -278,21 +278,23 @@ void App::Run() { | ||
18 | signal(SIGALRM, AlarmSignal); | ||
19 | |||
20 | #ifndef XNEST_DEBUG | ||
21 | - OpenLog(); | ||
22 | - | ||
23 | if (!force_nodaemon && cfg->getOption("daemon") == "yes") { | ||
24 | daemonmode = true; | ||
25 | } | ||
26 | |||
27 | // Daemonize | ||
28 | if (daemonmode) { | ||
29 | - if (daemon(0, 1) == -1) { | ||
30 | + if (daemon(0, 0) == -1) { | ||
31 | cerr << APPNAME << ": " << strerror(errno) << endl; | ||
32 | exit(ERR_EXIT); | ||
33 | } | ||
34 | - UpdatePid(); | ||
35 | } | ||
36 | |||
37 | + OpenLog(); | ||
38 | + | ||
39 | + if (daemonmode) | ||
40 | + UpdatePid(); | ||
41 | + | ||
42 | CreateServerAuth(); | ||
43 | StartServer(); | ||
44 | alarm(2); | ||
45 | -- | ||
46 | 1.6.6.1 | ||
47 | |||
diff --git a/meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch b/meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch deleted file mode 100644 index 0c5cfb742..000000000 --- a/meta-oe/recipes-graphics/slim/slim/0008-restart-Xserver-if-killed.patch +++ /dev/null | |||
@@ -1,161 +0,0 @@ | |||
1 | From ee77a3d154443d2823ecbf2141daa1b5924f629f Mon Sep 17 00:00:00 2001 | ||
2 | From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> | ||
3 | Date: Fri, 17 Jun 2011 20:38:34 +0000 | ||
4 | Subject: [PATCH 8/8] restart Xserver if killed | ||
5 | |||
6 | Patch from http://developer.berlios.de/patch/?func=detailpatch&patch_id=2378&group_id=2663. | ||
7 | |||
8 | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | ||
9 | |||
10 | git-svn-id: svn://svn.berlios.de/slim/trunk@182 7c53e7cc-98ea-0310-8f1f-a0b24da60408 | ||
11 | --- | ||
12 | app.cpp | 36 +++++++++--------------------------- | ||
13 | app.h | 2 +- | ||
14 | 2 files changed, 10 insertions(+), 28 deletions(-) | ||
15 | |||
16 | diff --git a/app.cpp b/app.cpp | ||
17 | index 44ab099..358a98f 100644 | ||
18 | --- a/app.cpp | ||
19 | +++ b/app.cpp | ||
20 | @@ -104,6 +104,11 @@ int conv(int num_msg, const struct pam_message **msg, | ||
21 | |||
22 | extern App* LoginApp; | ||
23 | |||
24 | +int xioerror(Display *disp) { | ||
25 | + LoginApp->RestartServer(); | ||
26 | + return 0; | ||
27 | +} | ||
28 | + | ||
29 | void CatchSignal(int sig) { | ||
30 | cerr << APPNAME << ": unexpected signal " << sig << endl; | ||
31 | |||
32 | @@ -114,19 +119,6 @@ void CatchSignal(int sig) { | ||
33 | exit(ERR_EXIT); | ||
34 | } | ||
35 | |||
36 | - | ||
37 | -void AlarmSignal(int sig) { | ||
38 | - int pid = LoginApp->GetServerPID(); | ||
39 | - if(waitpid(pid, NULL, WNOHANG) == pid) { | ||
40 | - LoginApp->StopServer(); | ||
41 | - LoginApp->RemoveLock(); | ||
42 | - exit(OK_EXIT); | ||
43 | - } | ||
44 | - signal(sig, AlarmSignal); | ||
45 | - alarm(2); | ||
46 | -} | ||
47 | - | ||
48 | - | ||
49 | void User1Signal(int sig) { | ||
50 | signal(sig, User1Signal); | ||
51 | } | ||
52 | @@ -275,7 +267,6 @@ void App::Run() { | ||
53 | signal(SIGHUP, CatchSignal); | ||
54 | signal(SIGPIPE, CatchSignal); | ||
55 | signal(SIGUSR1, User1Signal); | ||
56 | - signal(SIGALRM, AlarmSignal); | ||
57 | |||
58 | #ifndef XNEST_DEBUG | ||
59 | if (!force_nodaemon && cfg->getOption("daemon") == "yes") { | ||
60 | @@ -297,7 +288,6 @@ void App::Run() { | ||
61 | |||
62 | CreateServerAuth(); | ||
63 | StartServer(); | ||
64 | - alarm(2); | ||
65 | #endif | ||
66 | |||
67 | } | ||
68 | @@ -613,6 +603,8 @@ void App::Login() { | ||
69 | int status; | ||
70 | while (wpid != pid) { | ||
71 | wpid = wait(&status); | ||
72 | + if (wpid == ServerPID) | ||
73 | + xioerror(Dpy); // Server died, simulate IO error | ||
74 | } | ||
75 | if (WIFEXITED(status) && WEXITSTATUS(status)) { | ||
76 | LoginPanel->Message("Failed to execute login command"); | ||
77 | @@ -658,9 +650,6 @@ void App::Login() { | ||
78 | |||
79 | |||
80 | void App::Reboot() { | ||
81 | - // Stop alarm clock | ||
82 | - alarm(0); | ||
83 | - | ||
84 | #ifdef USE_PAM | ||
85 | try{ | ||
86 | pam.end(); | ||
87 | @@ -683,9 +672,6 @@ void App::Reboot() { | ||
88 | |||
89 | |||
90 | void App::Halt() { | ||
91 | - // Stop alarm clock | ||
92 | - alarm(0); | ||
93 | - | ||
94 | #ifdef USE_PAM | ||
95 | try{ | ||
96 | pam.end(); | ||
97 | @@ -771,6 +757,7 @@ void App::RestartServer() { | ||
98 | |||
99 | StopServer(); | ||
100 | RemoveLock(); | ||
101 | + while (waitpid(-1, NULL, WNOHANG) > 0); // Collects all dead childrens | ||
102 | Run(); | ||
103 | } | ||
104 | |||
105 | @@ -841,6 +828,7 @@ int App::WaitForServer() { | ||
106 | |||
107 | for(cycles = 0; cycles < ncycles; cycles++) { | ||
108 | if((Dpy = XOpenDisplay(DisplayName))) { | ||
109 | + XSetIOErrorHandler(xioerror); | ||
110 | return 1; | ||
111 | } else { | ||
112 | if(!ServerTimeout(1, (char *) "X server to begin accepting connections")) | ||
113 | @@ -925,9 +913,6 @@ int App::StartServer() { | ||
114 | ServerPID = -1; | ||
115 | break; | ||
116 | } | ||
117 | - alarm(15); | ||
118 | - pause(); | ||
119 | - alarm(0); | ||
120 | |||
121 | // Wait for server to start up | ||
122 | if(WaitForServer() == 0) { | ||
123 | @@ -962,15 +947,12 @@ int IgnoreXIO(Display *d) { | ||
124 | |||
125 | |||
126 | void App::StopServer() { | ||
127 | - // Stop alars clock and ignore signals | ||
128 | - alarm(0); | ||
129 | signal(SIGQUIT, SIG_IGN); | ||
130 | signal(SIGINT, SIG_IGN); | ||
131 | signal(SIGHUP, SIG_IGN); | ||
132 | signal(SIGPIPE, SIG_IGN); | ||
133 | signal(SIGTERM, SIG_DFL); | ||
134 | signal(SIGKILL, SIG_DFL); | ||
135 | - signal(SIGALRM, SIG_DFL); | ||
136 | |||
137 | // Catch X error | ||
138 | XSetIOErrorHandler(IgnoreXIO); | ||
139 | diff --git a/app.h b/app.h | ||
140 | index dd7c281..2db1038 100644 | ||
141 | --- a/app.h | ||
142 | +++ b/app.h | ||
143 | @@ -34,6 +34,7 @@ public: | ||
144 | ~App(); | ||
145 | void Run(); | ||
146 | int GetServerPID(); | ||
147 | + void RestartServer(); | ||
148 | void StopServer(); | ||
149 | |||
150 | bool serverStarted; | ||
151 | @@ -49,7 +50,6 @@ private: | ||
152 | void Console(); | ||
153 | void Exit(); | ||
154 | void KillAllClients(Bool top); | ||
155 | - void RestartServer(); | ||
156 | void ReadConfig(); | ||
157 | void OpenLog(); | ||
158 | void CloseLog(); | ||
159 | -- | ||
160 | 1.6.6.1 | ||
161 | |||
diff --git a/meta-oe/recipes-graphics/slim/slim_1.3.2.bb b/meta-oe/recipes-graphics/slim/slim_1.3.2.bb deleted file mode 100644 index 2fbdcab46..000000000 --- a/meta-oe/recipes-graphics/slim/slim_1.3.2.bb +++ /dev/null | |||
@@ -1,82 +0,0 @@ | |||
1 | DESCRIPTION="Simple Login Manager" | ||
2 | HOMEPAGE="http://slim.berlios.de" | ||
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" | ||
5 | |||
6 | PR = "r1" | ||
7 | |||
8 | DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | ||
9 | |||
10 | SRC_URI = " \ | ||
11 | http://download.berlios.de/${BPN}/${BP}.tar.gz \ | ||
12 | file://0002-Fix-image-handling-integer-overflows.patch \ | ||
13 | file://0003-Fix-build-failure-with-ld-as-needed.patch \ | ||
14 | file://0004-Add-support-libpng15.patch \ | ||
15 | file://0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch \ | ||
16 | file://0006-Remove-localhost-from-Authenticator-of-pam.patch \ | ||
17 | file://0007-Fix-tty-slowness.patch \ | ||
18 | file://0008-restart-Xserver-if-killed.patch \ | ||
19 | file://slim-dynwm \ | ||
20 | file://update_slim_wmlist \ | ||
21 | file://Makefile.oe \ | ||
22 | file://slim.pamd \ | ||
23 | file://slim.service \ | ||
24 | " | ||
25 | |||
26 | SRC_URI[md5sum] = "ca1ae6120e6f4b4969f2d6cf94f47b42" | ||
27 | SRC_URI[sha256sum] = "f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8" | ||
28 | |||
29 | |||
30 | EXTRA_OEMAKE += " \ | ||
31 | USE_PAM=${@bb.utils.contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \ | ||
32 | PREFIX=${prefix} \ | ||
33 | CFGDIR=${sysconfdir} \ | ||
34 | MANDIR=${mandir} \ | ||
35 | DESTDIR=${D} \ | ||
36 | CFLAGS+=-I${STAGING_INCDIR}/freetype2 \ | ||
37 | CXXFLAGS+=-I${STAGING_INCDIR}/freetype2 \ | ||
38 | " | ||
39 | |||
40 | do_compile_prepend() { | ||
41 | cp -pP ${WORKDIR}/Makefile.oe ${S}/Makefile | ||
42 | } | ||
43 | |||
44 | do_install() { | ||
45 | oe_runmake install | ||
46 | install -d ${D}${bindir} | ||
47 | install -m 0755 ${WORKDIR}/slim-dynwm ${D}${bindir}/ | ||
48 | install -m 0755 ${WORKDIR}/update_slim_wmlist ${D}${bindir}/ | ||
49 | install -d ${D}${sysconfdir}/pam.d/ | ||
50 | install -m 0644 ${WORKDIR}/slim.pamd ${D}${sysconfdir}/pam.d/slim | ||
51 | |||
52 | install -d ${D}${systemd_unitdir}/system/ | ||
53 | install -m 0644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system/ | ||
54 | |||
55 | echo 'sessionstart_cmd /usr/bin/sessreg -a -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf | ||
56 | echo 'sessionstop_cmd /usr/bin/sessreg -d -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf | ||
57 | } | ||
58 | |||
59 | |||
60 | RDEPENDS_${PN} = "perl xauth freetype sessreg " | ||
61 | FILES_${PN} += "${systemd_unitdir}/system/" | ||
62 | |||
63 | pkg_postinst_${PN} () { | ||
64 | if test "x$D" != "x"; then | ||
65 | exit 1 | ||
66 | fi | ||
67 | systemctl enable slim.service | ||
68 | |||
69 | # Register SLiM as default DM | ||
70 | mkdir -p ${sysconfdir}/X11/ | ||
71 | echo "${bindir}/slim" > ${sysconfdir}/X11/default-display-manager | ||
72 | } | ||
73 | |||
74 | pkg_postrm_${PN} () { | ||
75 | if test "x$D" != "x"; then | ||
76 | exit 1 | ||
77 | fi | ||
78 | systemctl disable slim.service | ||
79 | sed -i /slim/d $D${sysconfdir}/X11/default-display-manager || true | ||
80 | } | ||
81 | |||
82 | PNBLACKLIST[slim] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-graphics/wayland/wayland-fits_git.bb b/meta-oe/recipes-graphics/wayland/wayland-fits_git.bb deleted file mode 100755 index 2af669770..000000000 --- a/meta-oe/recipes-graphics/wayland/wayland-fits_git.bb +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | SUMMARY = "Wayland-fits, the Wayland Functional Integration Test Suite" | ||
2 | DESCRIPTION = "Wayland-fits is a fully automated functional integration \ | ||
3 | test suite. Its main purpose is to test the functionality and integration of \ | ||
4 | client-side (i.e. toolkit) and server-side (compositor) implementations of \ | ||
5 | the Wayland protocol." | ||
6 | HOMEPAGE = "https://github.com/01org/wayland-fits" | ||
7 | LICENSE = "MIT" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=f8d34cadaf891753c0f00c6cd48f08f5 \ | ||
9 | file://src/extensions/weston/weston-wfits.cpp;endline=21;md5=848c81e55cf3a30a9f6ed75f0dba7a97" | ||
10 | |||
11 | SRC_URI = "git://github.com/01org/wayland-fits.git" | ||
12 | SRCREV = "f108335e374772ae2818a30ae37fe6fcda81980f" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | inherit autotools pkgconfig | ||
17 | |||
18 | DEPENDS = "libcheck boost wayland weston" | ||
19 | RDEPENDS_${PN} = "weston" | ||
20 | |||
21 | EXTRA_OECONF += "--enable-shared --disable-static --with-boost-libdir=${STAGING_LIBDIR}" | ||
22 | |||
23 | PACKAGECONFIG ?= "gtk+3" | ||
24 | |||
25 | PACKAGECONFIG[elementary] = "--enable-efl-tests,--disable-efl-tests,elementary" | ||
26 | PACKAGECONFIG[gtk+3] = "--enable-gtk-tests,--disable-gtk-tests,gtk+3" | ||
27 | |||
28 | do_install_append() { | ||
29 | rm -f ${D}/${libdir}/weston/*.la | ||
30 | } | ||
31 | |||
32 | FILES_${PN} += "${bindir}/wfits ${libdir}/weston/*.so" | ||
33 | FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/weston/.debug ${prefix}/src" | ||
34 | |||
35 | PNBLACKLIST[wayland-fits] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130632/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev/fix-it.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev/fix-it.patch deleted file mode 100644 index 771a2a8e1..000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev/fix-it.patch +++ /dev/null | |||
@@ -1,153 +0,0 @@ | |||
1 | diff --git a/src/multitouch.c b/src/multitouch.c | ||
2 | index c55d742..4a8192d 100644 | ||
3 | --- a/src/multitouch.c | ||
4 | +++ b/src/multitouch.c | ||
5 | @@ -114,7 +114,7 @@ static int init_properties(DeviceIntPtr dev) | ||
6 | return Success; | ||
7 | } | ||
8 | |||
9 | -static int device_init(DeviceIntPtr dev, LocalDevicePtr local) | ||
10 | +static int device_init(DeviceIntPtr dev, InputInfoPtr local) | ||
11 | { | ||
12 | struct mtev_mtouch *mt = local->private; | ||
13 | Atom atom; | ||
14 | @@ -222,7 +222,7 @@ static int device_init(DeviceIntPtr dev, LocalDevicePtr local) | ||
15 | xf86InitValuatorAxisStruct(dev, val, axes_labels[val], | ||
16 | min, | ||
17 | max, | ||
18 | - 1, 0, 1); | ||
19 | + 1, 0, 1,Absolute); | ||
20 | xf86InitValuatorDefaults(dev, val); | ||
21 | } | ||
22 | } | ||
23 | @@ -232,7 +232,7 @@ static int device_init(DeviceIntPtr dev, LocalDevicePtr local) | ||
24 | return Success; | ||
25 | } | ||
26 | |||
27 | -static int device_on(LocalDevicePtr local) | ||
28 | +static int device_on(InputInfoPtr local) | ||
29 | { | ||
30 | struct mtev_mtouch *mt = local->private; | ||
31 | local->fd = xf86OpenSerial(local->options); | ||
32 | @@ -248,7 +248,7 @@ static int device_on(LocalDevicePtr local) | ||
33 | return Success; | ||
34 | } | ||
35 | |||
36 | -static int device_off(LocalDevicePtr local) | ||
37 | +static int device_off(InputInfoPtr local) | ||
38 | { | ||
39 | struct mtev_mtouch *mt = local->private; | ||
40 | xf86RemoveEnabledDevice(local); | ||
41 | @@ -259,12 +259,12 @@ static int device_off(LocalDevicePtr local) | ||
42 | return Success; | ||
43 | } | ||
44 | |||
45 | -static int device_close(LocalDevicePtr local) | ||
46 | +static int device_close(InputInfoPtr local) | ||
47 | { | ||
48 | return Success; | ||
49 | } | ||
50 | |||
51 | -static void process_state(LocalDevicePtr local, | ||
52 | +static void process_state(InputInfoPtr local, | ||
53 | const struct mtev_mtouch *mt) | ||
54 | { | ||
55 | |||
56 | @@ -321,22 +321,22 @@ static void process_state(LocalDevicePtr local, | ||
57 | } | ||
58 | |||
59 | /* Some x-clients assume they get motion events before button down */ | ||
60 | + xf86Msg(X_INFO,"down %d|pdown %d\n", down, pdown); | ||
61 | if (down) | ||
62 | xf86PostMotionEventP(local->dev, TRUE, | ||
63 | 0, down * MT_AXIS_PER_FINGER, valuators); | ||
64 | - | ||
65 | if(down && pdown == 0) | ||
66 | xf86PostButtonEventP(local->dev, TRUE, | ||
67 | 1, 1, | ||
68 | 0, down * MT_AXIS_PER_FINGER, valuators); | ||
69 | - else if (down == 0 && pdown) | ||
70 | - xf86PostButtonEvent(local->dev, TRUE, 1, 0, 0, 0); | ||
71 | - | ||
72 | + else if (down == 0 && pdown){ | ||
73 | + xf86PostButtonEvent(local->dev, TRUE, 1, 1, 0, 0); | ||
74 | + } | ||
75 | pdown = !!down; | ||
76 | } | ||
77 | |||
78 | /* called for each full received packet from the touchpad */ | ||
79 | -static void read_input(LocalDevicePtr local) | ||
80 | +static void read_input(InputInfoPtr local) | ||
81 | { | ||
82 | struct mtev_mtouch *mt = local->private; | ||
83 | while (mtouch_read_synchronized_event(mt, local->fd)) { | ||
84 | @@ -346,7 +346,7 @@ static void read_input(LocalDevicePtr local) | ||
85 | |||
86 | static Bool device_control(DeviceIntPtr dev, int mode) | ||
87 | { | ||
88 | - LocalDevicePtr local = dev->public.devicePrivate; | ||
89 | + InputInfoPtr local = dev->public.devicePrivate; | ||
90 | switch (mode) { | ||
91 | case DEVICE_INIT: | ||
92 | xf86Msg(X_INFO, "device control: init\n"); | ||
93 | @@ -366,39 +366,29 @@ static Bool device_control(DeviceIntPtr dev, int mode) | ||
94 | } | ||
95 | } | ||
96 | |||
97 | -static InputInfoPtr preinit(InputDriverPtr drv, IDevPtr dev, int flags) | ||
98 | +static InputInfoPtr preinit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) | ||
99 | { | ||
100 | struct mtev_mtouch *mt; | ||
101 | - InputInfoPtr local = xf86AllocateInput(drv, 0); | ||
102 | - if (!local) | ||
103 | - goto error; | ||
104 | + int rc; | ||
105 | + | ||
106 | mt = calloc(1, sizeof(struct mtev_mtouch)); | ||
107 | + | ||
108 | if (!mt) | ||
109 | goto error; | ||
110 | |||
111 | - local->name = dev->identifier; | ||
112 | - local->type_name = XI_TOUCHSCREEN; | ||
113 | - local->device_control = device_control; | ||
114 | - local->read_input = read_input; | ||
115 | - local->private = mt; | ||
116 | - local->flags = XI86_POINTER_CAPABLE | | ||
117 | - XI86_SEND_DRAG_EVENTS; | ||
118 | - | ||
119 | - local->conf_idev = dev; | ||
120 | - | ||
121 | - xf86CollectInputOptions(local, NULL, NULL); | ||
122 | - //xf86OptionListReport(local->options); | ||
123 | - xf86ProcessCommonOptions(local, local->options); | ||
124 | + pInfo->private = mt; | ||
125 | + pInfo->type_name = "UNKNOWN"; | ||
126 | + pInfo->device_control = device_control; | ||
127 | + pInfo->read_input = read_input; | ||
128 | |||
129 | + mt->swap_xy = xf86SetBoolOption(pInfo->options, "SwapAxes", FALSE); | ||
130 | + mt->invert_x = xf86SetBoolOption(pInfo->options, "InvertX", FALSE); | ||
131 | + mt->invert_y = xf86SetBoolOption(pInfo->options, "InvertY", FALSE); | ||
132 | |||
133 | - mt->swap_xy = xf86SetBoolOption(local->options, "SwapAxes", FALSE); | ||
134 | - mt->invert_x = xf86SetBoolOption(local->options, "InvertX", FALSE); | ||
135 | - mt->invert_y = xf86SetBoolOption(local->options, "InvertY", FALSE); | ||
136 | - | ||
137 | - local->flags |= XI86_CONFIGURED; | ||
138 | + return Success; | ||
139 | |||
140 | error: | ||
141 | - return local; | ||
142 | + return !Success; | ||
143 | } | ||
144 | |||
145 | static void uninit(InputDriverPtr drv, InputInfoPtr local, int flags) | ||
146 | @@ -415,7 +405,6 @@ static InputDriverRec MTEV = { | ||
147 | .PreInit = preinit, | ||
148 | .UnInit = uninit, | ||
149 | .module = NULL, | ||
150 | - .refCount = 0 | ||
151 | }; | ||
152 | |||
153 | static XF86ModuleVersionInfo VERSION = { | ||
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb deleted file mode 100644 index 5f2adec1a..000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | require recipes-graphics/xorg-driver/xorg-driver-input.inc | ||
2 | SUMMARY = "X.Org X server -- multitouch input driver" | ||
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543" | ||
5 | |||
6 | DEPENDS += "pixman" | ||
7 | |||
8 | PNBLACKLIST[xf86-input-mtev] ?= "BROKEN: doesn't build with B!=S (Makefile without ${S} in sed call) - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
9 | |||
10 | SRC_URI = "git://gitorious.org/xorg/xf86-input-mtev.git file://fix-it.patch" | ||
11 | SRCREV = "1eb469166ffc095c5801475f057f911f97a6e641" | ||
12 | S = "${WORKDIR}/git" | ||
13 | PV = "1.0.0+gitr${SRCPV}" | ||
14 | PR = "${INC_PR}.0" | ||
15 | |||
16 | EXTRA_OEMAKE = "'INCLUDE=-I${STAGING_INCDIR}/xorg -I${STAGING_INCDIR}/pixman-1'" | ||
17 | |||
18 | #skip xorg-driver-common.inc AC_CHECK_FILE mangling | ||
19 | do_configure_prepend () { | ||
20 | sed 's#gcc#${CC}#g' -i Makefile | ||
21 | return | ||
22 | } | ||
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch deleted file mode 100644 index fcd2f684b..000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 621d946e56efac2c779b83b1a5c6b645169c4ebd Mon Sep 17 00:00:00 2001 | ||
2 | From: "Brian A. Lloyd" <brian.lloyd@familyhonor.net> | ||
3 | Date: Wed, 1 Oct 2014 12:35:18 +0300 | ||
4 | Subject: [PATCH] Add config.h include to src/lx_memory.c | ||
5 | |||
6 | The src/lx_memory.c file uses the xf86.h header file. This file must have | ||
7 | HAVE_STRNDUP defined before calling it when the building platform has a strndup | ||
8 | function. When using config.h, this file doesn't have that define and so fails | ||
9 | to compile. | ||
10 | |||
11 | The attached patch adds the conditional config.h to this file so it may compile | ||
12 | on the affected platforms. | ||
13 | |||
14 | The patch is trivial and may be included and used under whatever licensing | ||
15 | desired. | ||
16 | |||
17 | Closes: Free Desktop Bug #84541 | ||
18 | |||
19 | Signed-off-by: Brian A. Lloyd <brian.lloyd@familyhonor.net> | ||
20 | Upstream-Status: Backport | ||
21 | --- | ||
22 | src/lx_memory.c | 3 +++ | ||
23 | 1 file changed, 3 insertions(+) | ||
24 | |||
25 | diff --git a/src/lx_memory.c b/src/lx_memory.c | ||
26 | index f26d280..992446f 100644 | ||
27 | --- a/src/lx_memory.c | ||
28 | +++ b/src/lx_memory.c | ||
29 | @@ -22,6 +22,9 @@ | ||
30 | * contributors may be used to endorse or promote products derived from this | ||
31 | * software without specific prior written permission. | ||
32 | */ | ||
33 | +#if HAVE_CONFIG_H | ||
34 | +#include "config.h" | ||
35 | +#endif | ||
36 | |||
37 | #include "xf86.h" | ||
38 | #include "geode.h" | ||
39 | -- | ||
40 | 2.1.1 | ||
41 | |||
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb deleted file mode 100644 index e543413ad..000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | require recipes-graphics/xorg-driver/xorg-driver-video.inc | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36" | ||
3 | |||
4 | SUMMARY = "X.org server -- Geode GX2/LX display driver" | ||
5 | PR = "${INC_PR}.0" | ||
6 | |||
7 | SRC_URI += "file://0001-Add-config.h-include-to-src-lx_memory.c.patch" | ||
8 | SRC_URI[md5sum] = "35fa387f6a33f6b22a56ce4bda424392" | ||
9 | SRC_URI[sha256sum] = "38fc1f55e29fb7985b90c9021a4b7e5295d42888bd669174f42f3b7f681fc1a7" | ||
10 | |||
11 | COMPATIBLE_HOST = "i.86.*-linux" | ||
12 | |||
13 | RDEPENDS_${PN} += "xserver-xorg-module-exa" | ||
14 | |||
15 | # 2_2.11.16-r21.0/xf86-video-geode-2.11.16/src/gx_driver.c:376:20: error: implicit declaration of function 'xf86MapVidMem' [-Werror=implicit-function-declaration] | ||
16 | PNBLACKLIST[xf86-video-geode] ?= "BROKEN, fails to build - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch deleted file mode 100644 index 25e83209d..000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From f485e878bc8bb0e381a38a30009308c82fa8d672 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 16 Aug 2012 08:18:56 +0200 | ||
4 | Subject: [PATCH] fix build with KMS disabled | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | src/glamo.h | 3 +++ | ||
9 | 1 files changed, 3 insertions(+), 0 deletions(-) | ||
10 | |||
11 | diff --git a/src/glamo.h b/src/glamo.h | ||
12 | index d4a2f19..5fd5c04 100644 | ||
13 | --- a/src/glamo.h | ||
14 | +++ b/src/glamo.h | ||
15 | @@ -37,8 +37,11 @@ | ||
16 | #include "xf86.h" | ||
17 | #include "exa.h" | ||
18 | #include <linux/fb.h> | ||
19 | + | ||
20 | +#ifdef HAVE_KMS | ||
21 | #include <libdrm/drm.h> | ||
22 | #include <libdrm/glamo_bo.h> | ||
23 | +#endif | ||
24 | |||
25 | #define GLAMO_REG_BASE(c) ((c)->attr.address[0]) | ||
26 | #define GLAMO_REG_SIZE(c) (0x2400) | ||
27 | -- | ||
28 | 1.7.8.6 | ||
29 | |||
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch deleted file mode 100644 index fab0b238f..000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From 040ade8bb86a771fa4e71b41d2080254830ca9f3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 16 Mar 2013 17:44:37 +0100 | ||
4 | Subject: [PATCH] glamo*driver: remove references to mibstore | ||
5 | |||
6 | * fix build with xserver-1.14 | ||
7 | |||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | src/glamo-driver.c | 2 -- | ||
11 | src/glamo-kms-driver.c | 1 - | ||
12 | 2 files changed, 3 deletions(-) | ||
13 | |||
14 | diff --git a/src/glamo-driver.c b/src/glamo-driver.c | ||
15 | index 10b7762..22f57d7 100644 | ||
16 | --- a/src/glamo-driver.c | ||
17 | +++ b/src/glamo-driver.c | ||
18 | @@ -14,7 +14,6 @@ | ||
19 | #include "xf86_OSproc.h" | ||
20 | |||
21 | #include "mipointer.h" | ||
22 | -#include "mibstore.h" | ||
23 | #include "micmap.h" | ||
24 | #include "colormapst.h" | ||
25 | #include "xf86cmap.h" | ||
26 | @@ -612,7 +611,6 @@ GlamoScreenInit(SCREEN_INIT_ARGS_DECL) | ||
27 | } | ||
28 | |||
29 | xf86SetBlackWhitePixels(pScreen); | ||
30 | - miInitializeBackingStore(pScreen); | ||
31 | xf86SetBackingStore(pScreen); | ||
32 | |||
33 | /* software cursor */ | ||
34 | diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c | ||
35 | index c5c7a00..f192398 100644 | ||
36 | --- a/src/glamo-kms-driver.c | ||
37 | +++ b/src/glamo-kms-driver.c | ||
38 | @@ -415,7 +415,6 @@ Bool GlamoKMSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, | ||
39 | |||
40 | GlamoKMSExaInit(pScrn); | ||
41 | |||
42 | - miInitializeBackingStore(pScreen); | ||
43 | xf86SetBackingStore(pScreen); | ||
44 | xf86SetSilkenMouse(pScreen); | ||
45 | miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); | ||
46 | -- | ||
47 | 1.8.1.5 | ||
48 | |||
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch deleted file mode 100644 index 0d6374363..000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 963c221aa01be2ea99d39578d91e4aa08ec3ab0a Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 23 May 2011 14:29:38 +0200 | ||
4 | Subject: [PATCH] glamo-kms-driver: drop unused xf86_config | ||
5 | |||
6 | * gcc-4.6 doesn't like unused variables which are only set and never read | ||
7 | |||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | src/glamo-kms-driver.c | 2 -- | ||
11 | 1 files changed, 0 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c | ||
14 | index ce87caa..c5c7a00 100644 | ||
15 | --- a/src/glamo-kms-driver.c | ||
16 | +++ b/src/glamo-kms-driver.c | ||
17 | @@ -208,7 +208,6 @@ static const xf86CrtcConfigFuncsRec crtc_config_funcs = { | ||
18 | |||
19 | Bool GlamoKMSPreInit(ScrnInfoPtr pScrn, int flags) | ||
20 | { | ||
21 | - xf86CrtcConfigPtr xf86_config; | ||
22 | GlamoPtr pGlamo; | ||
23 | rgb defaultWeight = { 0, 0, 0 }; | ||
24 | int max_width, max_height; | ||
25 | @@ -254,7 +253,6 @@ Bool GlamoKMSPreInit(ScrnInfoPtr pScrn, int flags) | ||
26 | |||
27 | /* Allocate an xf86CrtcConfig */ | ||
28 | xf86CrtcConfigInit(pScrn, &crtc_config_funcs); | ||
29 | - xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); | ||
30 | |||
31 | max_width = 480; | ||
32 | max_height = 640; | ||
33 | -- | ||
34 | 1.7.5.rc3 | ||
35 | |||
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch deleted file mode 100644 index cbdc6e762..000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch +++ /dev/null | |||
@@ -1,279 +0,0 @@ | |||
1 | From 57e8944e3cced03b9526bd075649d74d97c24899 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 20 Nov 2012 22:18:23 +0100 | ||
4 | Subject: [PATCH 3/3] glamo-driver: adapt to xserver-0.13 video API | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | src/compat-api.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
9 | src/glamo-driver.c | 43 ++++++++++++------------ | ||
10 | 2 files changed, 118 insertions(+), 21 deletions(-) | ||
11 | create mode 100644 src/compat-api.h | ||
12 | |||
13 | diff --git a/src/compat-api.h b/src/compat-api.h | ||
14 | new file mode 100644 | ||
15 | index 0000000..b1591b1 | ||
16 | --- /dev/null | ||
17 | +++ b/src/compat-api.h | ||
18 | @@ -0,0 +1,96 @@ | ||
19 | +/* | ||
20 | + * Copyright 2012 Red Hat, Inc. | ||
21 | + * | ||
22 | + * Permission is hereby granted, free of charge, to any person obtaining a | ||
23 | + * copy of this software and associated documentation files (the "Software"), | ||
24 | + * to deal in the Software without restriction, including without limitation | ||
25 | + * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
26 | + * and/or sell copies of the Software, and to permit persons to whom the | ||
27 | + * Software is furnished to do so, subject to the following conditions: | ||
28 | + * | ||
29 | + * The above copyright notice and this permission notice (including the next | ||
30 | + * paragraph) shall be included in all copies or substantial portions of the | ||
31 | + * Software. | ||
32 | + * | ||
33 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
34 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
35 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
36 | + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
37 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
38 | + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
39 | + * DEALINGS IN THE SOFTWARE. | ||
40 | + * | ||
41 | + * Author: Dave Airlie <airlied@redhat.com> | ||
42 | + */ | ||
43 | + | ||
44 | +/* this file provides API compat between server post 1.13 and pre it, | ||
45 | + it should be reused inside as many drivers as possible */ | ||
46 | +#ifndef COMPAT_API_H | ||
47 | +#define COMPAT_API_H | ||
48 | + | ||
49 | +#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR | ||
50 | +#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] | ||
51 | +#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p | ||
52 | +#endif | ||
53 | + | ||
54 | +#ifndef XF86_HAS_SCRN_CONV | ||
55 | +#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] | ||
56 | +#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] | ||
57 | +#endif | ||
58 | + | ||
59 | +#ifndef XF86_SCRN_INTERFACE | ||
60 | + | ||
61 | +#define SCRN_ARG_TYPE int | ||
62 | +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] | ||
63 | + | ||
64 | +#define SCREEN_ARG_TYPE int | ||
65 | +#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] | ||
66 | + | ||
67 | +#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv | ||
68 | + | ||
69 | +#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask | ||
70 | +#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask | ||
71 | + | ||
72 | +#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen | ||
73 | +#define CLOSE_SCREEN_ARGS scrnIndex, pScreen | ||
74 | + | ||
75 | +#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags | ||
76 | + | ||
77 | +#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags | ||
78 | + | ||
79 | +#define FREE_SCREEN_ARGS_DECL int arg, int flags | ||
80 | +#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0 | ||
81 | + | ||
82 | +#define VT_FUNC_ARGS_DECL int arg, int flags | ||
83 | +#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags) | ||
84 | + | ||
85 | +#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex) | ||
86 | +#else | ||
87 | +#define SCRN_ARG_TYPE ScrnInfoPtr | ||
88 | +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) | ||
89 | + | ||
90 | +#define SCREEN_ARG_TYPE ScreenPtr | ||
91 | +#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) | ||
92 | + | ||
93 | +#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv | ||
94 | + | ||
95 | +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask | ||
96 | +#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask | ||
97 | + | ||
98 | +#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen | ||
99 | +#define CLOSE_SCREEN_ARGS pScreen | ||
100 | + | ||
101 | +#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y | ||
102 | +#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode | ||
103 | + | ||
104 | +#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg | ||
105 | +#define FREE_SCREEN_ARGS(x) (x) | ||
106 | + | ||
107 | +#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg | ||
108 | +#define VT_FUNC_ARGS(flags) pScrn | ||
109 | + | ||
110 | +#define XF86_ENABLEDISABLEFB_ARG(x) (x) | ||
111 | + | ||
112 | +#endif | ||
113 | + | ||
114 | +#endif | ||
115 | diff --git a/src/glamo-driver.c b/src/glamo-driver.c | ||
116 | index b13caae..10b7762 100644 | ||
117 | --- a/src/glamo-driver.c | ||
118 | +++ b/src/glamo-driver.c | ||
119 | @@ -43,6 +43,7 @@ | ||
120 | |||
121 | #include <sys/mman.h> | ||
122 | |||
123 | +#include "compat-api.h" | ||
124 | |||
125 | static Bool debug = 0; | ||
126 | |||
127 | @@ -68,10 +69,10 @@ static Bool | ||
128 | GlamoPreInit(ScrnInfoPtr pScrn, int flags); | ||
129 | |||
130 | static Bool | ||
131 | -GlamoScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv); | ||
132 | +GlamoScreenInit(SCREEN_INIT_ARGS_DECL); | ||
133 | |||
134 | static Bool | ||
135 | -GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen); | ||
136 | +GlamoCloseScreen(CLOSE_SCREEN_ARGS_DECL); | ||
137 | |||
138 | static Bool | ||
139 | GlamoCrtcResize(ScrnInfoPtr scrn, int width, int height); | ||
140 | @@ -86,10 +87,10 @@ static void | ||
141 | GlamoRestoreHW(ScrnInfoPtr pScren); | ||
142 | |||
143 | static Bool | ||
144 | -GlamoEnterVT(int scrnIndex, int flags); | ||
145 | +GlamoEnterVT(VT_FUNC_ARGS_DECL); | ||
146 | |||
147 | static void | ||
148 | -GlamoLeaveVT(int scrnIndex, int flags); | ||
149 | +GlamoLeaveVT(VT_FUNC_ARGS_DECL); | ||
150 | |||
151 | static void | ||
152 | GlamoLoadColormap(ScrnInfoPtr pScrn, int numColors, int *indices, | ||
153 | @@ -248,8 +249,8 @@ GlamoUnmapMMIO(ScrnInfoPtr pScrn) { | ||
154 | } | ||
155 | |||
156 | static Bool | ||
157 | -GlamoSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) { | ||
158 | - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; | ||
159 | +GlamoSwitchMode(SWITCH_MODE_ARGS_DECL) { | ||
160 | + SCRN_INFO_PTR(arg); | ||
161 | xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (pScrn); | ||
162 | xf86OutputPtr output = config->output[config->compat_output]; | ||
163 | Rotation rotation; | ||
164 | @@ -286,7 +287,7 @@ GlamoFbdevProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections) | ||
165 | |||
166 | for (i = 0; i < numDevSections; i++) { | ||
167 | |||
168 | - dev = xf86FindOptionValue(devSections[i]->options, "Device"); | ||
169 | + dev = (char *) xf86FindOptionValue(devSections[i]->options, "Device"); | ||
170 | if (fbdevHWProbe(NULL, dev, NULL)) { | ||
171 | int entity; | ||
172 | pScrn = NULL; | ||
173 | @@ -430,7 +431,7 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags) | ||
174 | |||
175 | pGlamo->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); | ||
176 | |||
177 | - fb_device = xf86FindOptionValue(pGlamo->pEnt->device->options, "Device"); | ||
178 | + fb_device = (char *) xf86FindOptionValue(pGlamo->pEnt->device->options, "Device"); | ||
179 | |||
180 | /* open device */ | ||
181 | if (!fbdevHWInit(pScrn, NULL, fb_device)) | ||
182 | @@ -523,7 +524,7 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags) | ||
183 | |||
184 | |||
185 | static Bool | ||
186 | -GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
187 | +GlamoScreenInit(SCREEN_INIT_ARGS_DECL) | ||
188 | { | ||
189 | ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; | ||
190 | GlamoPtr pGlamo = GlamoPTR(pScrn); | ||
191 | @@ -545,7 +546,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
192 | #endif | ||
193 | |||
194 | if (NULL == (pGlamo->fbmem = fbdevHWMapVidmem(pScrn))) { | ||
195 | - xf86DrvMsg(scrnIndex, X_ERROR, "mapping of video memory failed\n"); | ||
196 | + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "mapping of video memory failed\n"); | ||
197 | return FALSE; | ||
198 | } | ||
199 | |||
200 | @@ -556,13 +557,13 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
201 | /* mi layer */ | ||
202 | miClearVisualTypes(); | ||
203 | if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) { | ||
204 | - xf86DrvMsg(scrnIndex, X_ERROR, | ||
205 | + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, | ||
206 | "visual type setup failed for %d bits per pixel [1]\n", | ||
207 | pScrn->bitsPerPixel); | ||
208 | return FALSE; | ||
209 | } | ||
210 | if (!miSetPixmapDepths()) { | ||
211 | - xf86DrvMsg(scrnIndex, X_ERROR, "pixmap depth setup failed\n"); | ||
212 | + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "pixmap depth setup failed\n"); | ||
213 | return FALSE; | ||
214 | } | ||
215 | |||
216 | @@ -617,7 +618,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
217 | /* software cursor */ | ||
218 | miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); | ||
219 | |||
220 | - GlamoEnterVT(scrnIndex, 0); | ||
221 | + GlamoEnterVT(VT_FUNC_ARGS(0)); | ||
222 | |||
223 | xf86CrtcScreenInit(pScreen); | ||
224 | #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,5,0,0,0) | ||
225 | @@ -627,7 +628,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
226 | /* colormap */ | ||
227 | pGlamo->colormap = NULL; | ||
228 | if (!miCreateDefColormap(pScreen)) { | ||
229 | - xf86DrvMsg(scrnIndex, X_ERROR, | ||
230 | + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, | ||
231 | "internal error: miCreateDefColormap failed " | ||
232 | "in GlamoScreenInit()\n"); | ||
233 | return FALSE; | ||
234 | @@ -652,9 +653,9 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||
235 | } | ||
236 | |||
237 | static Bool | ||
238 | -GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen) | ||
239 | +GlamoCloseScreen(CLOSE_SCREEN_ARGS_DECL) | ||
240 | { | ||
241 | - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; | ||
242 | + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); | ||
243 | GlamoPtr pGlamo = GlamoPTR(pScrn); | ||
244 | |||
245 | if (pGlamo->accel) | ||
246 | @@ -675,7 +676,7 @@ GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen) | ||
247 | |||
248 | pScreen->CreateScreenResources = pGlamo->CreateScreenResources; | ||
249 | pScreen->CloseScreen = pGlamo->CloseScreen; | ||
250 | - return (*pScreen->CloseScreen)(scrnIndex, pScreen); | ||
251 | + return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); | ||
252 | } | ||
253 | |||
254 | static Bool | ||
255 | @@ -826,8 +827,8 @@ GlamoRestoreHW(ScrnInfoPtr pScrn) { | ||
256 | } | ||
257 | |||
258 | static Bool | ||
259 | -GlamoEnterVT(int scrnIndex, int flags) { | ||
260 | - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; | ||
261 | +GlamoEnterVT(VT_FUNC_ARGS_DECL) { | ||
262 | + SCRN_INFO_PTR(arg); | ||
263 | GlamoPtr pGlamo = GlamoPTR(pScrn); | ||
264 | |||
265 | GlamoSaveHW(pScrn); | ||
266 | @@ -842,8 +843,8 @@ GlamoEnterVT(int scrnIndex, int flags) { | ||
267 | } | ||
268 | |||
269 | static void | ||
270 | -GlamoLeaveVT(int scrnIndex, int flags) { | ||
271 | - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; | ||
272 | +GlamoLeaveVT(VT_FUNC_ARGS_DECL) { | ||
273 | + SCRN_INFO_PTR(arg); | ||
274 | GlamoPtr pGlamo = GlamoPTR(pScrn); | ||
275 | |||
276 | if (pGlamo->accel) | ||
277 | -- | ||
278 | 1.8.0 | ||
279 | |||
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch deleted file mode 100644 index a82037109..000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 180a00634f351a09ceabc5695d8e1acc3e585501 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Fri, 12 Dec 2014 12:00:10 +0100 | ||
4 | Subject: [PATCH] glamo.h: use const for jbt6k74_state_path | ||
5 | |||
6 | * fix build issue with xserver 1.16: | ||
7 | glamo-driver.c:501:32: error: assignment discards 'const' qualifier from pointer target type [-Werror] | ||
8 | |||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | src/glamo.h | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/src/glamo.h b/src/glamo.h | ||
15 | index 5fd5c04..5e072be 100644 | ||
16 | --- a/src/glamo.h | ||
17 | +++ b/src/glamo.h | ||
18 | @@ -148,7 +148,7 @@ typedef struct { | ||
19 | #endif | ||
20 | |||
21 | #ifdef JBT6K74_SET_STATE | ||
22 | - char *jbt6k74_state_path; | ||
23 | + const char *jbt6k74_state_path; | ||
24 | char saved_jbt6k74_state[14]; | ||
25 | #endif | ||
26 | |||
27 | -- | ||
28 | 2.1.3 | ||
29 | |||
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb deleted file mode 100644 index 5818d0cc9..000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | require recipes-graphics/xorg-driver/xorg-driver-video.inc | ||
2 | SUMMARY = "X.Org X server -- Glamo display driver with KMS support" | ||
3 | DEPENDS += "libdrm" | ||
4 | RDEPENDS_${PN} += "xserver-xorg-module-exa" | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8" | ||
7 | |||
8 | PE = "2" | ||
9 | PV = "1.0.0+gitr${SRCPV}" | ||
10 | PR = "${INC_PR}.4" | ||
11 | |||
12 | SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;branch=master \ | ||
13 | file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \ | ||
14 | file://0001-fix-build-with-KMS-disabled.patch \ | ||
15 | file://0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch \ | ||
16 | file://0001-glamo-driver-remove-references-to-mibstore.patch \ | ||
17 | file://0004-glamo.h-use-const-for-jbt6k74_state_path.patch \ | ||
18 | " | ||
19 | |||
20 | S = "${WORKDIR}/git" | ||
21 | SRCREV = "cb9ed17035a79e49dde26a1e7e2bc5f10fd8144b" | ||
22 | |||
23 | EXTRA_OECONF = " --disable-kms " | ||
24 | |||
25 | PNBLACKLIST[xf86-video-glamo] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130629/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-kernel/ktap/ktap-module_git.bb b/meta-oe/recipes-kernel/ktap/ktap-module_git.bb deleted file mode 100644 index 1119d4c90..000000000 --- a/meta-oe/recipes-kernel/ktap/ktap-module_git.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
2 | |||
3 | require ktap.inc | ||
4 | |||
5 | SUMMARY = "KTAP is a scripting dynamic tracing tool for Linux" | ||
6 | |||
7 | inherit module | ||
8 | |||
9 | # See https://github.com/ktap/ktap/issues/80 | ||
10 | PNBLACKLIST[ktap-module] ?= "Not compatible with 3.19 kernel - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
11 | |||
12 | # Only build the module | ||
13 | MAKE_TARGETS = "mod" | ||
14 | |||
15 | # Kernel module packages MUST begin with 'kernel-module-', otherwise | ||
16 | # multilib image generation can fail. | ||
17 | # | ||
18 | # The following line is only necessary if the recipe name does not begin | ||
19 | # with kernel-module-. | ||
20 | # | ||
21 | PKG_${PN} = "kernel-module-${PN}" | ||
22 | |||
diff --git a/meta-oe/recipes-kernel/ktap/ktap.inc b/meta-oe/recipes-kernel/ktap/ktap.inc deleted file mode 100644 index c214a020d..000000000 --- a/meta-oe/recipes-kernel/ktap/ktap.inc +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
2 | |||
3 | HOMEPAGE = "http://www.ktap.org" | ||
4 | LICENSE = "GPLv2" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE-GPL;md5=eb723b61539feef013de476e68b5c50a" | ||
6 | |||
7 | PV = "0.4+gitr${SRCPV}" | ||
8 | SRCREV = "c8401e07c89cdec9a5f673da4ddb12b7982b522b" | ||
9 | SRC_URI = "git://github.com/ktap/ktap.git" | ||
10 | |||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | # Package config is abused as a general compile time configuration tool. | ||
14 | |||
15 | # Only supports x86_64 for now!. Needs to be enabled for ktap-module too. | ||
16 | PACKAGECONFIG[ffi] = "" | ||
17 | |||
18 | # Needed to resolve symbols in DSO and for sdt | ||
19 | PACKAGECONFIG[libelf] = ",,elfutils" | ||
20 | |||
21 | PACKAGECONFIG ?= "libelf" | ||
22 | |||
23 | EXTRA_OEMAKE = " \ | ||
24 | ${@bb.utils.contains('PACKAGECONFIG', 'libelf', '', 'NO_LIBELF=1', d)} \ | ||
25 | ${@bb.utils.contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} \ | ||
26 | " | ||
diff --git a/meta-oe/recipes-kernel/ktap/ktap_git.bb b/meta-oe/recipes-kernel/ktap/ktap_git.bb deleted file mode 100644 index a947b7fcc..000000000 --- a/meta-oe/recipes-kernel/ktap/ktap_git.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
2 | |||
3 | require ktap.inc | ||
4 | |||
5 | SUMMARY = "KTAP is a scripting dynamic tracing tool for Linux" | ||
6 | DEPENDS = "ktap-module" | ||
7 | |||
8 | PNBLACKLIST[ktap] ?= "Depends on blacklisted kernel-module-ktapvm - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
9 | |||
10 | # Only build the userspace app | ||
11 | EXTRA_OEMAKE += "ktap" | ||
12 | |||
13 | do_install() { | ||
14 | install -d ${D}${bindir} | ||
15 | install -m 0755 ${S}/ktap ${D}${bindir}/ | ||
16 | } | ||
17 | |||
18 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
19 | RRECOMMENDS_${PN} = "kernel-module-ktapvm" | ||
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc b/meta-oe/recipes-multimedia/minidlna/minidlna.inc deleted file mode 100644 index b333fce0b..000000000 --- a/meta-oe/recipes-multimedia/minidlna/minidlna.inc +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \ | ||
2 | being fully compliant with DLNA/UPnP-AV clients." | ||
3 | LICENSE = "GPL-2.0|BSD" | ||
4 | DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis" | ||
5 | |||
6 | # because it depends on libav which has commercial flag | ||
7 | LICENSE_FLAGS = "commercial" | ||
8 | |||
9 | inherit gettext autotools-brokensep update-rc.d systemd | ||
10 | |||
11 | SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ | ||
12 | file://minidlna-daemon.init.d \ | ||
13 | file://minidlna.service " | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | # This remove "--exclude=autopoint" option from autoreconf argument to avoid | ||
18 | # configure.ac:30: error: required file './ABOUT-NLS' not found | ||
19 | EXTRA_AUTORECONF = "" | ||
20 | |||
21 | do_install_append(){ | ||
22 | install -d ${D}${sysconfdir} | ||
23 | install -m 0755 minidlna.conf ${D}${sysconfdir} | ||
24 | |||
25 | # Systemd script | ||
26 | install -d ${D}${nonarch_base_libdir}/systemd/system | ||
27 | install -m 0755 ${WORKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system | ||
28 | |||
29 | # Sysvinit script | ||
30 | install -d ${D}${sysconfdir}/init.d | ||
31 | install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna | ||
32 | |||
33 | } | ||
34 | |||
35 | SYSTEMD_SERVICE_${PN} = "minidlna.service" | ||
36 | |||
37 | INITSCRIPT_NAME = "minidlna" | ||
38 | INITSCRIPT_PARAMS = "defaults 90" | ||
39 | |||
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb deleted file mode 100644 index 81d700a7b..000000000 --- a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRCREV = "v1_1_5" | ||
4 | LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b" | ||
5 | |||
6 | PNBLACKLIST[minidlna] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130630/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch b/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch deleted file mode 100644 index e232595cd..000000000 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 3541649b711a773aa2e42ac80d9b4c1b36fce23f Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 27 Mar 2014 00:08:54 +0100 | ||
4 | Subject: [PATCH] configure: don't disable ASS support when explicitly enabled | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | configure | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/configure b/configure | ||
12 | index 60fd308..2f7df3b 100755 | ||
13 | --- a/configure | ||
14 | +++ b/configure | ||
15 | @@ -4346,7 +4346,7 @@ fi | ||
16 | |||
17 | |||
18 | echocheck "SSA/ASS support" | ||
19 | -if test "$_ass" = auto ; then | ||
20 | +if test "$_ass" = auto -o "$_ass" = yes ; then | ||
21 | if pkg_config_add libass ; then | ||
22 | _ass=yes | ||
23 | def_ass='#define CONFIG_ASS 1' | ||
24 | -- | ||
25 | 1.9.1 | ||
26 | |||
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch b/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch deleted file mode 100644 index b4d98412f..000000000 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch +++ /dev/null | |||
@@ -1,136 +0,0 @@ | |||
1 | From 0571bb4f1a6e1934ee7e093ce7aa517b9bac8e6a Mon Sep 17 00:00:00 2001 | ||
2 | From: Awais Belal <awais_belal@mentor.com> | ||
3 | Date: Sun, 17 Jan 2016 14:46:10 +0500 | ||
4 | Subject: [PATCH] demux_ogg: partially port libtheora glue code to Theora 1.0 | ||
5 | API | ||
6 | |||
7 | This partially backports the following commit to allow building | ||
8 | with gcc-5.x and otherwise fails to find the definition of | ||
9 | the _ilog function the way it is used. | ||
10 | |||
11 | https://github.com/pigoz/mplayer-svn/commit/85e51408cd00979fc209da8e3a39b6f0e7f325bc | ||
12 | |||
13 | Signed-off-by: Awais Belal <awais_belal@mentor.com> | ||
14 | --- | ||
15 | libmpdemux/demux_ogg.c | 52 ++++++++++++++++++++++++++------------------------ | ||
16 | 1 file changed, 27 insertions(+), 25 deletions(-) | ||
17 | |||
18 | diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c | ||
19 | index 9eea061..9144426 100644 | ||
20 | --- a/libmpdemux/demux_ogg.c | ||
21 | +++ b/libmpdemux/demux_ogg.c | ||
22 | @@ -50,8 +50,7 @@ | ||
23 | #endif | ||
24 | |||
25 | #ifdef CONFIG_OGGTHEORA | ||
26 | -#include <theora/theora.h> | ||
27 | -int _ilog (unsigned int); /* defined in many places in theora/lib/ */ | ||
28 | +#include <theora/theoradec.h> | ||
29 | #endif | ||
30 | |||
31 | #define BLOCK_SIZE 4096 | ||
32 | @@ -62,9 +61,10 @@ int _ilog (unsigned int); /* defined in many places in theora/lib/ */ | ||
33 | */ | ||
34 | #ifdef CONFIG_OGGTHEORA | ||
35 | typedef struct theora_struct_st { | ||
36 | - theora_state st; | ||
37 | - theora_comment cc; | ||
38 | - theora_info inf; | ||
39 | + th_setup_info *tsi; | ||
40 | + th_dec_ctx *tctx; | ||
41 | + th_comment tc; | ||
42 | + th_info ti; | ||
43 | } theora_struct_t; | ||
44 | #endif | ||
45 | |||
46 | @@ -117,7 +117,7 @@ typedef struct ogg_stream { | ||
47 | float samplerate; /// granulpos 2 time | ||
48 | int64_t lastpos; | ||
49 | int32_t lastsize; | ||
50 | - int keyframe_frequency_force; | ||
51 | + int keyframe_granule_shift; | ||
52 | |||
53 | // Logical stream state | ||
54 | ogg_stream_state stream; | ||
55 | @@ -300,11 +300,10 @@ static unsigned char *demux_ogg_read_packet(ogg_stream_t *os, ogg_packet *pack, | ||
56 | have theora_state st, until all header packets were passed to the | ||
57 | decoder. */ | ||
58 | if (!pack->bytes || !(*data&0x80)) { | ||
59 | - int keyframe_granule_shift = _ilog(os->keyframe_frequency_force - 1); | ||
60 | - int64_t iframemask = (1 << keyframe_granule_shift) - 1; | ||
61 | + int64_t iframemask = iframemask = (1 << os->keyframe_granule_shift) - 1; | ||
62 | |||
63 | if (pack->granulepos >= 0) { | ||
64 | - os->lastpos = pack->granulepos >> keyframe_granule_shift; | ||
65 | + os->lastpos = pack->granulepos >> os->keyframe_granule_shift; | ||
66 | os->lastpos += pack->granulepos & iframemask; | ||
67 | *keyframe = (pack->granulepos & iframemask) == 0; | ||
68 | } else { | ||
69 | @@ -888,14 +887,15 @@ int demux_ogg_open(demuxer_t *demuxer) | ||
70 | #ifdef CONFIG_OGGTHEORA | ||
71 | } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) { | ||
72 | int errorCode = 0; | ||
73 | - theora_info inf; | ||
74 | - theora_comment cc; | ||
75 | + th_info ti; | ||
76 | + th_comment tc; | ||
77 | + th_setup_info *tsi = NULL; | ||
78 | |||
79 | - theora_info_init (&inf); | ||
80 | - theora_comment_init (&cc); | ||
81 | + th_info_init (&ti); | ||
82 | + th_comment_init (&tc); | ||
83 | |||
84 | - errorCode = theora_decode_header (&inf, &cc, &pack); | ||
85 | - if (errorCode) { | ||
86 | + errorCode = th_decode_headerin(&ti, &tc, &tsi, &pack); | ||
87 | + if (errorCode < 0) { | ||
88 | mp_msg(MSGT_DEMUX, MSGL_ERR, | ||
89 | "Theora header parsing failed: %i \n", errorCode); | ||
90 | } else { | ||
91 | @@ -904,30 +904,32 @@ int demux_ogg_open(demuxer_t *demuxer) | ||
92 | sh_v->bih = calloc(1, sizeof(*sh_v->bih)); | ||
93 | sh_v->bih->biSize = sizeof(*sh_v->bih); | ||
94 | sh_v->bih->biCompression = sh_v->format = FOURCC_THEORA; | ||
95 | - sh_v->fps = ((double)inf.fps_numerator) / (double)inf.fps_denominator; | ||
96 | - sh_v->frametime = ((double)inf.fps_denominator) / (double)inf.fps_numerator; | ||
97 | - sh_v->disp_w = sh_v->bih->biWidth = inf.frame_width; | ||
98 | - sh_v->disp_h = sh_v->bih->biHeight = inf.frame_height; | ||
99 | + sh_v->fps = ((double)ti.fps_numerator) / (double)ti.fps_denominator; | ||
100 | + sh_v->frametime = ((double)ti.fps_denominator) / (double)ti.fps_numerator; | ||
101 | + sh_v->i_bps = ti.target_bitrate / 8; | ||
102 | + sh_v->disp_w = sh_v->bih->biWidth = ti.frame_width; | ||
103 | + sh_v->disp_h = sh_v->bih->biHeight = ti.frame_height; | ||
104 | sh_v->bih->biBitCount = 24; | ||
105 | sh_v->bih->biPlanes = 3; | ||
106 | sh_v->bih->biSizeImage = ((sh_v->bih->biBitCount / 8) * sh_v->bih->biWidth * sh_v->bih->biHeight); | ||
107 | ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps; | ||
108 | ogg_d->subs[ogg_d->num_sub].theora = 1; | ||
109 | - ogg_d->subs[ogg_d->num_sub].keyframe_frequency_force = inf.keyframe_frequency_force; | ||
110 | + ogg_d->subs[ogg_d->num_sub].keyframe_granule_shift = ti.keyframe_granule_shift; | ||
111 | ogg_d->subs[ogg_d->num_sub].id = n_video; | ||
112 | n_video++; | ||
113 | mp_msg(MSGT_DEMUX, MSGL_INFO, | ||
114 | "[Ogg] stream %d: video (Theora v%d.%d.%d), -vid %d\n", | ||
115 | ogg_d->num_sub, | ||
116 | - (int)inf.version_major, | ||
117 | - (int)inf.version_minor, | ||
118 | - (int)inf.version_subminor, | ||
119 | + (int)ti.version_major, | ||
120 | + (int)ti.version_minor, | ||
121 | + (int)ti.version_subminor, | ||
122 | n_video - 1); | ||
123 | if (mp_msg_test(MSGT_HEADER, MSGL_V)) | ||
124 | print_video_header(sh_v->bih, MSGL_V); | ||
125 | } | ||
126 | - theora_comment_clear(&cc); | ||
127 | - theora_info_clear(&inf); | ||
128 | + th_comment_clear(&tc); | ||
129 | + th_info_clear(&ti); | ||
130 | + th_setup_free(tsi); | ||
131 | #endif /* CONFIG_OGGTHEORA */ | ||
132 | } else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) { | ||
133 | sh_a = new_sh_audio_aid(demuxer, ogg_d->num_sub, n_audio); | ||
134 | -- | ||
135 | 1.9.1 | ||
136 | |||
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb deleted file mode 100644 index 1a4ae27e6..000000000 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ /dev/null | |||
@@ -1,159 +0,0 @@ | |||
1 | SUMMARY = "Open Source multimedia player" | ||
2 | SECTION = "multimedia" | ||
3 | HOMEPAGE = "http://www.mplayerhq.hu/" | ||
4 | DEPENDS = "libvpx libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \ | ||
5 | libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \ | ||
6 | libxv virtual/libx11 libass speex faad2 libxscrnsaver" | ||
7 | |||
8 | RDEPENDS_${PN} = "mplayer-common" | ||
9 | PROVIDES = "mplayer" | ||
10 | RPROVIDES_${PN} = "mplayer" | ||
11 | RCONFLICTS_${PN} = "mplayer" | ||
12 | |||
13 | # Depends on xsp, libxv, virtual/libx11, libxscrnsaver | ||
14 | REQUIRED_DISTRO_FEATURES = "x11" | ||
15 | |||
16 | # because it depends on libpostproc/libav which has commercial flag | ||
17 | LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'postproc', 'commercial', '', d)}" | ||
18 | |||
19 | LICENSE = "GPLv3" | ||
20 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" | ||
21 | |||
22 | SRC_URI = "git://repo.or.cz/mplayer.git \ | ||
23 | file://0001-configure-don-t-disable-ASS-support-when-explicitly-.patch \ | ||
24 | file://0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch \ | ||
25 | " | ||
26 | |||
27 | SRCREV = "2c378c71a4d9b1df382db9aa787b646628b4e3f9" | ||
28 | |||
29 | ARM_INSTRUCTION_SET = "arm" | ||
30 | |||
31 | PV = "2.0+gitr${SRCPV}" | ||
32 | PR = "r13" | ||
33 | |||
34 | PARALLEL_MAKE = "" | ||
35 | |||
36 | S = "${WORKDIR}/git" | ||
37 | |||
38 | FILES_${PN} = "${bindir}/mplayer ${libdir} /usr/etc/mplayer/" | ||
39 | CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \ | ||
40 | /usr/etc/mplayer/example.conf \ | ||
41 | /usr/etc/mplayer/codecs.conf \ | ||
42 | " | ||
43 | |||
44 | inherit autotools-brokensep pkgconfig python3native | ||
45 | |||
46 | EXTRA_OECONF = " \ | ||
47 | --prefix=/usr \ | ||
48 | --mandir=${mandir} \ | ||
49 | --target=${SIMPLE_TARGET_SYS} \ | ||
50 | \ | ||
51 | --disable-lirc \ | ||
52 | --disable-lircc \ | ||
53 | --disable-joystick \ | ||
54 | --disable-vm \ | ||
55 | --disable-xf86keysym \ | ||
56 | --enable-tv \ | ||
57 | --enable-tv-v4l2 \ | ||
58 | --disable-tv-bsdbt848 \ | ||
59 | --enable-rtc \ | ||
60 | --enable-networking \ | ||
61 | --disable-smb \ | ||
62 | --disable-dvdnav \ | ||
63 | --enable-dvdread \ | ||
64 | --disable-dvdread-internal \ | ||
65 | --disable-libdvdcss-internal \ | ||
66 | --disable-enca \ | ||
67 | --disable-ftp \ | ||
68 | --disable-vstream \ | ||
69 | \ | ||
70 | --disable-gif \ | ||
71 | --enable-png \ | ||
72 | --enable-jpeg \ | ||
73 | --disable-libcdio \ | ||
74 | --disable-qtx \ | ||
75 | --disable-xanim \ | ||
76 | --disable-real \ | ||
77 | --disable-xvid \ | ||
78 | \ | ||
79 | --enable-speex \ | ||
80 | --enable-theora \ | ||
81 | --disable-ladspa \ | ||
82 | --disable-libdv \ | ||
83 | --enable-mad \ | ||
84 | --disable-xmms \ | ||
85 | --disable-musepack \ | ||
86 | \ | ||
87 | --disable-gl \ | ||
88 | --enable-sdl \ | ||
89 | --disable-caca \ | ||
90 | --disable-directx \ | ||
91 | --disable-dvb \ | ||
92 | --enable-xv \ | ||
93 | --disable-vm \ | ||
94 | --disable-xinerama \ | ||
95 | --enable-x11 \ | ||
96 | --disable-directfb \ | ||
97 | --disable-tga \ | ||
98 | --disable-pnm \ | ||
99 | --disable-md5sum \ | ||
100 | \ | ||
101 | --enable-alsa \ | ||
102 | --enable-ossaudio \ | ||
103 | --disable-pulse \ | ||
104 | --disable-jack \ | ||
105 | --disable-openal \ | ||
106 | --enable-select \ | ||
107 | --enable-libass \ | ||
108 | \ | ||
109 | --extra-libs=' -lXext -lX11 -lvorbis -ltheoradec -lasound ' \ | ||
110 | " | ||
111 | # -ltheoradec is missing in: | ||
112 | # libmpcodecs/vd_theora.o: undefined reference to symbol 'theora_decode_init@@libtheora.so.1.0' | ||
113 | |||
114 | EXTRA_OECONF_append_armv6 = " --enable-armv6" | ||
115 | EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" | ||
116 | |||
117 | PACKAGECONFIG ??= "vorbis postproc" | ||
118 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" | ||
119 | PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52" | ||
120 | PACKAGECONFIG[lame] = ",,lame" | ||
121 | PACKAGECONFIG[postproc] = ",--disable-libpostproc,libpostproc" | ||
122 | PACKAGECONFIG[vorbis] = ",--disable-libvorbis,libvorbis" | ||
123 | PACKAGECONFIG[portaudio] = ",--disable-portaudio,portaudio-v19" | ||
124 | PACKAGECONFIG[mpg123] = ",--disable-mpg123,mpg123" | ||
125 | PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" | ||
126 | |||
127 | FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math" | ||
128 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" | ||
129 | |||
130 | CFLAGS_append = " -I${S}/libdvdread4 " | ||
131 | |||
132 | do_configure() { | ||
133 | sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure | ||
134 | sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure | ||
135 | sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure | ||
136 | sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure | ||
137 | sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure | ||
138 | sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile | ||
139 | sed -i 's|extra_cflags="-I. $extra_cflags"|extra_cflags="-I. -I${STAGING_INCDIR}/directfb $extra_cflags"|g' ${S}/configure | ||
140 | export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)" | ||
141 | ./configure ${EXTRA_OECONF} | ||
142 | |||
143 | } | ||
144 | |||
145 | do_compile () { | ||
146 | oe_runmake | ||
147 | } | ||
148 | |||
149 | do_install() { | ||
150 | oe_runmake 'DESTDIR=${D}' install-no-man | ||
151 | install -d ${D}/usr/etc/mplayer | ||
152 | install ${S}/etc/input.conf ${D}/usr/etc/mplayer/ | ||
153 | install ${S}/etc/example.conf ${D}/usr/etc/mplayer/ | ||
154 | install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/ | ||
155 | [ -e ${D}/usr/lib ] && rmdir ${D}/usr/lib | ||
156 | } | ||
157 | |||
158 | # http://errors.yoctoproject.org/Errors/Details/40734/ | ||
159 | PNBLACKLIST[mplayer2] ?= "Not compatible with currently used ffmpeg 3 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb b/meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb deleted file mode 100644 index 4e821be5a..000000000 --- a/meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb +++ /dev/null | |||
@@ -1,114 +0,0 @@ | |||
1 | SUMMARY = "GDAL is a translator library for raster geospatial data formats" | ||
2 | HOMEPAGE = "http://www.gdal.org/" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=0952e17969fab12227096b5228f23149" | ||
5 | |||
6 | DEPENDS = "proj sqlite3 tiff json-c" | ||
7 | |||
8 | SRC_URI = "ftp://download.osgeo.org/gdal/${PV}/${BP}.tar.xz" | ||
9 | |||
10 | SRC_URI[md5sum] = "2e126d7c6605691d38f3e71b945f5c73" | ||
11 | SRC_URI[sha256sum] = "20e1042cff15a71038459a299732fb342428aea9912f32df30c85790fcab6302" | ||
12 | |||
13 | inherit autotools-brokensep lib_package binconfig | ||
14 | |||
15 | EXTRA_OECONF = "--without-perl \ | ||
16 | --without-php \ | ||
17 | --without-ruby \ | ||
18 | --without-python \ | ||
19 | \ | ||
20 | --without-grass \ | ||
21 | --without-libgrass \ | ||
22 | --without-cfitsio \ | ||
23 | --without-dds \ | ||
24 | --without-gta \ | ||
25 | --without-pcidsk \ | ||
26 | --without-ogdi \ | ||
27 | --without-fme \ | ||
28 | --without-hdf4 \ | ||
29 | --without-hdf5 \ | ||
30 | --without-pg \ | ||
31 | --without-jpeg12 \ | ||
32 | --without-ogdi \ | ||
33 | --without-netcdf \ | ||
34 | --without-openjpeg \ | ||
35 | --without-fgdb \ | ||
36 | --without-ecw \ | ||
37 | --without-kakadu \ | ||
38 | --without-mrsid \ | ||
39 | --without-jp2mrsid \ | ||
40 | --without-mrsid_lidar \ | ||
41 | --without-msg \ | ||
42 | --without-bsb \ | ||
43 | --without-grib \ | ||
44 | --without-mysql \ | ||
45 | --without-ingres \ | ||
46 | --without-odbc \ | ||
47 | --without-dods_root \ | ||
48 | --without-xml2 \ | ||
49 | --without-spatialite \ | ||
50 | --without-pcre \ | ||
51 | --without-dwgdirect \ | ||
52 | --without-dwgdirect \ | ||
53 | --without-idb \ | ||
54 | --without-sde \ | ||
55 | --without-sde-version \ | ||
56 | --without-epsilon \ | ||
57 | --without-webp \ | ||
58 | --without-opencl \ | ||
59 | --without-opencl-include \ | ||
60 | --without-opencl-lib \ | ||
61 | --without-freexl \ | ||
62 | --without-pam \ | ||
63 | --without-poppler \ | ||
64 | --without-podofo \ | ||
65 | --without-podofo-lib \ | ||
66 | --without-podofo-extra-lib-for-test \ | ||
67 | --without-static_proj4 \ | ||
68 | --without-perl \ | ||
69 | --without-php \ | ||
70 | --without-ruby \ | ||
71 | --without-python \ | ||
72 | --without-java \ | ||
73 | --without-mdb \ | ||
74 | --without-jvm-lib \ | ||
75 | --without-jvm-lib-add-rpath \ | ||
76 | --without-rasdaman \ | ||
77 | --without-armadillo \ | ||
78 | \ | ||
79 | --with-pcraster=internal \ | ||
80 | --with-geotiff=internal \ | ||
81 | \ | ||
82 | --with-sqlite3=${STAGING_EXECPREFIXDIR} \ | ||
83 | --with-libtiff=${STAGING_EXECPREFIXDIR} \ | ||
84 | --with-libjson-c=${STAGING_EXECPREFIXDIR} \ | ||
85 | --with-expat=${STAGING_EXECPREFIXDIR} \ | ||
86 | " | ||
87 | |||
88 | EXTRA_OEMAKE += "INST_DATA="${datadir}/gdal"" | ||
89 | |||
90 | PACKAGECONFIG ?= "geos png jasper" | ||
91 | PACKAGECONFIG[geos] = "--with-geos,--without-geos,geos" | ||
92 | PACKAGECONFIG[lzma] = "--with-liblzma,--without-liblzma,xz" | ||
93 | PACKAGECONFIG[png] = "--with-png,--without-png,libpng" | ||
94 | PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib" | ||
95 | PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg" | ||
96 | PACKAGECONFIG[z] = "--with-libz,--without-libz,zlib" | ||
97 | PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper" | ||
98 | PACKAGECONFIG[curl] = "--with-curl,--without-curl,curl" | ||
99 | |||
100 | do_configure_prepend () { | ||
101 | # The configure script has many hardcoded paths to search | ||
102 | # for the library headers when using external libraries, | ||
103 | # workaround it. | ||
104 | sed -e 's,/usr/include,NON_EXISTENT_DIR,g' \ | ||
105 | -e 's,/usr/lib,NON_EXISTENT_DIR,g' \ | ||
106 | -i ${S}/configure.in | ||
107 | } | ||
108 | |||
109 | FILES_${PN} += "${libdir}/gdalplugins" | ||
110 | |||
111 | # | gdalserver.c:124:21: error: storage size of 'sHints' isn't known | ||
112 | # | struct addrinfo sHints; | ||
113 | # | ^ | ||
114 | PNBLACKLIST[gdal] ?= "BROKEN: fails to build with gcc-5 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-sato/claws-mail/claws-mail_3.9.0.bb b/meta-oe/recipes-sato/claws-mail/claws-mail_3.9.0.bb deleted file mode 100644 index 534ba3b14..000000000 --- a/meta-oe/recipes-sato/claws-mail/claws-mail_3.9.0.bb +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | SECTION = "x11/network" | ||
2 | SUMMARY = "Mail user agent" | ||
3 | DEPENDS = "gtk+ libetpan openssl aspell curl libgcrypt" | ||
4 | LICENSE = "GPLv3" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=e059bde2972c1790af786f3e86bac22e" | ||
6 | |||
7 | PNBLACKLIST[claws-mail] ?= "depends on blacklisted libetpan - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
8 | |||
9 | inherit autotools pkgconfig gettext | ||
10 | |||
11 | # translation patch: http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1774 | ||
12 | SRC_URI = "\ | ||
13 | ${SOURCEFORGE_MIRROR}/project/claws-mail/Claws%20Mail/${PV}/claws-mail-${PV}.tar.bz2;name=archive " | ||
14 | SRC_URI[archive.md5sum] = "4c5ac7b21f0ed17d0f6404124c2229a4" | ||
15 | SRC_URI[archive.sha256sum] = "ed70975a5056b3ffc4fe6e977f0d9606febc1499763c090241b029a73ff24e65" | ||
16 | |||
17 | do_configure_append() { | ||
18 | cd ${S}/po ; for PO in *.po ; do MO=`echo $PO | sed s/\\.po//`.gmo ; if ! test -f $MO ; then msgfmt $PO -o $MO ; fi ; done; cd ${B} | ||
19 | } | ||
20 | |||
21 | PACKAGECONFIG ??= "startup-notification dbus" | ||
22 | PACKAGECONFIG[enchant] = "--enable-enchant,--disable-enchant,enchant" | ||
23 | PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" | ||
24 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" | ||
25 | PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap" | ||
26 | |||
27 | # FIXME: maemo builds may want --enable-maemo | ||
28 | # FIXME: some platforms may want --enable-generic-umpc | ||
29 | EXTRA_OECONF = " \ | ||
30 | --disable-manual \ | ||
31 | --disable-crash-dialog \ | ||
32 | --disable-jpilot \ | ||
33 | --disable-trayicon-plugin \ | ||
34 | --disable-spamassassin-plugin \ | ||
35 | --disable-bogofilter-plugin \ | ||
36 | --disable-pgpcore-plugin \ | ||
37 | --disable-pgpmime-plugin \ | ||
38 | --disable-pgpinline-plugin \ | ||
39 | --disable-dillo-viewer-plugin \ | ||
40 | --disable-valgrind \ | ||
41 | " | ||
42 | |||
43 | # Remove enchant references: | ||
44 | do_install_prepend() { | ||
45 | sed -i -e 's:${STAGING_INCDIR}:${includedir}:g;s:${STAGING_LIBDIR}:${libdir}:g' claws-mail.pc | ||
46 | } | ||
47 | |||
48 | # Work-around broken GPE icon lookup: | ||
49 | do_install_append() { | ||
50 | rm -r ${D}${datadir}/icons | ||
51 | install -d ${D}${datadir}/pixmaps | ||
52 | install -m 0644 ${S}/claws-mail.png ${D}${datadir}/pixmaps/ | ||
53 | sed -i 's/Icon=[^.]*$/&.png/' ${D}${datadir}/applications/claws-mail.desktop | ||
54 | } | ||
55 | |||
56 | RSUGGESTS_${PN} = "claws-plugin-gtkhtml2-viewer claws-plugin-mailmbox claws-plugin-rssyl" | ||
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer/configure.patch b/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer/configure.patch deleted file mode 100644 index 222a79602..000000000 --- a/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer/configure.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | Index: gtkhtml2_viewer-0.31/configure.ac | ||
2 | =================================================================== | ||
3 | --- gtkhtml2_viewer-0.31.orig/configure.ac 2011-08-27 08:08:55.000000000 +0000 | ||
4 | +++ gtkhtml2_viewer-0.31/configure.ac 2014-07-18 07:28:42.769518618 +0000 | ||
5 | @@ -1,33 +1,27 @@ | ||
6 | AC_PREREQ(2.60) | ||
7 | -AC_INIT(src/gtkhtml2_viewer.c) | ||
8 | + | ||
9 | +dnl plugin version | ||
10 | +m4_define([plugin_major_version],[0]) | ||
11 | +m4_define([plugin_minor_version],[31]) | ||
12 | +m4_define([plugin_micro_version],[0]) | ||
13 | +m4_define([plugin_version], [plugin_major_version.plugin_minor_version.plugin_micro_version]) | ||
14 | + | ||
15 | +AC_INIT(gtkhml2_viewer, plugin_version) | ||
16 | +AC_CONFIG_SRCDIR(src/gtkhtml2_viewer.c) | ||
17 | AC_CONFIG_AUX_DIR(config) | ||
18 | AM_MAINTAINER_MODE | ||
19 | |||
20 | PACKAGE=gtkhtml2_viewer | ||
21 | |||
22 | -dnl plugin version | ||
23 | -MAJOR_VERSION=0 | ||
24 | -MINOR_VERSION=31 | ||
25 | -MICRO_VERSION=0 | ||
26 | +MAJOR_VERSION=plugin_major_version | ||
27 | +MINOR_VERSION=plugin_minor_version | ||
28 | +MICRO_VERSION=plugin_micro_version | ||
29 | EXTRA_VERSION=0 | ||
30 | - | ||
31 | -if test \( $EXTRA_VERSION -eq 0 \); then | ||
32 | - if test \( $MICRO_VERSION -eq 0 \); then | ||
33 | - VERSION=${MAJOR_VERSION}.${MINOR_VERSION} | ||
34 | - else | ||
35 | - VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION} | ||
36 | - fi | ||
37 | -else | ||
38 | - if test \( $MICRO_VERSION -eq 0 \); then | ||
39 | - VERSION=${MAJOR_VERSION}.${MINOR_VERSION}cvs${EXTRA_VERSION} | ||
40 | - else | ||
41 | - VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION} | ||
42 | - fi | ||
43 | -fi | ||
44 | +VERSION=plugin_version | ||
45 | |||
46 | AC_CANONICAL_SYSTEM | ||
47 | |||
48 | -AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) | ||
49 | +AM_INIT_AUTOMAKE([foreign no-define]) | ||
50 | AC_CONFIG_HEADERS(config.h) | ||
51 | AC_DEFINE_UNQUOTED(PLUGINVERSION, "$VERSION", [plugin version]) | ||
52 | |||
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb b/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb deleted file mode 100644 index 29b41be93..000000000 --- a/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | SECTION = "x11/network" | ||
2 | SUMMARY = "Mail user agent plugins" | ||
3 | DEPENDS = "claws-mail gtkhtml2 curl" | ||
4 | LICENSE = "GPLv3" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=977f04a8048c04684e521c06e2844a94" | ||
6 | |||
7 | PNBLACKLIST[claws-plugin-gtkhtml2-viewer] ?= "depends on blacklisted claws-mail - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
8 | |||
9 | PR = "r1" | ||
10 | |||
11 | SRC_URI = "http://www.claws-mail.org/downloads/plugins_obsolete/gtkhtml2_viewer-${PV}.tar.gz \ | ||
12 | file://configure.patch" | ||
13 | SRC_URI[md5sum] = "a6c9dfa6f969ccd844796a5724b52167" | ||
14 | SRC_URI[sha256sum] = "4d41f6d961efaac0f51705e5052bac732bc0bdafee2ef2082a9cf9d89f183ae5" | ||
15 | |||
16 | inherit autotools pkgconfig gettext | ||
17 | |||
18 | S = "${WORKDIR}/gtkhtml2_viewer-${PV}" | ||
19 | |||
20 | FILES_${PN} = "${libdir}/claws-mail/plugins/*.so" | ||
21 | FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug" | ||
22 | FILES_${PN}-dev += "${libdir}/claws-mail/plugins/*.la" | ||
23 | FILES_${PN}-staticdev = "${libdir}/claws-mail/plugins/*.a" | ||
24 | |||
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.15.bb b/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.15.bb deleted file mode 100644 index 986b5d40d..000000000 --- a/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.15.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | SECTION = "x11/network" | ||
2 | SUMMARY = "Mail user agent plugins" | ||
3 | DEPENDS = "claws-mail" | ||
4 | LICENSE = "GPLv3" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
6 | |||
7 | PNBLACKLIST[claws-plugin-mailmbox] ?= "depends on blacklisted claws-mail - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
8 | |||
9 | SRC_URI = "http://www.claws-mail.org/downloads/plugins_obsolete/mailmbox-${PV}.tar.gz" | ||
10 | SRC_URI[md5sum] = "7f72c68e6e1a8768f1247f455fd20b62" | ||
11 | SRC_URI[sha256sum] = "633f7835261c88a0aa06de38553ac935a1799a7128120963a7fa87ace01dac18" | ||
12 | |||
13 | inherit autotools pkgconfig | ||
14 | |||
15 | S = "${WORKDIR}/mailmbox-${PV}" | ||
16 | |||
17 | FILES_${PN} = "${libdir}/claws-mail/plugins/*.so" | ||
18 | FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug" | ||
19 | FILES_${PN}-dev += "${libdir}/claws-mail/plugins/*.la" | ||
20 | FILES_${PN}-staticdev = "${libdir}/claws-mail/plugins/*.a" | ||
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl/configure.patch b/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl/configure.patch deleted file mode 100644 index a7a38f30c..000000000 --- a/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl/configure.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | Index: rssyl-0.34/configure.ac | ||
2 | =================================================================== | ||
3 | --- rssyl-0.34.orig/configure.ac 2014-07-18 07:37:28.981532959 +0000 | ||
4 | +++ rssyl-0.34/configure.ac 2014-07-18 07:39:45.881536690 +0000 | ||
5 | @@ -1,5 +1,13 @@ | ||
6 | + | ||
7 | +dnl plugin version | ||
8 | +m4_define([plugin_major_version],[0]) | ||
9 | +m4_define([plugin_minor_version],[34]) | ||
10 | +m4_define([plugin_micro_version],[0]) | ||
11 | +m4_define([plugin_version], [plugin_major_version.plugin_minor_version.plugin_micro_version]) | ||
12 | + | ||
13 | AC_PREREQ(2.60) | ||
14 | -AC_INIT(src/plugin.c) | ||
15 | +AC_INIT(rssyl, plugin_version) | ||
16 | +AC_CONFIG_SRCDIR(src/plugin.c) | ||
17 | AC_CONFIG_AUX_DIR(config) | ||
18 | AM_MAINTAINER_MODE | ||
19 | AC_CONFIG_HEADERS(config.h) | ||
20 | @@ -7,28 +15,15 @@ | ||
21 | PACKAGE=rssyl | ||
22 | |||
23 | dnl plugin version | ||
24 | -MAJOR_VERSION=0 | ||
25 | -MINOR_VERSION=34 | ||
26 | -MICRO_VERSION=0 | ||
27 | +MAJOR_VERSION=plugin_major_version | ||
28 | +MINOR_VERSION=plugin_minor_version | ||
29 | +MICRO_VERSION=plugin_micro_version | ||
30 | EXTRA_VERSION=0 | ||
31 | - | ||
32 | -if test \( $EXTRA_VERSION -eq 0 \); then | ||
33 | - if test \( $MICRO_VERSION -eq 0 \); then | ||
34 | - VERSION=${MAJOR_VERSION}.${MINOR_VERSION} | ||
35 | - else | ||
36 | - VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION} | ||
37 | - fi | ||
38 | -else | ||
39 | - if test \( $MICRO_VERSION -eq 0 \); then | ||
40 | - VERSION=${MAJOR_VERSION}.${MINOR_VERSION}cvs${EXTRA_VERSION} | ||
41 | - else | ||
42 | - VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION} | ||
43 | - fi | ||
44 | -fi | ||
45 | +VERSION=plugin_version | ||
46 | |||
47 | AC_CANONICAL_SYSTEM | ||
48 | |||
49 | -AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) | ||
50 | +AM_INIT_AUTOMAKE([foreign no-define]) | ||
51 | AC_DEFINE_UNQUOTED(PLUGINVERSION, "$VERSION", [plugin version]) | ||
52 | |||
53 | AC_PROG_CC | ||
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.34.bb b/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.34.bb deleted file mode 100644 index eec9a2d70..000000000 --- a/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.34.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | SECTION = "x11/network" | ||
2 | SUMMARY = "Mail user agent plugins" | ||
3 | DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+" | ||
4 | LICENSE = "GPLv2" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=0c2348e0a084e573f0220f5e45d8097e" | ||
6 | |||
7 | PNBLACKLIST[claws-plugin-rssyl] ?= "depends on blacklisted claws-mail - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
8 | |||
9 | SRC_URI = "http://www.claws-mail.org/downloads/plugins_obsolete/rssyl-${PV}.tar.gz \ | ||
10 | file://configure.patch" | ||
11 | SRC_URI[md5sum] = "49b45608e8d160b3625d3d50016ec2ca" | ||
12 | SRC_URI[sha256sum] = "2e96a1cd6a1a5bb7f86cd2eb48f6e174665957fafe1f3b1e8361aac3bb967f79" | ||
13 | inherit autotools pkgconfig gettext | ||
14 | |||
15 | S = "${WORKDIR}/rssyl-${PV}" | ||
16 | |||
17 | FILES_${PN} = "${libdir}/claws-mail/plugins/*.so" | ||
18 | FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug" | ||
19 | FILES_${PN}-dev += "${libdir}/claws-mail/plugins/*.la" | ||
20 | FILES_${PN}-staticdev = "${libdir}/claws-mail/plugins/*.a" | ||
diff --git a/meta-oe/recipes-sato/claws-mail/sylpheed/glib-2.32.patch b/meta-oe/recipes-sato/claws-mail/sylpheed/glib-2.32.patch deleted file mode 100644 index 1520e578a..000000000 --- a/meta-oe/recipes-sato/claws-mail/sylpheed/glib-2.32.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- sylpheed-2.7.1.orig/libsylph/defs.h 2009-06-10 09:55:46.000000000 +0200 | ||
2 | +++ sylpheed-2.7.1/libsylph/defs.h 2012-05-06 08:28:27.514746256 +0200 | ||
3 | @@ -24,8 +24,6 @@ | ||
4 | # include "config.h" | ||
5 | #endif | ||
6 | |||
7 | -#include <glibconfig.h> | ||
8 | - | ||
9 | #ifdef G_OS_WIN32 | ||
10 | # include <glib/gwin32.h> | ||
11 | #endif | ||
diff --git a/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb b/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb deleted file mode 100644 index 978d777ea..000000000 --- a/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | SECTION = "x11/network" | ||
2 | SUMMARY = "Mail user agent" | ||
3 | DEPENDS = "gtk+ gpgme gnutls" | ||
4 | LICENSE = "GPLv2 & LGPLv2.1" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \ | ||
6 | file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" | ||
7 | |||
8 | PR = "r2" | ||
9 | |||
10 | SRC_URI = "http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-${PV}.tar.bz2 \ | ||
11 | file://glib-2.32.patch \ | ||
12 | " | ||
13 | SRC_URI[md5sum] = "1f470525c1fbe53253813a0978c18228" | ||
14 | SRC_URI[sha256sum] = "8bb6457db4e2eea1877b487d9ac8513546372db9a6a2e4271d11229f4af84e23" | ||
15 | |||
16 | FILES_${PN} += "${datadir}/pixmaps ${datadir}/applications" | ||
17 | FILES_${PN}-doc += "${datadir}" | ||
18 | |||
19 | EXTRA_OECONF = "--disable-ssl" | ||
20 | |||
21 | CFLAGS += "-D_GNU_SOURCE" | ||
22 | |||
23 | do_configure_prepend() { | ||
24 | mkdir -p m4 | ||
25 | for i in $(find ${S} -name "Makefile.am") ; do | ||
26 | sed -i s:'-I$(includedir)'::g $i | ||
27 | done | ||
28 | } | ||
29 | |||
30 | inherit autotools pkgconfig | ||
31 | |||
32 | |||
33 | PNBLACKLIST[sylpheed] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130651/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb b/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb deleted file mode 100644 index c8c54a413..000000000 --- a/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | SUMMARY = "Apcupsd a daemon for controlling APC UPSes" | ||
2 | |||
3 | LICENSE = "GPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=c12853cc7fdf20d17b4fddefd26b7802" | ||
5 | |||
6 | SRC_URI = "http://garr.dl.sourceforge.net/project/apcupsd/apcupsd%20-%20Stable/3.14.10/apcupsd-${PV}.tar.gz" | ||
7 | SRC_URI[md5sum] = "5928822d855c5cf7ac29655e3e0b8c23" | ||
8 | SRC_URI[sha256sum] = "0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032" | ||
9 | |||
10 | PNBLACKLIST[apcupsd] ?= "BROKEN: doesn't build with B!=S - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
11 | |||
12 | inherit autotools | ||
13 | |||
14 | LD = "${CXX}" | ||
15 | |||
16 | EXTRA_OECONF = "--without-x \ | ||
17 | --enable-usb \ | ||
18 | --with-distname=${DISTRO}" | ||
19 | |||
20 | do_configure() { | ||
21 | export topdir=${S} | ||
22 | cp -R --no-dereference --preserve=mode,links -v ${S}/autoconf/configure.in ${S} | ||
23 | |||
24 | if ! [ -d ${S}/platforms/${DISTRO} ] ; then | ||
25 | cp -R --no-dereference --preserve=mode,links -v ${S}/platforms/unknown ${S}/platforms/${DISTRO} | ||
26 | fi | ||
27 | |||
28 | gnu-configize --force | ||
29 | # install --help says '-c' is an ignored option, but it turns out that the argument to -c isn't ignored, so drop the complete '-c path/to/strip' line | ||
30 | sed -i -e 's:$(INSTALL_PROGRAM) $(STRIP):$(INSTALL_PROGRAM):g' ${S}/autoconf/targets.mak | ||
31 | # Searching in host dirs triggers the QA checks | ||
32 | sed -i -e 's:-I/usr/local/include::g' -e 's:-L/usr/local/lib64::g' -e 's:-L/usr/local/lib::g' ${S}/configure | ||
33 | |||
34 | # m4 macros are missing, using autotools_do_configure leads to linking errors with gethostname_re | ||
35 | oe_runconf | ||
36 | } | ||
37 | |||
38 | do_install_append() { | ||
39 | rm ${D}${datadir}/hal -rf | ||
40 | } | ||
41 | |||
42 | |||
diff --git a/meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch b/meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch deleted file mode 100644 index 4200301a3..000000000 --- a/meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Fix linking problem: | ||
2 | undefined reference to `__aeabi_unwind_cpp_pr0' | ||
3 | undefined reference to `__aeabi_unwind_cpp_pr1' | ||
4 | Index: emacs/src/Makefile.in | ||
5 | =================================================================== | ||
6 | --- emacs.orig/src/Makefile.in 2008-08-16 14:20:18.000000000 +0000 | ||
7 | +++ emacs/src/Makefile.in 2008-08-16 14:51:25.000000000 +0000 | ||
8 | @@ -443,7 +443,7 @@ | ||
9 | ask GCC explicitly where to find libgcc.a. */ | ||
10 | |||
11 | #ifndef LINKER | ||
12 | -#define LINKER $(CC) -nostdlib | ||
13 | +#define LINKER $(CC) -nostdlib -lgcc_s | ||
14 | #endif | ||
15 | |||
16 | #ifndef LIB_GCC | ||
diff --git a/meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch b/meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch deleted file mode 100644 index c15207a43..000000000 --- a/meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch +++ /dev/null | |||
@@ -1,104 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | diff -uNr emacs-23.4/Makefile.in emacs-23.4.new/Makefile.in | ||
4 | --- emacs-23.4/Makefile.in 2012-01-11 13:35:01.000000000 +0100 | ||
5 | +++ emacs-23.4.new/Makefile.in 2012-07-31 00:54:07.223590866 +0200 | ||
6 | @@ -336,7 +336,7 @@ | ||
7 | # all preloaded elisp files, and only then dump the actual src/emacs, which | ||
8 | # is not wrong, but is overkill in 99.99% of the cases. | ||
9 | src: Makefile FRC | ||
10 | - boot=bootstrap-emacs$(EXEEXT); \ | ||
11 | + boot=${QEMU} bootstrap-emacs$(EXEEXT); \ | ||
12 | if [ ! -x "src/$$boot" ]; then \ | ||
13 | cd $@; $(MAKE) all $(MFLAGS) \ | ||
14 | CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ | ||
15 | diff -uNr emacs-23.4/leim/Makefile.in emacs-23.4.new/leim/Makefile.in | ||
16 | --- emacs-23.4/leim/Makefile.in 2012-01-11 13:35:01.000000000 +0100 | ||
17 | +++ emacs-23.4.new/leim/Makefile.in 2012-07-31 00:54:07.179590866 +0200 | ||
18 | @@ -51,7 +51,7 @@ | ||
19 | |||
20 | # How to run Emacs. | ||
21 | RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ | ||
22 | - ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte | ||
23 | + ${QEMU} ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte | ||
24 | |||
25 | # Subdirectories to be made if ${srcdir} is different from the current | ||
26 | # directory. | ||
27 | diff -uNr emacs-23.4/lib-src/Makefile.in emacs-23.4.new/lib-src/Makefile.in | ||
28 | --- emacs-23.4/lib-src/Makefile.in 2012-01-11 13:35:01.000000000 +0100 | ||
29 | +++ emacs-23.4.new/lib-src/Makefile.in 2012-07-31 00:54:07.180590866 +0200 | ||
30 | @@ -23,7 +23,7 @@ | ||
31 | SHELL = /bin/sh | ||
32 | |||
33 | # Following ../lisp/Makefile.in. | ||
34 | -EMACS = ../src/emacs | ||
35 | +EMACS = ${QEMU} ../src/emacs | ||
36 | EMACSOPT = -batch --no-site-file --multibyte | ||
37 | |||
38 | # ==================== Things `configure' will edit ==================== | ||
39 | @@ -372,7 +372,7 @@ | ||
40 | clobbered too. */ | ||
41 | test-distrib${EXEEXT}: ${srcdir}/test-distrib.c | ||
42 | $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c | ||
43 | - ./test-distrib ${srcdir}/testfile | ||
44 | + ${QEMU} ./test-distrib ${srcdir}/testfile | ||
45 | |||
46 | /* We need the following in order to create a <getopt.h> when the system | ||
47 | does not have one that works with the given compiler. */ | ||
48 | diff -uNr emacs-23.4/lisp/Makefile.in emacs-23.4.new/lisp/Makefile.in | ||
49 | --- emacs-23.4/lisp/Makefile.in 2012-01-11 13:35:01.000000000 +0100 | ||
50 | +++ emacs-23.4.new/lisp/Makefile.in 2012-07-31 00:54:07.195590866 +0200 | ||
51 | @@ -26,8 +26,7 @@ | ||
52 | # You can specify a different executable on the make command line, | ||
53 | # e.g. "make EMACS=../src/emacs ...". | ||
54 | |||
55 | -EMACS = ../src/emacs | ||
56 | - | ||
57 | +EMACS = "${QEMU} ../src/emacs" | ||
58 | # Command line flags for Emacs. This must include --multibyte, | ||
59 | # otherwise some files will not compile. | ||
60 | |||
61 | diff -uNr emacs-23.4/src/Makefile.in emacs-23.4.new/src/Makefile.in | ||
62 | --- emacs-23.4/src/Makefile.in 2012-01-12 11:27:54.000000000 +0100 | ||
63 | +++ emacs-23.4.new/src/Makefile.in 2012-07-31 00:55:30.344593847 +0200 | ||
64 | @@ -482,7 +482,7 @@ | ||
65 | this with the shell''s ``for'' construct. | ||
66 | Note that some people do not have '.' in their paths, so we must | ||
67 | use ./prefix-args. */ | ||
68 | -#define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags` | ||
69 | +#define YMF_PASS_LDFLAGS(flags) `${QEMU} ./prefix-args -Xlinker flags` | ||
70 | #else | ||
71 | #define YMF_PASS_LDFLAGS(flags) flags | ||
72 | #endif | ||
73 | @@ -919,9 +919,9 @@ | ||
74 | $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR) | ||
75 | |||
76 | #ifdef HAVE_SHM | ||
77 | -RUN_TEMACS = `/bin/pwd`/temacs -nl | ||
78 | +RUN_TEMACS = ${QEMU} temacs -nl | ||
79 | #else | ||
80 | -RUN_TEMACS = `/bin/pwd`/temacs | ||
81 | +RUN_TEMACS = ${QEMU} temacs | ||
82 | #endif | ||
83 | |||
84 | all: emacs${EXEEXT} $(OTHER_FILES) | ||
85 | @@ -936,7 +936,7 @@ | ||
86 | @: This new Emacs is as functional and more efficient then | ||
87 | @: bootstrap-emacs, so let us replace it. | ||
88 | -ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} | ||
89 | - -./emacs -q -batch -f list-load-path-shadows | ||
90 | + -${QEMU} ./emacs -q -batch -f list-load-path-shadows | ||
91 | #endif /* ! defined (CANNOT_DUMP) */ | ||
92 | |||
93 | /* We run make-docfile twice because the command line may get too long | ||
94 | @@ -954,8 +954,8 @@ | ||
95 | only in order to reduce the command line length. --Stef */ | ||
96 | ${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${lisp} ${SOME_MACHINE_LISP} | ||
97 | -rm -f ${etc}DOC | ||
98 | - ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC | ||
99 | - ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp} | ||
100 | + ${QEMU}${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC | ||
101 | + ${QEMU} ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp} | ||
102 | |||
103 | ${libsrc}make-docfile${EXEEXT}: | ||
104 | cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT} | ||
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc deleted file mode 100644 index 5b905f93f..000000000 --- a/meta-oe/recipes-support/emacs/emacs.inc +++ /dev/null | |||
@@ -1,147 +0,0 @@ | |||
1 | DESCRIPTION = "Emacs" | ||
2 | HOMEPAGE = "http://www.gnu.org/software/emacs/" | ||
3 | LICENSE = "GPLv3" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
5 | SECTION = "editor" | ||
6 | # and it needs to run some generated binaries.. | ||
7 | DEPENDS += "qemu-native" | ||
8 | |||
9 | DEPENDS +=" liblockfile" | ||
10 | |||
11 | X11DEPENDS = " \ | ||
12 | libice libsm atk cairo dbus expat libffi fontconfig freetype gconf giflib \ | ||
13 | jpeg xz pixman libpng librsvg tiff libcroco \ | ||
14 | libx11 libxau libxcomposite libxcursor libxdamage libxdmcp libxext libxfixes \ | ||
15 | libxft libxpm libxrandr libxrender \ | ||
16 | gdk-pixbuf glib-2.0 gtk+ pango libxcb harfbuzz icu \ | ||
17 | " | ||
18 | |||
19 | EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " | ||
20 | |||
21 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | ||
22 | PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}" | ||
23 | |||
24 | |||
25 | inherit autotools | ||
26 | |||
27 | PACKAGES =+ "${PN}-el" | ||
28 | |||
29 | FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \ | ||
30 | ${datadir}/emacs/*/*/*/*.el.gz" | ||
31 | |||
32 | FILES_${PN} += "${datadir}/emacs ${datadir}/icons" | ||
33 | |||
34 | FILES_${PN}-dbg += "${libexecdir}/emacs/*/*/.debug ${datadir}/emacs/*/*/.debug" | ||
35 | |||
36 | TREEDIR = "${WORKDIR}/qemu-treedir" | ||
37 | |||
38 | QEMUARCH= "${TARGET_ARCH}" | ||
39 | QEMUARCH_x86 = "i386" | ||
40 | |||
41 | # Large stack is required at least on x86_64 host, otherwise random segfaults appear: | ||
42 | QEMU = "qemu-${QEMUARCH} ${QEMU_OPTIONS} -s 1048576 -L ${TREEDIR} " | ||
43 | |||
44 | export LOGNAME = "$(whoami)" | ||
45 | |||
46 | do_compile_prepend() { | ||
47 | sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile` | ||
48 | export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${TOOLCHAIN_PATH}/${TARGET_SYS}/lib" | ||
49 | # Ugly hack, see files/use-qemu.patch for more: | ||
50 | ln -sf ../src/emacs lisp/emacs | ||
51 | ln -sf ../src/emacs lib-src/emacs | ||
52 | ln -sf ../src/emacs leim/emacs | ||
53 | #copy STAGING_DIR_TARGET and libgcc_s.so* to WORKDIR/qemu-treedir #copied code from glibc-package.bbclass | ||
54 | treedir=${TREEDIR} | ||
55 | if [ -e $treedir ];then | ||
56 | rm -rf $treedir | ||
57 | fi | ||
58 | |||
59 | mkdir -p $treedir/${base_libdir} | ||
60 | |||
61 | if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then | ||
62 | cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/${base_libdir} | ||
63 | fi | ||
64 | if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then | ||
65 | cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/${base_libdir} | ||
66 | fi | ||
67 | # stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails | ||
68 | # temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one | ||
69 | if [ ! -f $treedir/${base_libdir}/libc.so ]; then | ||
70 | ln -s libc.so.6 $treedir/${base_libdir}/libc.so | ||
71 | fi | ||
72 | |||
73 | # copy only as much stuff as we need | ||
74 | # before: 5.5G ../../qemu-treedir/ | ||
75 | # after: 17M ../../qemu-treedir/ | ||
76 | cp -pPR \ | ||
77 | ${STAGING_DIR_TARGET}/${base_libdir}/ld-* \ | ||
78 | ${STAGING_DIR_TARGET}/${base_libdir}/libc.* \ | ||
79 | ${STAGING_DIR_TARGET}/${base_libdir}/libc-* \ | ||
80 | ${STAGING_DIR_TARGET}/${base_libdir}/libm-* \ | ||
81 | ${STAGING_DIR_TARGET}/${base_libdir}/libm.* \ | ||
82 | ${STAGING_DIR_TARGET}/${base_libdir}/libtinfo.so.* \ | ||
83 | ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \ | ||
84 | ${STAGING_DIR_TARGET}/${base_libdir}/libdl* \ | ||
85 | ${STAGING_DIR_TARGET}/${base_libdir}/librt* \ | ||
86 | ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ | ||
87 | ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ | ||
88 | |||
89 | if [ ! -z "${@bb.utils.filter('PACKAGECONFIG', 'x11', d)}" ]; then | ||
90 | echo "X11 build enabled" | ||
91 | # copy only as much stuff as we need | ||
92 | # before: 5.5G ../../qemu-treedir/ | ||
93 | # after: 86M ../../qemu-treedir/ | ||
94 | cp -pPR \ | ||
95 | ${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \ | ||
96 | ${STAGING_DIR_TARGET}/${base_libdir}/libz.so.* \ | ||
97 | ${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \ | ||
98 | ${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \ | ||
99 | ${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \ | ||
100 | ${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \ | ||
101 | ${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \ | ||
102 | ${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \ | ||
103 | ${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \ | ||
104 | ${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \ | ||
105 | ${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \ | ||
106 | ${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \ | ||
107 | ${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \ | ||
108 | ${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \ | ||
109 | ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \ | ||
110 | ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \ | ||
111 | ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \ | ||
112 | ${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \ | ||
113 | ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \ | ||
114 | ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \ | ||
115 | ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \ | ||
116 | ${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \ | ||
117 | ${STAGING_DIR_TARGET}/${libdir}/libcroco-0.6.so.* \ | ||
118 | ${STAGING_DIR_TARGET}/${libdir}/libharfbuzz.so.* \ | ||
119 | ${STAGING_DIR_TARGET}/${libdir}/libicule.so.* \ | ||
120 | ${STAGING_DIR_TARGET}/${libdir}/libicuuc.so.* \ | ||
121 | ${STAGING_DIR_TARGET}/${libdir}/libicudata.so.* $treedir/${base_libdir}/ | ||
122 | |||
123 | # X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender | ||
124 | cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/ | ||
125 | |||
126 | # gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11 | ||
127 | cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/ | ||
128 | |||
129 | # pango pangocairo pangoft2 | ||
130 | cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/ | ||
131 | |||
132 | # xcb-render xcb-shm xcb | ||
133 | cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/ | ||
134 | fi | ||
135 | } | ||
136 | |||
137 | do_install_append() { | ||
138 | # freaks package.bbclass and whole bitbake call returns error code | ||
139 | # ERROR: runstrip: ''arm-oe-linux-gnueabi-strip' '/var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/emacs-23.4-r0/package/usr/share/emacs/23.4/etc/tutorials/TUTORIAL.ko'' strip command failed | ||
140 | mv ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.ko ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.KO | ||
141 | # Info dir listing isn't interesting at this point so remove it if it exists. | ||
142 | if [ -e "${D}${infodir}/dir" ]; then | ||
143 | rm -f ${D}${infodir}/dir | ||
144 | fi | ||
145 | } | ||
146 | |||
147 | EXTRA_OEMAKE += 'QEMU="${QEMU}"' | ||
diff --git a/meta-oe/recipes-support/emacs/emacs_23.4.bb b/meta-oe/recipes-support/emacs/emacs_23.4.bb deleted file mode 100644 index 3388ff01e..000000000 --- a/meta-oe/recipes-support/emacs/emacs_23.4.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | require emacs.inc | ||
2 | |||
3 | PR = "r4" | ||
4 | |||
5 | PNBLACKLIST[emacs] ?= "qemu: uncaught target signal 11 (Segmentation fault) - core dumped - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
6 | |||
7 | SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \ | ||
8 | file://use-qemu.patch \ | ||
9 | file://nostdlib-unwind.patch \ | ||
10 | " | ||
11 | SRC_URI[tarball.md5sum] = "34405165fcd978fbc8b304cbd99ccf4f" | ||
12 | SRC_URI[tarball.sha256sum] = "b9a2b8434052771f797d2032772eba862ff9aa143029efc72295170607289c18" | ||
diff --git a/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb b/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb deleted file mode 100644 index 14ce57aaf..000000000 --- a/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers." | ||
2 | HOMEPAGE = "http://farsight.sf.net" | ||
3 | SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${BP}.tar.gz" | ||
4 | |||
5 | LICENSE = "LGPLv2.1" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | ||
7 | |||
8 | PR = "r3" | ||
9 | |||
10 | DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base" | ||
11 | |||
12 | inherit autotools pkgconfig | ||
13 | |||
14 | PACKAGECONFIG ??= "" | ||
15 | PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd" | ||
16 | |||
17 | EXTRA_OECONF = " \ | ||
18 | --disable-debug \ | ||
19 | --disable-gtk-doc \ | ||
20 | --disable-python \ | ||
21 | " | ||
22 | |||
23 | FILES_${PN} += "${libdir}/*/*.so" | ||
24 | FILES_${PN}-dev += "${libdir}/*/*.la" | ||
25 | FILES_${PN}-staticdev += "${libdir}/*/*.a" | ||
26 | FILES_${PN}-dbg += "${libdir}/*/.debug" | ||
27 | |||
28 | |||
29 | SRC_URI[md5sum] = "e1f540cf3ebab06c3d7db1f46b44ac88" | ||
30 | SRC_URI[sha256sum] = "3ae59aa61a8071c9fad111e5fd606aabc27961eb4192f8729987a27dae6b3974" | ||
31 | |||
32 | PNBLACKLIST[farsight2] ?= "Depends on blacklisted gstreamer - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
33 | PNBLACKLIST[farsight2] ?= "Depends on blacklisted libnice - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
34 | PNBLACKLIST[farsight2] ?= "Depends on blacklisted gst-plugins-base - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-support/fftw/benchfft_3.1.bb b/meta-oe/recipes-support/fftw/benchfft_3.1.bb deleted file mode 100644 index 49cc270fe..000000000 --- a/meta-oe/recipes-support/fftw/benchfft_3.1.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SUMMARY = "FFTW benchmarks" | ||
2 | SECTION = "libs" | ||
3 | LICENSE = "GPLv2" | ||
4 | |||
5 | # single precision fftw is called fftwf | ||
6 | DEPENDS = "virtual/fftw" | ||
7 | |||
8 | SRC_URI = "http://www.fftw.org/benchfft/benchfft-${PV}.tar.gz" | ||
9 | |||
10 | EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared" | ||
11 | |||
12 | inherit autotools pkgconfig | ||
13 | |||
14 | do_compile_prepend() { | ||
15 | sed -i -e 's:all-recursive:$(RECURSIVE_TARGETS):g' ${S}/Makefile | ||
16 | } | ||
17 | |||
18 | SRC_URI[md5sum] = "9356e5e9dcb3f1481977009720a2ccf8" | ||
19 | SRC_URI[sha256sum] = "1b4a5b5e48ad5e61a21586b7b59d5c0a88691a981e73e2c6dc5868197461791b" | ||
20 | |||
21 | PNBLACKLIST[benchfft] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch b/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch deleted file mode 100644 index e1e7aed50..000000000 --- a/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | --- flite-1.3-release/configure.in.old 2008-01-06 02:17:47.000000000 -0600 | ||
2 | +++ flite-1.3-release/configure.in 2008-01-06 02:19:56.000000000 -0600 | ||
3 | @@ -220,7 +220,8 @@ dnl allow the user to override the one d | ||
4 | dnl | ||
5 | AC_ARG_WITH( audio, | ||
6 | [ --with-audio with specific audio support (none linux freebsd etc) ], | ||
7 | - AUDIODRIVER=$with_audio ) | ||
8 | + [AUDIODRIVER=$with_audio | ||
9 | + AUDIODEFS=]) | ||
10 | |||
11 | if test "x$AUDIODEFS" = x; then | ||
12 | case "$AUDIODRIVER" in | ||
diff --git a/meta-oe/recipes-support/flite/flite-alsa_1.3.bb b/meta-oe/recipes-support/flite/flite-alsa_1.3.bb deleted file mode 100644 index 0883c1ad4..000000000 --- a/meta-oe/recipes-support/flite/flite-alsa_1.3.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | require flite.inc | ||
2 | |||
3 | PR = "r1" | ||
4 | |||
5 | EXTRA_OECONF = "--with-audio=alsa --enable-shared" | ||
6 | |||
7 | SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.gz \ | ||
8 | file://flite-1.3-alsa_support-1.2.diff \ | ||
9 | file://flite-alsa-1.3-configure-with-audio.patch" | ||
10 | |||
11 | SRC_URI[md5sum] = "ae0aca1cb7b4801f4372f3a75a9e52b5" | ||
12 | SRC_URI[sha256sum] = "922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b" | ||
13 | |||
14 | # Looks like caused by flite-1.3-alsa_support-1.2.diff | ||
15 | # flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/armv5te-oe-linux-gnueabi/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox16/usr/lib/libflite_cmu_us_kal16.so.1.3' [ldflags] | ||
16 | # flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/armv5te-oe-linux-gnueabi/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox8/usr/lib/libflite_cmu_us_kal.so.1.3' [ldflags] | ||
17 | # flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/core2-64-oe-linux/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox16/usr/lib/libflite_cmu_us_kal16.so.1.3' [ldflags] | ||
18 | # flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/core2-64-oe-linux/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox8/usr/lib/libflite_cmu_us_kal.so.1.3' [ldflags] | ||
19 | # flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/i586-oe-linux/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox16/usr/lib/libflite_cmu_us_kal16.so.1.3' [ldflags] | ||
20 | # flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/i586-oe-linux/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox8/usr/lib/libflite_cmu_us_kal.so.1.3' [ldflags] | ||
21 | PNBLACKLIST[flite-alsa] ?= "OLD: wasn't updated in over 6 years, only navit was RSUGGESTing it and doesn't respect LDFLAGS - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-support/flite/flite.inc b/meta-oe/recipes-support/flite/flite.inc deleted file mode 100644 index 0ef82c004..000000000 --- a/meta-oe/recipes-support/flite/flite.inc +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | DESCRIPTION = "flite - the festival light speech synthesizer" | ||
2 | HOMEPAGE = "http://www.speech.cs.cmu.edu/flite/" | ||
3 | SECTION = "console/utils" | ||
4 | LICENSE = "flite" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=68a16b1ee49c96c36f232ccdcd287650" | ||
6 | DEPENDS = "alsa-oss" | ||
7 | |||
8 | PARALLEL_MAKE = "" | ||
9 | |||
10 | S = "${WORKDIR}/flite-${PV}-release" | ||
11 | |||
12 | CFLAGS += " -lasound " | ||
13 | |||
14 | inherit autotools-brokensep | ||
15 | |||
16 | PACKAGES += "lib${PN} lib${PN}-vox8 lib${PN}-vox16" | ||
17 | |||
18 | FILES_${PN} = "${bindir}" | ||
19 | |||
20 | FILES_lib${PN} ="${libdir}/libflite.so.* \ | ||
21 | ${libdir}/libflite_cmu_time_awb.so.* \ | ||
22 | ${libdir}/libflite_cmulex.so.* \ | ||
23 | ${libdir}/libflite_usenglish.so.*" | ||
24 | |||
25 | FILES_lib${PN}-vox8 = "${libdir}/libflite_cmu_us_kal.so.*" | ||
26 | |||
27 | FILES_lib${PN}-vox16 = "${libdir}/libflite_cmu_us_kal16.so.*" | ||
28 | |||
29 | LEAD_SONAME = "libflite.so" | ||
30 | |||
31 | do_install() { | ||
32 | oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install | ||
33 | } | ||
diff --git a/meta-oe/recipes-support/iksemel/iksemel_1.4.bb b/meta-oe/recipes-support/iksemel/iksemel_1.4.bb deleted file mode 100644 index 3dc22c590..000000000 --- a/meta-oe/recipes-support/iksemel/iksemel_1.4.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | SUMMARY = "Fast and portable XML parser and Jabber protocol library" | ||
2 | AUTHOR = "Gurer Ozen <meduketto at gmail.com>" | ||
3 | HOMEPAGE = "http://iksemel.googlecode.com" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "LGPLv2.1" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" | ||
7 | DEPENDS = "gnutls" | ||
8 | |||
9 | PR = "r1" | ||
10 | |||
11 | # http://errors.yoctoproject.org/Errors/Details/25825/ | ||
12 | PNBLACKLIST[iksemel] ?= "Not compatible with gnutls version 3.4 currently in oe-core - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
13 | |||
14 | SRC_URI = "http://iksemel.googlecode.com/files/${BP}.tar.gz;name=archive \ | ||
15 | file://r25.diff" | ||
16 | SRC_URI[archive.md5sum] = "532e77181694f87ad5eb59435d11c1ca" | ||
17 | SRC_URI[archive.sha256sum] = "458c1b8fb3349076a6cecf26c29db1d561315d84e16bfcfba419f327f502e244" | ||
18 | |||
19 | inherit autotools pkgconfig | ||
diff --git a/meta-oe/recipes-support/libdbi/libdbi-drivers.inc b/meta-oe/recipes-support/libdbi/libdbi-drivers.inc deleted file mode 100644 index b509532e4..000000000 --- a/meta-oe/recipes-support/libdbi/libdbi-drivers.inc +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | # libdbi-drivers OE build file | ||
2 | # Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved | ||
3 | # Released under the MIT license (see packages/COPYING) | ||
4 | |||
5 | DESCRIPTION = "Database Drivers for libdbi" | ||
6 | HOMEPAGE = "http://libdbi-drivers.sourceforge.net/" | ||
7 | LICENSE = "LGPLv2.1" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" | ||
9 | SECTION = "libs" | ||
10 | |||
11 | PROVIDES = "libdbd-sqlite" | ||
12 | DEPENDS = "libdbi sqlite sqlite3 mysql5 postgresql" | ||
13 | |||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/libdbi-drivers/libdbi-drivers-${PV}.tar.gz" | ||
15 | |||
16 | inherit autotools | ||
17 | |||
18 | PACKAGES += "libdbd-sqlite3 libdbd-sqlite libdbd-pgsql libdbd-mysql" | ||
19 | |||
20 | EXTRA_OECONF = "--with-dbi-incdir=${STAGING_INCDIR} \ | ||
21 | --with-dbi-libdir=${STAGING_LIBDIR} \ | ||
22 | --with-sqlite \ | ||
23 | --with-sqlite3 \ | ||
24 | --with-pgsql \ | ||
25 | --with-mysql \ | ||
26 | --with-sqlite-libdir=${STAGING_LIBDIR} \ | ||
27 | --with-sqlite-incdir=${STAGING_INCDIR} \ | ||
28 | --with-sqlite3-incdir=${STAGING_INCDIR} \ | ||
29 | --with-sqlite3-libdir=${STAGING_LIBDIR} \ | ||
30 | --with-mysql-incdir=${STAGING_INCDIR} \ | ||
31 | --with-mysql-libdir=${STAGING_LIBDIR} \ | ||
32 | --with-pgsql-incdir=${STAGING_INCDIR} \ | ||
33 | --with-pgsql-libdir=${STAGING_LIBDIR} \ | ||
34 | --disable-docs" | ||
35 | |||
36 | FILES_${PN}-dbg += " ${libdir}/dbd/.debug/*.so" | ||
37 | FILES_${PN}-dev += " ${libdir}/dbd/*.la" | ||
38 | FILES_${PN}-staticdev += " ${libdir}/dbd/*.a" | ||
39 | |||
40 | DESCRIPTION_libdbd-sqlite = "SQLite database driver for libdbi" | ||
41 | FILES_libdbd-sqlite = "${libdir}/dbd/libdbdsqlite.so" | ||
42 | |||
43 | DESCRIPTION_libdbd-sqlite3 = "SQLite3 database driver for libdbi" | ||
44 | FILES_libdbd-sqlite3 = "${libdir}/dbd/libdbdsqlite3.so" | ||
45 | |||
46 | DESCRIPTION_libdbd-mysql = "MySQL4 database driver for libdbi" | ||
47 | FILES_libdbd-mysql = "${libdir}/dbd/libdbdmysql.so" | ||
48 | |||
49 | DESCRIPTION_libdbd-psql = "Postgres SQL database driver for libdbi" | ||
50 | FILES_libdbd-pgsql = "${libdir}/dbd/libdbdpgsql.so" | ||
51 | |||
diff --git a/meta-oe/recipes-support/libdbi/libdbi-drivers_0.8.3-1.bb b/meta-oe/recipes-support/libdbi/libdbi-drivers_0.8.3-1.bb deleted file mode 100644 index 8d2c5054a..000000000 --- a/meta-oe/recipes-support/libdbi/libdbi-drivers_0.8.3-1.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | require ${PN}.inc | ||
2 | |||
3 | |||
4 | SRC_URI[md5sum] = "4de79b323162a5a7652b65b608eca6cd" | ||
5 | SRC_URI[sha256sum] = "4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72" | ||
6 | |||
7 | # libdbi-drivers-0.8.3-1/drivers/mysql/dbd_mysql.c:232:5: error: conflicting types for 'dbd_goto_row' | ||
8 | PNBLACKLIST[libdbi-drivers] ?= "BROKEN: fails to build with gcc-5 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-autoreconf.patch b/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-autoreconf.patch deleted file mode 100644 index d05967da3..000000000 --- a/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-autoreconf.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: libetpan-0.57/configure.ac | ||
2 | =================================================================== | ||
3 | --- libetpan-0.57.orig/configure.ac 2008-10-08 19:54:20.000000000 +0000 | ||
4 | +++ libetpan-0.57/configure.ac 2008-11-11 16:34:33.000000000 +0000 | ||
5 | @@ -106,6 +106,7 @@ | ||
6 | |||
7 | # Check the C compiler. | ||
8 | AC_PROG_CC | ||
9 | +AC_PROG_CXX | ||
10 | |||
11 | # Compiler flags. | ||
12 | AC_ARG_ENABLE(debug, [ --enable-debug setup flags (gcc) for debugging (default=no)], | ||
diff --git a/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-ldflags.patch b/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-ldflags.patch deleted file mode 100644 index 438f44f15..000000000 --- a/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-ldflags.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- libetpan-0.57/configure.ac~ 2009-09-21 23:31:42.000000000 +0200 | ||
2 | +++ libetpan-0.57/configure.ac 2009-09-21 23:31:42.000000000 +0200 | ||
3 | @@ -457,7 +457,7 @@ | ||
4 | LDFLAGS="-$flag $LDFLAGS" | ||
5 | AC_TRY_LINK([], [pthread_create();], | ||
6 | [pthflag=yes; checkpthread=no], | ||
7 | - [pthflag=no; LDFLAGS="$OLDCFLAGS"]) | ||
8 | + [pthflag=no; LDFLAGS="$OLDFLAGS"]) | ||
9 | AC_MSG_RESULT($pthflag) | ||
10 | fi | ||
11 | done | ||
diff --git a/meta-oe/recipes-support/libetpan/libetpan-0.57/sepbuild.patch b/meta-oe/recipes-support/libetpan/libetpan-0.57/sepbuild.patch deleted file mode 100644 index 4f0161727..000000000 --- a/meta-oe/recipes-support/libetpan/libetpan-0.57/sepbuild.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Index: libetpan-0.57/rules.mk | ||
2 | =================================================================== | ||
3 | --- libetpan-0.57.orig/rules.mk | ||
4 | +++ libetpan-0.57/rules.mk | ||
5 | @@ -134,9 +134,9 @@ prepare-am: prepare-local | ||
6 | if test -e ../../$(subdir)/$${hdr}; then \ | ||
7 | echo "$(LN_S) -f ../../$(subdir)/$${hdr} ."; \ | ||
8 | $(LN_S) -f ../../$(subdir)/$${hdr} .; \ | ||
9 | else \ | ||
10 | - echo "$(LN_S) -f ../../$(subdir)/$(srcdir)/$${hdr} ."; \ | ||
11 | - $(LN_S) -f ../../$(subdir)/$(srcdir)/$${hdr} .; \ | ||
12 | + echo "$(LN_S) -f $(srcdir)/$${hdr} ."; \ | ||
13 | + $(LN_S) -f $(srcdir)/$${hdr} .; \ | ||
14 | fi; \ | ||
15 | fi; \ | ||
16 | done; \ | ||
diff --git a/meta-oe/recipes-support/libetpan/libetpan_0.57.bb b/meta-oe/recipes-support/libetpan/libetpan_0.57.bb deleted file mode 100644 index 5cadf16ce..000000000 --- a/meta-oe/recipes-support/libetpan/libetpan_0.57.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \ | ||
2 | It supports the protocols SMTP, POP3, IMAP and NNTP." | ||
3 | HOMEPAGE = "http://www.etpan.org" | ||
4 | SECTION = "libs" | ||
5 | DEPENDS = "gnutls liblockfile curl" | ||
6 | LICENSE = "BSD" | ||
7 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f18ebe7e452708c26f83954f81062ba7" | ||
8 | |||
9 | PR = "r1" | ||
10 | |||
11 | # http://errors.yoctoproject.org/Errors/Details/25823/ | ||
12 | PNBLACKLIST[libetpan] ?= "Not compatible with gnutls version 3.4 currently in oe-core - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
13 | |||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ | ||
15 | file://libetpan-autoreconf.patch \ | ||
16 | file://libetpan-ldflags.patch \ | ||
17 | file://sepbuild.patch" | ||
18 | |||
19 | inherit autotools pkgconfig gettext binconfig | ||
20 | |||
21 | EXTRA_OECONF = "--without-openssl --without-sasl --with-gnutls --disable-db" | ||
22 | |||
23 | PARALLEL_MAKE = "" | ||
24 | |||
25 | FILES_${PN} = "${libdir}/lib*.so.*" | ||
26 | FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" | ||
27 | |||
28 | |||
29 | SRC_URI[md5sum] = "8ce8c6c071e81884a475b12b7f9a9cc0" | ||
30 | SRC_URI[sha256sum] = "1f3fda5c9e2961d1a6298dc8aadae321493d37727d8db45bc2e8d58f20547011" | ||
diff --git a/meta-oe/recipes-support/ode/ode/configure.patch b/meta-oe/recipes-support/ode/ode/configure.patch deleted file mode 100644 index 246b2e2c2..000000000 --- a/meta-oe/recipes-support/ode/ode/configure.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: ode-0.13/libccd/configure.ac | ||
2 | =================================================================== | ||
3 | --- ode-0.13.orig/libccd/configure.ac 2013-08-19 17:48:03.000000000 +0000 | ||
4 | +++ ode-0.13/libccd/configure.ac 2014-07-17 22:04:16.580595690 +0000 | ||
5 | @@ -5,7 +5,7 @@ | ||
6 | AC_INIT([libccd], [1.0], [danfis@danfis.cz]) | ||
7 | AC_CONFIG_SRCDIR([src/ccd.c]) | ||
8 | AC_CONFIG_HEADERS([src/config.h]) | ||
9 | -AM_INIT_AUTOMAKE | ||
10 | +AM_INIT_AUTOMAKE([foreign]) | ||
11 | |||
12 | # Checks for programs. | ||
13 | AC_PROG_CXX | ||
diff --git a/meta-oe/recipes-support/ode/ode_0.13.bb b/meta-oe/recipes-support/ode/ode_0.13.bb deleted file mode 100644 index c90c81954..000000000 --- a/meta-oe/recipes-support/ode/ode_0.13.bb +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | SUMMARY = "ODE is an Open Source Physics Engine" | ||
2 | SECTION = "libs" | ||
3 | HOMEPAGE = "http://www.ode.org" | ||
4 | LICENSE = "LGPLv2.1 & BSD" | ||
5 | LIC_FILES_CHKSUM = " \ | ||
6 | file://COPYING;md5=1de906ee96808d9776dd72a5f9a79a22 \ | ||
7 | file://LICENSE.TXT;md5=771782cb6245c7fbbe74bc0ec059beff \ | ||
8 | " | ||
9 | # LICENSE-BSD.TXT is missing in 0.13 tarball, but COPYING still says it's dual licensed | ||
10 | # and svn repo still contains LICENSE-BSD.TXT so maybe it will return in next tarball | ||
11 | # file://LICENSE-BSD.TXT;md5=c74e6304a772117e059458fb9763a928 | ||
12 | |||
13 | |||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-${PV}.tar.bz2 \ | ||
15 | file://configure.patch" | ||
16 | SRC_URI[md5sum] = "04b32c9645c147e18caff7a597a19f84" | ||
17 | SRC_URI[sha256sum] = "34ce3e236e313bf109a0cb5546d2fca462aed99f29a42e62bc1463b803c31ef9" | ||
18 | |||
19 | inherit autotools binconfig | ||
20 | |||
21 | EXTRA_OECONF = "--disable-demos --enable-soname" | ||
22 | |||
23 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" | ||
24 | |||
25 | PACKAGECONFIG ?= "" | ||
26 | # if it isn't explicitly selected and "$build_os" == "$target_os", then configure will run | ||
27 | # series of AC_TRY_RUN which won't work for cross-compilation and configure fails | ||
28 | PACKAGECONFIG[double-precision] = "--enable-double-precision,--disable-double-precision" | ||
29 | |||
30 | PNBLACKLIST[ode] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130599/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
31 | PNBLACKLIST[ode] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130620/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-support/open-vcdiff/open-vcdiff_0.8.4.bb b/meta-oe/recipes-support/open-vcdiff/open-vcdiff_0.8.4.bb deleted file mode 100644 index d3f2e789b..000000000 --- a/meta-oe/recipes-support/open-vcdiff/open-vcdiff_0.8.4.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SUMMARY = "An encoder/decoder for the VCDIFF (RFC3284) format" | ||
2 | DESCRIPTION = "A library with a simple API is included, as well as a \ | ||
3 | command-line executable that can apply the encoder and \ | ||
4 | decoder to source, target, and delta files. \ | ||
5 | A slight variation from the draft standard is defined \ | ||
6 | to allow chunk-by-chunk decoding when only a partial \ | ||
7 | delta file window is available." | ||
8 | HOMEPAGE = "http://code.google.com/p/open-vcdiff/" | ||
9 | SECTION = "console/utils" | ||
10 | |||
11 | LICENSE = "Apache-2.0" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=ff820d4ddc1ba05b6fd37b41a21506f9" | ||
13 | |||
14 | SRC_URI = "https://drive.google.com/uc?id=0B5WpIi2fQU1aNGJwVE9hUjU5clU&export=download;downloadfilename=${BP}.tar.gz" | ||
15 | SRC_URI[md5sum] = "5c0d378d907bebc38b51c3d7e4117011" | ||
16 | SRC_URI[sha256sum] = "2b142b1027fb0a62c41347600e01a53fa274dad15445a7da48083c830c3138b3" | ||
17 | |||
18 | inherit autotools | ||
19 | |||
20 | # http://errors.yoctoproject.org/Errors/Details/68667/ | ||
21 | PNBLACKLIST[open-vcdiff] ?= "BROKEN: fails to build with gcc-6 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb b/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb deleted file mode 100644 index 107184be4..000000000 --- a/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | SUMMARY = "Opencv : The Open Computer Vision Library" | ||
2 | HOMEPAGE = "http://opencv.willowgarage.com/wiki/" | ||
3 | SECTION = "libs" | ||
4 | LICENSE = "BSD" | ||
5 | |||
6 | DEPENDS = "opencv" | ||
7 | |||
8 | LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14 \ | ||
9 | " | ||
10 | SRCREV = "6fae07ba8867b8fd2c53344a774aab669afa7c5e" | ||
11 | SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \ | ||
12 | " | ||
13 | PV = "2.4.3+git${SRCPV}" | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | do_install() { | ||
18 | cd samples/c | ||
19 | install -d ${D}/${bindir} | ||
20 | install -d ${D}/${datadir}/opencv/samples | ||
21 | |||
22 | cp * ${D}/${datadir}/opencv/samples || true | ||
23 | |||
24 | for i in *.c; do | ||
25 | echo "compiling $i" | ||
26 | ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .c` $i `pkg-config --libs opencv` || true | ||
27 | install -m 0755 `basename $i .c` ${D}/${bindir} || true | ||
28 | rm ${D}/${datadir}/opencv/samples/`basename $i .c` || true | ||
29 | done | ||
30 | for i in *.cpp; do | ||
31 | echo "compiling $i" | ||
32 | ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .cpp` $i `pkg-config --libs opencv` || true | ||
33 | install -m 0755 `basename $i .cpp` ${D}/${bindir} || true | ||
34 | rm ${D}/${datadir}/opencv/samples/`basename $i .cpp` || true | ||
35 | done | ||
36 | } | ||
37 | |||
38 | FILES_${PN}-dev += "${datadir}/opencv/samples/*.c* ${datadir}/opencv/samples/*.vcp* ${datadir}/opencv/samples/build*" | ||
39 | FILES_${PN} += "${bindir} ${datadir}/opencv" | ||
40 | |||
41 | PNBLACKLIST[opencv-samples] ?= "Depends on blacklisted opencv - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Use-__vector-instead-of-vector-as-suggests-Eigen.patch b/meta-oe/recipes-support/opencv/opencv/0001-Use-__vector-instead-of-vector-as-suggests-Eigen.patch deleted file mode 100644 index 7f809bce1..000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-Use-__vector-instead-of-vector-as-suggests-Eigen.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From 711f07a34ceb504e8f75e978692201efa58268ca Mon Sep 17 00:00:00 2001 | ||
2 | From: Dinar Valeev <dvaleev@suse.com> | ||
3 | Date: Thu, 16 Jan 2014 21:53:49 +0100 | ||
4 | Subject: [PATCH] Use __vector instead of vector as suggests Eigen | ||
5 | |||
6 | This fixes build on PowerPC where Eigen unsets vector, bool and pixel | ||
7 | |||
8 | Signed-off-by: Dinar Valeev <dvaleev@suse.com> | ||
9 | |||
10 | This patch is already part of OpenCV v3.0. The patch can be obtained | ||
11 | from: | ||
12 | |||
13 | https://github.com/Itseez/opencv/commit/711f07a34ceb504e8f75e978692201efa58268ca.patch | ||
14 | |||
15 | Upstream-Status: Backport [commit 711f07a34c, part of version 3.0] | ||
16 | |||
17 | Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> | ||
18 | --- | ||
19 | 3rdparty/include/opencl/1.2/CL/cl_platform.h | 14 +++++++------- | ||
20 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
21 | |||
22 | diff --git a/3rdparty/include/opencl/1.2/CL/cl_platform.h b/3rdparty/include/opencl/1.2/CL/cl_platform.h | ||
23 | index e94949a..42c35d5 100644 | ||
24 | --- a/3rdparty/include/opencl/1.2/CL/cl_platform.h | ||
25 | +++ b/3rdparty/include/opencl/1.2/CL/cl_platform.h | ||
26 | @@ -332,13 +332,13 @@ typedef unsigned int cl_GLenum; | ||
27 | /* Define basic vector types */ | ||
28 | #if defined( __VEC__ ) | ||
29 | #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ | ||
30 | - typedef vector unsigned char __cl_uchar16; | ||
31 | - typedef vector signed char __cl_char16; | ||
32 | - typedef vector unsigned short __cl_ushort8; | ||
33 | - typedef vector signed short __cl_short8; | ||
34 | - typedef vector unsigned int __cl_uint4; | ||
35 | - typedef vector signed int __cl_int4; | ||
36 | - typedef vector float __cl_float4; | ||
37 | + typedef __vector unsigned char __cl_uchar16; | ||
38 | + typedef __vector signed char __cl_char16; | ||
39 | + typedef __vector unsigned short __cl_ushort8; | ||
40 | + typedef __vector signed short __cl_short8; | ||
41 | + typedef __vector unsigned int __cl_uint4; | ||
42 | + typedef __vector signed int __cl_int4; | ||
43 | + typedef __vector float __cl_float4; | ||
44 | #define __CL_UCHAR16__ 1 | ||
45 | #define __CL_CHAR16__ 1 | ||
46 | #define __CL_USHORT8__ 1 | ||
47 | -- | ||
48 | 1.9.3 | ||
49 | |||
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb deleted file mode 100644 index d17c640ac..000000000 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ /dev/null | |||
@@ -1,106 +0,0 @@ | |||
1 | SUMMARY = "Opencv : The Open Computer Vision Library" | ||
2 | HOMEPAGE = "http://opencv.org/" | ||
3 | SECTION = "libs" | ||
4 | |||
5 | LICENSE = "BSD-3-Clause" | ||
6 | LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14" | ||
7 | |||
8 | ARM_INSTRUCTION_SET_armv4 = "arm" | ||
9 | ARM_INSTRUCTION_SET_armv5 = "arm" | ||
10 | |||
11 | DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" | ||
12 | |||
13 | SRCREV = "2c9547e3147779001811d01936aed38f560929fc" | ||
14 | SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \ | ||
15 | file://0001-Use-__vector-instead-of-vector-as-suggests-Eigen.patch" | ||
16 | |||
17 | PV = "2.4.11+git${SRCPV}" | ||
18 | |||
19 | S = "${WORKDIR}/git" | ||
20 | |||
21 | # Do an out-of-tree build | ||
22 | OECMAKE_SOURCEPATH = "${S}" | ||
23 | OECMAKE_BUILDPATH = "${WORKDIR}/build-${TARGET_ARCH}" | ||
24 | |||
25 | EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \ | ||
26 | -DBUILD_PYTHON_SUPPORT=ON \ | ||
27 | -DWITH_GSTREAMER=OFF \ | ||
28 | -DWITH_1394=OFF \ | ||
29 | -DCMAKE_SKIP_RPATH=ON \ | ||
30 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ | ||
31 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ | ||
32 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ | ||
33 | ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ | ||
34 | ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ | ||
35 | " | ||
36 | |||
37 | PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l \ | ||
38 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ | ||
39 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" | ||
40 | |||
41 | PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen," | ||
42 | PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+," | ||
43 | PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," | ||
44 | PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," | ||
45 | PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," | ||
46 | PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," | ||
47 | PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," | ||
48 | PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," | ||
49 | PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," | ||
50 | |||
51 | inherit distutils-base pkgconfig cmake | ||
52 | |||
53 | export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" | ||
54 | export PYTHON="${STAGING_BINDIR_NATIVE}/python" | ||
55 | |||
56 | TARGET_CC_ARCH += "-I${S}/include " | ||
57 | |||
58 | PACKAGES += "${PN}-apps python-opencv" | ||
59 | |||
60 | python populate_packages_prepend () { | ||
61 | cv_libdir = d.expand('${libdir}') | ||
62 | cv_libdir_dbg = d.expand('${libdir}/.debug') | ||
63 | do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) | ||
64 | do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') | ||
65 | do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') | ||
66 | do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) | ||
67 | |||
68 | pn = d.getVar('PN') | ||
69 | metapkg = pn + '-dev' | ||
70 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") | ||
71 | blacklist = [ metapkg ] | ||
72 | metapkg_rdepends = [ ] | ||
73 | packages = d.getVar('PACKAGES').split() | ||
74 | for pkg in packages[1:]: | ||
75 | if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): | ||
76 | metapkg_rdepends.append(pkg) | ||
77 | d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) | ||
78 | } | ||
79 | |||
80 | PACKAGES_DYNAMIC += "^libopencv-.*" | ||
81 | |||
82 | FILES_${PN} = "" | ||
83 | FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" | ||
84 | FILES_${PN}-dbg += "${libdir}/.debug" | ||
85 | FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" | ||
86 | FILES_${PN}-doc = "${datadir}/OpenCV/doc" | ||
87 | |||
88 | ALLOW_EMPTY_${PN} = "1" | ||
89 | |||
90 | SUMMARY_python-opencv = "Python bindings to opencv" | ||
91 | FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" | ||
92 | RDEPENDS_python-opencv = "python-core python-numpy" | ||
93 | |||
94 | do_install_append() { | ||
95 | cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ | ||
96 | sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h | ||
97 | |||
98 | # Move Python files into correct library folder (for multilib build) | ||
99 | if [ "$libdir" != "/usr/lib" ]; then | ||
100 | mv ${D}/usr/lib/* ${D}/${libdir}/ | ||
101 | rm -rf ${D}/usr/lib | ||
102 | fi | ||
103 | } | ||
104 | |||
105 | # http://errors.yoctoproject.org/Errors/Details/40660/ | ||
106 | PNBLACKLIST[opencv] ?= "Not compatible with currently used ffmpeg 3 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-support/openmotif/openmotif/configure.patch b/meta-oe/recipes-support/openmotif/openmotif/configure.patch deleted file mode 100644 index 8868e805a..000000000 --- a/meta-oe/recipes-support/openmotif/openmotif/configure.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | --- a/configure.ac~ 2009-10-27 14:10:23.000000000 -0200 | ||
2 | +++ b/configure.ac 2011-05-31 10:51:00.207232036 -0300 | ||
3 | @@ -3,12 +3,6 @@ | ||
4 | AC_CONFIG_SRCDIR([lib/Xm/Form.c]) | ||
5 | AC_PREREQ(2.52) | ||
6 | AC_CONFIG_AUX_DIR(.) | ||
7 | -AC_CHECK_FILE(/usr/X/include/X11/X.h, | ||
8 | - AC_PREFIX_DEFAULT(/usr/X), | ||
9 | - AC_PREFIX_DEFAULT(/usr)) | ||
10 | -AC_CHECK_FILE(/usr/X11R6/include/X11/X.h, | ||
11 | - AC_PREFIX_DEFAULT(/usr/X11R6), | ||
12 | - AC_PREFIX_DEFAULT(/usr)) | ||
13 | |||
14 | dnl AM_MAINTAINER_MODE | ||
15 | AC_CANONICAL_TARGET | ||
diff --git a/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb b/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb deleted file mode 100644 index 35c39cbe8..000000000 --- a/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | SECTION = "libs" | ||
2 | SUMMARY = "OSM/Motif implementation" | ||
3 | LICENSE = "OGPL" | ||
4 | DEPENDS = "xbitmaps virtual/libx11 libxt libxft xproto" | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=14f692c82491db3d52419929d2f3b343" | ||
7 | |||
8 | PR = "r3" | ||
9 | |||
10 | PNBLACKLIST[openmotif] ?= "BROKEN: doesn't build with B!=S - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
11 | |||
12 | SRC_URI = "http://motif.ics.com/sites/default/files/openmotif-2.3.3.tar.gz \ | ||
13 | file://configure.patch;patch=1" | ||
14 | |||
15 | SRC_URI[md5sum] = "fd27cd3369d6c7d5ef79eccba524f7be" | ||
16 | SRC_URI[sha256sum] = "c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc10cd103" | ||
17 | |||
18 | inherit autotools | ||
19 | |||
20 | PACKAGECONFIG ??= "" | ||
21 | PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" | ||
22 | PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" | ||
23 | |||
24 | EXTRA_OECONF = "X_CFLAGS=-I${STAGING_INCDIR} --disable-printing" | ||
25 | |||
26 | PACKAGES += "${PN}-bin" | ||
27 | |||
28 | FILES_${PN}-bin = "${bindir}" | ||
29 | |||
30 | do_compile() { | ||
31 | ( | ||
32 | # HACK: build a native binaries need during the build | ||
33 | unset CC LD CXX CCLD CFLAGS | ||
34 | oe_runmake -C config/util CC="${BUILD_CC}" LD="${BUILD_LD}" CXX="${BUILD_CXX}" LIBS="" makestrs | ||
35 | ) | ||
36 | if [ "$?" != "0" ]; then | ||
37 | exit 1 | ||
38 | fi | ||
39 | oe_runmake -C lib | ||
40 | oe_runmake -C include | ||
41 | } | ||
42 | |||
43 | do_install() { | ||
44 | oe_runmake DESTDIR=${D} -C lib install | ||
45 | oe_runmake DESTDIR=${D} -C include install | ||
46 | } | ||
47 | |||
48 | LEAD_SONAME = "libXm.so.4" | ||
diff --git a/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb b/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb deleted file mode 100644 index e9142385b..000000000 --- a/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb +++ /dev/null | |||
@@ -1,115 +0,0 @@ | |||
1 | SUMMARY = "Web Based Enterprise Management (WBEM) Implementation" | ||
2 | DESCRIPTION = "OpenWBEM is a set of software components that help facilitate \ | ||
3 | deployment of the Common Information Model (CIM) and Web-Based \ | ||
4 | Enterprise Management (WBEM) technologies of the Distributed Management \ | ||
5 | Task Force (DMTF). \ | ||
6 | \ | ||
7 | Web-Based Enterprise Management (WBEM) is a set of management and \ | ||
8 | Internet standard technologies developed to unify the management of \ | ||
9 | distributed computing environments. WBEM provides the ability for the \ | ||
10 | industry to deliver a well-integrated set of standards-based management \ | ||
11 | tools, facilitating the exchange of data across otherwise disparate \ | ||
12 | technologies and platforms. \ | ||
13 | \ | ||
14 | For more information about DMTF and its technologies, visit \ | ||
15 | http://www.dmtf.org/standards. " | ||
16 | SECTION = "System/Management" | ||
17 | HOMEPAGE = "http://openwbem.sourceforge.net/" | ||
18 | |||
19 | inherit autotools-brokensep pkgconfig | ||
20 | |||
21 | SOURCE1="novell-openwbem-root-acl.mof" | ||
22 | SOURCE2="loadmof.sh" | ||
23 | SOURCE3="rmmof.sh" | ||
24 | SOURCE4="openwbem-owcimomd.init" | ||
25 | SOURCE5="openwbem-etc_pam.d_openwbem" | ||
26 | SOURCE6="openwbem-rpmlintrc" | ||
27 | |||
28 | SRC_URI = " \ | ||
29 | git://github.com/kkaempf/openwbem.git \ | ||
30 | file://${SOURCE1} \ | ||
31 | file://${SOURCE2} \ | ||
32 | file://${SOURCE3} \ | ||
33 | file://${SOURCE4} \ | ||
34 | file://${SOURCE5} \ | ||
35 | file://${SOURCE6} \ | ||
36 | file://checkserverkey \ | ||
37 | file://owcimomd.service \ | ||
38 | " | ||
39 | SRCREV = "5c688eefc1f8e35a4b1c58529aae5f114c25c2a8" | ||
40 | S = "${WORKDIR}/git" | ||
41 | LICENSE = "BSD-3-Clause" | ||
42 | LIC_FILES_CHKSUM += "file://COPYING;md5=0504a2eb85e01aa92c9efd4125a34660" | ||
43 | INSANE_SKIP_${PN} = "dev-so" | ||
44 | DEPENDS += "openssl libpam bash" | ||
45 | RDEPENDS_${PN} += "bash" | ||
46 | EXTRA_OECONF = " \ | ||
47 | --prefix=/usr \ | ||
48 | --sysconfdir=/etc \ | ||
49 | --libdir=${libdir} \ | ||
50 | --localstatedir=/var/lib \ | ||
51 | --libexecdir=${libdir}/openwbem/bin \ | ||
52 | --mandir=/usr/share/man \ | ||
53 | --enable-threads-run-as-user \ | ||
54 | " | ||
55 | do_configure_prepend() { | ||
56 | autoreconf --force --install | ||
57 | } | ||
58 | |||
59 | do_install() { | ||
60 | oe_runmake DESTDIR=${D} install | ||
61 | install -d ${D}/etc/openwbem/openwbem.conf.d | ||
62 | install -d ${D}/var/adm/fillup-templates | ||
63 | install -m 644 etc/sysconfig/daemons/owcimomd ${D}/var/adm/fillup-templates/sysconfig.owcimomd | ||
64 | |||
65 | # fix up hardcoded paths | ||
66 | sed -i -e 's,/usr/sbin/,${sbindir}/,' ${WORKDIR}/owcimomd.service | ||
67 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
68 | install -d ${D}/${systemd_unitdir}/system | ||
69 | install -m 644 ${WORKDIR}/owcimomd.service ${D}/${systemd_unitdir}/system | ||
70 | install -m 755 ${WORKDIR}/checkserverkey ${D}${sysconfdir}/openwbem/ | ||
71 | fi | ||
72 | |||
73 | install -d ${D}/etc/init.d | ||
74 | ln -sf ../../etc/init.d/owcimomd ${D}/usr/sbin/rcowcimomd | ||
75 | install -m 755 ${WORKDIR}/${SOURCE4} ${D}/etc/init.d/owcimomd | ||
76 | install -d ${D}${sbindir} | ||
77 | install -d ${D}/usr/bin | ||
78 | install -d ${D}/etc/pam.d | ||
79 | install -d ${D}/${libdir}/openwbem/cmpiproviders | ||
80 | install -m 644 etc/pam.d/openwbem ${D}/etc/pam.d | ||
81 | install -d ${D}/${libdir}/openwbem/c++providers | ||
82 | install -d ${D}/var/lib/openwbem | ||
83 | install -m 755 ${WORKDIR}/${SOURCE2} ${D}/usr/bin/ow-loadmof.sh | ||
84 | install -m 755 ${WORKDIR}/${SOURCE3} ${D}/usr/bin/ow-rmmof.sh | ||
85 | install -m 644 ${WORKDIR}/${SOURCE5} ${D}/etc/pam.d/openwbem | ||
86 | |||
87 | MOFPATH=${D}/usr/share/mof/openwbem | ||
88 | install -d $MOFPATH | ||
89 | mv ${D}/usr/share/openwbem/* $MOFPATH/ | ||
90 | rmdir ${D}/usr/share/openwbem | ||
91 | install -m 644 ${WORKDIR}/${SOURCE1} $MOFPATH/ | ||
92 | |||
93 | touch ${D}/var/lib/openwbem/{classassociation,instances,instassociation,namespaces,schema}.{dat,ndx,lock} | ||
94 | } | ||
95 | |||
96 | inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} | ||
97 | SYSTEMD_SERVICE_${PN} = "owcimomd.service" | ||
98 | SYSTEMD_AUTO_ENABLE = "disable" | ||
99 | FILES_${PN} += " \ | ||
100 | ${libdir} \ | ||
101 | ${datadir}/mof \ | ||
102 | ${systemd_unitdir} \ | ||
103 | " | ||
104 | FILES_${PN}-dbg += " \ | ||
105 | ${libdir}/openwbem/c++providers/.debug \ | ||
106 | ${libdir}/openwbem/provifcs/.debug \ | ||
107 | ${libdir}/openwbem/bin/openwbem/.debug \ | ||
108 | " | ||
109 | FILES_${PN}-dev = " \ | ||
110 | ${includedir} \ | ||
111 | ${datadir}/aclocal/openwbem.m4 \ | ||
112 | " | ||
113 | |||
114 | # http://errors.yoctoproject.org/Errors/Details/68630/ | ||
115 | PNBLACKLIST[openwbem] ?= "BROKEN: fails to build with gcc-6 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch b/meta-oe/recipes-support/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch deleted file mode 100644 index 7eda03875..000000000 --- a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | [PATCH] do not use the hardcode libdir | ||
2 | |||
3 | Upstream-status: Pending | ||
4 | |||
5 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | ||
6 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
7 | --- | ||
8 | configure.ac | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/configure.ac b/configure.ac | ||
12 | index 9b88d4c..df5ad7a 100644 | ||
13 | --- a/configure.ac | ||
14 | +++ b/configure.ac | ||
15 | @@ -140,7 +140,7 @@ if test "$with_libpq" != yes; then | ||
16 | if test -d "$with_libpq"; then | ||
17 | PATH="$PATH:$with_libpq/bin" | ||
18 | CPPFLAGS="$CPPFLAGS -I$with_libpq/include" | ||
19 | - LDFLAGS="$LDFLAGS -L$with_libpq/lib" | ||
20 | + LDFLAGS="$LDFLAGS -L$with_libpq/${base_libdir}" | ||
21 | else | ||
22 | if test -x "$with_libpq"; then | ||
23 | PG_CONFIG=$with_libpq | ||
24 | -- | ||
25 | 2.8.1 | ||
26 | |||
diff --git a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch b/meta-oe/recipes-support/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch deleted file mode 100644 index a8f14e768..000000000 --- a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch +++ /dev/null | |||
@@ -1,148 +0,0 @@ | |||
1 | Subject: [PATCH] psqlodbc: fixes for ptest support | ||
2 | |||
3 | * Fix the LIBODBC since we don't use ODBC_CONFIG. | ||
4 | * Fix the path for driver. | ||
5 | * Add the default info of postgresql server. | ||
6 | * Fix the output format for ptest. | ||
7 | * Fix the results and exe dir. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE ptest specific] | ||
10 | |||
11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
12 | --- | ||
13 | test/Makefile.in | 2 +- | ||
14 | test/odbcini-gen.sh | 8 ++++---- | ||
15 | test/runsuite.c | 26 +++++++++++++------------- | ||
16 | 3 files changed, 18 insertions(+), 18 deletions(-) | ||
17 | |||
18 | diff --git a/test/Makefile.in b/test/Makefile.in | ||
19 | index 8710616..fcb470e 100644 | ||
20 | --- a/test/Makefile.in | ||
21 | +++ b/test/Makefile.in | ||
22 | @@ -18,7 +18,7 @@ CFLAGS = @CFLAGS@ | ||
23 | ODBC_CONFIG = @ODBC_CONFIG@ | ||
24 | PROVE = @PROVE@ | ||
25 | |||
26 | -LIBODBC := $(shell $(ODBC_CONFIG) --libs) | ||
27 | +LIBODBC = -lodbc | ||
28 | |||
29 | all: $(TESTBINS) runsuite reset-db | ||
30 | |||
31 | diff --git a/test/odbcini-gen.sh b/test/odbcini-gen.sh | ||
32 | index d2c2c87..6068d9d 100755 | ||
33 | --- a/test/odbcini-gen.sh | ||
34 | +++ b/test/odbcini-gen.sh | ||
35 | @@ -6,7 +6,7 @@ | ||
36 | outini=odbc.ini | ||
37 | outinstini=odbcinst.ini | ||
38 | |||
39 | -drvr=../.libs/psqlodbcw | ||
40 | +drvr=@LIBDIR@/psqlodbca | ||
41 | driver=${drvr}.so | ||
42 | if test ! -e $driver ; then | ||
43 | driver=${drvr}.dll | ||
44 | @@ -33,10 +33,10 @@ Driver = psqlodbc test driver | ||
45 | Trace = No | ||
46 | TraceFile = | ||
47 | Database = contrib_regression | ||
48 | -Servername = | ||
49 | -Username = | ||
50 | +Servername = localhost | ||
51 | +Username = postgres | ||
52 | Password = | ||
53 | -Port = | ||
54 | +Port = 5432 | ||
55 | ReadOnly = No | ||
56 | RowVersioning = No | ||
57 | ShowSystemTables = No | ||
58 | diff --git a/test/runsuite.c b/test/runsuite.c | ||
59 | index 583cf35..fd2a90e 100644 | ||
60 | --- a/test/runsuite.c | ||
61 | +++ b/test/runsuite.c | ||
62 | @@ -51,7 +51,7 @@ bailout(const char *fmt, ...) | ||
63 | |||
64 | /* Given a test program's name, get the test name */ | ||
65 | void | ||
66 | -parse_argument(const char *in, char *testname, char *binname) | ||
67 | +parse_argument(const char *in, char *testname, char *binname, const char *inputdir) | ||
68 | { | ||
69 | const char *basename; | ||
70 | #ifdef WIN32 | ||
71 | @@ -65,7 +65,7 @@ parse_argument(const char *in, char *testname, char *binname) | ||
72 | if (strchr(in, DIR_SEP) == NULL) | ||
73 | { | ||
74 | strcpy(testname, in); | ||
75 | - sprintf(binname, "exe%c%s-test", DIR_SEP, in); | ||
76 | + sprintf(binname, "%s%cexe%c%s-test", inputdir, DIR_SEP, DIR_SEP, in); | ||
77 | return; | ||
78 | } | ||
79 | |||
80 | @@ -127,7 +127,7 @@ int main(int argc, char **argv) | ||
81 | failures = 0; | ||
82 | for (i = 1, j = 1; i <= numtests; i++, j++) | ||
83 | { | ||
84 | - parse_argument(argv[j], testname, binname); | ||
85 | + parse_argument(argv[j], testname, binname, inputdir); | ||
86 | if (runtest(binname, testname, i, inputdir) != 0) | ||
87 | failures++; | ||
88 | } | ||
89 | @@ -157,29 +157,29 @@ runtest(const char *binname, const char *testname, int testno, const char *input | ||
90 | #ifndef WIN32 | ||
91 | snprintf(cmdline, sizeof(cmdline), | ||
92 | "ODBCSYSINI=. ODBCINSTINI=./odbcinst.ini ODBCINI=./odbc.ini " | ||
93 | - "%s > results/%s.out", | ||
94 | - binname, testname); | ||
95 | + "%s > %s/results/%s.out", | ||
96 | + binname, inputdir, testname); | ||
97 | #else | ||
98 | snprintf(cmdline, sizeof(cmdline), | ||
99 | - "%s > results\\%s.out", | ||
100 | - binname, testname); | ||
101 | + "%s > %s/results\\%s.out", | ||
102 | + binname, inputdir, testname); | ||
103 | #endif | ||
104 | rc = system(cmdline); | ||
105 | |||
106 | diff = rundiff(testname, inputdir); | ||
107 | if (rc != 0) | ||
108 | { | ||
109 | - printf("not ok %d - %s test returned %d\n", testno, testname, rc); | ||
110 | + printf("FAIL: %d - %s\n\ttest returned %d\n", testno, testname, rc); | ||
111 | ret = 1; | ||
112 | } | ||
113 | else if (diff != 0) | ||
114 | { | ||
115 | - printf("not ok %d - %s test output differs\n", testno, testname); | ||
116 | + printf("FAIL: %d - %s\n\ttest output differs\n", testno, testname); | ||
117 | ret = 1; | ||
118 | } | ||
119 | else | ||
120 | { | ||
121 | - printf("ok %d - %s\n", testno, testname); | ||
122 | + printf("PASS: %d - %s\n", testno, testname); | ||
123 | ret = 0; | ||
124 | } | ||
125 | fflush(stdout); | ||
126 | @@ -196,7 +196,7 @@ rundiff(const char *testname, const char *inputdir) | ||
127 | char *result; | ||
128 | size_t result_len; | ||
129 | |||
130 | - snprintf(filename, sizeof(filename), "results/%s.out", testname); | ||
131 | + snprintf(filename, sizeof(filename), "%s/results/%s.out", inputdir, testname); | ||
132 | result = slurpfile(filename, &result_len); | ||
133 | |||
134 | outputno = 0; | ||
135 | @@ -244,8 +244,8 @@ rundiff(const char *testname, const char *inputdir) | ||
136 | * files and print the smallest diff? | ||
137 | */ | ||
138 | snprintf(cmdline, sizeof(cmdline), | ||
139 | - "diff -c %s/expected/%s.out results/%s.out >> regression.diffs", | ||
140 | - inputdir, testname, testname); | ||
141 | + "diff -c %s/expected/%s.out %s/results/%s.out >> regression.diffs", | ||
142 | + inputdir, testname, inputdir, testname); | ||
143 | if (system(cmdline) == -1) | ||
144 | printf("# diff failed\n"); | ||
145 | |||
146 | -- | ||
147 | 2.8.2 | ||
148 | |||
diff --git a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch b/meta-oe/recipes-support/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch deleted file mode 100644 index 1d988182e..000000000 --- a/meta-oe/recipes-support/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch +++ /dev/null | |||
@@ -1,118 +0,0 @@ | |||
1 | Subject: [PATCH] remove some checks for cross-compiling | ||
2 | |||
3 | some lib check is not suitable for | ||
4 | cross-compiling, so remove them. | ||
5 | |||
6 | Upstream-Status: Inappropriate [not a real bug,just for cross-compiling] | ||
7 | |||
8 | Signed-off-by: Song.Li <Song.Li@windriver.com> | ||
9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
10 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
11 | --- | ||
12 | configure.ac | 66 +++++++----------------------------------------------------- | ||
13 | 1 file changed, 7 insertions(+), 59 deletions(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index df5ad7a..b72bd4c 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -46,57 +46,19 @@ AC_ARG_WITH(iodbc, [ --with-iodbc[[=DIR]] [[default=no]] DIR is the iODBC bas | ||
20 | if test "$with_iodbc" != no; then | ||
21 | with_unixodbc=no | ||
22 | AC_DEFINE(WITH_IODBC, 1, [Define to 1 to build with iODBC support]) | ||
23 | - if test "$with_iodbc" = yes; then | ||
24 | - AC_PATH_PROGS(ODBC_CONFIG, iodbc-config) | ||
25 | - else | ||
26 | - ODBC_CONFIG=$with_iodbc | ||
27 | - fi | ||
28 | - if test ! -x "${ODBC_CONFIG}/bin/iodbc-config"; then | ||
29 | - if test ! -x "${ODBC_CONFIG}"; then | ||
30 | - AC_MSG_ERROR([iodbc-config not found (required for iODBC build)]) | ||
31 | - fi | ||
32 | - else | ||
33 | - ODBC_CONFIG=${ODBC_CONFIG}/bin/iodbc-config | ||
34 | - fi | ||
35 | fi | ||
36 | |||
37 | if test "$with_unixodbc" != no; then | ||
38 | AC_DEFINE(WITH_UNIXODBC, 1, | ||
39 | [Define to 1 to build with unixODBC support]) | ||
40 | - if test "$with_unixodbc" = yes; then | ||
41 | - AC_PATH_PROGS(ODBC_CONFIG, odbc_config) | ||
42 | - else | ||
43 | - ODBC_CONFIG=$with_unixodbc | ||
44 | - fi | ||
45 | - if test ! -x "${ODBC_CONFIG}/bin/odbc_config"; then | ||
46 | - if test ! -x "${ODBC_CONFIG}"; then | ||
47 | - AC_MSG_ERROR([odbc_config not found (required for unixODBC build)]) | ||
48 | - fi | ||
49 | - else | ||
50 | - ODBC_CONFIG=${ODBC_CONFIG}/bin/odbc_config | ||
51 | - fi | ||
52 | fi | ||
53 | |||
54 | # | ||
55 | # ODBC include and library | ||
56 | # | ||
57 | - | ||
58 | -if test "$ODBC_CONFIG" != ""; then | ||
59 | - if test "$with_iodbc" != no; then | ||
60 | - ODBC_INCLUDE=`${ODBC_CONFIG} --cflags` | ||
61 | - CPPFLAGS="$CPPFLAGS ${ODBC_INCLUDE}" | ||
62 | - # Linking libiodoc is rather problematic | ||
63 | - [ODBC_LIBDIR=`${ODBC_CONFIG} --libs | sed -e "s/^\(-L\|.*[ \t]-L\)\([^ \n\r\f\t]*\).*$/-L\2/"`] | ||
64 | - LDFLAGS="$LDFLAGS ${ODBC_LIBDIR}" | ||
65 | - else | ||
66 | - ODBC_INCLUDE=`${ODBC_CONFIG} --include-prefix` | ||
67 | - CPPFLAGS="$CPPFLAGS -I${ODBC_INCLUDE}" | ||
68 | - # Linking libodoc is rather problematic | ||
69 | - ODBC_LIBDIR=`${ODBC_CONFIG} --lib-prefix` | ||
70 | - LDFLAGS="$LDFLAGS -L${ODBC_LIBDIR}" | ||
71 | - fi | ||
72 | - AC_MSG_NOTICE([using $ODBC_INCLUDE $ODBC_LIBDIR]) | ||
73 | -fi | ||
74 | +ODBC_LIBS="-lodbcinst" | ||
75 | +LIBS="$LIBS ${ODBC_LIBS}" | ||
76 | +AC_MSG_NOTICE([using $ODBC_INCLUDE $ODBC_LIBS]) | ||
77 | |||
78 | # | ||
79 | # SQLCOLATTRIBUTE_SQLLEN check | ||
80 | @@ -176,18 +138,10 @@ PGAC_ARG_BOOL(enable, pthreads, yes, | ||
81 | # Find libpq headers and libraries | ||
82 | # | ||
83 | |||
84 | -if test -z "$PG_CONFIG"; then | ||
85 | - AC_PATH_PROGS(PG_CONFIG, pg_config) | ||
86 | -fi | ||
87 | - | ||
88 | -if test -n "$PG_CONFIG"; then | ||
89 | - pg_includedir=`"$PG_CONFIG" --includedir` | ||
90 | - pg_libdir=`"$PG_CONFIG" --libdir` | ||
91 | - CPPFLAGS="$CPPFLAGS -I$pg_includedir" | ||
92 | - LDFLAGS="$LDFLAGS -L$pg_libdir" | ||
93 | -fi | ||
94 | - | ||
95 | - | ||
96 | +pg_includedir="" | ||
97 | +pg_libdir="" | ||
98 | +CPPFLAGS="$CPPFLAGS" | ||
99 | +LDFLAGS="$LDFLAGS" | ||
100 | |||
101 | # 1. Programs | ||
102 | |||
103 | @@ -211,12 +165,6 @@ if test "$with_iodbc" != no; then | ||
104 | [AC_MSG_ERROR([iODBC library "iodbcinst" not found])]) | ||
105 | fi | ||
106 | |||
107 | -if test "$enable_pthreads" = yes; then | ||
108 | - AC_CHECK_LIB(pthreads, pthread_create, | ||
109 | - [], | ||
110 | - [AC_CHECK_LIB(pthread, pthread_create)]) | ||
111 | -fi | ||
112 | - | ||
113 | AC_CHECK_LIB(pq, PQsetSingleRowMode, [], | ||
114 | [AC_MSG_ERROR([libpq library version >= 9.2 is required])]) | ||
115 | |||
116 | -- | ||
117 | 2.8.1 | ||
118 | |||
diff --git a/meta-oe/recipes-support/psqlodbc/psqlodbc.inc b/meta-oe/recipes-support/psqlodbc/psqlodbc.inc deleted file mode 100644 index 5337b4569..000000000 --- a/meta-oe/recipes-support/psqlodbc/psqlodbc.inc +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | SUMMARY = "ODBC driver for PostgreSQL" | ||
2 | DESCRIPTION = "\ | ||
3 | This package provides a driver that allows ODBC-enabled applications to \ | ||
4 | access PostgreSQL databases. ODBC is an abstraction layer that allows \ | ||
5 | applications written for that layer to access databases in a manner \ | ||
6 | that is relatively independent of the particular database management \ | ||
7 | system. \ | ||
8 | . \ | ||
9 | You need to install this package if you want to use an application that \ | ||
10 | provides database access through ODBC and you want that application to \ | ||
11 | access a PostgreSQL database. This package would need to be installed \ | ||
12 | on the same machine as that client application; the PostgreSQL database \ | ||
13 | server can be on a different machine and does not need any additional \ | ||
14 | software to accept ODBC clients. \ | ||
15 | " | ||
16 | SECTION = "libs" | ||
17 | HOMEPAGE = "http://psqlodbc.projects.postgresql.org/" | ||
18 | |||
19 | DEPENDS += "postgresql unixodbc" | ||
20 | |||
21 | EXTRA_OECONF = "\ | ||
22 | ac_cv_lib_ltdl_lt_dlopen=no \ | ||
23 | ac_cv_lib_pq_PQconnectdb=yes \ | ||
24 | --with-unixodbc=yes \ | ||
25 | --with-libpq=${STAGING_LIBDIR}/.. \ | ||
26 | --enable-pthreads \ | ||
27 | --disable-unicode \ | ||
28 | LIBS="-lpthread" \ | ||
29 | " | ||
30 | |||
31 | inherit autotools pkgconfig ptest | ||
32 | |||
33 | do_compile_ptest() { | ||
34 | oe_runmake -C ${B}/test | ||
35 | } | ||
36 | |||
37 | do_install_ptest() { | ||
38 | install -d ${D}${PTEST_PATH} | ||
39 | cp -a --no-preserve=ownership ${B}/test/exe ${S}/test/expected ${D}${PTEST_PATH} | ||
40 | install -m 0755 ${B}/test/reset-db ${D}${PTEST_PATH} | ||
41 | install -m 0755 ${B}/test/runsuite ${D}${PTEST_PATH} | ||
42 | install -m 0755 ${S}/test/odbcini-gen.sh ${D}${PTEST_PATH} | ||
43 | install -m 0755 ${S}/test/sampletables.sql ${D}${PTEST_PATH} | ||
44 | sed -i -e 's|@LIBDIR@|${libdir}|' ${D}${PTEST_PATH}/odbcini-gen.sh | ||
45 | } | ||
46 | |||
47 | FILES_${PN} += "${libdir}" | ||
48 | |||
49 | # The tests need a local PostgreSQL server running | ||
50 | RDEPENDS_${PN}-ptest = "postgresql" | ||
diff --git a/meta-oe/recipes-support/psqlodbc/psqlodbc_09.05.0300.bb b/meta-oe/recipes-support/psqlodbc/psqlodbc_09.05.0300.bb deleted file mode 100644 index 97326a20e..000000000 --- a/meta-oe/recipes-support/psqlodbc/psqlodbc_09.05.0300.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | require ${PN}.inc | ||
2 | |||
3 | LICENSE = "LGPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" | ||
5 | |||
6 | SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \ | ||
7 | file://psqlodbc-remove-some-checks-for-cross-compiling.patch \ | ||
8 | file://psqlodbc-donot-use-the-hardcode-libdir.patch \ | ||
9 | file://psqlodbc-fix-for-ptest-support.patch \ | ||
10 | file://run-ptest \ | ||
11 | " | ||
12 | |||
13 | SRC_URI[md5sum] = "4c6e0b22187d7bb1c998ffac89e50f6b" | ||
14 | SRC_URI[sha256sum] = "9521f328bf28aaaf5c8488dc89792b614f9d6271742c0baf9bb41c97537764a8" | ||
15 | |||
16 | PNBLACKLIST[psqlodbc] ?= "Depends on blacklisted postgresql - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb b/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb deleted file mode 100644 index 1219cb8ed..000000000 --- a/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | SUMMARY = "A lightweight Terminal Emulator based on libvte, written in Vala" | ||
2 | SECTION = "x11/applications" | ||
3 | DEPENDS = "vte9 intltool-native" | ||
4 | SRCREV = "0fefa38087581f85fa0631b40500b9428369c146" | ||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
7 | PV = "1.3+gitr${SRCPV}" | ||
8 | PE = "1" | ||
9 | PR = "r1" | ||
10 | |||
11 | PNBLACKLIST[vala-terminal] ?= "BROKEN: Doesn't work with B!=S, touch: cannot touch `src/.stamp': No such file or directory - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
12 | |||
13 | inherit autotools perlnative vala | ||
14 | |||
15 | SRC_URI = "${FREESMARTPHONE_GIT}/vala-terminal.git;branch=master" | ||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | RDEPENDS_${PN} = "ttf-liberation-mono" | ||
19 | RREPLACES_${PN} = "openmoko-terminal2" | ||
20 | RPROVIDES_${PN} = "openmoko-terminal2" | ||
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_4.3.36.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_4.3.36.bb deleted file mode 100644 index c7bae1c08..000000000 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_4.3.36.bb +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | SUMMARY = "VirtualBox Linux Guest Drivers" | ||
2 | SECTION = "core" | ||
3 | LICENSE = "GPL-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" | ||
5 | |||
6 | DEPENDS = "virtual/kernel" | ||
7 | |||
8 | inherit module kernel-module-split | ||
9 | |||
10 | COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" | ||
11 | |||
12 | VBOX_NAME = "VirtualBox-${PV}" | ||
13 | |||
14 | SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ | ||
15 | file://Makefile.utils \ | ||
16 | " | ||
17 | SRC_URI[md5sum] = "8635387dec6cbfd576ba453355d4dc0c" | ||
18 | SRC_URI[sha256sum] = "af0776df6d03b2709cb76a69f055487bf12bdb3b4163e2a82959860300283046" | ||
19 | |||
20 | S = "${WORKDIR}/vbox_module" | ||
21 | |||
22 | export BUILD_TARGET_ARCH="${ARCH}" | ||
23 | export BUILD_TARGET_ARCH_x86-64="amd64" | ||
24 | export KERN_DIR="${STAGING_KERNEL_DIR}" | ||
25 | |||
26 | addtask export_sources before do_patch after do_unpack | ||
27 | |||
28 | do_export_sources() { | ||
29 | mkdir -p "${S}" | ||
30 | ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules ${T}/vbox_modules.tar.gz | ||
31 | tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz | ||
32 | |||
33 | # add a mount utility to use shared folder from VBox Addition Source Code | ||
34 | mkdir -p "${S}/utils" | ||
35 | install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils | ||
36 | install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils | ||
37 | install ${S}/../Makefile.utils ${S}/utils/Makefile | ||
38 | |||
39 | } | ||
40 | |||
41 | # compile and install mount utility | ||
42 | do_compile_append() { | ||
43 | oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils | ||
44 | if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then | ||
45 | echo "ERROR: One of vbox*.ko modules wasn't built" | ||
46 | exit 1 | ||
47 | fi | ||
48 | } | ||
49 | |||
50 | module_do_install() { | ||
51 | MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc | ||
52 | install -d $MODULE_DIR | ||
53 | install -m 644 vboxguest.ko $MODULE_DIR | ||
54 | install -m 644 vboxsf.ko $MODULE_DIR | ||
55 | install -m 644 vboxvideo.ko $MODULE_DIR | ||
56 | } | ||
57 | |||
58 | do_install_append() { | ||
59 | install -d ${D}${base_sbindir} | ||
60 | install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} | ||
61 | } | ||
62 | |||
63 | PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" | ||
64 | RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" | ||
65 | |||
66 | FILES_${PN} = "${base_sbindir}" | ||
67 | |||
68 | # autoload if installed | ||
69 | KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" | ||
70 | |||
71 | # http://errors.yoctoproject.org/Errors/Details/83333/ | ||
72 | PNBLACKLIST[vboxguestdrivers] ?= "BROKEN: not compatible with default kernel version 4.8 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-support/xchat/xchat-2.8.8/automake-foreign.patch b/meta-oe/recipes-support/xchat/xchat-2.8.8/automake-foreign.patch deleted file mode 100644 index cfa2f6c7f..000000000 --- a/meta-oe/recipes-support/xchat/xchat-2.8.8/automake-foreign.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- a/configure.in 2014-08-18 01:25:43.911597023 -0700 | ||
2 | +++ b/configure.in 2014-08-18 01:26:27.763786629 -0700 | ||
3 | @@ -8,7 +8,7 @@ | ||
4 | AC_CONFIG_HEADERS([config.h]) | ||
5 | AC_CONFIG_SRCDIR([configure.in]) | ||
6 | |||
7 | -AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects no-define]) | ||
8 | +AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 subdir-objects no-define]) | ||
9 | |||
10 | AM_MAINTAINER_MODE | ||
11 | AC_PROG_CC | ||
diff --git a/meta-oe/recipes-support/xchat/xchat-2.8.8/fix-includes-for-separate-build.patch b/meta-oe/recipes-support/xchat/xchat-2.8.8/fix-includes-for-separate-build.patch deleted file mode 100644 index 4394e5257..000000000 --- a/meta-oe/recipes-support/xchat/xchat-2.8.8/fix-includes-for-separate-build.patch +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | diff -ur xchat-2.8.8-orig/plugins/perl/perl.c xchat-2.8.8/plugins/perl/perl.c | ||
2 | --- xchat-2.8.8-orig/plugins/perl/perl.c 2014-08-30 14:09:05.125116286 -0700 | ||
3 | +++ xchat-2.8.8/plugins/perl/perl.c 2014-08-30 14:09:45.281106532 -0700 | ||
4 | @@ -31,7 +31,7 @@ | ||
5 | #endif | ||
6 | |||
7 | #undef PACKAGE | ||
8 | -#include "../../config.h" /* for #define OLD_PERL */ | ||
9 | +#include <config.h> /* for #define OLD_PERL */ | ||
10 | #include "xchat-plugin.h" | ||
11 | |||
12 | static xchat_plugin *ph; /* plugin handle */ | ||
13 | diff -ur xchat-2.8.8-orig/src/common/network.c xchat-2.8.8/src/common/network.c | ||
14 | --- xchat-2.8.8-orig/src/common/network.c 2014-08-30 14:09:05.137116222 -0700 | ||
15 | +++ xchat-2.8.8/src/common/network.c 2014-08-30 14:13:52.729116323 -0700 | ||
16 | @@ -24,7 +24,7 @@ | ||
17 | #include <unistd.h> | ||
18 | #include <glib.h> | ||
19 | |||
20 | -#include "../../config.h" /* grab USE_IPV6 and LOOKUPD defines */ | ||
21 | +#include <config.h> /* grab USE_IPV6 and LOOKUPD defines */ | ||
22 | |||
23 | #define WANTSOCKET | ||
24 | #define WANTARPA | ||
25 | diff -ur xchat-2.8.8-orig/src/common/ssl.c xchat-2.8.8/src/common/ssl.c | ||
26 | --- xchat-2.8.8-orig/src/common/ssl.c 2014-08-30 14:09:05.137116222 -0700 | ||
27 | +++ xchat-2.8.8/src/common/ssl.c 2014-08-30 14:14:08.449133899 -0700 | ||
28 | @@ -23,7 +23,7 @@ | ||
29 | #include <string.h> /* strncpy() */ | ||
30 | #include "ssl.h" /* struct cert_info */ | ||
31 | #include "inet.h" | ||
32 | -#include "../../config.h" /* HAVE_SNPRINTF */ | ||
33 | +#include <config.h> /* HAVE_SNPRINTF */ | ||
34 | |||
35 | #ifndef HAVE_SNPRINTF | ||
36 | #define snprintf g_snprintf | ||
37 | diff -ur xchat-2.8.8-orig/src/common/util.c xchat-2.8.8/src/common/util.c | ||
38 | --- xchat-2.8.8-orig/src/common/util.c 2014-08-30 14:09:05.133116243 -0700 | ||
39 | +++ xchat-2.8.8/src/common/util.c 2014-08-30 14:10:23.633116070 -0700 | ||
40 | @@ -41,7 +41,7 @@ | ||
41 | #include "xchatc.h" | ||
42 | #include <ctype.h> | ||
43 | #include "util.h" | ||
44 | -#include "../../config.h" | ||
45 | +#include <config.h> | ||
46 | |||
47 | #define WANTSOCKET | ||
48 | #include "inet.h" | ||
49 | diff -ur xchat-2.8.8-orig/src/common/xchat.h xchat-2.8.8/src/common/xchat.h | ||
50 | --- xchat-2.8.8-orig/src/common/xchat.h 2014-08-30 14:09:05.133116243 -0700 | ||
51 | +++ xchat-2.8.8/src/common/xchat.h 2014-08-30 14:13:42.797116472 -0700 | ||
52 | @@ -1,4 +1,4 @@ | ||
53 | -#include "../../config.h" | ||
54 | +#include <config.h> | ||
55 | |||
56 | #include <glib.h> | ||
57 | #include <time.h> /* need time_t */ | ||
58 | diff -ur xchat-2.8.8-orig/src/fe-gtk/fe-gtk.h xchat-2.8.8/src/fe-gtk/fe-gtk.h | ||
59 | --- xchat-2.8.8-orig/src/fe-gtk/fe-gtk.h 2014-08-30 14:09:05.129116272 -0700 | ||
60 | +++ xchat-2.8.8/src/fe-gtk/fe-gtk.h 2014-08-30 14:10:13.309115951 -0700 | ||
61 | @@ -1,4 +1,4 @@ | ||
62 | -#include "../../config.h" | ||
63 | +#include <config.h> | ||
64 | |||
65 | #ifdef WIN32 | ||
66 | /* If you're compiling this for Windows, your release is un-official | ||
67 | diff -ur xchat-2.8.8-orig/src/fe-gtk/xtext.c xchat-2.8.8/src/fe-gtk/xtext.c | ||
68 | --- xchat-2.8.8-orig/src/fe-gtk/xtext.c 2014-08-30 14:09:05.129116272 -0700 | ||
69 | +++ xchat-2.8.8/src/fe-gtk/xtext.c 2014-08-30 14:10:00.313138254 -0700 | ||
70 | @@ -51,7 +51,7 @@ | ||
71 | #include <gtk/gtkwindow.h> | ||
72 | |||
73 | #ifdef XCHAT | ||
74 | -#include "../../config.h" /* can define USE_XLIB here */ | ||
75 | +#include <config.h> /* can define USE_XLIB here */ | ||
76 | #else | ||
77 | #define USE_XLIB | ||
78 | #endif | ||
diff --git a/meta-oe/recipes-support/xchat/xchat-2.8.8/glib-2.32.patch b/meta-oe/recipes-support/xchat/xchat-2.8.8/glib-2.32.patch deleted file mode 100644 index c9bce6a9c..000000000 --- a/meta-oe/recipes-support/xchat/xchat-2.8.8/glib-2.32.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | --- xchat-2.8.8.orig/src/common/xchat.h 2009-08-16 11:40:16.000000000 +0200 | ||
2 | +++ xchat-2.8.8/src/common/xchat.h 2012-05-06 08:30:16.125755497 +0200 | ||
3 | @@ -1,10 +1,6 @@ | ||
4 | #include "../../config.h" | ||
5 | |||
6 | -#include <glib/gslist.h> | ||
7 | -#include <glib/glist.h> | ||
8 | -#include <glib/gutils.h> | ||
9 | -#include <glib/giochannel.h> | ||
10 | -#include <glib/gstrfuncs.h> | ||
11 | +#include <glib.h> | ||
12 | #include <time.h> /* need time_t */ | ||
13 | |||
14 | #ifndef XCHAT_H | ||
15 | --- xchat-2.8.8.orig/src/common/servlist.c 2010-05-16 09:24:26.000000000 +0200 | ||
16 | +++ xchat-2.8.8/src/common/servlist.c 2012-05-06 08:30:45.681758019 +0200 | ||
17 | @@ -24,7 +24,6 @@ | ||
18 | #include <unistd.h> | ||
19 | |||
20 | #include "xchat.h" | ||
21 | -#include <glib/ghash.h> | ||
22 | |||
23 | #include "cfgfiles.h" | ||
24 | #include "fe.h" | ||
25 | --- xchat-2.8.8.orig/src/common/util.c 2009-08-16 11:40:16.000000000 +0200 | ||
26 | +++ xchat-2.8.8/src/common/util.c 2012-05-06 08:31:10.389760122 +0200 | ||
27 | @@ -39,7 +39,6 @@ | ||
28 | #include <errno.h> | ||
29 | #include "xchat.h" | ||
30 | #include "xchatc.h" | ||
31 | -#include <glib/gmarkup.h> | ||
32 | #include <ctype.h> | ||
33 | #include "util.h" | ||
34 | #include "../../config.h" | ||
35 | --- xchat-2.8.8.orig/src/common/text.c 2010-05-30 04:14:41.000000000 +0200 | ||
36 | +++ xchat-2.8.8/src/common/text.c 2012-05-06 08:31:22.300761137 +0200 | ||
37 | @@ -28,7 +28,6 @@ | ||
38 | #include <sys/mman.h> | ||
39 | |||
40 | #include "xchat.h" | ||
41 | -#include <glib/ghash.h> | ||
42 | #include "cfgfiles.h" | ||
43 | #include "chanopt.h" | ||
44 | #include "plugin.h" | ||
diff --git a/meta-oe/recipes-support/xchat/xchat_2.8.8.bb b/meta-oe/recipes-support/xchat/xchat_2.8.8.bb deleted file mode 100644 index 408c700bb..000000000 --- a/meta-oe/recipes-support/xchat/xchat_2.8.8.bb +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | SUMMARY = "Full-featured IRC chat client with scripting support" | ||
2 | LICENSE = "GPLv2+" | ||
3 | HOMEPAGE = "http://www.xchat.org" | ||
4 | SECTION = "x11/network" | ||
5 | |||
6 | DEPENDS = "libgcrypt zlib gtk+ libsexy" | ||
7 | DEPENDS += "gdk-pixbuf-native" | ||
8 | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" | ||
10 | |||
11 | PR = "r2" | ||
12 | |||
13 | SRC_URI = "http://xchat.org/files/source/2.8/xchat-${PV}.tar.bz2 \ | ||
14 | file://glib-2.32.patch \ | ||
15 | file://automake-foreign.patch \ | ||
16 | file://fix-includes-for-separate-build.patch \ | ||
17 | " | ||
18 | |||
19 | inherit autotools gettext pkgconfig | ||
20 | |||
21 | PACKAGECONFIG ??= "dbus" | ||
22 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus-glib" | ||
23 | PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" | ||
24 | PACKAGECONFIG[python] = "--enable-python,--disable-python,python" | ||
25 | |||
26 | EXTRA_OECONF = "\ | ||
27 | --enable-maintainer-mode \ | ||
28 | --disable-perl \ | ||
29 | --disable-tcl \ | ||
30 | " | ||
31 | |||
32 | RDEPENDS_${PN} += "dbus" | ||
33 | FILES_${PN} += "${datadir}/dbus-1" | ||
34 | FILES_${PN}-dbg += "${libdir}/xchat/plugins/.debug" | ||
35 | |||
36 | SRC_URI[md5sum] = "6775c44f38e84d06c06c336b32c4a452" | ||
37 | SRC_URI[sha256sum] = "0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0" | ||
38 | |||
39 | PNBLACKLIST[xchat] ?= "Depends on blacklisted libsexy - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||