[Scummvm-git-logs] scummvm master -> 2724ce7753ff3cc78bdcf030a232d6dd2aa01620

citral23 noreply at scummvm.org
Mon Jan 16 09:31:20 UTC 2023 

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2994ab025d OPENDINGUX: force 320x240 for the RG99
2724ce7753 OPENDINGUX: simplify build scripts


Commit: 2994ab025d100cc3ddd9a3c5aa37d07a950e08d4
    https://github.com/scummvm/scummvm/commit/2994ab025d100cc3ddd9a3c5aa37d07a950e08d4
Author: Christophe Branchereau (cbranchereau at gmail.com)
Date: 2023-01-16T10:31:14+01:00

Commit Message:
OPENDINGUX: force 320x240 for the RG99

The device has a 320x480 screen and aspect of gui is wrong if we use
the full resolution

Signed-off-by: Christophe Branchereau <cbranchereau at gmail.com>

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp


diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index c8d87e61ead..7f8ae07cfe1 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -738,6 +738,7 @@ void SurfaceSdlGraphicsManager::getDefaultResolution(uint &w, uint &h) {
 	SDL_Rect const* const*availableModes = SDL_ListModes(&p, SDL_FULLSCREEN|SDL_HWSURFACE);
 	w = availableModes[0]->w;
 	h = availableModes[0]->h;
+	if (h > w) h /= 2; // RG99 has a 320x480 screen, gui should render at 320x240 to look correct
 #else
 	w = 320;
 	h = 200;


Commit: 2724ce7753ff3cc78bdcf030a232d6dd2aa01620
    https://github.com/scummvm/scummvm/commit/2724ce7753ff3cc78bdcf030a232d6dd2aa01620
Author: Christophe Branchereau (cbranchereau at gmail.com)
Date: 2023-01-16T10:31:14+01:00

Commit Message:
OPENDINGUX: simplify build scripts

The rs90 and rg99 can use the exact same binary and opk including
the .desktop file

Signed-off-by: Christophe Branchereau <cbranchereau at gmail.com>

Changed paths:
  R dists/opendingux/startGame.rg99.desktop
  R dists/opendingux/startUI.rg99.desktop
    backends/platform/sdl/opendingux/README.BUILD
    backends/platform/sdl/opendingux/build_odbeta.sh
    backends/platform/sdl/opendingux/opendingux.mk
    configure
    dists/opendingux/startGame.rs90.desktop
    dists/opendingux/startUI.rs90.desktop


diff --git a/backends/platform/sdl/opendingux/README.BUILD b/backends/platform/sdl/opendingux/README.BUILD
index d732138182e..a6f694e5c10 100644
--- a/backends/platform/sdl/opendingux/README.BUILD
+++ b/backends/platform/sdl/opendingux/README.BUILD
@@ -15,7 +15,9 @@ Running Linux on an x86/amd64 machine:
 2. git clone the ScummVM repository
 
 3. Run 'backends/platform/sdl/opendingux/build_odbeta.sh x'
-   where x=gcw0|lepus|rg99
+   where x=gcw0|lepus|rs90
+
+   the rs90 build applies to the rg99
 
    Or if you want a dual opk with one launcher capable of starting games directly
    for e.g. simplemenu integration :
diff --git a/backends/platform/sdl/opendingux/build_odbeta.sh b/backends/platform/sdl/opendingux/build_odbeta.sh
index f68524c1aee..eb70fd07ba0 100755
--- a/backends/platform/sdl/opendingux/build_odbeta.sh
+++ b/backends/platform/sdl/opendingux/build_odbeta.sh
@@ -12,29 +12,21 @@ fi
 case $target in
 
         gcw0)
-	target2=$target
 	libc=uclibc
         ;;
 
-        lepus)
-	target2=$target
-	libc=musl
-        ;;
-
-        rg99 | rs90)
-	target2=rs90
-        target=rg99
+        lepus | rs90)
 	libc=musl
         ;;
 
         *)
