From 53d19fa7371c9a457a42d17b6b3644a3f1a49a46 Mon Sep 17 00:00:00 2001
From: Mikhail Efremov <sem@altlinux.org>
Date: Wed, 30 Jun 2021 23:23:03 +0300
Subject: [PATCH] workstation: Use celluloid on non-x86 instead of vlc

With exceptoon for tegra: celluloid segfaults there.
---
 conf.d/basealt.mk                             | 21 +++++++++++++++----
 conf.d/mixin-basealt.mk                       |  2 +-
 pkg.in/groups/workstation/celluloid.directory |  8 +++++++
 pkg.in/lists/workstation/celluloid            |  2 ++
 pkg.in/lists/workstation/live.pkgs            |  1 -
 5 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 pkg.in/groups/workstation/celluloid.directory
 create mode 100644 pkg.in/lists/workstation/celluloid

diff --git a/conf.d/basealt.mk b/conf.d/basealt.mk
index 5a9ee169..359e5cf6 100644
--- a/conf.d/basealt.mk
+++ b/conf.d/basealt.mk
@@ -2,7 +2,7 @@ ifeq (distro,$(IMAGE_CLASS))
 
 distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
 	3rdparty blender clamav cloud-clients freecad \
-	gtk-dictionary kvm smartcard voip-clients)
+	gtk-dictionary kvm smartcard voip-clients vlc)
 
 distro/alt-workstation: distro/.base +vmguest +wireless +efi \
 	mixin/desktop-installer mixin/alt-workstation \
@@ -17,11 +17,16 @@ distro/alt-workstation: distro/.base +vmguest +wireless +efi \
 	use/e2k/multiseat/801/full use/e2k/x11/101 use/e2k/sound/401
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call add,MAIN_GROUPS,$(workstation_groups_x86))
+	@$(call add,LIVE_LISTS,workstation/vlc)
 endif
 ifeq (,$(filter-out x86_64,$(ARCH)))
 	@$(call add,MAIN_GROUPS,workstation/virtualbox)
 	@$(call add,BASE_KMODULES,kvm virtualbox)
 endif
+ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))
+	@$(call add,MAIN_GROUPS,workstation/celluloid)
+	@$(call add,LIVE_LISTS,workstation/celluloid)
+endif
 ifeq (,$(filter-out e2k%,$(ARCH)))
 	@$(call add,THE_PACKAGES,python-module-serial)
 	@$(call add,THE_PACKAGES,setup-mate-nocomposite)
@@ -49,27 +54,35 @@ vm/.alt-workstation: vm/systemd use/x11/lightdm/gtk \
 
 vm/alt-workstation:: vm/.alt-workstation
 	@$(call add,THE_LISTS,workstation/libreoffice)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,THE_LISTS,workstation/vlc)
+endif
 
 ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))
 vm/alt-workstation:: use/uboot
 	@$(call add,BASE_LISTS,uboot)
+	@$(call add,THE_LISTS,workstation/celluloid)
 endif
 
 ifeq (,$(filter-out aarch64 armh,$(ARCH)))
-vm/alt-workstation-rpi: vm/.alt-workstation use/arm-rpi4/full; @:
+vm/alt-workstation-rpi: vm/.alt-workstation use/arm-rpi4/full
+	@$(call add,THE_LISTS,workstation/celluloid)
 endif
 
 ifeq (,$(filter-out aarch64,$(ARCH)))
-vm/alt-workstation-tegra: vm/.alt-workstation use/aarch64-tegra; @:
+vm/alt-workstation-tegra: vm/.alt-workstation use/aarch64-tegra
+	@$(call add,THE_LISTS,workstation/vlc)
 endif
 
 ifeq (,$(filter-out armh,$(ARCH)))
-vm/alt-workstation-mcom02: vm/.alt-workstation use/armh-mcom02/x11; @:
+vm/alt-workstation-mcom02: vm/.alt-workstation use/armh-mcom02/x11
+	@$(call add,THE_LISTS,workstation/celluloid)
 endif
 
 ifeq (,$(filter-out mipsel,$(ARCH)))
 vm/alt-workstation::
 	@$(call add,THE_PACKAGES,mate-reduced-resource)
+	@$(call add,THE_LISTS,workstation/celluloid)
 
 vm/alt-workstation-bfk3: vm/alt-workstation use/mipsel-bfk3/x11; @:
 vm/alt-workstation-tavolga: vm/alt-workstation use/mipsel-mitx/x11; @:
diff --git a/conf.d/mixin-basealt.mk b/conf.d/mixin-basealt.mk
index faedbdcc..d6aa70dc 100644
--- a/conf.d/mixin-basealt.mk
+++ b/conf.d/mixin-basealt.mk
@@ -4,7 +4,7 @@ mixin/alt-workstation-install: workstation_groups = $(addprefix workstation/,\
 	10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
 	agents emulators ganttproject gnome-peer-to-peer graphics-editing \
 	libreoffice mate-usershare pidgin raccess scanning scribus \
-	sound-editing thunderbird vlc freeipa-client admc)
+	sound-editing thunderbird freeipa-client admc)
 
 mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm +power \
 	use/kernel/latest \
diff --git a/pkg.in/groups/workstation/celluloid.directory b/pkg.in/groups/workstation/celluloid.directory
new file mode 100644
index 00000000..b3635187
--- /dev/null
+++ b/pkg.in/groups/workstation/celluloid.directory
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Celluloid mediaplayer
+Name[ru_RU]=Медиаплеер (Celluloid)
+X-Alterator-PackageList=workstation/celluloid
+X-Alterator-Required=yes
+X-Alterator-Parent=workstation/30-multimedia
diff --git a/pkg.in/lists/workstation/celluloid b/pkg.in/lists/workstation/celluloid
new file mode 100644
index 00000000..47f9c53c
--- /dev/null
+++ b/pkg.in/lists/workstation/celluloid
@@ -0,0 +1,2 @@
+celluloid
+celluloid-csd-disabled
diff --git a/pkg.in/lists/workstation/live.pkgs b/pkg.in/lists/workstation/live.pkgs
index e1e299f8..bf6d7d03 100644
--- a/pkg.in/lists/workstation/live.pkgs
+++ b/pkg.in/lists/workstation/live.pkgs
@@ -1,5 +1,4 @@
 connector
-vlc
 luvcview@X86
 
 xterm-