openmamba/makedist-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Latest deps updates and fixes

Browse Source
This commit is contained in:
Silvan Calarco 2022-05-17 21:03:58 +02:00
parent 6e690e54ce
commit 3a53e4ea78
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile.defs
View File

@ -14,6 +14,7 @@ _initsystem = systemd
/sbin/telinit = $(_initsystem) /sbin/telinit = $(_initsystem)
# util-linux vs. shadow-extra # util-linux vs. shadow-extra
shadow-extra = util-linux
/bin/su = util-linux /bin/su = util-linux
/sbin/nologin = util-linux /sbin/nologin = util-linux
/usr/bin/chfn = util-linux /usr/bin/chfn = util-linux
@ -143,10 +144,11 @@ libnvidia-tls.so.1 = xorg-drv-video-nvidia
libvdpau.so.1 = libvdpau libvdpau.so.1 = libvdpau
libvdpau_trace.so.1 = libvdpau libvdpau_trace.so.1 = libvdpau
xorgdrvvideo = xorg-drv-video-ast xorg-drv-video-cirrus xorg-drv-video-dummy xorg-drv-video-fbdev \ xorgdrvvideo = xorg-drv-video-ast xorg-drv-video-cirrus xorg-drv-video-dummy xorg-drv-video-fbdev \
xorg-drv-video-ati xorg-drv-video-intel xorg-drv-video-nouveau \ xorg-drv-video-ati xorg-drv-video-nouveau \
xorg-drv-video-mach64 xorg-drv-video-mga xorg-drv-video-neomagic \ xorg-drv-video-mach64 xorg-drv-video-mga xorg-drv-video-neomagic \
xorg-drv-video-openchrome xorg-drv-video-r128 xorg-drv-video-s3virge xorg-drv-video-savage xf86-video-modesetting \ xorg-drv-video-openchrome xorg-drv-video-r128 xorg-drv-video-s3virge xorg-drv-video-savage xf86-video-modesetting \
xorg-drv-video-vesa xorg-drv-video-vmware xorg-drv-video-voodoo xorg-drv-video-amdgpu $(xorgproprietary) xorg-drv-video-vesa xorg-drv-video-vmware xorg-drv-video-voodoo xorg-drv-video-amdgpu $(xorgproprietary)
# xorg-drv-video-intel
# xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo
bootloader = syslinux bootloader = syslinux
endif endif
@ -210,9 +212,10 @@ libnvidia-tls.so.1 = xorg-drv-video-nvidia
libvdpau.so.1[][64bit] = libvdpau libvdpau.so.1[][64bit] = libvdpau
libvdpau_trace.so.1[][64bit] = libvdpau libvdpau_trace.so.1[][64bit] = libvdpau
xorgdrvvideo = xorg-drv-video-ast xorg-drv-video-ati xorg-drv-video-cirrus xorg-drv-video-dummy xorg-drv-video-fbdev \ xorgdrvvideo = xorg-drv-video-ast xorg-drv-video-ati xorg-drv-video-cirrus xorg-drv-video-dummy xorg-drv-video-fbdev \
xorg-drv-video-intel xorg-drv-video-mach64 xorg-drv-video-mga xorg-drv-video-neomagic xorg-drv-video-nouveau \ xorg-drv-video-mach64 xorg-drv-video-mga xorg-drv-video-neomagic xorg-drv-video-nouveau \
xorg-drv-video-openchrome xorg-drv-video-r128 xorg-drv-video-s3virge xorg-drv-video-savage xf86-video-modesetting \ xorg-drv-video-openchrome xorg-drv-video-r128 xorg-drv-video-s3virge xorg-drv-video-savage xf86-video-modesetting \
xorg-drv-video-vesa xorg-drv-video-vmware xorg-drv-video-voodoo $(xorgproprietary) xorg-drv-video-vesa xorg-drv-video-vmware xorg-drv-video-voodoo $(xorgproprietary)
# xorg-drv-video-intel
bootloader = syslinux bootloader = syslinux
endif endif
@ -230,6 +233,7 @@ libOpenCL.so.1[OPENCL_1.0][64bit] = ocl-icd
libEGL.so.1[][64bit] = libEGL libEGL.so.1[][64bit] = libEGL
libGL.so.1[][64bit] = libGL-Mesa-dri libGL.so.1[][64bit] = libGL-Mesa-dri
libGLU.so.1[][64bit] = libGL-Mesa-dri libGLU.so.1[][64bit] = libGL-Mesa-dri
libblas.so.3[][64bit] = libblas
libbluetooth.so.3[][64bit] = libbluetooth libbluetooth.so.3[][64bit] = libbluetooth
libawt.so[][64bit] = java-openjdk-runtime libawt.so[][64bit] = java-openjdk-runtime
libawt_xawt.so[][64bit] = java-openjdk-runtime libawt_xawt.so[][64bit] = java-openjdk-runtime
@ -270,11 +274,12 @@ libkcupslib.so[][64bit] = print-manager
libkdeconnectcore.so.1[][64bit] = kdeconnect4 libkdeconnectcore.so.1[][64bit] = kdeconnect4
libkdeconnectinterfaces.so.1[][64bit] = kdeconnect4 libkdeconnectinterfaces.so.1[][64bit] = kdeconnect4
libkdeconnectdeclarativeplugin.so.1[][64bit] = kdeconnect4 libkdeconnectdeclarativeplugin.so.1[][64bit] = kdeconnect4
libboost_python-mt.so.1.65.1[][64bit] = python-boost libboost_python-mt.so.1.65.1[][64bit] = python-boost165
libboost_python.so.1.65.1[][64bit] := python-boost libboost_python.so.1.65.1[][64bit] = python-boost165
libwayland-egl.so.1[][64bit] := libwayland-egl libboost_python37.so.1.78.0[][64bit] = python-boost-py3
libAppStreamQt.so.2[][64bit] := libappstream-qt libwayland-egl.so.1[][64bit] = libwayland-egl
libappstream.so.4[][64bit] := libappstream libAppStreamQt.so.2[][64bit] = libappstream-qt
libappstream.so.4[][64bit] = libappstream
# ffmpeg / libav # ffmpeg / libav
libavresample.so.3[][64bit] = libavresample-ffmpeg libavresample.so.3[][64bit] = libavresample-ffmpeg
libavresample.so.3[LIBAVRESAMPLE_3][64bit] = libavresample-ffmpeg libavresample.so.3[LIBAVRESAMPLE_3][64bit] = libavresample-ffmpeg
@ -301,12 +306,14 @@ libpoppler-cpp.so.0[][64bit] = libpoppler-cpp
libpoppler-glib.so.8[][64bit] = libpoppler-glib libpoppler-glib.so.8[][64bit] = libpoppler-glib
libpoppler-qt5.so.1[][64bit] = libpoppler-qt5 libpoppler-qt5.so.1[][64bit] = libpoppler-qt5
libcommon.so[][64bit] = mariadb-columnstore libcommon.so[][64bit] = mariadb-columnstore
libvulkan.so.1[][64bit] = libvulkan
else else
libOpenCL.so.1 = ocl-icd libOpenCL.so.1 = ocl-icd
libOpenCL.so.1[OPENCL_1.0] = ocl-icd libOpenCL.so.1[OPENCL_1.0] = ocl-icd
libEGL.so.1 = libEGL libEGL.so.1 = libEGL
libGL.so.1 = libGL-Mesa-dri libGL.so.1 = libGL-Mesa-dri
libGLU.so.1 = libGL-Mesa-dri libGLU.so.1 = libGL-Mesa-dri
libblas.so.3 = libblas
libbluetooth.so.3 = libbluetooth libbluetooth.so.3 = libbluetooth
libjvm.so = java-openjdk-runtime libjvm.so = java-openjdk-runtime
libjawt.so = java-openjdk-runtime libjawt.so = java-openjdk-runtime
@ -345,10 +352,11 @@ libkdeconnectcore.so.1 = kdeconnect4
libkdeconnectinterfaces.so.1 = kdeconnect4 libkdeconnectinterfaces.so.1 = kdeconnect4
libkdeconnectdeclarativeplugin.so.1 = kdeconnect4 libkdeconnectdeclarativeplugin.so.1 = kdeconnect4
libboost_python-mt.so.1.65.1 = python-boost libboost_python-mt.so.1.65.1 = python-boost
libboost_python.so.1.65.1 := python-boost libboost_python.so.1.65.1 = python-boost
libwayland-egl.so.1 := libwayland-egl libboost_python37.so.1.78.0 = python-boost-py3
libAppStreamQt.so.2 := libappstream-qt libwayland-egl.so.1 = libwayland-egl
libappstream.so.4 := libappstream libAppStreamQt.so.2 = libappstream-qt
libappstream.so.4 = libappstream
# ffmpeg / libav # ffmpeg / libav
libavresample.so.3 = libavresample-ffmpeg libavresample.so.3 = libavresample-ffmpeg
libavresample.so.3[LIBAVRESAMPLE_3] = libavresample-ffmpeg libavresample.so.3[LIBAVRESAMPLE_3] = libavresample-ffmpeg