-        echo "please provide a valid target for the build: gcw0, lepus, rg99 or rs90"
+        echo "please provide a valid target for the build: gcw0, lepus or rs90"
         exit 1
         ;;
 esac
 
-TOOLCHAIN=/opt/$target2-toolchain
-SYSROOT=$TOOLCHAIN/mipsel-$target2-linux-$libc
+TOOLCHAIN=/opt/$target-toolchain
+SYSROOT=$TOOLCHAIN/mipsel-$target-linux-$libc
 
 export PATH=$TOOLCHAIN/usr/bin:$SYSROOT/usr/include:$TOOLCHAIN/bin:$PATH
 export CXX=mipsel-linux-g++
diff --git a/backends/platform/sdl/opendingux/opendingux.mk b/backends/platform/sdl/opendingux/opendingux.mk
index 47c6350342e..d10e500af1b 100644
--- a/backends/platform/sdl/opendingux/opendingux.mk
+++ b/backends/platform/sdl/opendingux/opendingux.mk
@@ -1,10 +1,6 @@
 OD_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
 bundle = od-opk
-ifeq ($(OPENDINGUX_TARGET), rg99)
-OPKNAME = rg99_rs90
-else
 OPKNAME = $(OPENDINGUX_TARGET)
-endif
 
 all: $(OD_EXE_STRIPPED)
 
@@ -15,7 +11,7 @@ $(bundle): all
 	$(MKDIR) $(bundle)
 	$(CP) $(DIST_FILES_DOCS) $(bundle)/
 
-ifneq ($(OPENDINGUX_TARGET), rg99)
+ifneq ($(OPENDINGUX_TARGET), rs90)
 	$(MKDIR) $(bundle)/themes
 	$(CP) $(DIST_FILES_THEMES) $(bundle)/themes/
 endif
@@ -23,7 +19,7 @@ endif
 ifdef DIST_FILES_ENGINEDATA
 	$(MKDIR) $(bundle)/engine-data
 	$(CP) $(DIST_FILES_ENGINEDATA) $(bundle)/engine-data/
-ifeq ($(OPENDINGUX_TARGET), rg99)
+ifeq ($(OPENDINGUX_TARGET), rs90)
 	$(CP) $(srcdir)/dists/opendingux/fonts_mini.dat $(bundle)/engine-data/fonts.dat
 endif
 endif
@@ -44,12 +40,6 @@ endif
 ifdef dualopk
 	$(CP) $(srcdir)/dists/opendingux/startGame.$(OPENDINGUX_TARGET).desktop $(bundle)/
 	$(CP) $(srcdir)/dists/opendingux/scummvm.sh $(bundle)/
-endif
-ifeq ($(OPENDINGUX_TARGET), rg99)
-	$(CP) $(srcdir)/dists/opendingux/startUI.rs90.desktop $(bundle)/
-ifdef dualopk
-	$(CP) $(srcdir)/dists/opendingux/startGame.rs90.desktop $(bundle)/
-endif
 endif
 
 	$(CP) $(srcdir)/backends/platform/sdl/opendingux/README.OPENDINGUX $(bundle)/README.man.txt
diff --git a/configure b/configure
index bdc8b98192c..881426f9d77 100755
--- a/configure
+++ b/configure
@@ -840,8 +840,7 @@ Special configuration feature:
                                            n64 for Nintendo 64
                                            opendingux-gcw0 for GCW0 with Opendingux Beta
                                            opendingux-lepus for Lepus with Opendingux Beta
-                                           opendingux-rg99 for RG99 and RS90 with Opendingux Beta
-                                           opendingux-rs90 for RG99 and RS90 with Opendingux Beta
+                                           opendingux-rs90 for RS90 and RG99 with Opendingux Beta
                                            openpandora for OpenPandora
                                            ouya for OUYA
                                            ps3 for PlayStation 3
@@ -3615,14 +3614,14 @@ if test -n "$_host"; then
 					_highres=no
 					_build_hq_scalers=no
 					;;
