build: drop xrandr (#310)

* build: drop xrandr

- Added in steamrt3 since https://gitlab.steamos.cloud/steamrt/steamrt/-/commit/f9803d848e87de49c926550c7154a83b18405eea

* util: find xrandr in PATH

* gamefixes-steam: fix lint

* util: ensure session is x11 before getting res

* util: update type

* util: refactor x11 detection

* util: update comments

Author: R1kaB3rN

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "subprojects/x11-xserver-utils"]
-	path = subprojects/x11-xserver-utils
-	url = https://salsa.debian.org/xorg-team/app/x11-xserver-utils.git
 [submodule "subprojects/libmspack"]
 	path = subprojects/libmspack
 	url = https://github.com/kyz/libmspack.git

Makefile

@@ -6,12 +6,12 @@ INSTALL_DIR ?= $(shell pwd)/dist/protonfixes
 
 .PHONY: all
 
-all: xrandr-dist cabextract-dist libmspack-dist unzip-dist python-xlib-dist
+all: cabextract-dist libmspack-dist unzip-dist python-xlib-dist
 
 .PHONY: install
 
 # Note: `export DEB_BUILD_MAINT_OPTIONS=hardening=-format` is required for the unzip target
-install: protonfixes-install xrandr-install cabextract-install libmspack-install unzip-install python-xlib-install
+install: protonfixes-install cabextract-install libmspack-install unzip-install python-xlib-install
 
 #
 # protonfixes
@@ -29,36 +29,6 @@ protonfixes-install: protonfixes
 	cp         umu-database.csv   $(INSTALL_DIR)
 	rm $(INSTALL_DIR)/protonfixes_test.py
 
-#
-# xrandr
-#
-
-$(OBJDIR)/.build-xrandr-dist: | $(OBJDIR)
-	$(info :: Installing xorg-macros )
-	cd subprojects/xutils-dev/util-macros && \
-	autoreconf -iv && \
-	./configure --prefix=/usr && \
-	make DESTDIR=$(INSTALL_DIR) install
-	$(info :: Building xrandr )
-	cd subprojects/x11-xserver-utils/xrandr && \
-	autoreconf -iv -I$(INSTALL_DIR)/usr/share/aclocal && \
-	./configure --prefix=/usr && \
-	make
-	touch $(@)
-
-.PHONY: xrandr-dist
-
-xrandr-dist: $(OBJDIR)/.build-xrandr-dist
-
-xrandr-install: xrandr-dist
-	$(info :: Installing xrandr )
-	# Install
-	cd subprojects/x11-xserver-utils/xrandr && \
-	make DESTDIR=$(INSTALL_DIR) install
-	# Post install
-	cp $(INSTALL_DIR)/usr/bin/xrandr $(INSTALL_DIR)
-	rm -r $(INSTALL_DIR)/usr
-
 #
 # cabextract
 #

gamefixes-steam/497360.py

@@ -29,7 +29,11 @@ def main() -> None:
         return
 
     # Get width of resolution
-    screen_width, screen_height = util.get_resolution()
+    resolution = util.get_resolution()
+    if not resolution:
+        return None
+
+    screen_width, screen_height = resolution
     width = int(screen_width / screen_height * 768 // 1)
 
     # dgvoodoo2 config patches

gamefixes-steam/65540.py

@@ -33,8 +33,12 @@ def main() -> None:
 
 def set_resolution() -> None:
     # Patch the config to match the system resolution
-    screen_width, screen_height = util.get_resolution()
+    resolution = util.get_resolution()
 
+    if not resolution:
+        return
+
+    screen_width, screen_height = resolution
     zVidResFullscreenX = str(screen_width)
     zVidResFullscreenY = str(screen_height)
 

subprojects/x11-xserver-utils

@@ -822,10 +822,21 @@ def set_xml_options(
     return True
 
 
-def get_resolution() -> tuple[int, int]:
+def get_resolution() -> Optional[tuple[int, int]]:
     """Returns screen res width, height using xrandr"""
     # Execute xrandr command and capture its output
-    xrandr_bin = os.path.abspath(__file__).replace('util.py', 'xrandr')
+    xrandr_bin = shutil.which('xrandr')
+
+    if not xrandr_bin:
+        log.info('xrandr not found in PATH, skipping screen resolution determination')
+        return None
+
+    # Current session must be X11/XWayland to get the resolution and xrandr
+    # requires DISPLAY to be set
+    if not os.environ.get('DISPLAY'):
+        log.info('DISPLAY does not exist, skipping screen resolution determination')
+        return None
+
     xrandr_output = subprocess.check_output([xrandr_bin, '--current']).decode('utf-8')
 
     # Find the line that starts with 'Screen   0:' and extract the resolution