From b73541124b54b0f85e20d120deb1491831b8f653 Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Fri, 26 Mar 2021 13:46:48 +0300 Subject: [PATCH] slinux: Use vlc on tegra Celluloid segfaults on Jetson Nano, so use vlc there, but keep celluloid for other aarch64 systems. --- conf.d/slinux.mk | 24 ++++++++++++++++++------ features.in/slinux/config.mk | 7 +++++-- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/conf.d/slinux.mk b/conf.d/slinux.mk index 7bfef212..609a7c25 100644 --- a/conf.d/slinux.mk +++ b/conf.d/slinux.mk @@ -16,32 +16,44 @@ distro/slinux: distro/.installer use/slinux/full use/rescue/base endif ifeq (vm,$(IMAGE_CLASS)) -vm/slinux:: use/slinux/vm-base use/auto-resize; @: +vm/slinux:: use/slinux/vm-base use/auto-resize +ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH))) + @$(call add,THE_LISTS,slinux/multimedia-player-celluloid) +else + @$(call add,THE_LISTS,slinux/multimedia-player-vlc) +endif ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH))) vm/slinux:: use/uboot @$(call add,BASE_LISTS,uboot) + @$(call add,THE_LISTS,slinux/multimedia-player-celluloid) endif ifeq (,$(filter-out aarch64 armh,$(ARCH))) -vm/slinux-rpi: use/slinux/vm-base use/arm-rpi4/full; @: +vm/slinux-rpi: use/slinux/vm-base use/arm-rpi4/full + @$(call add,THE_LISTS,slinux/multimedia-player-celluloid) endif ifeq (,$(filter-out aarch64,$(ARCH))) -vm/slinux-tegra: use/slinux/vm-base use/aarch64-tegra; @: +vm/slinux-tegra: use/slinux/vm-base use/aarch64-tegra + @$(call add,THE_LISTS,slinux/multimedia-player-vlc) endif ifeq (,$(filter-out armh,$(ARCH))) -vm/slinux-mcom02: use/slinux/vm-base use/armh-mcom02/x11; @: +vm/slinux-mcom02: use/slinux/vm-base use/armh-mcom02/x11 + @$(call add,THE_LISTS,slinux/multimedia-player-celluloid) endif ifeq (,$(filter-out mipsel,$(ARCH))) vm/slinux:: @$(call add,THE_PACKAGES,installer-feature-bell-off-stage3) @$(call add,THE_PACKAGES,xfce-reduced-resource) + @$(call add,THE_LISTS,slinux/multimedia-player-celluloid) -vm/slinux-tavolga: vm/slinux use/mipsel-mitx/x11; @: -vm/slinux-bfk3: vm/slinux use/mipsel-bfk3/x11; @: +vm/slinux-tavolga: vm/slinux use/mipsel-mitx/x11 + @$(call add,THE_LISTS,slinux/multimedia-player-celluloid) +vm/slinux-bfk3: vm/slinux use/mipsel-bfk3/x11 + @$(call add,THE_LISTS,slinux/multimedia-player-celluloid) endif endif diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk index 25c94544..34e3ba42 100644 --- a/features.in/slinux/config.mk +++ b/features.in/slinux/config.mk @@ -78,10 +78,8 @@ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \ @$(call add,THE_KMODULES,staging) ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH))) @$(call add,THE_LISTS,slinux/browser-firefox) - @$(call add,THE_LISTS,slinux/multimedia-player-celluloid) else @$(call add,THE_LISTS,slinux/browser-chromium) - @$(call add,THE_LISTS,slinux/multimedia-player-vlc) endif ifeq (,$(filter-out armh aarch64 i586 x86_64,$(ARCH))) @$(call set,KFLAVOURS,un-def) @@ -104,6 +102,11 @@ use/slinux/base: use/isohybrid use/luks \ @$(call add,LIVE_LISTS,slinux/live) @$(call add,BASE_PACKAGES,installer-distro-simply-linux-stage3) @$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad) +ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH))) + @$(call add,THE_LISTS,slinux/multimedia-player-celluloid) +else + @$(call add,THE_LISTS,slinux/multimedia-player-vlc) +endif use/slinux/full: use/slinux/base @$(call add,MAIN_LISTS,slinux/not-install-full)