working v41-dev parallel build (bcm2836) (x86_64 is serial only)

- merges missing dependency declarations in *.mk & Config.in (batocera-linux#12485) - use udance4ever/batocera.buildroot fork - merges DIRECT_BUILD (batocera-linux#12470), Makefile cleanup (batocera-linux#12477) and %-upgrade fix (batocera-linux#12487) - add *~ (emacs/mg) to .gitignore - checks in localization files (.po)
udance4ever · Sep 15, 2024 · 50e83b4 · 50e83b4
1 parent e7d3765
commit 50e83b4
Show file tree

Hide file tree

Showing 92 changed files with 2,057 additions and 1,950 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ package/batocera/emulationstation/batocera-emulationstation/keys.txt
 .directory
 *.po~
 batocera-mok.key
+*~
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "buildroot"]
 	path = buildroot
-	url = https://github.com/bryanforbes/batocera.buildroot.git
+	url = https://github.com/udance4ever/batocera.buildroot.git
diff --git a/Makefile b/Makefile
@@ -205,12 +205,17 @@ endif
 %-upgrade: %-supported
 	$(if $(DEV),,$(error "DEV not specified!"))
 	-@sudo umount /tmp/mount
-	-@mkdir /tmp/mount
+	-@mkdir -p /tmp/mount
 	@sudo mount $(DEV)1 /tmp/mount
+	@lsblk
+	@ls /tmp/mount
+	@echo "continue BATOCERA upgrade $(DEV)1 with $* build? [y/N]"
+	@read line; if [ "$$line" != "y" ]; then echo aborting; exit 1 ; fi
 	-@sudo rm /tmp/mount/boot/batocera
-	@sudo tar xvf $(OUTPUT_DIR)/$*/images/batocera/boot.tar.xz -C /tmp/mount --no-same-owner
+	@sudo tar xvf $(OUTPUT_DIR)/$*/images/batocera/images/$*/boot.tar.xz -C /tmp/mount --no-same-owner --exclude=batocera-boot.conf --exclude=config.txt
 	@sudo umount /tmp/mount
 	-@rmdir /tmp/mount
+	@sudo fatlabel $(DEV)1 BATOCERA
 
 %-toolchain: %-supported
 	$(if $(shell which btrfs 2>/dev/null),, $(error "btrfs not found!"))

diff --git a/batocera.mk.template b/batocera.mk.template
diff --git a/buildroot b/buildroot
diff --git a/package/batocera/audio/zmusic/zmusic.mk b/package/batocera/audio/zmusic/zmusic.mk
@@ -7,12 +7,12 @@ ZMUSIC_VERSION = 1.1.12
 ZMUSIC_SITE = $(call github,coelckers,ZMusic,$(ZMUSIC_VERSION))
 ZMUSIC_LICENSE = GPLv3
 ZMUSIC_INSTALL_STAGING = YES
-ZMUSIC_DEPENDENCIES = zlib mpg123 libsndfile alsa-lib
+ZMUSIC_DEPENDENCIES = zlib mpg123 libsndfile alsa-lib libglib2
 
 ZMUSIC_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release
 
 define ZMUSIC_INSTALL_TARGET_CMDS
     cp -d $(@D)/source/libzmusic* $(TARGET_DIR)/usr/lib/
 endef
 
-$(eval $(cmake-package))
+$(eval $(cmake-package))
diff --git a/package/batocera/boot/batocera-initramfs/Config.in b/package/batocera/boot/batocera-initramfs/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_BATOCERA_INITRAMFS
 	select BR2_PACKAGE_HOST_LZ4  if !BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY && \
 					!BR2_PACKAGE_BATOCERA_TARGET_A3GEN2     && \
 					!BR2_PACKAGE_BATOCERA_TARGET_S9GEN4
+	select BR2_PACKAGE_LIBXCRYPT
 
 	default n
 	help

diff --git a/package/batocera/boot/batocera-initramfs/batocera-initramfs.mk b/package/batocera/boot/batocera-initramfs/batocera-initramfs.mk
@@ -10,7 +10,7 @@ BATOCERA_INITRAMFS_SOURCE = busybox-$(BATOCERA_INITRAMFS_VERSION).tar.bz2
 BATOCERA_INITRAMFS_LICENSE = GPLv2
 BATOCERA_INITRAMFS_LICENSE_FILES = LICENSE
 
