keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

workstation: Use celluloid on non-x86 instead of vlc

Browse Source 
With exceptoon for tegra: celluloid segfaults there.
This commit is contained in:
Mikhail Efremov 2021-06-30 23:23:03 +03:00 committed by Anton Midyukov
parent ecba9d55eb
commit 53d19fa737
5 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
conf.d/basealt.mk
View File

@ -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; @:

2
conf.d/mixin-basealt.mk
View File

@ -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 \

8
pkg.in/groups/workstation/celluloid.directory Normal file
View File

@ -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

2
pkg.in/lists/workstation/celluloid Normal file
View File

@ -0,0 +1,2 @@
celluloid
celluloid-csd-disabled

1
pkg.in/lists/workstation/live.pkgs
View File

@ -1,5 +1,4 @@
connector
vlc
luvcview@X86
xterm-