[Scummvm-git-logs] scummvm master -> 724dcd36e9880a83cd4e2ea9e4a47e750ad59161
lephilousophe
lephilousophe at users.noreply.github.com
Fri Nov 12 10:59:55 UTC 2021
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
213168047e OPENDINGUX: Integrate all OpenDingux platforms in configure script
d96e5cf316 OPENDINGUX: Don't use unknown cecho and unset variable
2814a42605 OPENDINGUX: Don't hardcode mksquashfs path
724dcd36e9 OPENDINGUX: Rework build_odbeta.sh to avoid environment variables
Commit: 213168047e0f5b74286d9a2b5ca2b8e4cd357ea6
https://github.com/scummvm/scummvm/commit/213168047e0f5b74286d9a2b5ca2b8e4cd357ea6
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-11-12T11:59:48+01:00
Commit Message:
OPENDINGUX: Integrate all OpenDingux platforms in configure script
Changed paths:
backends/platform/sdl/opendingux/build_odbeta.sh
backends/platform/sdl/opendingux/opendingux.mk
configure
diff --git a/backends/platform/sdl/opendingux/build_odbeta.sh b/backends/platform/sdl/opendingux/build_odbeta.sh
index 717eebace5..e639690b5d 100755
--- a/backends/platform/sdl/opendingux/build_odbeta.sh
+++ b/backends/platform/sdl/opendingux/build_odbeta.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-CONFIG="./configure --host=opendingux --enable-release --disable-detection-full"
+CONFIG="./configure --host=opendingux-$target --enable-release --disable-detection-full"
case $target in
@@ -10,14 +10,10 @@ case $target in
lepus)
target2=$target
- export DEFINES="-DLEPUS"
- CONFIG+=" --disable-highres --disable-hq-scalers"
;;
rg99)
target2=rs90
- export DEFINES="-DRS90 -DDISABLE_FANCY_THEMES"
- CONFIG+=" --disable-highres --disable-16bit --disable-scalers"
;;
*)
diff --git a/backends/platform/sdl/opendingux/opendingux.mk b/backends/platform/sdl/opendingux/opendingux.mk
index 3a3f3ab606..4d50b3e0cf 100644
--- a/backends/platform/sdl/opendingux/opendingux.mk
+++ b/backends/platform/sdl/opendingux/opendingux.mk
@@ -10,7 +10,7 @@ $(bundle): all
$(MKDIR) $(bundle)
$(CP) $(DIST_FILES_DOCS) $(bundle)/
-ifneq ($(target), rg99)
+ifneq ($(OPENDINGUX_TARGET), rg99)
$(MKDIR) $(bundle)/themes
$(CP) $(DIST_FILES_THEMES) $(bundle)/themes/
endif
@@ -18,7 +18,7 @@ endif
ifdef DIST_FILES_ENGINEDATA
$(MKDIR) $(bundle)/engine-data
$(CP) $(DIST_FILES_ENGINEDATA) $(bundle)/engine-data/
-ifeq ($(target), rg99)
+ifeq ($(OPENDINGUX_TARGET), rg99)
$(CP) $(srcdir)/dists/opendingux/fonts_mini.dat $(bundle)/engine-data/fonts.dat
endif
endif
@@ -35,9 +35,9 @@ endif
$(CP) $(EXECUTABLE) $(bundle)/scummvm
$(CP) $(srcdir)/dists/opendingux/scummvm.png $(bundle)/
- $(CP) $(srcdir)/dists/opendingux/startUI.$(target).desktop $(bundle)/
+ $(CP) $(srcdir)/dists/opendingux/startUI.$(OPENDINGUX_TARGET).desktop $(bundle)/
ifdef dualopk
- $(CP) $(srcdir)/dists/opendingux/startGame.$(target).desktop $(bundle)/
+ $(CP) $(srcdir)/dists/opendingux/startGame.$(OPENDINGUX_TARGET).desktop $(bundle)/
$(CP) $(srcdir)/dists/opendingux/scummvm.sh $(bundle)/
endif
$(CP) $(srcdir)/backends/platform/sdl/opendingux/README.OPENDINGUX $(bundle)/README.man.txt
@@ -50,7 +50,7 @@ od-make-opk: $(bundle)
$(STRIP) $(bundle)/scummvm
ifdef dualopk
- $(srcdir)/dists/opendingux/make-opk.sh -d $(bundle) -o scummvm_$(target)_dual
+ $(srcdir)/dists/opendingux/make-opk.sh -d $(bundle) -o scummvm_$(OPENDINGUX_TARGET)_dual
else
- $(srcdir)/dists/opendingux/make-opk.sh -d $(bundle) -o scummvm_$(target)
+ $(srcdir)/dists/opendingux/make-opk.sh -d $(bundle) -o scummvm_$(OPENDINGUX_TARGET)
endif
diff --git a/configure b/configure
index 5f08ca3342..8808342063 100755
--- a/configure
+++ b/configure
@@ -829,7 +829,9 @@ Special configuration feature:
ios7-arm64 for Apple iPhone / iPad (iOS >= 7, 64-bit)
maemo for Nokia Maemo
n64 for Nintendo 64
- opendingux for Opendingux Beta
+ opendingux-gcw0 for GCW0 with Opendingux Beta
+ opendingux-lepus for Lepus with Opendingux Beta
+ opendingux-rg99 for RG99 with Opendingux Beta
openpandora for OpenPandora
ouya for OUYA
ps3 for PlayStation 3
@@ -1576,7 +1578,7 @@ caanoo)
_host_cpu=arm
_host_alias=arm-none-linux-gnueabi
;;
-dingux | gcw0 | opendingux)
+dingux | gcw0 | opendingux-*)
_host_os=linux
_host_cpu=mipsel
_host_alias=mipsel-linux
@@ -3491,7 +3493,7 @@ if test -n "$_host"; then
_build_hq_scalers=no
_mt32emu=no
;;
- opendingux)
+ opendingux-*)
_sysroot=`$CXX --print-sysroot`
_sdlpath=$_sysroot/usr/bin
append_var DEFINES "-DDINGUX -DOPENDINGUX -DREDUCE_MEMORY_USAGE"
@@ -3514,6 +3516,25 @@ if test -n "$_host"; then
_backend="opendingux"
_port_mk="backends/platform/sdl/opendingux/opendingux.mk"
add_line_to_config_mk 'OPENDINGUX = 1'
+ add_line_to_config_mk "OPENDINGUX_TARGET = ${_host#opendingux-}"
+ case "$_host" in
+ opendingux-gcw0)
+ ;;
+ opendingux-lepus)
+ append_var DEFINES "-DLEPUS"
+ _highres=no
+ _build_hq_scalers=no
+ ;;
+ opendingux-rg99)
+ append_var DEFINES "-DRS90 -DDISABLE_FANCY_THEMES"
+ _16bit=no
+ _highres=no
+ _build_hq_scalers=no
+ ;;
+ *)
+ echo "WARNING: Unknown OpenDingux target"
+ ;;
+ esac
;;
openpandora)
# Use -O3 on the OpenPandora for optimized builds.
Commit: d96e5cf316751564cd95784d422b1d83820d6f90
https://github.com/scummvm/scummvm/commit/d96e5cf316751564cd95784d422b1d83820d6f90
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-11-12T11:59:48+01:00
Commit Message:
OPENDINGUX: Don't use unknown cecho and unset variable
Changed paths:
dists/opendingux/make-opk.sh
diff --git a/dists/opendingux/make-opk.sh b/dists/opendingux/make-opk.sh
index e4b5b50769..94bdb3e00f 100755
--- a/dists/opendingux/make-opk.sh
+++ b/dists/opendingux/make-opk.sh
@@ -15,8 +15,8 @@ check_for_tool()
which $1 &> /dev/null
if [ "$?" -ne "0" ];
then
- cecho "ERROR: Could not find the program '$1'. Please make sure
-that it is available in your PATH since it is required to complete your request." $red
+ echo "ERROR: Could not find the program '$1'. Please make sure
+that it is available in your PATH since it is required to complete your request."
exit 1
fi
}
Commit: 2814a426058902fa37da538200063da3e6a0a992
https://github.com/scummvm/scummvm/commit/2814a426058902fa37da538200063da3e6a0a992
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-11-12T11:59:48+01:00
Commit Message:
OPENDINGUX: Don't hardcode mksquashfs path
The check just above uses the path so it's not coherent.
Changed paths:
dists/opendingux/make-opk.sh
diff --git a/dists/opendingux/make-opk.sh b/dists/opendingux/make-opk.sh
index 94bdb3e00f..35ad0e1e1d 100755
--- a/dists/opendingux/make-opk.sh
+++ b/dists/opendingux/make-opk.sh
@@ -91,12 +91,12 @@ fi
echo "Creating an iso file based on '$FOLDER'."
check_for_tool mksquashfs
-if [ $(/usr/bin/mksquashfs -version | awk 'BEGIN{r=0} $3>=4{r=1} END{print r}') -eq 0 ];
+if [ $(mksquashfs -version | awk 'BEGIN{r=0} $3>=4{r=1} END{print r}') -eq 0 ];
then
echo "ERROR: Your squashfs version is older then version 4, please upgrade to 4.0 or later"
exit 1
fi
-/usr/bin/mksquashfs $FOLDER $OPKNAME.opk -noappend -no-exports -no-xattrs
+mksquashfs $FOLDER $OPKNAME.opk -noappend -no-exports -no-xattrs
# Final message
if [ -f $OPKNAME.opk ];
Commit: 724dcd36e9880a83cd4e2ea9e4a47e750ad59161
https://github.com/scummvm/scummvm/commit/724dcd36e9880a83cd4e2ea9e4a47e750ad59161
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-11-12T11:59:48+01:00
Commit Message:
OPENDINGUX: Rework build_odbeta.sh to avoid environment variables
Changed paths:
backends/platform/sdl/opendingux/README.BUILD
backends/platform/sdl/opendingux/build_odbeta.sh
diff --git a/backends/platform/sdl/opendingux/README.BUILD b/backends/platform/sdl/opendingux/README.BUILD
index 241803e394..69db3db279 100644
--- a/backends/platform/sdl/opendingux/README.BUILD
+++ b/backends/platform/sdl/opendingux/README.BUILD
@@ -6,12 +6,12 @@ Running Linux on an x86/amd64 machine:
2. git clone the ScummVM repository
-3. Run 'target=x backends/platform/sdl/opendingux/build_odbeta.sh'
+3. Run 'backends/platform/sdl/opendingux/build_odbeta.sh x'
where x=gcw0|lepus|rg99
Or if you want a dual opk with one launcher capable of starting games directly
for e.g. simplemenu integration :
- 'target=x dualopk=yes backends/platform/sdl/opendingux/build_odbeta.s'
+ 'backends/platform/sdl/opendingux/build_odbeta.sh x dualopk'
4. Copy the resulting file scummvm_$(target).opk or scummvm_$(target)_dual.opk to your device
diff --git a/backends/platform/sdl/opendingux/build_odbeta.sh b/backends/platform/sdl/opendingux/build_odbeta.sh
index e639690b5d..5b02650830 100755
--- a/backends/platform/sdl/opendingux/build_odbeta.sh
+++ b/backends/platform/sdl/opendingux/build_odbeta.sh
@@ -1,37 +1,46 @@
#!/bin/bash
-CONFIG="./configure --host=opendingux-$target --enable-release --disable-detection-full"
+set -e
+
+target=$1
+if [ "$2" = "dualopk" ]; then
+ dualopk="dualopk=yes"
+else
+ dualopk=
+fi
case $target in
gcw0)
target2=$target
+ libc=uclibc
;;
lepus)
target2=$target
+ libc=musl
;;
rg99)
target2=rs90
+ libc=musl
;;
*)
echo "please provide a valid target for the build: gcw0, lepus or rg99"
- exit 0
+ exit 1
;;
esac
TOOLCHAIN=/opt/$target2-toolchain
-
-if [ $target == "gcw0" ]; then
- SYSROOT=$TOOLCHAIN/mipsel-$target2-linux-uclibc
-else
- SYSROOT=$TOOLCHAIN/mipsel-$target2-linux-musl
-fi
+SYSROOT=$TOOLCHAIN/mipsel-$target2-linux-$libc
export PATH=$TOOLCHAIN/usr/bin:$SYSROOT/usr/include:$TOOLCHAIN/bin:$PATH
export CXX=mipsel-linux-g++
export CXXFLAGS="-funsigned-char" # workaround for a scummvm tolower() bug when adding games
-$CONFIG && make -j12 od-make-opk && ls -lh scummvm_$target*.opk
+./configure --host=opendingux-$target --enable-release --disable-detection-full
+
+make -j12 od-make-opk $dualopk
+
+ls -lh scummvm_$target*.opk
More information about the Scummvm-git-logs
mailing list