From 007498ac72e26e9f7064de74f7fe96e91ae6c969 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 24 Jul 2017 19:25:35 +0200 Subject: bluez4: remove bluez4-only recipes * remove recipes which support only bluez4 and are blacklisted when bluez5 is selected in DISTRO_FEATURES, if someone is still using bluez4, then it can be restored in separate meta-bluez4 and maintained by people using it. * there are few recipes which support both bluez5 or bluez4 based on selected DISTRO_FEATURES, these can stay in meta-oe repository, but now people without bluez5 in DISTRO_FEATURES will need to add meta-bluez4 layer to satisfy bluez4 dependency meta-gnome/recipes-connectivity/obex/obexd_0.48.bb:DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb: ${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)} \ meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb:DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb:DEPENDS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb:RDEPENDS_bluez4 = " \ meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb:# Install bluez4 tools or bluez5 tools depending on what is specified in the distro. Signed-off-by: Martin Jansa --- .../foxtrotgps/foxtrotgps_1.1.1.bb | 26 ----- ...g_type_init-is-deprecated-for-glib-2.35.0.patch | 114 --------------------- .../recipes-navigation/gypsy/files/fixups.patch | 21 ---- meta-oe/recipes-navigation/gypsy/gypsy.inc | 25 ----- meta-oe/recipes-navigation/gypsy/gypsy_0.9.bb | 15 --- meta-oe/recipes-navigation/gypsy/gypsy_git.bb | 22 ---- meta-oe/recipes-navigation/navit/navit-fpu.inc | 6 -- meta-oe/recipes-navigation/navit/navit.inc | 95 ----------------- .../navit/navit/configure.add.imlib2.option.patch | 16 --- .../navit/navit/freetype-include-path.patch | 28 ----- meta-oe/recipes-navigation/navit/navit/maps.xml | 24 ----- meta-oe/recipes-navigation/navit/navit/navit.xml | 45 -------- meta-oe/recipes-navigation/navit/navit/osd.xml | 15 --- meta-oe/recipes-navigation/navit/navit/plugins.xml | 6 -- meta-oe/recipes-navigation/navit/navit/speech.xml | 8 -- meta-oe/recipes-navigation/navit/navit_svn.bb | 11 -- 16 files changed, 477 deletions(-) delete mode 100644 meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb delete mode 100644 meta-oe/recipes-navigation/gypsy/files/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch delete mode 100644 meta-oe/recipes-navigation/gypsy/files/fixups.patch delete mode 100644 meta-oe/recipes-navigation/gypsy/gypsy.inc delete mode 100644 meta-oe/recipes-navigation/gypsy/gypsy_0.9.bb delete mode 100644 meta-oe/recipes-navigation/gypsy/gypsy_git.bb delete mode 100644 meta-oe/recipes-navigation/navit/navit-fpu.inc delete mode 100644 meta-oe/recipes-navigation/navit/navit.inc delete mode 100644 meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch delete mode 100644 meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch delete mode 100644 meta-oe/recipes-navigation/navit/navit/maps.xml delete mode 100644 meta-oe/recipes-navigation/navit/navit/navit.xml delete mode 100644 meta-oe/recipes-navigation/navit/navit/osd.xml delete mode 100644 meta-oe/recipes-navigation/navit/navit/plugins.xml delete mode 100644 meta-oe/recipes-navigation/navit/navit/speech.xml delete mode 100644 meta-oe/recipes-navigation/navit/navit_svn.bb (limited to 'meta-oe/recipes-navigation') diff --git a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb deleted file mode 100644 index d91cbcbbb3..0000000000 --- a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "FoxtrotGPS is a map and GPS application using OpenStreetMap" -AUTHOR = "Joshua Judson Rosen " -HOMEPAGE = "http://www.foxtrotgps.org/" -SECTION = "x11/applications" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "curl gtk+ libglade sqlite3 libexif gpsd bluez4 intltool-native" - -PNBLACKLIST[foxtrotgps] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}" - -SRC_URI = "http://www.foxtrotgps.org/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "6777d448ee9d3ba195f9d26ea90e3163" -SRC_URI[sha256sum] = "ae9706285510554cc0813ac92522e0d1672b0ddb065307bfacfcff3c328f6adb" - -inherit autotools pkgconfig perlnative gconf - -PR = "r2" - -do_configure_prepend() { - if [ -f ${S}/configure.in ] ; then - mv ${S}/configure.in ${S}/configure.ac - fi -} - -RDEPENDS_${PN} += "python perl" -RRECOMMENDS_${PN} = "gpsd" diff --git a/meta-oe/recipes-navigation/gypsy/files/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch b/meta-oe/recipes-navigation/gypsy/files/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch deleted file mode 100644 index 063bea618d..0000000000 --- a/meta-oe/recipes-navigation/gypsy/files/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5b859b6e7c82f49d967c25398a8e75b61af9bcc0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 12 Jun 2013 20:58:51 -0700 -Subject: [PATCH] g_type_init() is deprecated for glib >= 2.35.0 - -Call it for old versions. - -Signed-off-by: Khem Raj - -Upstream-Status: Pending ---- - examples/list-known-gps-devices.c | 4 ++-- - examples/simple-gps-dbus.c | 3 ++- - examples/simple-gps-gypsy.c | 4 ++-- - examples/simple-gps-satellites.c | 4 ++-- - gypsy/gypsy-marshal.c | 2 +- - src/main.c | 4 ++-- - 6 files changed, 11 insertions(+), 10 deletions(-) - -diff --git a/examples/list-known-gps-devices.c b/examples/list-known-gps-devices.c -index c7c4059..0a8b04b 100644 ---- a/examples/list-known-gps-devices.c -+++ b/examples/list-known-gps-devices.c -@@ -20,9 +20,9 @@ main (int argc, - GError *error = NULL; - GPtrArray *known_devices; - int i; -- -+#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); -- -+#endif - discovery = gypsy_discovery_new (); - known_devices = gypsy_discovery_list_devices (discovery, &error); - -diff --git a/examples/simple-gps-dbus.c b/examples/simple-gps-dbus.c -index f7044e6..76b18aa 100644 ---- a/examples/simple-gps-dbus.c -+++ b/examples/simple-gps-dbus.c -@@ -121,8 +121,9 @@ main (int argc, - DBusConnection *conn; - DBusError error; - GMainLoop *mainloop; -- -+#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); -+#endif - conn = get_connection (); - - dbus_error_init (&error); -diff --git a/examples/simple-gps-gypsy.c b/examples/simple-gps-gypsy.c -index 0b6b7a6..86033d9 100644 ---- a/examples/simple-gps-gypsy.c -+++ b/examples/simple-gps-gypsy.c -@@ -67,9 +67,9 @@ main (int argc, - g_print ("Usage: %s device\n", argv[0]); - return 0; - } -- -+#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); -- -+#endif - control = gypsy_control_get_default (); - path = gypsy_control_create (control, argv[1], &error); - if (path == NULL) { -diff --git a/examples/simple-gps-satellites.c b/examples/simple-gps-satellites.c -index 140c98f..9a3f95a 100644 ---- a/examples/simple-gps-satellites.c -+++ b/examples/simple-gps-satellites.c -@@ -42,9 +42,9 @@ main (int argc, - g_print ("Usage: %s device\n", argv[0]); - return 0; - } -- -+#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); -- -+#endif - control = gypsy_control_get_default (); - path = gypsy_control_create (control, argv[1], &error); - if (path == NULL) { -diff --git a/gypsy/gypsy-marshal.c b/gypsy/gypsy-marshal.c -index 6964644..9ac0095 100644 ---- a/gypsy/gypsy-marshal.c -+++ b/gypsy/gypsy-marshal.c -@@ -5,7 +5,7 @@ - - #ifdef G_ENABLE_DEBUG - #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) --#define g_marshal_value_peek_char(v) g_value_get_char (v) -+#define g_marshal_value_peek_char(v) g_value_get_schar (v) - #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) - #define g_marshal_value_peek_int(v) g_value_get_int (v) - #define g_marshal_value_peek_uint(v) g_value_get_uint (v) -diff --git a/src/main.c b/src/main.c -index 3e8a794..ec980e5 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -187,9 +187,9 @@ main (int argc, - g_option_context_free (context); - - umask (022); -- -+#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); -- -+#endif - mainloop = g_main_loop_new (NULL, FALSE); - - conn = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); --- -1.7.9.5 - diff --git a/meta-oe/recipes-navigation/gypsy/files/fixups.patch b/meta-oe/recipes-navigation/gypsy/files/fixups.patch deleted file mode 100644 index de4d92ea1b..0000000000 --- a/meta-oe/recipes-navigation/gypsy/files/fixups.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - docs/reference/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - ---- gypsy.orig/docs/reference/Makefile.am -+++ gypsy/docs/reference/Makefile.am -@@ -81,10 +81,12 @@ expand_content_files= - # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) - - INCLUDES=-I$(top_srcdir) $(GYPSY_CFLAGS) - GTKDOC_LIBS=$(top_builddir)/gypsy/libgypsy.la $(GYPSY_LIBS) - -+EXTRA_DIST = -+CLEANFILES = - # This includes the standard gtk-doc make rules, copied by gtkdocize. - include $(top_srcdir)/gtk-doc.make - - # Other files to distribute - # e.g. EXTRA_DIST += version.xml.in diff --git a/meta-oe/recipes-navigation/gypsy/gypsy.inc b/meta-oe/recipes-navigation/gypsy/gypsy.inc deleted file mode 100644 index 9efd35637b..0000000000 --- a/meta-oe/recipes-navigation/gypsy/gypsy.inc +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "GPS Multiplexing Daemon" -DESCRIPTION = "Gypsy is a GPS multiplexing daemon which allows \ -multiple clients to access GPS data from multiple GPS sources \ -concurrently. Gypsy also hides the details of parsing NMEA from the \ -client applications, passing the data as simple values for the clients \ -to use." -LICENSE = "GPLv2.0 & LGPLv2.1" -SECTION = "console/network" -DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt-native libxslt" - -PNBLACKLIST[gypsy] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}" - -inherit autotools pkgconfig gtk-doc -PACKAGES += "libgypsy" - -FILES_${PN} = " \ - ${sysconfdir}/gypsy.conf \ - ${sysconfdir}/dbus-1 \ - ${libexecdir}/gypsy-daemon \ - ${datadir}/dbus-1 \ -" - -FILES_libgypsy = " \ - ${libdir}/libgypsy${SOLIBS} \ -" diff --git a/meta-oe/recipes-navigation/gypsy/gypsy_0.9.bb b/meta-oe/recipes-navigation/gypsy/gypsy_0.9.bb deleted file mode 100644 index 24c8987ef9..0000000000 --- a/meta-oe/recipes-navigation/gypsy/gypsy_0.9.bb +++ /dev/null @@ -1,15 +0,0 @@ -require gypsy.inc - -PR = "r2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \ - file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd \ - file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd" - -SRC_URI += "http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz \ - file://0001-g_type_init-is-deprecated-for-glib-2.35.0.patch \ - " - -SRC_URI[md5sum] = "e2d186df9c2cc3b70a027043e22acf1a" -SRC_URI[sha256sum] = "14e1cbe17351f408538e033ca370b4bf51ccf9c88744e236ddfb271904f154d6" diff --git a/meta-oe/recipes-navigation/gypsy/gypsy_git.bb b/meta-oe/recipes-navigation/gypsy/gypsy_git.bb deleted file mode 100644 index 6ab16e6bee..0000000000 --- a/meta-oe/recipes-navigation/gypsy/gypsy_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -require gypsy.inc - -DEFAULT_PREFERENCE = "-1" - -SRCREV = "be8c9c382d2d1d37b51d29b0843045121ec90213" -PV = "0.9+git${SRCPV}" -PR = "r2" - -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \ - file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd \ - file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd" - -SRC_URI += "git://anongit.freedesktop.org/gypsy \ - file://fixups.patch" - -do_configure_prepend() { - # from patch 563716fc596d53f1085949a9dd11a62f39b2d624 - test -d ${S}/m4 || mkdir -p ${S}/m4 -} diff --git a/meta-oe/recipes-navigation/navit/navit-fpu.inc b/meta-oe/recipes-navigation/navit/navit-fpu.inc deleted file mode 100644 index 54b7a97793..0000000000 --- a/meta-oe/recipes-navigation/navit/navit-fpu.inc +++ /dev/null @@ -1,6 +0,0 @@ - -def get_navit_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft' ]: - return "--enable-avoid-float" - return "" - diff --git a/meta-oe/recipes-navigation/navit/navit.inc b/meta-oe/recipes-navigation/navit/navit.inc deleted file mode 100644 index 1c0bfdaae0..0000000000 --- a/meta-oe/recipes-navigation/navit/navit.inc +++ /dev/null @@ -1,95 +0,0 @@ -DESCRIPTION = "Navit is a car navigation system with routing engine." -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ed539d099d6ce08de6ea0dfed9ecb333 \ - file://LGPL-2;md5=3214f080875748938ba060314b4f727d \ - file://GPL-2;md5=751419260aa954499f7abaabaa882bbe \ -" - -SECTION = "x11/applications" -DEPENDS = "glib-2.0 gd gypsy librsvg-native" -RDEPENDS_${PN} = " ${PN}-icons ${PN}-config " -RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk" -RSUGGESTS_${PN} = "flite-alsa espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool" - -PE = "1" -INC_PR = "r11" - -# Depends on gypsy -PNBLACKLIST[navit] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}" - -inherit autotools gettext pkgconfig - -PACKAGECONFIG ?= "" -PACKAGECONFIG[fribidi] = "--enable-fribidi,--disable-fribidi,fribidi" -PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2" -PACKAGECONFIG[sdl] = "--enable-graphics-sdl,--disable-graphics-sdl,libsdl" -PACKAGECONFIG[gtk] = "--enable-graphics-gtk-drawing-area --enable-gui-gtk,--disable-graphics-gtk-drawing-area --disable-gui-gtk,gtk+" -PACKAGECONFIG[qt] = "--enable-graphics-qt-qpainter --enable-gui-qml,--disable-graphics-qt-qpainter --disable-gui-qml,qt4-x11-free,qt4-plugin-imageformat-svg" - -EXTRA_OECONF += " \ - --disable-binding-python \ - --disable-samplemap \ - --enable-avoid-unaligned \ - --enable-svg2png-scaling-flag=32 \ - --disable-speech-speech-dispatcher \ - --enable-cache-size=20971520 \ -" - -# --enable-avoid-float \ -#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -require navit-fpu.inc -EXTRA_OECONF += "${@get_navit_fpu_setting(bb, d)}" - -PACKAGES =+ "${PN}-maptool ${PN}-config ${PN}-dbus ${PN}-speech-cmdline ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-internal ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-gtk ${PN}-graphics-qt ${PN}-icons" - -EXTRA_AUTORECONF = " -I m4" - -CONFFILES_${PN}-config += "${datadir}/navit/navit.default.xml \ - ${datadir}/navit/navit.xml \ - ${datadir}/navit/maps.xml \ - ${datadir}/navit/osd.xml \ - ${datadir}/navit/speech.xml \ - ${datadir}/navit/plugins.xml \ -" - -SRC_URI += "file://navit.xml \ - file://maps.xml \ - file://osd.xml \ - file://speech.xml \ - file://plugins.xml \ -" - -FILES_${PN} += "${libdir}/${BPN}/*/*.so ${datadir}/icons" -FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug" -FILES_${PN}-maptool = " ${bindir}/maptool " -FILES_${PN}-config = " ${datadir}/navit/*.xml " -FILES_${PN}-dbus = " ${datadir}/dbus-1/services/ ${libdir}/${BPN}/binding/libbinding_dbus.so " -FILES_${PN}-speech-cmdline = " ${libdir}/${BPN}/speech/libspeech_cmdline.so " -FILES_${PN}-speech-dbus = " ${libdir}/${BPN}/speech/libspeech_dbus.so " -FILES_${PN}-gui-gtk = " ${libdir}/${BPN}/gui/libgui_gtk.so " -FILES_${PN}-gui-qml = " ${libdir}/${BPN}/gui/libgui_qml.so ${datadir}/navit/skins/ " -FILES_${PN}-gui-internal = " ${libdir}/${BPN}/gui/libgui_internal.so " -FILES_${PN}-graphics-sdl = " ${libdir}/${BPN}/graphics/libgraphics_sdl.so " -FILES_${PN}-graphics-qt = " ${libdir}/${BPN}/graphics/libgraphics_qt_qpainter.so " -FILES_${PN}-graphics-gtk = " ${libdir}/${BPN}/graphics/libgraphics_gtk_drawing_area.so " -FILES_${PN}-icons = "/usr/share/navit/xpm/" - -do_configure_prepend() { - # MOC=`$PKG_CONFIG QtGui --variable=moc_location` returns only /usr/bin/moc4 which is not available on hosts without Qt - sed -i "s#MOC=#MOC=${STAGING_DIR_NATIVE}#g" ${S}/configure.in -} - -do_install_append() { - # fix QA issue - sed -i 's#Categories=GTK;Utility;Geography;#Categories=Graphics;#g' ${D}${datadir}/applications/navit.desktop - - rm ${D}${libdir}/${BPN}/*/*.la - - #Use split config - mv ${D}${datadir}/navit/navit.xml ${D}${datadir}/navit/navit.default.xml - install -m 0644 ${WORKDIR}/navit.xml ${D}${datadir}/navit/navit.xml - install -m 0644 ${WORKDIR}/maps.xml ${D}${datadir}/navit/maps.xml - install -m 0644 ${WORKDIR}/osd.xml ${D}${datadir}/navit/osd.xml - install -m 0644 ${WORKDIR}/speech.xml ${D}${datadir}/navit/speech.xml - install -m 0644 ${WORKDIR}/plugins.xml ${D}${datadir}/navit/plugins.xml -} diff --git a/meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch b/meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch deleted file mode 100644 index be41792617..0000000000 --- a/meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/configure.in.orig 2014-05-10 15:57:18.146362110 +0200 -+++ b/configure.in 2014-05-10 15:59:27.859358845 +0200 -@@ -498,10 +498,13 @@ - AC_SUBST(FRIBIDI_CFLAGS) - AC_SUBST(FRIBIDI_LIBS) - -+AC_ARG_ENABLE(imlib2, [ --disable-imlib2 disable imlib2 support], imlib2=$enableval;imlib2_reason="configure parameter", imlib2=yes) -+if test x"${imlib2}" = "xyes"; then - PKG_CHECK_MODULES(IMLIB2, [imlib2], [imlib2_pkgconfig=yes], [imlib2_pkgconfig=no]) - if test "x$imlib2_pkgconfig" = "xyes"; then - AC_DEFINE(HAVE_IMLIB2, 1, [Define to 1 if you have imlib2]) - fi -+fi - AC_SUBST(IMLIB2_CFLAGS) - AC_SUBST(IMLIB2_LIBS) - diff --git a/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch b/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch deleted file mode 100644 index 288997bca5..0000000000 --- a/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Fix FTBFS caused by freetype headers path change. -Author: Gilles Filippini -Bug-Debian: http://bugs.debian.org/733378 -Index: navit/navit/font/freetype/font_freetype.c -=================================================================== ---- navit.orig/navit/font/freetype/font_freetype.c 2013-09-23 10:43:32.000000000 +0200 -+++ navit/navit/font/freetype/font_freetype.c 2013-12-30 19:54:45.000000000 +0100 -@@ -32,7 +32,7 @@ - #if USE_FRIBIDI - #include - #endif --#include -+#include - #include "point.h" - #include "graphics.h" - #include "debug.h" -diff -uNr navit.orig/navit/graphics/sdl/graphics_sdl.c navit/navit/graphics/sdl/graphics_sdl.c ---- navit.orig/navit/graphics/sdl/graphics_sdl.c 2012-06-22 14:16:01.000000000 +0200 -+++ navit/navit/graphics/sdl/graphics_sdl.c 2014-01-01 22:31:10.892948164 +0100 -@@ -84,7 +84,7 @@ - #else - #include - #include FT_FREETYPE_H --#include -+#include - #endif - #include - diff --git a/meta-oe/recipes-navigation/navit/navit/maps.xml b/meta-oe/recipes-navigation/navit/navit/maps.xml deleted file mode 100644 index 6f59f20c39..0000000000 --- a/meta-oe/recipes-navigation/navit/navit/maps.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/meta-oe/recipes-navigation/navit/navit/navit.xml b/meta-oe/recipes-navigation/navit/navit/navit.xml deleted file mode 100644 index 58c8c226f2..0000000000 --- a/meta-oe/recipes-navigation/navit/navit/navit.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/meta-oe/recipes-navigation/navit/navit/osd.xml b/meta-oe/recipes-navigation/navit/navit/osd.xml deleted file mode 100644 index 2d0f9ffdf4..0000000000 --- a/meta-oe/recipes-navigation/navit/navit/osd.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - diff --git a/meta-oe/recipes-navigation/navit/navit/plugins.xml b/meta-oe/recipes-navigation/navit/navit/plugins.xml deleted file mode 100644 index 015b05517f..0000000000 --- a/meta-oe/recipes-navigation/navit/navit/plugins.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/meta-oe/recipes-navigation/navit/navit/speech.xml b/meta-oe/recipes-navigation/navit/navit/speech.xml deleted file mode 100644 index 28c49906d9..0000000000 --- a/meta-oe/recipes-navigation/navit/navit/speech.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/meta-oe/recipes-navigation/navit/navit_svn.bb b/meta-oe/recipes-navigation/navit/navit_svn.bb deleted file mode 100644 index bdfbb4b62e..0000000000 --- a/meta-oe/recipes-navigation/navit/navit_svn.bb +++ /dev/null @@ -1,11 +0,0 @@ -require navit.inc - -SRCREV = "5310" -PV = "0.2.0+svnr${SRCPV}" -PR = "${INC_PR}.3" - -S = "${WORKDIR}/${BPN}" -SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;protocol=http \ - file://freetype-include-path.patch \ - file://configure.add.imlib2.option.patch \ -" -- cgit 1.2.3-korg