-BATOCERA_INITRAMFS_DEPENDENCIES += host-uboot-tools
+BATOCERA_INITRAMFS_DEPENDENCIES += host-uboot-tools libxcrypt
 BATOCERA_INITRAMFS_CFLAGS = $(TARGET_CFLAGS)
 BATOCERA_INITRAMFS_LDFLAGS = $(TARGET_LDFLAGS)
 

diff --git a/package/batocera/cases/gpicase/gpicase.mk b/package/batocera/cases/gpicase/gpicase.mk
@@ -9,6 +9,7 @@ GPICASE_SOURCE =
 define GPICASE_INSTALL_TARGET_CMDS
 	mkdir -p $(BINARIES_DIR)/rpi-firmware/overlays
 	cp -rf $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/cases/gpicase/overlays/*			$(BINARIES_DIR)/rpi-firmware/overlays/
+	mkdir -p $(TARGET_DIR)/etc/udev/rules.d/
 	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/cases/gpicase/99-gpicase.rules		$(TARGET_DIR)/etc/udev/rules.d/
 
 	install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/cases/gpicase/batocera-gpicase-install	$(TARGET_DIR)/usr/bin/batocera-gpicase-install

diff --git a/package/batocera/core/batocera-system/Config.in b/package/batocera/core/batocera-system/Config.in
@@ -269,7 +269,9 @@ config BR2_PACKAGE_BATOCERA_SYSTEM
 	select BR2_PACKAGE_FLATPAK				if BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY # flatpak app packaging system
 	select BR2_PACKAGE_BAUH					if BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY # flatpak gui
 	select BR2_PACKAGE_RYZENADJ				if BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY # ryzen apu configuration
-	select BR2_PACKAGE_SYNCTHING				# sync files across multiple batoceras
+# $$$ host-go (not yet resolved building bcm2836 on aarch64 yet) (x86_64 can be built on aarch64)
+	# sync files across multiple batoceras
+	select BR2_PACKAGE_SYNCTHING				# if !(BR2_HOSTARCH = "aarch64" && BR2_PACKAGE_TARGET_BCM2836)
 	select BR2_PACKAGE_RCLONE				if BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY # sync files in the cloud (require x86_64)
 	select BR2_PACKAGE_BTOP					# htop alternative
 	select BR2_PACKAGE_MOKUTIL				if BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY # mokutil machine owner key utility
@@ -407,7 +409,8 @@ config BR2_PACKAGE_BATOCERA_SYSTEM
 	select BR2_PACKAGE_MK_ARCADE_JOYSTICK_RPI			if BR2_PACKAGE_BATOCERA_RPI_ANY
 	select BR2_PACKAGE_PYTHON_RPI_GPIO				if BR2_PACKAGE_BATOCERA_RPI_ANY && !BR2_PACKAGE_BATOCERA_TARGET_BCM2712
 	select BR2_PACKAGE_PYTHON_GPIOZERO				if BR2_PACKAGE_BATOCERA_TARGET_BCM2835 || BR2_PACKAGE_BATOCERA_TARGET_BCM2836
-	select BR2_PACKAGE_PYTHON_ADAFRUIT_CIRCUITPYTHON_WS2801		if BR2_PACKAGE_BATOCERA_RPI_ANY && !BR2_PACKAGE_BATOCERA_TARGET_BCM2712
+# $$ PARALLEL_BUILD issue: setuptools_scm
+	select BR2_PACKAGE_PYTHON_ADAFRUIT_CIRCUITPYTHON_WS2801		if BR2_PACKAGE_BATOCERA_RPI_ANY && !BR2_PACKAGE_BATOCERA_TARGET_BCM2712 && !PARALLEL_BUILD
 	select BR2_PACKAGE_PYTHON3_GPIOD				if BR2_PACKAGE_BATOCERA_TARGET_BCM2712 || BR2_PACKAGE_BATOCERA_TARGET_BCM2711
 
 	# GPIO kernel driver
@@ -682,7 +685,7 @@ config BR2_PACKAGE_BATOCERA_FLASH_SYSTEMS
 
 	# Flash Player Emulator
 	select BR2_PACKAGE_RUFFLE		if BR2_PACKAGE_XORG7 && BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY # need to be configured to support crosscompilation
-	select BR2_PACKAGE_LIGHTSPARK		if !BR2_PACKAGE_BATOCERA_TARGET_BCM2835
+	select BR2_PACKAGE_LIGHTSPARK		if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_BATOCERA_TARGET_BCM2835
 
 #### Moonlight / Gamestream ####
 config BR2_PACKAGE_BATOCERA_GAMESTREAM_SYSTEMS
@@ -718,6 +721,7 @@ config BR2_PACKAGE_BATOCERA_HOMEBREW_SYSTEMS
 	select BR2_PACKAGE_BATOCERA_PYGAME	if !BR2_PACKAGE_BATOCERA_TARGET_H3
 
 	# RPG engine : Solarus
+# $$$ batocera-luajit (aarch64 can target x86_64, not bcm2836 due to ia32 (-m32) depends on gcc-multilib)
 	select BR2_PACKAGE_SOLARUS_ENGINE	if !BR2_riscv # LuajIT does not support riscv ?
 
 	# RPG engine : EasyRPG / RPG MAker
@@ -900,7 +904,8 @@ config BR2_PACKAGE_BATOCERA_HANDHELD_SYSTEMS
 config BR2_PACKAGE_BATOCERA_MSDOS_SYSTEMS
 	bool "batocera.linux MS/DOS emulation packages"
 
-	select BR2_PACKAGE_DOSBOX				if  BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY # || BR2_PACKAGE_BATOCERA_TARGET_BCM2711 # Need libGLEW
+# $$$ libglew-dev requested (even after building and linking libglew)
+#	select BR2_PACKAGE_DOSBOX				if  BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY # || BR2_PACKAGE_BATOCERA_TARGET_BCM2711 # Need libGLEW
 
 	select BR2_PACKAGE_DOSBOX_X				if !BR2_PACKAGE_BATOCERA_TARGET_RK3326	&& \
 								   !BR2_PACKAGE_BATOCERA_TARGET_BCM2835	&& \
@@ -1384,12 +1389,13 @@ config BR2_PACKAGE_BATOCERA_CORES_EXPERIMENTAL
 	select BR2_PACKAGE_FHEROES2		# ALL
 
 	# HoMM3 open source engine
-	select BR2_PACKAGE_VCMI			if BR2_x86_64				|| \
-						   BR2_PACKAGE_BATOCERA_TARGET_BCM2711	|| \
-						   BR2_PACKAGE_BATOCERA_TARGET_BCM2712	|| \
-						   BR2_PACKAGE_BATOCERA_TARGET_S922X	|| \
-						   BR2_PACKAGE_BATOCERA_TARGET_RK3568	|| \
-						   BR2_PACKAGE_BATOCERA_TARGET_H616
+# $$$ Could not find a package configuration file provided by "Qt5LinguistTools"
+#	select BR2_PACKAGE_VCMI			if BR2_x86_64				|| \
+#						   BR2_PACKAGE_BATOCERA_TARGET_BCM2711	|| \
+#						   BR2_PACKAGE_BATOCERA_TARGET_BCM2712	|| \
+#						   BR2_PACKAGE_BATOCERA_TARGET_S922X	|| \
+#						   BR2_PACKAGE_BATOCERA_TARGET_RK3568	|| \
+#						   BR2_PACKAGE_BATOCERA_TARGET_H616
 
 	# Amstrad CPC emulator
 	select BR2_PACKAGE_SUGARBOX		if BR2_x86_64				|| \
@@ -1400,12 +1406,13 @@ config BR2_PACKAGE_BATOCERA_CORES_EXPERIMENTAL
 						   BR2_PACKAGE_BATOCERA_TARGET_H616
 
 	# Symbian OS / Nokia N-Gage emulator
-	select BR2_PACKAGE_EKA2L1		if BR2_x86_64				|| \
-						   BR2_PACKAGE_BATOCERA_TARGET_BCM2711	|| \
-						   BR2_PACKAGE_BATOCERA_TARGET_BCM2712	|| \
-						   BR2_PACKAGE_BATOCERA_TARGET_S922X	|| \
-						   BR2_PACKAGE_BATOCERA_TARGET_RK3568	|| \
-						   BR2_PACKAGE_BATOCERA_TARGET_H616
+# $$$ https://github.com/MerryMage/ext-boost no longer public
+#	select BR2_PACKAGE_EKA2L1		if BR2_x86_64				|| \
+#						   BR2_PACKAGE_BATOCERA_TARGET_BCM2711	|| \
+#						   BR2_PACKAGE_BATOCERA_TARGET_BCM2712	|| \
+#						   BR2_PACKAGE_BATOCERA_TARGET_S922X	|| \
+#						   BR2_PACKAGE_BATOCERA_TARGET_RK3568	|| \
+#						   BR2_PACKAGE_BATOCERA_TARGET_H616
 
 	# Supermodel OpenGL ES port
 	select BR2_PACKAGE_SUPERMODEL_ES	if BR2_PACKAGE_BATOCERA_TARGET_BCM2711	|| \
@@ -1845,7 +1852,8 @@ config BR2_PACKAGE_BATOCERA_GPU_X86
 	bool "batocera.linux GPU support for x86 platform"
 
 	# nvidia
-	select BR2_PACKAGE_BATOCERA_NVIDIA			if BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY
+# $$ linker errors on `nvidia-proprietary-driver` (only parallel?)
+	select BR2_PACKAGE_BATOCERA_NVIDIA			if BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY && !PARALLEL_BUILD
 	# AMD
 	select BR2_PACKAGE_BATOCERA_AMD				if BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY
 

diff --git a/package/batocera/emulationstation/batocera-es-system/locales/ar/batocera-es-system.po b/package/batocera/emulationstation/batocera-es-system/locales/ar/batocera-es-system.po
@@ -10315,7 +10315,7 @@ msgctxt "game_options"
 msgid "LIMIT FPS"
 msgstr ""
 
-#. TRANSLATION: openbor/openbor7530, supermodel
+#. TRANSLATION: openbor/openbor7530, supermodel, model2emu
 msgctxt "game_options"
 msgid "Only some games feature rumble. Not compatible with all controllers."
 msgstr ""
@@ -14861,7 +14861,7 @@ msgctxt "keys_files"
 msgid "Configuration menu"
 msgstr ""
 
-#. TRANSLATION: wiiu.keys, triforce.dolphin_triforce.keys, naomi2.flycast.keys, atomiswave.flycast.keys, dreamcast.flycast.keys, ...
+#. TRANSLATION: wiiu.keys, 3ds.citra.keys, triforce.dolphin_triforce.keys, atomiswave.flycast.keys, dreamcast.flycast.keys, ...
 msgctxt "keys_files"
 msgid "Exit emulator"
 msgstr "الخروج من المحاكي"
@@ -14871,6 +14871,51 @@ msgctxt "keys_files"
 msgid "Display the controller screen"
 msgstr ""
 
+#. TRANSLATION: 3ds.citra.keys
+msgctxt "keys_files"
+msgid "Move Stylet Pointer"
+msgstr ""
+
+#. TRANSLATION: 3ds.citra.keys
+msgctxt "keys_files"
+msgid "Restart Emulation"
+msgstr ""
+
+#. TRANSLATION: 3ds.citra.keys
+msgctxt "keys_files"
+msgid "Continue/Pause emulation"
+msgstr ""
+
+#. TRANSLATION: 3ds.citra.keys
+msgctxt "keys_files"
+msgid "Swap Screen"
+msgstr "تبديل الشاشة"
+
+#. TRANSLATION: 3ds.citra.keys
+msgctxt "keys_files"
+msgid "Toggle Screen Layout"
+msgstr ""
+
+#. TRANSLATION: 3ds.citra.keys, triforce.dolphin_triforce.keys, psx.duckstation.keys, psp.ppsspp.keys, mame.keys, ...
+msgctxt "keys_files"
+msgid "Screenshot"
+msgstr "لقطة شاشة"
+
+#. TRANSLATION: 3ds.citra.keys
+msgctxt "keys_files"
+msgid "Toggle Speed Limit"
+msgstr ""
+
+#. TRANSLATION: 3ds.citra.keys
+msgctxt "keys_files"
+msgid "Swap screens"
+msgstr ""
+
+#. TRANSLATION: 3ds.citra.keys
+msgctxt "keys_files"
+msgid "Mouse Click"
+msgstr "النقر بالفأرة"
+
 #. TRANSLATION: cave3rd.demul.keys, dreamcast.demul.keys, gaelco.demul.keys, hikaru.demul.keys, naomi.demul.keys, ...
 msgctxt "keys_files"
 msgid "Start"
@@ -15006,11 +15051,6 @@ msgctxt "keys_files"
 msgid "Save State Slot 1"
 msgstr "احفظ الحالة في فتحة ١"
 
-#. TRANSLATION: triforce.dolphin_triforce.keys, psx.duckstation.keys, psp.ppsspp.keys, mame.keys, scummvm.keys, ...
-msgctxt "keys_files"
-msgid "Screenshot"
-msgstr "لقطة شاشة"
-
 #. TRANSLATION: dos.dosbox-x.keys
 msgctxt "keys_files"
 msgid "Exit Dosbox-X"
@@ -15186,7 +15226,7 @@ msgctxt "keys_files"
 msgid "Fast Forward"
 msgstr "تسريع إلى الأمام"
 
-#. TRANSLATION: naomi2.flycast.keys, atomiswave.flycast.keys, dreamcast.flycast.keys, naomi.flycast.keys, dreamcast.redream.keys
+#. TRANSLATION: atomiswave.flycast.keys, dreamcast.flycast.keys, naomi.flycast.keys, naomi2.flycast.keys, dreamcast.redream.keys
 msgctxt "keys_files"
 msgid "Hide the bezel"
 msgstr ""
@@ -15201,6 +15241,11 @@ msgctxt "keys_files"
 msgid "Settings GUI"
 msgstr ""
 
+#. TRANSLATION: daphne.hypseus-singe.keys, singe.hypseus-singe.keys
+msgctxt "keys_files"
+msgid "Service menu"
+msgstr ""
+
 #. TRANSLATION: moonlight.moonlight.keys
 #, fuzzy
 msgctxt "keys_files"
@@ -15292,51 +15337,6 @@ msgctxt "keys_files"
 msgid "Right magnasave"
 msgstr ""
 
-#. TRANSLATION: 3ds.citra.keys
-msgctxt "keys_files"
-msgid "Move Stylet Pointer"
-msgstr ""
-
-#. TRANSLATION: 3ds.citra.keys
-msgctxt "keys_files"
-msgid "Restart Emulation"
-msgstr ""
-
-#. TRANSLATION: 3ds.citra.keys
-msgctxt "keys_files"
-msgid "Continue/Pause emulation"
-msgstr ""
-
-#. TRANSLATION: 3ds.citra.keys
-msgctxt "keys_files"
-msgid "Swap Screen"
-msgstr "تبديل الشاشة"
-
-#. TRANSLATION: 3ds.citra.keys
-msgctxt "keys_files"
-msgid "Toggle Screen Layout"
-msgstr ""
-
-#. TRANSLATION: 3ds.citra.keys
-msgctxt "keys_files"
-msgid "Toggle Speed Limit"
-msgstr ""
-
-#. TRANSLATION: 3ds.citra.keys
-msgctxt "keys_files"
-msgid "Swap screens"
-msgstr ""
-
-#. TRANSLATION: 3ds.citra.keys
-msgctxt "keys_files"
-msgid "Mouse Click"
-msgstr "النقر بالفأرة"
-
-#. TRANSLATION: daphne.hypseus-singe.keys, singe.hypseus-singe.keys
-msgctxt "keys_files"
-msgid "Service menu"
-msgstr ""
-
 #. TRANSLATION: corsixth.keys
 msgctxt "keys_files"
 msgid "Move camera up"
-Original file line number
+Diff line change
@@ Expand Up @@
     .directory
     *.po~
     batocera-mok.key
+    *~
+3 −2		package/libfreeimage/libfreeimage.mk
+2 −0		package/mariadb/Config.in
+3 −1		package/mariadb/mariadb.mk
+21 −0		package/webkitgtk/0002-GStreamerDefinitions-disable-USE_GSTREAMER_TRANSCODER.patch
+2 −1		package/x11r7/xserver_xorg-server/xserver_xorg-server.mk