Merge pull request #11 from sharkwouter/debian-fix

Debian fix

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([SteamOS Compostitor], [1.0], [linux@steampowered.com], [steamos-compositor], [http://support.steampowered.com])
+AC_INIT([SteamOS Compostitor Plus], [1.0], [aleshslovak@gmail.com], [steamos-compositor-plus], [https://github.com/gamer-os/steamos-compositor-plus/])
 AM_INIT_AUTOMAKE([foreign tar-ustar])
 PKG_CHECK_MODULES([DEPS],xxf86vm gl x11 xrender xcomposite SDL_image libudev xext xdamage)
 

debian/changelog

@@ -1,244 +1,5 @@
-steamos-compositor (1.35) brewmaster; urgency=medium
+steamos-compositor-plus (1.3.0) unstable; urgency=medium
 
-  * Crude workaround for Steam login issue.
+  * Initial Release.
 
- -- Pierre-Loup A. Griffais <[email protected]>  Fri, 24 Aug 2018 16:42:56 -0700
-
-steamos-compositor (1.34) brewmaster; urgency=medium
-
-  * Small tweak to loadargb_cursor to better handle non-premult cursors
-
- -- Pierre-Loup A. Griffais <[email protected]>  Thu, 19 May 2016 15:52:35 -0700
-
-steamos-compositor (1.33) brewmaster; urgency=medium
-
-  * Prefer HDMI/DP over other types of displays. (patch by Coucouf)
-
- -- Pierre-Loup A. Griffais <[email protected]>  Thu, 24 Mar 2016 14:25:56 -0700
-
-steamos-compositor (1.32) brewmaster; urgency=medium
-
-  * Fix a bug where cursor would be auto-hidden even when buttons held
-  * Show cursor if a button gets clicked while it's hidden
-
- -- Pierre-Loup A. Griffais <[email protected]>  Mon, 30 Nov 2015 15:23:18 -0800
-
-steamos-compositor (1.31) brewmaster; urgency=medium
-
-  * Added support for one than more overlay layers; most opaque one wins.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Tue, 27 Oct 2015 14:52:13 -0700
-
-steamos-compositor (1.30) brewmaster; urgency=medium
-
-  * Added preliminary support for screen magnification.
-  * Increase cursor hiding time to 10 seconds.
-  * Fix bug while cursor would hide even when moving the mouse if a button was
-    held.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Wed, 02 Sep 2015 16:22:38 -0700
-
-steamos-compositor (1.29) brewmaster; urgency=medium
-
-  * Tweaking focus and display logic in steamcompmgr to avoid event storms on newer
-    X servers. It looks like Damage semantics changed on Xserver 1.16 and we were
-    getting unexpected events after XDamageSubtract().
-
- -- Pierre-Loup A. Griffais <[email protected]>  Fri, 03 Jul 2015 19:36:36 -0700
-
-steamos-compositor (1.28) brewmaster; urgency=medium
-
-  * Add set_hd_mode.sh helper script, run at start of session; helps get out
-    of problematic cases like 30hz refresh rates and non-HD modes
-
- -- Pierre-Loup A. Griffais <[email protected]>  Mon, 29 Jun 2015 13:39:14 -0700
-
-steamos-compositor (1.27) brewmaster; urgency=medium
-
-  * depend on libudev1 instead of libudev0
-
- -- John Vert <[email protected]>  Fri, 15 May 2015 11:45:12 -0700
-
-steamos-compositor (1.26) brewmaster; urgency=medium
-
-  * compilation fixes
-
- -- John Vert <[email protected]>  Fri, 15 May 2015 11:29:10 -0700
-
-steamos-compositor (1.25) brewmaster; urgency=medium
-
-  * fix missing tab in debian/rules, change Build-Depends from automake to automake1.11
-
- -- John Vert <[email protected]>  Fri, 01 May 2015 16:25:26 -0700
-
-steamos-compositor (1.24) alchemist; urgency=medium
-
-  * Fix an issue where XCOM wouldn't focus on startup.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Thu, 04 Dec 2014 17:56:55 -0800
-
-steamos-compositor (1.23) alchemist; urgency=medium
-
-  * Remove outdated pulseaudio line from SteamOS session script.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Wed, 17 Sep 2014 15:17:41 -0700
-
-steamos-compositor (1.22) alchemist; urgency=medium
-
-  * Fix issue where Planetary Annihilation window would not get displayed.
-  * Fix bug with cursor image sometimes not having the right colors.
-  * Fix bug with cursor sometimes not aiming where it should.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Tue, 16 Sep 2014 17:56:34 -0700
-
-steamos-compositor (1.21) alchemist; urgency=medium
-
-  * Fix issue with 1.20 where overlay would appear flickery.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Wed, 23 Jul 2014 18:02:07 -0700
-
-steamos-compositor (1.20) alchemist; urgency=medium
-
-  * Fix cases where notifications/overlays would start getting presented before
-    the first frame had landed from Steam, resulting in a black flash.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Mon, 30 Jun 2014 15:54:03 -0700
-
-steamos-compositor (1.19) alchemist; urgency=medium
-
-  * Integrate LunarG patch to exclude MS visuals; they can't be used for TFP on
-    Mesa drivers and cause a black screen.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Fri, 09 May 2014 10:17:04 -0700
-
-steamos-compositor (1.18) alchemist; urgency=low
-
-  * Don't re-compute focus if newly-damaged window isn't focusable.
-    This avoids extra computation when a Steam 2' chat window pops up.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Tue, 25 Mar 2014 19:40:02 -0700
-
-steamos-compositor (1.17.3) alchemist; urgency=low
-
-  * Add udev_is_boot_vga, little tool to check which GPU drives the console.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Fri, 28 Feb 2014 18:39:57 -0800
-
-steamos-compositor (1.16) alchemist; urgency=low
-
-  * Only consider InputOutput windows for focus; this fixes "CID The Dummy"
-    and potentially other Wine-based ports. Thanks to Andrew Eikum for helping.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Mon, 24 Feb 2014 19:26:12 -0800
-
-steamos-compositor (1.15.2) alchemist; urgency=low
-
-  * Set _NET_WM_STATE_HIDDEN on out of focus windows and the overlays when
-    appropriate. Steam knows to stop its rendering loop when it sees this.
-  * Fix double cursor when a game is starting or exiting.
-  * Always request vertical synchronization, as some implementations might not
-    enable it by default.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Wed, 08 Jan 2014 13:57:13 -0800
-
-steamos-compositor (1.14) alchemist; urgency=low
-
-  * Fix possible race condition crash when getting Motion events on out-of-date
-    or yet-untracked windows.
-  * Present the overlay if it's there and a game is running, not only if it 
-    has a window. This ties in with work in Steam to have the overlay window
-    have the same lifetime as the application itself instead of its GL context.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Fri, 22 Nov 2013 16:02:08 -0800
-
-steamos-compositor (1.13) alchemist; urgency=low
-
-  * update copyright
-
- -- John Vert <[email protected]>  Wed, 20 Nov 2013 09:55:42 -0800
-
-steamos-compositor (1.12) alchemist; urgency=low
-
-  * Only honor size hints if they specify the same min and max size, since
-    "Long Live the Queen" sets a maximum size of 4k X 4k.
-  * Listen for pointer motion on all children of the focus window.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Wed, 13 Nov 2013 16:04:35 -0800
-
-steamos-compositor (1.11) alchemist; urgency=low
-
-  * The Bard's Tale has a single override redirect window; allow using it but
-    always prefer regular windows if they're available.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Wed, 13 Nov 2013 11:40:15 -0800
-
-steamos-compositor (1.10) alchemist; urgency=low
-
-  * Monitor mouse input of the child window the legacy SDL1.2 fullscreen.
-  * Clamp fake cursor image.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Tue, 12 Nov 2013 18:45:37 -0800
-
-steamos-compositor (1.9) alchemist; urgency=low
-
-  * Add SDL_image dependency for loadargbcursor.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Thu, 07 Nov 2013 14:58:43 -0800
-
-steamos-compositor (1.8) alchemist; urgency=low
-
-  * Rearm ignore warp count when hiding cursor to prevent spurious appearances.
-  * Work around X server bug 69198 by warping the cursor back into our window
-    if it escapes.
-  * Disable DPMS and the X screensaver for now in the SteamOS session.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Wed, 30 Oct 2013 09:47:18 -0700
-
-steamos-compositor (1.7) alchemist; urgency=low
-
-  * Add -enableremotecontrol to Steam commandline arguments.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Tue, 29 Oct 2013 19:56:56 -0700
-
-steamos-compositor (1.6) alchemist; urgency=low
-
-  * Fix audio by starting and publishing pulse session daemon before Steam
-    starts.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Mon, 28 Oct 2013 16:17:00 -0700
-
-steamos-compositor (1.5) alchemist; urgency=low
-
-  * Use Steam Big Picture cursor as the root window cursor.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Fri, 25 Oct 2013 18:59:41 -0700
-
-steamos-compositor (1.4) alchemist; urgency=low
-
-  * Fix running Steam and games that are higher resolution than the desktop.
-
- -- Pierre-Loup A. Griffais <[email protected]>  Wed, 23 Oct 2013 16:17:58 -0700
-
-steamos-compositor (1.3) alchemist; urgency=low
-
-  * Add loadargbcursor
-
- -- John Vert <[email protected]>  Tue, 22 Oct 2013 20:10:16 -0700
-
-steamos-compositor (1.2) alchemist; urgency=low
-
-  * fix multiarch paths
-
- -- John Vert <[email protected]>  Tue, 22 Oct 2013 10:54:50 -0700
-
-steamos-compositor (1.1) alchemist; urgency=low
-
-  * Add steamos-session
-
- -- John Vert <[email protected]>  Tue, 22 Oct 2013 09:42:37 -0700
-
-steamos-compositor (1.0) alchemist; urgency=low
-
-  * Initial release. 
-
- -- John Vert <[email protected]>  Fri, 18 Oct 2013 16:03:00 -0700
+ -- Wouter Wijsman <[email protected]>  Fri, 23 Aug 2019 00:28:27 +0200

debian/compat

@@ -1 +1 @@
-8
+11

debian/control

@@ -1,12 +1,18 @@
-Source: steamos-compositor
-Maintainer: Pierre-Loup Griffais <[email protected]>
-Section: misc
+Source: steamos-compositor-plus
+Section: x11
 Priority: optional
-Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 8), pkg-config, libxxf86vm-dev, libgl1-mesa-dev, libx11-dev, libxrender-dev, libxcomposite-dev, libxdamage-dev, libsdl-image1.2-dev, automake1.11, autoconf, libudev-dev
+Maintainer: Wouter Wijsman <[email protected]>
+Build-Depends: debhelper (>= 11), pkg-config, libxxf86vm-dev, libgl1-mesa-dev, libx11-dev, libxrender-dev, libxcomposite-dev, libxdamage-dev, libsdl-image1.2-dev, automake1.11, autoconf, libxrandr-dev, libudev-dev
+Standards-Version: 4.3.0
+Homepage: https://github.com/gamer-os/steamos-compositor-plus
 
-Package: steamos-compositor
+Package: steamos-compositor-plus
 Architecture: any
-Depends: libsdl-image1.2, libudev1, ${shlibs:Depends}, ${misc:Depends}
-Description: SteamOS Compositor
- Provides graphics compositor services for the full-screen environment of SteamOS
+Depends: libsdl-image1.2 (>= 1.2.10), libudev1 (>= 183), libgl1, libsdl1.2debian (>= 1.2.11), libx11-6, libxcomposite1 (>= 1:0.3-1), libxdamage1 (>= 1:1.1), libxext6, libxfixes3 (>= 1:5.0), libxrender1, libx11-6, libxrandr2 (>= 2:1.2.0), libxxf86vm1, lsb-release, ${shlibs:Depends}, ${misc:Depends}
+Description: fork of the SteamOS Compositor
+ Based on SteamOS Compositor version 1.35. SteamOS Compositor Plus includes 4k
+ support allows adjusting resolution/refresh rate through a configuration file,
+ hides the annoying color flashing on startup of Proton games and adds a fix
+ for games that start in the background, including Dead Cells, 
+ The Count Lucanor, most Feral games and probably others.
+

debian/copyright

@@ -1,9 +1,17 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Contact: [email protected]
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: steamos-compositor-plus
+Source: https://github.com/gamer-os/steamos-compositor-plus
 
 Files: *
 Copyright: 2013 Valve Corporation <[email protected]>
-License: BSD-2-clause
+           2019 Alesh Slovak <[email protected]>
+License: BSD-2-Clause
+
+Files: debian/*
+Copyright: 2019 Wouter Wijsman <[email protected]>
+License: BSD-2-Clause
+
+License: BSD-2-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:

debian/rules

@@ -1,6 +1,14 @@
 #!/usr/bin/make -f
+# output every command that modifies files on the build system.
+export DH_VERBOSE = 1
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh $@
 
-override_dh_shlibdeps:
-	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+
+# dh_make generated override targets
+override_dh_auto_configure:
+	dh_auto_configure -- \
+			--prefix=/usr