bluez4: remove bluez4-only recipes
RFC PATCH 1/1 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.--- .../bluez/bluez-hcidump_2.5.bb | 24 ----- .../bluez/bluez4-4.101/bluetooth.conf | 16 --- .../bluez/bluez4-4.101/fix-udev-paths.patch | 37 ------- .../bluez/bluez4-4.101/fix_encrypt_collision.patch | 110 -------------------- .../bluez/bluez4-4.101/install-test-script.patch | 26 ----- ...ork-fix-network-Connect-method-parameters.patch | 30 ------ .../bluez4-4.101/obsolete_automake_macros.patch | 14 --- .../bluez/bluez4-4.101/sbc_mmx.patch | 24 ----- meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb | 50 --------- .../bluez/gst-plugin-bluetooth_4.101.bb | 41 -------- .../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 -- .../recipes-support/opensync/libsyncml_0.5.4.bb | 21 ---- 27 files changed, 870 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb delete mode 100644 meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb 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 delete mode 100644 meta-oe/recipes-support/opensync/libsyncml_0.5.4.bb
meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb deleted +0 -24
@@ -1,24 +0,0 @@ -SUMMARY = "Linux Bluetooth Stack HCI Debugger Tool" -DESCRIPTION = "The hcidump tool reads raw HCI data coming from and going to a Bluetooth device \ -and displays the commands, events and data in a human-readable form." - -SECTION = "console" -# hcidump was integrated into bluez5 -DEPENDS = "bluez4" -RCONFLICTS_${PN} = "bluez5" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ - file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf" -PR = "r1" - -PNBLACKLIST[bluez-hcidump] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}" - -SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz \ - file://obsolete_automake_macros.patch \ -" - -SRC_URI[md5sum] = "2eab54bbd2b59a2ed4274ebb9390cf18" -SRC_URI[sha256sum] = "9b7c52b375081883738cf049ecabc103b97d094b19c6544fb241267905d88881" -S = "${WORKDIR}/bluez-hcidump-${PV}" - -inherit autotools
meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf deleted +0 -16
@@ -1,16 +0,0 @@ -<!-- This configuration file specifies the required security policies - for Bluetooth core daemon to work. --> - -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - - <!-- ../system.conf have denied everything, so we just punch some holes --> - - <policy context="default"> - <allow own="org.bluez"/> - <allow send_destination="org.bluez"/> - <allow send_interface="org.bluez.Agent"/> - </policy> - -</busconfig>
meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch deleted +0 -37
@@ -1,37 +0,0 @@ -Add udevdir/udevrulesdir options - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Constantin Musca <[email protected]> - -Index: bluez-4.101/Makefile.am -=================================================================== ---- bluez-4.101.orig/Makefile.am -+++ bluez-4.101/Makefile.am -@@ -395,7 +395,7 @@ EXTRA_DIST += audio/bluetooth.conf - include Makefile.tools - - if DATAFILES --rulesdir = @UDEV_DIR@/rules.d -+rulesdir = @UDEV_RULES_DIR@ - - udev_files = - -Index: bluez-4.101/configure.ac -=================================================================== ---- bluez-4.101.orig/configure.ac -+++ bluez-4.101/configure.ac -@@ -61,4 +61,14 @@ if (test -n "${path_systemdunit}"); then - fi - AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}") - -+AC_ARG_WITH([udevdir], -+ AS_HELP_STRING([--with-udevdir=DIR], [udev directory]), -+ [], [with_udevdir=/lib/udev/]) -+AC_SUBST([UDEV_DIR], [$with_udevdir]) -+ -+AC_ARG_WITH([udevrulesdir], -+ AS_HELP_STRING([--with-udevrulesdir=DIR], [udev rules directory]), -+ [], [with_udevrulesdir=/lib/udev/rules.d]) -+AC_SUBST([UDEV_RULES_DIR], [$with_udevrulesdir]) -+ - AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 src/bluetooth.service bluez.pc)
meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch deleted +0 -110
110 lines not on this page · raw message
meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch deleted +0 -26
@@ -1,26 +0,0 @@ -Upstream-Status: Inappropriate - -Install the bluez's test scripts - -Signed-off-by: Zhong Hongbo <[email protected]> -diff -Nurd bluez-4.101.orig/Makefile.tools bluez-4.101/Makefile.tools ---- bluez-4.101.orig/Makefile.tools 2013-11-19 15:49:07.688838000 +0800 -+++ bluez-4.101/Makefile.tools 2013-11-19 15:50:09.256837848 +0800 -@@ -227,6 +227,17 @@ - test/service-spp.xml test/service-opp.xml test/service-ftp.xml \ - test/simple-player test/test-nap - -+bluez4_testdir = $(libdir)/bluez4/test/ -+dist_bluez4_test_SCRIPTS = test/sap-client test/hsplay test/hsmicro \ -+ test/monitor-bluetooth test/list-devices \ -+ test/test-discovery test/test-manager test/test-adapter \ -+ test/test-device test/test-service test/test-serial \ -+ test/test-telephony test/test-network test/simple-agent \ -+ test/simple-service test/simple-endpoint test/test-audio \ -+ test/test-input test/test-sap-server test/test-oob \ -+ test/test-attrib test/test-proximity test/test-thermometer \ -+ test/test-serial-proxy test/test-health test/test-health-sink \ -+ test/simple-player test/test-nap - if HIDD - bin_PROGRAMS += compat/hidd -
meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch deleted +0 -30
@@ -1,30 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Peter A. Bigot <[email protected]> - -From 57170b311f1468330f4a9961dc0b3ac45f97bc13 Mon Sep 17 00:00:00 2001 -From: Gustavo Padovan <[email protected]> -Date: Sat, 30 Jun 2012 00:39:05 -0300 -Subject: [PATCH] network: fix network Connect() method parameters - ---- - network/connection.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/network/connection.c b/network/connection.c -index 544ec3a..59423a9 100644 ---- a/network/connection.c -+++ b/network/connection.c -@@ -554,7 +554,9 @@ static void path_unregister(void *data) - - static const GDBusMethodTable connection_methods[] = { - { GDBUS_ASYNC_METHOD("Connect", -- NULL, NULL, connection_connect) }, -+ GDBUS_ARGS({"uuid", "s"}), -+ GDBUS_ARGS({"interface", "s"}), -+ connection_connect) }, - { GDBUS_METHOD("Disconnect", - NULL, NULL, connection_disconnect) }, - { GDBUS_METHOD("GetProperties", --- -1.7.9.5 -
meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch deleted +0 -14
@@ -1,14 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Marko Lindqvist <[email protected]> -diff -Nurd bluez-4.101/configure.ac bluez-4.101/configure.ac ---- bluez-4.101/configure.ac 2012-06-22 19:36:49.000000000 +0300 -+++ bluez-4.101/configure.ac 2013-01-07 06:13:18.385888966 +0200 -@@ -2,7 +2,7 @@ - AC_INIT(bluez, 4.101) - - AM_INIT_AUTOMAKE([foreign subdir-objects color-tests]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch deleted +0 -24
@@ -1,24 +0,0 @@ -on x86 and x86_64 gcc 4.7 complains - -sbc/sbc_primitives_mmx.c: In function 'sbc_calc_scalefactors_mmx': -sbc/sbc_primitives_mmx.c:294:4: warning: asm operand 2 probably doesn't match constraints [enabled by default] -sbc/sbc_primitives_mmx.c:294:4: error: impossible constraint in 'asm' - -This patch is taken from https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/911871 - -Signed-off-by: Khem Raj <[email protected]> - -Upstream-Status: Pending -Index: bluez-4.98/sbc/sbc_primitives_mmx.c -=================================================================== ---- bluez-4.98.orig/sbc/sbc_primitives_mmx.c 2011-12-21 14:53:54.000000000 -0800 -+++ bluez-4.98/sbc/sbc_primitives_mmx.c 2012-02-24 10:07:03.422073800 -0800 -@@ -318,7 +318,7 @@ - "movl %k0, 4(%3)\n" - : "+r" (blk) - : "r" (&sb_sample_f[0][ch][sb]), -- "i" ((char *) &sb_sample_f[1][0][0] - -+ "r" ((char *) &sb_sample_f[1][0][0] - - (char *) &sb_sample_f[0][0][0]), - "r" (&scale_factor[ch][sb]), - "r" (&consts),
meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb deleted +0 -50
50 lines not on this page · raw message
meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb deleted +0 -41
41 lines not on this page · raw message
meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb deleted +0 -26
@@ -1,26 +0,0 @@ -SUMMARY = "FoxtrotGPS is a map and GPS application using OpenStreetMap" -AUTHOR = "Joshua Judson Rosen <[email protected]>" -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"
meta-oe/recipes-navigation/gypsy/files/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch deleted +0 -114
114 lines not on this page · raw message
meta-oe/recipes-navigation/gypsy/files/fixups.patch deleted +0 -21
@@ -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
meta-oe/recipes-navigation/gypsy/gypsy.inc deleted +0 -25
@@ -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} \ -"
meta-oe/recipes-navigation/gypsy/gypsy_0.9.bb deleted +0 -15
@@ -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"
meta-oe/recipes-navigation/gypsy/gypsy_git.bb deleted +0 -22
@@ -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 -}
meta-oe/recipes-navigation/navit/navit-fpu.inc deleted +0 -6
@@ -1,6 +0,0 @@ - -def get_navit_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft' ]: - return "--enable-avoid-float" - return "" -
meta-oe/recipes-navigation/navit/navit.inc deleted +0 -95
95 lines not on this page · raw message
meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch deleted +0 -16
@@ -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) -
meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch deleted +0 -28
@@ -1,28 +0,0 @@ -Description: Fix FTBFS caused by freetype headers path change. -Author: Gilles Filippini <[email protected]> -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 <fribidi.h> - #endif --#include <freetype/ftglyph.h> -+#include <ftglyph.h> - #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 <ft2build.h> - #include FT_FREETYPE_H --#include <freetype/ftglyph.h> -+#include <ftglyph.h> - #endif - #include <event.h> -
meta-oe/recipes-navigation/navit/navit/maps.xml deleted +0 -24
@@ -1,24 +0,0 @@ - <!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line and set the path correctly --> - <mapset enabled="no"> - <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map"/> - <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp1.smp"/> - <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp2.smp"/> - <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp3.smp"/> - <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp4.smp"/> - <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp5.smp"/> - </mapset> - - <!-- If you dont want to use the sample map, either set enabled="no" in the next line or remove the xml file from the maps directory --> - <mapset enabled="no"> - <xi:include href="$NAVIT_SHAREDIR/maps/*.xml"/> - </mapset> - - <!-- Mapset template for openstreetmaps --> - <mapset enabled="yes"> - <map type="binfile" enabled="yes" data="/media/mmc2/MapsNavit/osm_europe.bin"/> - </mapset> - - <!-- Mapset template for garmin maps --> - <mapset enabled="no"> - <map type="garmin" enabled="yes" data="/path/to/img" debug="4"/> - </mapset>
meta-oe/recipes-navigation/navit/navit/navit.xml deleted +0 -45
45 lines not on this page · raw message
meta-oe/recipes-navigation/navit/navit/osd.xml deleted +0 -15
@@ -1,15 +0,0 @@ - <!-- osd items allow to position display and control items directly on top of the map: --> - <osd enabled="no" type="compass"/> - <osd enabled="no" type="eta"/> - <osd enabled="no" type="navigation_distance_to_target"/> - <osd enabled="no" type="navigation"/> - <osd enabled="no" type="navigation_distance_to_next"/> - <osd enabled="no" type="navigation_next_turn"/> - - <!-- Commands include gui_internal_menu, gui_internal_fullscreen, zoom_in and zoom_out. - Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner. - It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. --> - <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen()" src="toggle_fullscreen.xpm"/> - <osd enabled="no" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/> - <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/> - <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.xpm"/>
meta-oe/recipes-navigation/navit/navit/plugins.xml deleted +0 -6
@@ -1,6 +0,0 @@ -<plugins> - <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so" ondemand="yes"/> - <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/> - <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so" active="yes"/> - <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/> -</plugins>
meta-oe/recipes-navigation/navit/navit/speech.xml deleted +0 -8
@@ -1,8 +0,0 @@ - <!-- Navit provides speech output in text format. - If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second. - The default is text output to the shell --> - <!-- <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/> --> - <!-- <speech type="cmdline" data="espeak -s 150 -v czech '%s' &"/> --> - <!-- <speech type="cmdline" data="flite -t '%s'"/> --> - <!-- <speech type="cmdline" data="/usr/local/bin/say.sh '%s'"/> --> - <speech type="cmdline" data="espeak '%s' &"/>
meta-oe/recipes-navigation/navit/navit_svn.bb deleted +0 -11
@@ -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://[email protected]/svnroot/navit/trunk;module=navit;protocol=http \ - file://freetype-include-path.patch \ - file://configure.add.imlib2.option.patch \ -"
meta-oe/recipes-support/opensync/libsyncml_0.5.4.bb deleted +0 -21
@@ -1,21 +0,0 @@ -SUMMARY = "Libsyncml is an implementation of the SyncML protocol" -HOMEPAGE = "https://libsyncml.opensync.org/" -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" - -DEPENDS = "libxml2 glib-2.0 libsoup-2.4 openobex wbxml2" - -# Depends on openobex -PNBLACKLIST[libsyncml] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libsyncml/libsyncml-${PV}.tar.gz" -SRC_URI[md5sum] = "84879ed7cb94618530fbcb801a1a4f95" -SRC_URI[sha256sum] = "05d6513637adb1300a3a58b6e29d53ab6373c8f370807d0d925bae72b2920e53" - -inherit cmake pkgconfig - -PACKAGES += "${PN}-tools" - -FILES_${PN}-tools = "${bindir}" -FILES_${PN} = "${libdir}/*.so.*"
Signature · 1 line
2.13.3
Quoted 9 lines · Martin Jansa
* 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 inDISTRO_FEATURESwill need to add meta-bluez4 layer to satisfy bluez4 dependency
Sounds reasonable.
Signature · 2 lines
# Randy MacLeod. SMTS, Linux, Wind River Direct: 613.963.1350 | 350 Terry Fox Drive, Suite 200, Ottawa, ON, Canada, K2K 2W5