-				opendingux-rg99 | opendingux-rs90)
+				opendingux-rs90)
 					append_var DEFINES "-DRS90 -DDISABLE_FANCY_THEMES"
 					_16bit=no
 					_highres=no
 					# Scaling is handled by IPU
 					_build_aspect=no
 					_build_scalers=no
-					_host=opendingux-rg99
+					_host=opendingux-rs90
 					;;
 				*)
 					echo "WARNING: Unknown OpenDingux target"
diff --git a/dists/opendingux/startGame.rg99.desktop b/dists/opendingux/startGame.rg99.desktop
deleted file mode 100644
index 90568e298a7..00000000000
--- a/dists/opendingux/startGame.rg99.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Name=ScummVM
-Comment=Interpreter for several adventure games
-Comment[pl]=Interpreter graficznych gier przygodowych
-Comment[sv]=Tolk för flera äventyrsspel
-Comment[he]=פרשן למספר משחקי הרפתקאות
-Comment[de]=Interpreter für diverse Abenteuerspiele
-Comment[es]=Intérprete para varias aventuras gráficas
-Comment[ca]=Intèrpret per diverses aventures gràfiques
-Exec=env SDL_VIDEO_KMSDRM_SCALING_MODE=1 ./scummvm.sh %f
-Icon=scummvm
-Terminal=false
-Type=Application
-Categories=games;
-StartupNotify=false
-X-OD-Manual=README.man.txt
diff --git a/dists/opendingux/startGame.rs90.desktop b/dists/opendingux/startGame.rs90.desktop
index 90568e298a7..97c6a1bf3e4 100644
--- a/dists/opendingux/startGame.rs90.desktop
+++ b/dists/opendingux/startGame.rs90.desktop
@@ -7,7 +7,7 @@ Comment[he]=פרשן למספר משחקי הרפתקאות
 Comment[de]=Interpreter für diverse Abenteuerspiele
 Comment[es]=Intérprete para varias aventuras gráficas
 Comment[ca]=Intèrpret per diverses aventures gràfiques
-Exec=env SDL_VIDEO_KMSDRM_SCALING_MODE=1 ./scummvm.sh %f
+Exec=scummvm.sh %f
 Icon=scummvm
 Terminal=false
 Type=Application
diff --git a/dists/opendingux/startUI.rg99.desktop b/dists/opendingux/startUI.rg99.desktop
deleted file mode 100644
index 9525a55f2e4..00000000000
--- a/dists/opendingux/startUI.rg99.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Name=ScummVM UI
-Comment=Interpreter for several adventure games
-Comment[pl]=Interpreter graficznych gier przygodowych
-Comment[sv]=Tolk för flera äventyrsspel
-Comment[he]=פרשן למספר משחקי הרפתקאות
-Comment[de]=Interpreter für diverse Abenteuerspiele
-Comment[es]=Intérprete para varias aventuras gráficas
-Comment[ca]=Intèrpret per diverses aventures gràfiques
-Exec=env SDL_VIDEO_KMSDRM_SCALING_MODE=1 ./scummvm
-Icon=scummvm
-Terminal=false
-Type=Application
-Categories=games;
-StartupNotify=false
-X-OD-Manual=README.man.txt
diff --git a/dists/opendingux/startUI.rs90.desktop b/dists/opendingux/startUI.rs90.desktop
index 9525a55f2e4..1dbac872a3c 100644
--- a/dists/opendingux/startUI.rs90.desktop
+++ b/dists/opendingux/startUI.rs90.desktop
@@ -7,7 +7,7 @@ Comment[he]=פרשן למספר משחקי הרפתקאות
 Comment[de]=Interpreter für diverse Abenteuerspiele
 Comment[es]=Intérprete para varias aventuras gráficas
 Comment[ca]=Intèrpret per diverses aventures gràfiques
-Exec=env SDL_VIDEO_KMSDRM_SCALING_MODE=1 ./scummvm
+Exec=scummvm
 Icon=scummvm
 Terminal=false
 Type=Application

More information about the Scummvm-git-logs mailing list