3
platforms/rootfs-base/Makefile
View File

@ -4,8 +4,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-i586:
$(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64:
$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ $(MAKEDIST_TARGET)-$(PLATFORM): bash rpm dnf
bash rpm dnf
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-$(PLATFORM)-de: langpacks-de $(MAKEDIST_TARGET)-$(PLATFORM)-de: langpacks-de

7
platforms/rootfs-light/Makefile
View File

@ -24,6 +24,13 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
postplug-xorg postplug-sound partitionmanager tar net-tools mambatray qtvkbd postplug-xorg postplug-sound partitionmanager tar net-tools mambatray qtvkbd
# Localization targets # Localization targets
ifeq ($(ARCH),arm)
firefox-langpack-de:
firefox-langpack-es-ES:
firefox-langpack-fr:
firefox-langpack-it:
endif
$(MAKEDIST_TARGET)-$(PLATFORM)-de: langpacks-de firefox-langpack-de $(MAKEDIST_TARGET)-$(PLATFORM)-de: langpacks-de firefox-langpack-de
$(MAKEDIST_TARGET)-$(PLATFORM)-en: langpacks-en_GB $(MAKEDIST_TARGET)-$(PLATFORM)-en: langpacks-en_GB
$(MAKEDIST_TARGET)-$(PLATFORM)-es: langpacks-es firefox-langpack-es-ES $(MAKEDIST_TARGET)-$(PLATFORM)-es: langpacks-es firefox-langpack-es-ES