Bump yquake2 to 8.50

Uses GLES1 renderer where available
Applies patch to enable Hotkey + Start to quit game
Also applies patch to convert from SDL3 joy controls to SDL2
Default config file added, and renamed game expansions for ordering

Author: protocultor

scriptmodules/ports/yquake2.sh

@@ -12,9 +12,9 @@
 rp_module_id="yquake2"
 rp_module_desc="yquake2 - The Yamagi Quake II client"
 rp_module_licence="GPL2 https://raw.githubusercontent.com/yquake2/yquake2/master/LICENSE"
-rp_module_repo="git https://github.com/yquake2/yquake2.git QUAKE2_8_41"
+rp_module_repo="git https://github.com/yquake2/yquake2.git QUAKE2_8_50"
 rp_module_section="exp"
-rp_module_flags=""
+rp_module_flags="sdl2"
 
 function depends_yquake2() {
     local depends=(libgl1-mesa-dev libglu1-mesa-dev libogg-dev libopenal-dev libsdl2-dev libvorbis-dev zlib1g-dev libcurl4-openssl-dev)
@@ -25,13 +25,17 @@ function depends_yquake2() {
 function sources_yquake2() {
     gitPullOrClone
     # get the add-ons sources
-    gitPullOrClone "$md_build/xatrix" "https://github.com/yquake2/xatrix" "XATRIX_2_13"
-    gitPullOrClone "$md_build/rogue" "https://github.com/yquake2/rogue" "ROGUE_2_12"
+    gitPullOrClone "$md_build/xatrix" "https://github.com/yquake2/xatrix" "XATRIX_2_14"
+    gitPullOrClone "$md_build/rogue" "https://github.com/yquake2/rogue" "ROGUE_2_13"
+
+    # 1st enables Guide+Start to quit. 2nd restores buttons to SDL2 style (from SDL3).
+    applyPatch "$md_data/hotkey_exit.diff"
+    applyPatch "$md_data/sdl2_joylabels.diff"
 }
 
 function build_yquake2() {
     make clean
-    make
+    make with_gles1
     # build the add-ons source
     local repo
     for repo in 'xatrix' 'rogue'; do
@@ -50,6 +54,8 @@ function install_yquake2() {
         'release/quake2'
         'release/ref_gl1.so'
         'release/ref_gl3.so'
+        'release/ref_gles1.so'
+        'release/ref_gles3.so'
         'release/ref_soft.so'
         'LICENSE'
         'README.md'
@@ -61,17 +67,15 @@ function install_yquake2() {
 function add_games_yquake2() {
     local cmd="$1"
     declare -A games=(
-        ['baseq2/pak0']="Quake II"
-        ['rogue/pak0']="Quake II - Ground Zero"
-        ['xatrix/pak0']="Quake II - The Reckoning"
+        ['baseq2']="Quake II"
+        ['xatrix']="Quake II XP1 - The Reckoning"
+        ['rogue']="Quake II XP2 - Ground Zero"
     )
 
     local game
-    local pak
     for game in "${!games[@]}"; do
-        pak="$romdir/ports/quake2/$game.pak"
-        if [[ -f "$pak" ]]; then
-            addPort "$md_id" "quake2" "${games[$game]}" "$cmd" "${game%%/*}"
+        if [[ -f "$romdir/ports/quake2/$game/pak0.pak" ]]; then
+            addPort "$md_id" "quake2" "${games[$game]}" "$cmd" "$game"
         fi
     done
 }
@@ -96,19 +100,19 @@ function configure_yquake2() {
 
     if isPlatform "gl3"; then
         params+=("+set vid_renderer gl3")
+    elif isPlatform "gles"; then
+        params+=("+set vid_renderer gles1")
     elif isPlatform "gl" || isPlatform "mesa"; then
         params+=("+set vid_renderer gl1")
     else
         params+=("+set vid_renderer soft")
     fi
 
-    if isPlatform "kms"; then
-        params+=("+set r_mode -1" "+set r_customwidth %XRES%" "+set r_customheight %YRES%" "+set r_vsync 1")
-    fi
-
     mkRomDir "ports/quake2"
 
     moveConfigDir "$home/.yq2" "$md_conf_root/quake2/yquake2"
+    mkUserDir "$md_conf_root/quake2/yquake2/baseq2"
+    copyDefaultConfig "$md_data/yq2.cfg" "$md_conf_root/quake2/yquake2/baseq2/yq2.cfg"
 
     [[ "$md_mode" == "install" ]] && game_data_yquake2
     add_games_yquake2 "$md_inst/quake2 -datadir $romdir/ports/quake2 ${params[*]} +set game %ROM%"

scriptmodules/ports/yquake2/hotkey_exit.diff

@@ -0,0 +1,91 @@
+diff --git a/src/client/input/sdl2.c b/src/client/input/sdl2.c
+index 7ea263a4..4e16892e 100644
+--- a/src/client/input/sdl2.c
++++ b/src/client/input/sdl2.c
+@@ -79,11 +79,12 @@ typedef enum
+ // IN_Update() called at the beginning of a frame to the
+ // actual movement functions called at a later time.
+ static float mouse_x, mouse_y;
+-static unsigned char joy_escbutton = SDL_CONTROLLER_BUTTON_START;
+ static int joystick_left_x, joystick_left_y, joystick_right_x, joystick_right_y;
+ static float gyro_yaw, gyro_pitch;
+ static qboolean mlooking;
+ 
++static qboolean hotkey_back = false;	// RetroPie Hotkey is Back instead of Guide
++
+ // The last time input events were processed.
+ // Used throughout the client.
+ int sys_frame_time;
+@@ -652,6 +653,7 @@ IN_Update(void)
+ 	static qboolean left_trigger = false;
+ 	static qboolean right_trigger = false;
+ 	static qboolean left_stick[4] = {false, false, false, false};   // left, right, up, down virtual keys
++	static qboolean hotkey_pressed = false;	// is Hotkey in RetroPie pressed
+ 
+ 	static int consoleKeyCode = 0;
+ 
+@@ -852,9 +854,22 @@ IN_Update(void)
+ 				qboolean down = (event.type == SDL_CONTROLLERBUTTONDOWN);
+ 				unsigned char btn = event.cbutton.button;
+ 
+-				// Handle Esc button first, to override its original key
+-				Key_Event( (btn == joy_escbutton)? K_ESCAPE : K_JOY_FIRST_BTN + btn,
+-					down, true );
++				switch (btn)
++				{
++					case SDL_CONTROLLER_BUTTON_START:
++						if (hotkey_pressed && down)
++							Cbuf_AddText("quit");
++						else
++							Key_Event( K_ESCAPE, down, true );
++						break;
++
++					case SDL_CONTROLLER_BUTTON_BACK:
++						if (hotkey_back)
++					case SDL_CONTROLLER_BUTTON_GUIDE:
++							hotkey_pressed = down;
++					default:
++						Key_Event( K_JOY_FIRST_BTN + btn, down, true );
++				}
+ 				break;
+ 			}
+ 
+@@ -2204,22 +2219,6 @@ IN_Controller_Init(qboolean notify_user)
+ 	SDL_Joystick *joystick = NULL;
+ 	SDL_bool is_controller = SDL_FALSE;
+ 
+-	cvar = Cvar_Get("joy_escbutton", "0", CVAR_ARCHIVE);
+-	if (cvar)
+-	{
+-		switch ((int)cvar->value)
+-		{
+-			case 1:
+-				joy_escbutton = SDL_CONTROLLER_BUTTON_BACK;
+-				break;
+-			case 2:
+-				joy_escbutton = SDL_CONTROLLER_BUTTON_GUIDE;
+-				break;
+-			default:
+-				joy_escbutton = SDL_CONTROLLER_BUTTON_START;
+-		}
+-	}
+-
+ 	cvar = Cvar_Get("in_initjoy", "1", CVAR_NOSET);
+ 	if (!cvar->value)
+ 	{
+@@ -2365,6 +2364,7 @@ IN_Controller_Init(qboolean notify_user)
+ 
+ 			show_gamepad = true;
+ 			Com_Printf("Enabled as Game Controller, settings:\n%s\n", SDL_GameControllerMapping(controller));
++			hotkey_back = ( !strstr(SDL_GameControllerMapping(controller), "guide:") );
+ 
+ #ifndef NO_SDL_GYRO
+ 
+@@ -2540,6 +2540,7 @@ IN_Controller_Shutdown(qboolean notify_user)
+ 	show_gamepad = show_gyro = show_haptic = false;
+ 	joystick_left_x = joystick_left_y = joystick_right_x = joystick_right_y = 0;
+ 	gyro_yaw = gyro_pitch = 0;
++	hotkey_back = false;
+ 
+ #ifdef NO_SDL_GYRO
+ 	if (imu_joystick)

scriptmodules/ports/yquake2/sdl2_joylabels.diff

@@ -0,0 +1,49 @@
+diff --git a/src/client/cl_keyboard.c b/src/client/cl_keyboard.c
+index 20ba3fcc..c9b24c41 100644
+--- a/src/client/cl_keyboard.c
++++ b/src/client/cl_keyboard.c
+@@ -216,10 +216,10 @@ static char *gamepadbtns[] =
+ 	// It is imperative that this list of buttons follow EXACTLY the order they
+ 	// appear in QKEYS enum in keyboard.h, which in turn is the same order as
+ 	// they appear in SDL_GamepadButton / SDL_GameControllerButton enum.
+-	"BTN_SOUTH",
+-	"BTN_EAST",
+-	"BTN_WEST",
+-	"BTN_NORTH",
++	"BTN_A",
++	"BTN_B",
++	"BTN_X",
++	"BTN_Y",
+ 	"BTN_BACK",
+ 	"BTN_GUIDE",
+ 	"BTN_START",
+@@ -245,10 +245,10 @@ static char *gamepadbtns[] =
+ 	"TRIG_LEFT",
+ 	"TRIG_RIGHT",
+ 	// Same with _ALT buttons ( button + 'alt modifier' pressed )
+-	"BTN_SOUTH_ALT",
+-	"BTN_EAST_ALT",
+-	"BTN_WEST_ALT",
+-	"BTN_NORTH_ALT",
++	"BTN_A_ALT",
++	"BTN_B_ALT",
++	"BTN_X_ALT",
++	"BTN_Y_ALT",
+ 	"BTN_BACK_ALT",
+ 	"BTN_GUIDE_ALT",
+ 	"BTN_START_ALT",
+diff --git a/src/client/input/sdl2.c b/src/client/input/sdl2.c
+index a4fa5e25..8a4fa52f 100644
+--- a/src/client/input/sdl2.c
++++ b/src/client/input/sdl2.c
+@@ -2467,8 +2467,8 @@ IN_Init(void)
+ 	joy_forwardsensitivity = Cvar_Get("joy_forwardsensitivity", "1.0", CVAR_ARCHIVE);
+ 	joy_sidesensitivity = Cvar_Get("joy_sidesensitivity", "1.0", CVAR_ARCHIVE);
+ 
+-	joy_labels = Cvar_Get("joy_labels", "-1", CVAR_ARCHIVE);
+-	joy_confirm = Cvar_Get("joy_confirm", "-1", CVAR_ARCHIVE);
++	joy_labels = Cvar_Get("joy_labels", "0", CVAR_ARCHIVE);
++	joy_confirm = Cvar_Get("joy_confirm", "0", CVAR_ARCHIVE);
+ 	joy_layout = Cvar_Get("joy_layout", "0", CVAR_ARCHIVE);
+ 	joy_left_expo = Cvar_Get("joy_left_expo", "2.0", CVAR_ARCHIVE);
+ 	joy_left_snapaxis = Cvar_Get("joy_left_snapaxis", "0.15", CVAR_ARCHIVE);

scriptmodules/ports/yquake2/yq2.cfg

@@ -0,0 +1,42 @@
+// Default gamepad controls
+bind SHOULDR_LEFT "+movedown"
+bind TRIG_LEFT "+moveup"
+bind SHOULDR_RIGHT "+joyaltselector"
+bind TRIG_RIGHT "+attack"
+
+bind BTN_A "+movedown"
+bind BTN_B "+moveup"
+bind BTN_X "weapprev"
+bind BTN_Y "weapnext"
+bind BTN_BACK "cmd help"
+bind BTN_GUIDE "+joyaltselector"
+bind STICK_LEFT "+gyroaction"
+bind STICK_RIGHT "centerview"
+bind DP_UP "cycleweap weapon_plasmabeam weapon_boomer weapon_chaingun weapon_etf_rifle weapon_machinegun weapon_blaster"
+bind DP_DOWN "cycleweap weapon_supershotgun weapon_shotgun weapon_chainfist"
+bind DP_LEFT "cycleweap weapon_phalanx weapon_rocketlauncher weapon_proxlauncher weapon_grenadelauncher ammo_grenades"
+bind DP_RIGHT "cycleweap weapon_bfg weapon_disintegrator weapon_railgun weapon_hyperblaster ammo_tesla ammo_trap"
+
+bind BTN_X_ALT "invdrop"
+bind BTN_Y_ALT "invuse"
+bind BTN_BACK_ALT "inven"
+bind DP_UP_ALT "invprev"
+bind DP_DOWN_ALT "invnext"
+bind DP_LEFT_ALT "invprev"
+bind DP_RIGHT_ALT "invnext"
+
+// Gameplay options, check YQ2 documentation
+set cl_run "1"
+set aimfix "1"
+set g_machinegun_norecoil "1"
+set g_quick_weap "1"
+set g_swap_speed "2"
+
+// Audio options
+set s_openal "0"
+set ogg_ignoretrack0 "1"
+
+// Video options
+set gl1_discardfb "1"
+set gl1_lightmapcopies "1"
+set r_mode "-2"