Commit 53d19fa7 authored by Mikhail Efremov's avatar Mikhail Efremov Committed by Anton Midyukov

workstation: Use celluloid on non-x86 instead of vlc

With exceptoon for tegra: celluloid segfaults there.
parent ecba9d55
...@@ -2,7 +2,7 @@ ifeq (distro,$(IMAGE_CLASS)) ...@@ -2,7 +2,7 @@ ifeq (distro,$(IMAGE_CLASS))
distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\ distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
3rdparty blender clamav cloud-clients freecad \ 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 \ distro/alt-workstation: distro/.base +vmguest +wireless +efi \
mixin/desktop-installer mixin/alt-workstation \ mixin/desktop-installer mixin/alt-workstation \
...@@ -17,11 +17,16 @@ distro/alt-workstation: distro/.base +vmguest +wireless +efi \ ...@@ -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 use/e2k/multiseat/801/full use/e2k/x11/101 use/e2k/sound/401
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,MAIN_GROUPS,$(workstation_groups_x86)) @$(call add,MAIN_GROUPS,$(workstation_groups_x86))
@$(call add,LIVE_LISTS,workstation/vlc)
endif endif
ifeq (,$(filter-out x86_64,$(ARCH))) ifeq (,$(filter-out x86_64,$(ARCH)))
@$(call add,MAIN_GROUPS,workstation/virtualbox) @$(call add,MAIN_GROUPS,workstation/virtualbox)
@$(call add,BASE_KMODULES,kvm virtualbox) @$(call add,BASE_KMODULES,kvm virtualbox)
endif 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))) ifeq (,$(filter-out e2k%,$(ARCH)))
@$(call add,THE_PACKAGES,python-module-serial) @$(call add,THE_PACKAGES,python-module-serial)
@$(call add,THE_PACKAGES,setup-mate-nocomposite) @$(call add,THE_PACKAGES,setup-mate-nocomposite)
...@@ -49,27 +54,35 @@ vm/.alt-workstation: vm/systemd use/x11/lightdm/gtk \ ...@@ -49,27 +54,35 @@ vm/.alt-workstation: vm/systemd use/x11/lightdm/gtk \
vm/alt-workstation:: vm/.alt-workstation vm/alt-workstation:: vm/.alt-workstation
@$(call add,THE_LISTS,workstation/libreoffice) @$(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))) ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))
vm/alt-workstation:: use/uboot vm/alt-workstation:: use/uboot
@$(call add,BASE_LISTS,uboot) @$(call add,BASE_LISTS,uboot)
@$(call add,THE_LISTS,workstation/celluloid)
endif endif
ifeq (,$(filter-out aarch64 armh,$(ARCH))) 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 endif
ifeq (,$(filter-out aarch64,$(ARCH))) 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 endif
ifeq (,$(filter-out armh,$(ARCH))) 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 endif
ifeq (,$(filter-out mipsel,$(ARCH))) ifeq (,$(filter-out mipsel,$(ARCH)))
vm/alt-workstation:: vm/alt-workstation::
@$(call add,THE_PACKAGES,mate-reduced-resource) @$(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-bfk3: vm/alt-workstation use/mipsel-bfk3/x11; @:
vm/alt-workstation-tavolga: vm/alt-workstation use/mipsel-mitx/x11; @: vm/alt-workstation-tavolga: vm/alt-workstation use/mipsel-mitx/x11; @:
......
...@@ -4,7 +4,7 @@ mixin/alt-workstation-install: workstation_groups = $(addprefix workstation/,\ ...@@ -4,7 +4,7 @@ mixin/alt-workstation-install: workstation_groups = $(addprefix workstation/,\
10-office 20-networking 30-multimedia 40-virtualization 50-publishing \ 10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
agents emulators ganttproject gnome-peer-to-peer graphics-editing \ agents emulators ganttproject gnome-peer-to-peer graphics-editing \
libreoffice mate-usershare pidgin raccess scanning scribus \ 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 \ mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm +power \
use/kernel/latest \ use/kernel/latest \
......
[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
celluloid
celluloid-csd-disabled
connector connector
vlc
luvcview@X86 luvcview@X86
xterm- xterm-
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment