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 | Kodi: Add GPU-accelerated support for Odroid N2 #3269

Merged
merged 3 commits into from
Dec 18, 2019
Merged

DietPi-Software | Kodi: Add GPU-accelerated support for Odroid N2 #3269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfa3573
v6.27
MichaIng Dec 18, 2019
b9f0da7
v6.27
MichaIng Dec 18, 2019
70445e4
v6.27
MichaIng Dec 18, 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
1 change: 1 addition & 0 deletions CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Changes / Improvements / Optimisations:
- DietPi-Software | Gitea: The latest version will now be pulled from GitHub automatically.
- DietPi-Software | Amiberry: Updated to v3.0.4, a large update from v2.25 with many improvements, see: https://github.com/midwan/amiberry/releases
- DietPi-Software | Amiberry: Since we ship a tailored SDL2 version, this has now been merged right into the Amiberry download archive and install directory, to not interfere with other system-wide installed SDL2 instances.
- DietPi-Software | Kodi: Add GPU-accelerated support for Odroid N2 via fbdev driver and special Kodi build, provided by Meveric. Many thanks to @ernero93 for doing this request: https://github.com/MichaIng/DietPi/issues/3255

Bug Fixes:
- DietPi-PREP | Resolved an issue, where in rare cases a wrong $PATH variable could break command calls. Many thanks to @dtm2001 for reporting this issue: https://github.com/MichaIng/DietPi/issues/3206
Expand Down
40 changes: 34 additions & 6 deletions dietpi/dietpi-software
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,8 @@ DietPi-Software will decrypt and use it for software installs. You can change it
aSOFTWARE_CATEGORY_INDEX[$software_id]=2
aSOFTWARE_TYPE[$software_id]=0
aSOFTWARE_REQUIRES_ALSA[$software_id]=1
aSOFTWARE_REQUIRES_XSERVERXORG[$software_id]=1
# Odroid N2 has not GPU support for Xserver, hence it's not required for Kodi
(( $G_HW_MODEL == 15 )) || aSOFTWARE_REQUIRES_XSERVERXORG[$software_id]=1
aSOFTWARE_ONLINEDOC_URL[$software_id]='p=43#p43'
# Only RPi + Odroid + x86_64
for ((i=22; i<=$MAX_G_HW_MODEL; i++))
Expand Down Expand Up @@ -3671,7 +3672,33 @@ _EOF_
# Odroids
if [[ $G_HW_MODEL == 1[0-9] ]]; then

package_list+=' kodi-odroid'
# Odroid N2: https://github.com/MichaIng/DietPi/issues/3255
if (( $G_HW_MODEL == 15 )); then

package_list+=' aml-libs-odroid malig52-fbdev-opencl-odroid kodi-n2-fbdev-odroid'
echo 'media_clock
firmware
decoder_common
stream_input
amvdec_avs
amvdec_h264
amvdec_h264_4k2k
amvdec_mh264
amvdec_h264mvc
amvdec_h265
amvdec_mjpeg
amvdec_mmjpeg
amvdec_mpeg12
amvdec_mpeg4
amvdec_mmpeg4
amvdec_real
amvdec_vc1
amvdec_vp9' > /etc/modules-load.d/dietpi-n2-kodi.conf

else
package_list+=' kodi-odroid'

fi

# Everything else
else
Expand Down Expand Up @@ -8307,7 +8334,7 @@ _EOF_

# Create .desktop symlink
mkdir -p /root/Desktop
G_RUN_CMD wget https://raw.githubusercontent.com/MichaIng/DietPi/$G_GITBRANCH/.conf/desktop/apps/kodi.desktop -O /usr/share/applications/kodi.desktop
G_RUN_CMD wget https://raw.githubusercontent.com/$G_GITOWNER/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

fi
Expand Down Expand Up @@ -13064,15 +13091,16 @@ _EOF_

fi

software_id=31
software_id=31 # Kodi
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then

Banner_Uninstalling
#apt-mark auto libcec4 libcurl3-gnutls libnfs*
G_AGP kodi kodi-odroid
#apt-mark auto libcec4 libcurl3-gnutls libnfs* # Odroid N2: aml-libs-odroid malig52-fbdev-opencl-odroid
G_AGP kodi kodi-odroid kodi-n2-fbdev-odroid
[[ -f '/usr/share/applications/kodi.desktop' ]] && rm /usr/share/applications/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
[[ -f '/etc/modules-load.d/dietpi-n2-kodi.conf' ]] && rm /etc/modules-load.d/dietpi-n2-kodi.conf

fi

Expand Down
6 changes: 3 additions & 3 deletions dietpi/misc/start_kodi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
#////////////////////////////////////
# Import DietPi-Globals --------------------------------------------------------------
# G_HW_MODEL required only
G_HW_MODEL=$(mawk 'NR==1 {print}' /DietPi/dietpi/.hw_model)
G_HW_MODEL=$(mawk 'NR==1' /DietPi/dietpi/.hw_model)
# Import DietPi-Globals --------------------------------------------------------------

#/////////////////////////////////////////////////////////////////////////////////////
# Main Loop
#/////////////////////////////////////////////////////////////////////////////////////
# RPi
if (( $G_HW_MODEL < 10 )); then
# RPi + Odroid N2
if (( $G_HW_MODEL < 10 || $G_HW_MODEL == 15 )); then

kodi --standalone

Expand Down