Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DietPi-Software | X.org/Kodi: Minor install update by comparing with setup-odroid #3035

Merged
merged 4 commits into from
Aug 6, 2019
+22 −24
Merged

DietPi-Software | X.org/Kodi: Minor install update by comparing with setup-odroid #3035

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9734da2
v6.26
MichaIng Aug 4, 2019
9b2cd10
Merge branch 'dev' into xorg_kodi_odroids
MichaIng Aug 4, 2019
afd894b
v6.26
MichaIng Aug 4, 2019
68d1b0d
v6.26
MichaIng Aug 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions dietpi/dietpi-software
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3861,32 +3861,21 @@ _EOF_

local package_list='kodi-odroid'

# - XU4: Requires pulse audio (fixes corrupt sound)
(( $G_HW_MODEL == 11 )) && package_list+=' pulseaudio'

# Everything else
else

local package_list='kodi'

# - RPi: Kodi 18 requires fbset to start with custom screen resolution: https://dietpi.com/phpbb/viewtopic.php?p=17550#p17550
# RPi: Kodi 18 requires fbset to start with custom screen resolution: https://dietpi.com/phpbb/viewtopic.php?p=17550#p17550
(( $G_HW_MODEL < 10 )) && package_list+=' fbset'

fi

# - libcurl3-gnutls required for C2. But lets apply to all: https://github.com/MichaIng/DietPi/issues/446
package_list+=' libcurl3-gnutls'

# - NFS/CEC support
if (( $G_DISTRO < 5 )); then

package_list+=' libnfs8 libcec4'

else

package_list+=' libnfs12 libcec4'
# CEC support + libcurl3-gnutls required for C2, but lets apply to all: https://github.com/MichaIng/DietPi/issues/446
package_list+=' libcec4 libcurl3-gnutls'

fi
# NFS support
(( $G_DISTRO < 5 )) && package_list+=' libnfs8' || package_list+=' libnfs12'

G_AGI $package_list

Expand Down Expand Up @@ -6114,7 +6103,7 @@ Mycroft AI requires at least 2 GiB memory on first start. We will now increase y
# Odroid C2
elif (( $G_HW_MODEL == 12 )); then

DEPS_LIST='aml-libs-odroid mali450-odroid xf86-video-mali-odroid libump-odroid xf86-video-fbturbo-odroid'
DEPS_LIST='aml-libs-odroid mali450-odroid libump-odroid xf86-video-fbturbo-odroid'
G_BACKUP_FP /etc/X11/xorg.conf
dps_index=$software_id Download_Install 'xorg_c2.conf' /etc/X11/xorg.conf

Expand All @@ -6123,7 +6112,7 @@ Mycroft AI requires at least 2 GiB memory on first start. We will now increase y

G_AGI firmware-samsung xf86-video-armsoc-odroid malit628-odroid

# Pine64
# Pine A64
elif (( $G_HW_MODEL == 40 )); then

Download_Install 'https://dietpi.com/downloads/binaries/all/libump_1-1_arm64.deb'
Expand Down Expand Up @@ -6157,6 +6146,17 @@ Mycroft AI requires at least 2 GiB memory on first start. We will now increase y
#ln -sf /usr/lib/aarch64-linux-gnu/libMali.so /usr/lib/aarch64-linux-gnu/libMaliOpenCL.so
#ln -sf /usr/lib/aarch64-linux-gnu/libMali.so /usr/lib/aarch64-linux-gnu/libOpenCL.so

# ASUS TB: On Stretch, install our prepared drivers archive
# - On Buster, new t76x driver packages require testing: https://packages.debian.org/buster/libegl1
elif (( $G_HW_MODEL == 52 && $G_DISTRO == 4 )); then

Download_Install 'https://dietpi.com/downloads/binaries/asus/ASUSTB_GPU.7z' gpu_drivers
dpkg --force-hold,confdef,confnew -i gpu_drivers/*.deb
G_AGF
rm -R gpu_drivers

dps_index=$software_id Download_Install 'xorg_asustb.conf' /etc/X11/xorg.conf

fi

fi
Expand Down Expand Up @@ -8333,18 +8333,16 @@ _EOF_
Banner_Configuration

# Remove Kodi user (Whilst waving)
userdel -r kodi &> /dev/null
getent passwd kodi &> /dev/null && userdel -r kodi

# Run Kodi as root
[[ -f '/etc/default/kodi' ]] && G_CONFIG_INJECT 'USER=' 'USER=root' /etc/default/kodi

# Copy udev rules, probably not needed for root, but we'll do it anyway
dps_index=$software_id Download_Install '99-dietpi-kodi.rules' /etc/udev/rules.d/99-dietpi-kodi.rules
chmod +x /etc/udev/rules.d/99-dietpi-kodi.rules

# Create .desktop SymLinks
# Create .desktop symlink
mkdir -p /root/Desktop
[[ -f '/usr/share/applications/kodi.desktop' ]] && rm /usr/share/applications/kodi.desktop
G_RUN_CMD wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/apps/kodi.desktop -O /usr/share/applications/kodi.desktop
ln -sf /usr/share/applications/kodi.desktop /root/Desktop/kodi.desktop

Expand Down Expand Up @@ -12953,10 +12951,10 @@ _EOF_
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then

Banner_Uninstalling
#apt-mark auto libcec4 libcurl3-gnutls libnfs*
G_AGP kodi kodi-odroid
[[ -f '/usr/share/applications/kodi.desktop' ]] && rm /usr/share/applications/kodi.desktop
[[ -f '/root/Desktop/kodi.desktop' ]] && rm /root/Desktop/kodi.desktop
rm -f /home/*/Desktop/kodi.desktop
rm -f /{root,home/*}/Desktop/kodi.desktop
[[ -f '/etc/udev/rules.d/99-dietpi-kodi.rules' ]] && rm /etc/udev/rules.d/99-dietpi-kodi.rules

fi
Expand Down