wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1745 from fewtarius/dev

Browse source 
Fix GMU media loading
This commit is contained in:
fewtarius 2023-07-16 16:18:38 -04:00 committed by GitHub
commit fbf7ac04c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 40 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/emulators/music.conf
View file

@ -3,8 +3,8 @@ SYSTEM_FULLNAME="Music Player"
SYSTEM_MANUFACTURER="JELOS"
SYSTEM_RELEASE="unknown"
SYSTEM_HARDWARE="system"
SYSTEM_PATH="/storage/roms/music"
SYSTEM_EXTENSION=".flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA"
SYSTEM_PATH="/storage/.config/gmu/playlists"
SYSTEM_EXTENSION=".m3u .M3U .sh .SH"
SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
SYSTEM_PLATFORM="music"
SYSTEM_THEME="music"

2
documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md
View file

@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
|Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
|JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
|JELOS|Ports (ports)|2021|`ports`|.sh .SH||
|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
|JELOS|Tools (tools)|2021|`modules`|.sh||

2
documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md
View file

@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
|Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
|JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
|JELOS|Ports (ports)|2021|`ports`|.sh .SH||
|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
|JELOS|Tools (tools)|2021|`modules`|.sh||

2
documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md
View file

@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
|Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
|JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
|JELOS|Ports (ports)|2021|`ports`|.sh .SH||
|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
|JELOS|Tools (tools)|2021|`modules`|.sh||

2
documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md
View file

@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
|Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
|JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
|JELOS|Ports (ports)|2021|`ports`|.sh .SH||
|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
|JELOS|Tools (tools)|2021|`modules`|.sh||

2
documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md
View file

@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
|Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
|JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
|JELOS|Ports (ports)|2021|`ports`|.sh .SH||
|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
|JELOS|Tools (tools)|2021|`modules`|.sh||

2
documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
View file

@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
|Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
|JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
|JELOS|Ports (ports)|2021|`ports`|.sh .SH||
|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
|JELOS|Tools (tools)|2021|`modules`|.sh||

2
documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
View file

@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
|Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
|JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
|JELOS|Ports (ports)|2021|`ports`|.sh .SH||
|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
|JELOS|Tools (tools)|2021|`modules`|.sh||

11
packages/jelos/sources/post-update
View file

@ -170,3 +170,14 @@ sed -i 's#<string name="PowerSaverMode".*$#<string name="PowerSaverMode" value="
### Remove properties containing "auto" from the system config.
sed -i "/^.*=auto/d" /storage/.config/system/configs/system.cfg
### Fix up music player to start selection
if [ -d "/storage/.local/share/gmu" ]
then
rm -rf /storage/.local/share/gmu
fi
if [ ! -d "/storage/.config/gmu/playlists" ]
then
mkdir -p /storage/.config/gmu/playlists
fi
cp -rf /usr/config/gmu/playlists/* /storage/.config/gmu/playlists/

5
packages/multimedia/gmu/package.mk
View file

@ -18,16 +18,17 @@ configure_target() {
./configure --enable=medialib
}
make_target() {
make
}
post_makeinstall_target() {
mkdir -p ${INSTALL}/usr/config/gmu
mkdir -p ${INSTALL}/usr/config/gmu/playlists
cp -f ${PKG_DIR}/config/gmu.conf ${INSTALL}/usr/config/gmu
mkdir -p ${INSTALL}/usr/bin
cp -f ${PKG_DIR}/scripts/start_gmu.sh ${INSTALL}/usr/bin
chmod +x ${INSTALL}/usr/bin/start_gmu.sh
ln -sf /usr/bin/start_gmu.sh "${INSTALL}/usr/config/gmu/playlists/Start Music Player.sh"
}

16
packages/multimedia/gmu/scripts/start_gmu.sh
View file

@ -4,11 +4,18 @@
. /etc/profile
jslisten set "-9 gmu.bin"
jslisten set "gmu.bin"
GMUPATH="/storage/.config/gmu"
GMUCONFIG="${GMUPATH}/gmu.conf"
if [ -d "/storage/.local/share/gmu" ]
then
rm -rf /storage/.local/share/gmu
fi
ln -sf ${GMUPATH}/playlists /storage/.local/share/gmu
FBHEIGHT=$(fbset | awk '/geometry/ {print $2}')
FBWIDTH=$(fbset | awk '/geometry/ {print $3}')
@ -26,5 +33,10 @@ then
sed -i "s~SDL.Fullscreen=.*\$~SDL.Fullscreen=no~g" ${GMUCONFIG}
fi
if [ "${1}" ]
then
PLAYLIST="-l \"${1}\""
fi
cd /usr/local/share/gmu
/usr/local/bin/gmu.bin -d /usr/local/etc/gmu -c /storage/.config/gmu/gmu.conf "$1"
/usr/local/bin/gmu.bin -d /usr/local/etc/gmu -c /storage/.config/gmu/gmu.conf ${PLAYLIST}

3
packages/virtual/emulators/package.mk
View file

@ -101,6 +101,9 @@ makeinstall_target() {
### Add BIOS directory
add_system_dir /storage/roms/bios
### Add music directory
add_system_dir /storage/roms/music
### Apply documentation header
start_system_doc