summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-11-22 18:32:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-02 11:25:33 +0000
commit9ffe68280ff21218cffdd09946d91ae29cbec12a (patch)
treeca4f309f63c77c2e32e55d4f687b7db8bd6e7640 /meta
parentc5111da124c2dff5c49dc98e1d43c796dcd91003 (diff)
downloadpoky-9ffe68280ff21218cffdd09946d91ae29cbec12a.tar.gz
neon: remove the recipe
For these reasons: 1) Upstream website has been dead for quite a while now; 2) Nothing is actually using neon in oe-core, except one gstreamer plugin in gst-plugins-bad (and I couldn't find evidence of that plugin being used anywhere) However, the recipe is still required by libmusicbrainz in meta-oe and so it will be moved there (with the tarball taken from debian). (From OE-Core rev: 62513ad6d38e4aba3e6b155e04c4c6344ed70ebc) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-self-hosted.bb1
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb1
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc2
-rw-r--r--meta/recipes-support/neon/neon/pkgconfig.patch15
-rw-r--r--meta/recipes-support/neon/neon_0.30.2.bb38
5 files changed, 1 insertions, 56 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index ff42866e32..adb0c56c3a 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -136,7 +136,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\
136 mtools \ 136 mtools \
137 ncurses \ 137 ncurses \
138 ncurses-terminfo-base \ 138 ncurses-terminfo-base \
139 neon \
140 nfs-utils \ 139 nfs-utils \
141 nfs-utils-client \ 140 nfs-utils-client \
142 openssl \ 141 openssl \
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 5baaf351e1..e1f34d5af1 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -68,7 +68,6 @@ RDEPENDS_packagegroup-core-sys-extended = "\
68 mc-helpers-perl \ 68 mc-helpers-perl \
69 mdadm \ 69 mdadm \
70 minicom \ 70 minicom \
71 neon \
72 parted \ 71 parted \
73 quota \ 72 quota \
74 screen \ 73 screen \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 7be15d9973..ca2ea9e963 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -22,7 +22,7 @@ PACKAGECONFIG ??= " \
22 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 22 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
23 ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan', d)} \ 23 ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan', d)} \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ 24 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
25 bz2 curl dash dtls hls neon rsvg sbc smoothstreaming sndfile uvch264 webp \ 25 bz2 curl dash dtls hls rsvg sbc smoothstreaming sndfile uvch264 webp \
26" 26"
27 27
28PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass" 28PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass"
diff --git a/meta/recipes-support/neon/neon/pkgconfig.patch b/meta/recipes-support/neon/neon/pkgconfig.patch
deleted file mode 100644
index 239dba8e25..0000000000
--- a/meta/recipes-support/neon/neon/pkgconfig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 neon.pc.in | 2 +-
5 1 file changed, 1 insertion(+), 1 deletion(-)
6
7--- neon-0.30.1.orig/neon.pc.in
8+++ neon-0.30.1/neon.pc.in
9@@ -7,5 +7,5 @@ Name: neon
10 Description: HTTP/WebDAV client library
11 Version: @NEON_VERSION@
12 Libs: -L${libdir} -lneon @NEON_PC_LIBS@
13-Libs.private: @NEON_LIBS@
14+Libs.private: -L${libdir} -lz -lgcrypt -lgpg-error -lexpat -lgnutls
15 Cflags: -I${includedir}/neon @NEON_CFLAGS@
diff --git a/meta/recipes-support/neon/neon_0.30.2.bb b/meta/recipes-support/neon/neon_0.30.2.bb
deleted file mode 100644
index 5792c56f3a..0000000000
--- a/meta/recipes-support/neon/neon_0.30.2.bb
+++ /dev/null
@@ -1,38 +0,0 @@
1SUMMARY = "An HTTP and WebDAV client library with a C interface"
2HOMEPAGE = "http://www.webdav.org/neon/"
3SECTION = "libs"
4LICENSE = "LGPLv2+"
5LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \
6 file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037"
7
8SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
9 file://pkgconfig.patch \
10 "
11
12SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41"
13SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"
14
15inherit autotools binconfig-disabled lib_package pkgconfig
16
17# Enable gnutls or openssl, not both
18PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib"
19PACKAGECONFIG_class-native = "expat gnutls webdav zlib"
20
21PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat"
22PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
23PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5"
24PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy"
25PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2"
26PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
27PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav,"
28PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
29
30EXTRA_OECONF += "--enable-shared"
31
32do_compile_append() {
33 oe_runmake -C test
34}
35
36BINCONFIG = "${bindir}/neon-config"
37
38BBCLASSEXTEND = "native"