Update Navit to simplified version

Speedsaver · Nov 22, 2022 · b50ebc6 · b50ebc6
1 parent 7fcf1e6
commit b50ebc6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7,413 deletions.
diff --git a/board/speedsaver/rootfs_overlay/etc/systemd/system/navit.service b/board/speedsaver/rootfs_overlay/etc/systemd/system/navit.service
diff --git a/board/speedsaver/rootfs_overlay/usr/share/navit/navit.xml b/board/speedsaver/rootfs_overlay/usr/share/navit/navit.xml
diff --git a/board/speedsaver/rootfs_overlay/usr/share/navit/tone7.wav b/board/speedsaver/rootfs_overlay/usr/share/navit/tone7.wav
diff --git a/configs/speedsaver_defconfig b/configs/speedsaver_defconfig
@@ -75,5 +75,3 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_SPEEDSAVER_LICHEE_PATH)/board/speedsaver/utilities/boot.cmd"
 BR2_PACKAGE_CURTAIL=y
 BR2_PACKAGE_NAVIT=y
-BR2_PACKAGE_NAVIT_SPEEDSAVER=y
-BR2_PACKAGE_NAVIT_VEHICLE_GPSD=y
diff --git a/packages/navit/Config.in b/packages/navit/Config.in
@@ -1,50 +1,9 @@
 config BR2_PACKAGE_NAVIT
-	bool "navit"
-	help
-	  The OpenSource vector based navigation software
-
-	  http://www.navit-project.org
-
-if BR2_PACKAGE_NAVIT
-
-config BR2_PACKAGE_NAVIT_GTK2
-	bool "enable GTK2 graphics driver"
-	select BR2_PACKAGE_LIBGTK2
-	select BR2_PACKAGE_XORG7
-	help
-	  Enable the gtk2 (gtk_drawing_area) graphics driver
-
-config BR2_PACKAGE_NAVIT_QT5
-	bool "enable QT5 graphics driver"
-	select BR2_PACKAGE_QT5DECLARATIVE
-	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-	select BR2_PACKAGE_QT5SVG
-	help
-	  Enable the QT5 (qml2) graphics driver
-
-config BR2_PACKAGE_NAVIT_SPEEDSAVER
-	bool "enable the speedsaver build"
+	bool "Speedsaver navit"
 	select BR2_PACKAGE_ARDUIPI_OLED
 	select BR2_PACKAGE_LIBGLIB2
-	help
-	  Enable the speedsaver build
-
-config BR2_PACKAGE_NAVIT_SPOTIFY_PLAYER
-	bool "enabled spotify player"
-	select BR2_PACKAGE_ALSA_LIB
-	select BR2_PACKAGE_LIBSPOTIFY
-	help
-	  Enable spotify player and alsa output
-
-config BR2_PACKAGE_NAVIT_J1850_PLUGIN
-	bool "enabled the j1850 plugin"
-	help
-	  Enable the SAE-J1850 plugin
-
-config BR2_PACKAGE_NAVIT_VEHICLE_GPSD
-	bool "enabled gpsd vehicle"
 	select BR2_PACKAGE_GPSD
 	help
-	  Enable the GPSD vehicle
+	  The OpenSource vector based navigation software
 
-endif
+	  http://www.navit-project.org
diff --git a/packages/navit/navit.mk b/packages/navit/navit.mk
@@ -4,47 +4,9 @@
 #
 ################################################################################
 
-NAVIT_VERSION = trunk
-NAVIT_SITE = git://github.com/navit-gps/navit
-NAVIT_LICENSE = GPL-2
-NAVIT_DEPENDENCIES = host-pkgconf
-NAVIT_MAKE = $(MAKE1)
-NAVIT_CONF_OPTS = -DSVG2PNG=FALSE -DLIBDIR=/usr/lib -DSAMPLE_MAP=0 -DCMAKE_EXE_LINKER_FLAGS=-Wl,--export-dynamic
-
-ifeq ($(BR2_PACKAGE_NAVIT_GTK2),y)
-NAVIT_DEPENDENCIES += libgtk2
-NAVIT_CONF_OPTS += -Dgraphics/gtk_drawing_area=1
-else
-NAVIT_CONF_OPTS += -Dgraphics/gtk_drawing_area=0
-endif
-
-ifeq ($(BR2_PACKAGE_NAVIT_QT5),y)
-NAVIT_DEPENDENCIES += qt5svg qt5declarative
-NAVIT_CONF_OPTS += -Dgraphics/qt5=1
-else
-NAVIT_CONF_OPTS += -DDISABLE_QT=1 -Dgraphics/qt5=0 -Dvehicle/qt5=0
-endif
-
-ifeq ($(BR2_PACKAGE_NAVIT_SPEEDSAVER),y)
-NAVIT_VERSION = 81714d7ecdcc392f73c613f42d3acf0d02b5f7ad
+NAVIT_VERSION = aa7181cd5dbccabd527f98bdf244125897be5f9b
 NAVIT_SITE = $(call github,speedsaver,navit,$(NAVIT_VERSION))
-NAVIT_DEPENDENCIES += arduipi-oled libglib2
-NAVIT_CONF_OPTS += -Dspeech/cmdline=0 -Dmap/textfile=0 -Dgui/internal=0 -DUSE_NATIVE_LANGUAGE_SUPPORT=0
-endif
-
-ifeq ($(BR2_PACKAGE_NAVIT_SPOTIFY_PLAYER),y)
-NAVIT_VERSION = audio
-NAVIT_DEPENDENCIES += alsa-lib libspotify
-NAVIT_CONF_OPTS += -DUSE_AUDIO_FRAMEWORK=1
-endif
-
-ifeq ($(BR2_PACKAGE_NAVIT_VEHICLE_GPSD),y)
-NAVIT_DEPENDENCIES += gpsd
-NAVIT_CONF_OPTS += -Dvehicle/gpsd=1
-endif
-
-ifeq ($(BR2_PACKAGE_NAVIT_J1850_PLUGIN),y)
-NAVIT_CONF_OPTS += -Dplugin/j1850=1
-endif
+NAVIT_LICENSE = GPL-2
+NAVIT_DEPENDENCIES = host-pkgconf arduipi-oled libglib2 gpsd
 
-$(eval $(cmake-package))
+$(eval $(meson-package))