Merge pull request #38 from akdor1154/proper-deps

make vendored libsdl depend on other vendored libs instead of system
akdor1154 · Sep 9, 2023 · 238c5cc · 238c5cc
2 parents ec3badc + 78c3715
commit 238c5cc
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 8 deletions.
diff --git a/gamescope.mk b/gamescope.mk
@@ -1,3 +1,3 @@
 GAMESCOPE_VERSION=3.12.5
 GAMESCOPE_TAG=3.12.5
-DEB_RELEASE=1
+DEB_RELEASE=2
diff --git a/ubuntu_22.04/01-deps/Makefile.deps.inside b/ubuntu_22.04/01-deps/Makefile.deps.inside
@@ -99,8 +99,38 @@ packages/vkheaders-$(VULKAN_LOADER_VERSION):
 
 .PHONY: packages/libsdl2
 packages/libsdl2: packages/libsdl2-$(LIBSDL2_VERSION)
-packages/libsdl2-$(LIBSDL2_VERSION):
+packages/libsdl2-$(LIBSDL2_VERSION): packages/wayland-$(WAYLAND_VERSION) packages/libdrm-$(LIBDRM_VERSION) packages/wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION)
 	set -ex
+
+	(
+		cd packages/wayland-$${WAYLAND_VERSION:?}
+		dpkg -i \
+			libwayland-egl1_$${WAYLAND_VERSION}_amd64.deb \
+			libwayland-client0_$${WAYLAND_VERSION}_amd64.deb \
+			libwayland-cursor0_$${WAYLAND_VERSION}_amd64.deb \
+			libwayland-dev_$${WAYLAND_VERSION}_amd64.deb \
+			libwayland-server0_$${WAYLAND_VERSION}_amd64.deb \
+			libwayland-bin_$${WAYLAND_VERSION}_amd64.deb
+	)
+
+	(
+		cd packages/libdrm-$${LIBDRM_VERSION:?}
+		dpkg -i \
+			libdrm2_$${LIBDRM_VERSION}_amd64.deb \
+			libdrm-amdgpu1_$${LIBDRM_VERSION}_amd64.deb \
+			libdrm-common_$${LIBDRM_VERSION}_all.deb \
+			libdrm-intel1_$${LIBDRM_VERSION}_amd64.deb \
+			libdrm-nouveau2_$${LIBDRM_VERSION}_amd64.deb \
+			libdrm-radeon1_$${LIBDRM_VERSION}_amd64.deb \
+			libdrm-dev_$${LIBDRM_VERSION}_amd64.deb
+	)
+
+	(
+		cd packages/wayland-protocols-$${WAYLAND_PROTOCOLS_VERSION:?}
+		dpkg -i \
+			wayland-protocols_$${WAYLAND_PROTOCOLS_VERSION}_all.deb
+	)
+
 	rm -rf packages/libsdl2_tmp
 	mkdir -p packages/libsdl2_tmp
 	(

diff --git a/ubuntu_22.04/01-deps/deps.Containerfile b/ubuntu_22.04/01-deps/deps.Containerfile
@@ -17,10 +17,10 @@ RUN apt-get -y build-dep \
     libsdl2-dev
 
 # debian sid
-RUN apt-key adv --keyserver keyserver.ubuntu.com \
-        --recv-keys 1F89983E0081FDE018F3CC9673A4F27B8DD47936 \
-    && apt-key adv --keyserver keyserver.ubuntu.com \
-        --recv-keys AC530D520F2F3269F5E98313A48449044AAD5C5D
+# RUN apt-key adv --keyserver keyserver.ubuntu.com \
+#         --recv-keys 1F89983E0081FDE018F3CC9673A4F27B8DD47936 \
+#     && apt-key adv --keyserver keyserver.ubuntu.com \
+#         --recv-keys AC530D520F2F3269F5E98313A48449044AAD5C5D
 COPY apt /etc/apt/
 RUN apt-get -y update \
     && dpkg --clear-avail \

diff --git a/ubuntu_22.04/03-package/Makefile b/ubuntu_22.04/03-package/Makefile
@@ -88,10 +88,16 @@ compute-deps:
 		-e ./$${PACKAGE_NAME:?}/opt/gamescope/bin/gamescope.real \
 		-e ./$${PACKAGE_NAME:?}/opt/gamescope/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.2600.3 \
 		-O \
+		-v \
 		-l./$${PACKAGE_NAME:?}/opt/gamescope/lib/x86_64-linux-gnu \
 		-xlibwayland-server0 \
 		-xlibdrm2 \
-		-xlibsdl2-2.0-0
+		-xlibwayland-client0 \
+		-xlibwayland-egl0 \
+		-xlibwayland-egl1 \
+		-xlibwayland-cursor0 \
+		-xlibsdl2-2.0-0 \
+		-xlibvulkan1
 
 .PHONY: test-install
 test-install: test-image

diff --git a/ubuntu_22.04/03-package/debian/control b/ubuntu_22.04/03-package/debian/control
@@ -8,7 +8,7 @@ Vcs-Git: https://github.com/akdor1154/gamescope-pkg
 
 Package: gamescope
 Architecture: amd64
-Depends: libasound2 (>= 1.0.27), libc6 (>= 2.34), libcap2 (>= 1:2.10), libdecor-0-0 (>= 0.1.0), libgbm1 (>= 8.1~0), libgcc-s1 (>= 3.4), libinput10 (>= 1.19.1), libpipewire-0.3-0 (>= 0.3.1), libpixman-1-0 (>= 0.27.4), libpulse0 (>= 0.99.1), libsamplerate0 (>= 0.1.7), libseat1 (>= 0.5.0), libstdc++6 (>= 12), libudev1 (>= 183), libvulkan1 (>= 1.2.131.2), libwayland-client0 (>= 1.20.0), libwayland-cursor0 (>= 1.0.2), libwayland-egl1 (>= 1.15.0), libx11-6 (>= 2:1.2.99.901), libxcomposite1 (>= 1:0.4.5), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3 (>= 1:5.0), libxi6 (>= 2:1.5.99.2), libxkbcommon0 (>= 1.0.0), libxmu6 (>= 2:1.1.3), libxrandr2 (>= 2:1.2.99.3), libxrender1, libxres1 (>= 2:1.2.1), libxss1, libxtst6, libxxf86vm1
+Depends: libasound2 (>= 1.0.27), libc6 (>= 2.34), libcap2 (>= 1:2.10), libdecor-0-0 (>= 0.1.0), libgbm1 (>= 8.1~0), libgcc-s1 (>= 3.4), libinput10 (>= 1.19.1), libpipewire-0.3-0 (>= 0.3.1), libpixman-1-0 (>= 0.27.4), libpulse0 (>= 0.99.1), libsamplerate0 (>= 0.1.7), libseat1 (>= 0.5.0), libstdc++6 (>= 12), libudev1 (>= 183), libx11-6 (>= 2:1.2.99.901), libxcomposite1 (>= 1:0.4.5), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3 (>= 1:5.0), libxi6 (>= 2:1.5.99.2), libxkbcommon0 (>= 1.0.0), libxmu6 (>= 2:1.1.3), libxrandr2 (>= 2:1.2.99.3), libxrender1, libxres1 (>= 2:1.2.1), libxss1, libxtst6, libxxf86vm1
 Description: Micro-compositor for game scaling
  Unofficial package for the Gamescope compositor.
  Gamescope itself is maintained at https://github.com/ValveSoftware/gamescope.