steam: fixes for udev rules and move native out to steam-native-runtime

6 files changed, 38 insertions, 146 deletions

diff --git a/steam/.footprint b/steam/.footprint
index 07acd5b6f..6a51fe0b0 100644
--- a/steam/.footprint
+++ b/steam/.footprint
@@ -3,15 +3,19 @@ drwxr-xr-x	root/root	etc/ssl/
 drwxr-xr-x	root/root	etc/ssl/certs/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/steam
--rwxr-xr-x	root/root	usr/bin/steam-native
+lrwxrwxrwx	root/root	usr/bin/steam -> /usr/bin/steam-runtime
+-rwxr-xr-x	root/root	usr/bin/steam-runtime
 lrwxrwxrwx	root/root	usr/bin/steamdeps -> /bin/true
-drwxr-xr-x	root/root	usr/lib32/
-drwxr-xr-x	root/root	usr/lib32/steam/
--rw-r--r--	root/root	usr/lib32/steam/bootstraplinux_ubuntu12_32.tar.xz
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/steam/
+-rw-r--r--	root/root	usr/lib/steam/bootstraplinux_ubuntu12_32.tar.xz
+-rwxr-xr-x	root/root	usr/lib/steam/steam
+drwxr-xr-x	root/root	usr/lib/udev/
+drwxr-xr-x	root/root	usr/lib/udev/rules.d/
+-rw-r--r--	root/root	usr/lib/udev/rules.d/70-steam-input.rules
+-rw-r--r--	root/root	usr/lib/udev/rules.d/70-steam-vr.rules
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
--rw-r--r--	root/root	usr/share/applications/steam-native.desktop
 -rw-r--r--	root/root	usr/share/applications/steam.desktop
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
diff --git a/steam/.signature b/steam/.signature
index 0536e18fc..d91e5be62 100644
--- a/steam/.signature
+++ b/steam/.signature
@@ -1,8 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF34hA9xtk8QADHiDszEo2M2h09dasrA73YLOTHaG6jATScGXGvxHGgNS1PI45BkbaGozSJUPxke3zLHazbCs2Gwo=
-SHA256 (Pkgfile) = faa388d30e3a3306074c6157ceb3b85cbcfeaec491004cf49070cd311a1c8061
-SHA256 (.footprint) = 2ccc7593f2f6e37a3f67ddee54c17e8d30a1948f34d58e459ef262b6ebff0115
+RWSagIOpLGJF38oMda2Sr1SjhLsa9vxuCWB2FPnFWgUZGWXNJIgzkxu8umpMsll/7msMsNQMephX5xui39a3sPQnT3ILaByODAw=
+SHA256 (Pkgfile) = a753569785b03765eacfac24310ba8e91cf2bfe5d99bee474b6433d8ff3318fb
+SHA256 (.footprint) = 367064b2d2f20b5867bf2754c049ae068f505620b93ddc59ca03b0c6a3ae07f6
 SHA256 (steam_1.0.0.61.tar.gz) = d66413cce9c9ad441f95c4377103b0c71bda4ac4570ecfc7dd2464fe4ef1bd30
-SHA256 (steam-native.sh) = 14bf649a0efa532816eb5509feab2702e54c6ec3cfe5ca6fcc3607823c9d8a0d
-SHA256 (steam-native.desktop) = 88ee3daafe792a9eb9d6c2b8cb4429dd5da3b18737a0eae54d64296a6a878332
+SHA256 (steam-runtime.sh) = 8b7af08f22f285e6ab08c2a50e2df2433626365beeb52eca682777eaa1856bd4
 SHA256 (alsa_sdl_audiodriver.patch) = 174a110eda1c9d5b1c92a4490b266b31918559bbf8292a94905221c92da4bc0e
diff --git a/steam/Pkgfile b/steam/Pkgfile
index cbb539369..f241c351b 100644
--- a/steam/Pkgfile
+++ b/steam/Pkgfile
@@ -2,14 +2,13 @@
 # URL: http://store.steampowered.com/
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Depends on: dbus-32 desktop-file-utils gtk-32 libgcrypt-32 mesa3d-32 nss-32 openal-32
-# Optional: pulseaudio-32 libappindicator-sharp-32
+# Optional: pulseaudio-32
 
 name=steam
 version=1.0.0.61
-release=1
+release=2
 source=(http://repo.steampowered.com/$name/pool/$name/s/$name/${name}_$version.tar.gz
-	steam-native.sh
-	steam-native.desktop
+	steam-runtime.sh
 	alsa_sdl_audiodriver.patch)
 
 build() {
@@ -17,24 +16,34 @@ build() {
 
 	patch -p1 -i $SRC/alsa_sdl_audiodriver.patch
 
-	install -m 0755 -D $SRC/steam-native.sh \
-		$PKG/usr/bin/steam-native
+	# apply roundups for udev rules
+	sed -r 's|("0666")|"0660", TAG+="uaccess"|g' -i lib/udev/rules.d/60-steam-input.rules
+	sed -r 's|("misc")|\1, OPTIONS+="static_node=uinput"|g' -i lib/udev/rules.d/60-steam-input.rules
+	sed -r 's|(, TAG\+="uaccess")|, MODE="0660"\1|g' -i lib/udev/rules.d/60-steam-vr.rules
+
+	# separated runtime/native desktop files
+	sed -r 's|(Name=Steam)|\1 (Runtime)|' -i steam.desktop
+	sed -r 's|(/usr/bin/steam)|\1-runtime|' -i steam.desktop
 
-	install -m 0644 -D $SRC/steam-native.desktop \
-		-t $PKG/usr/share/applications
-	
 	make DESTDIR=$PKG install
 
+	install -Dm 755 $SRC/steam-runtime.sh \
+                $PKG/usr/bin/steam-runtime
+
+	install -d $PKG/usr/lib/steam
+	mv $PKG/usr/bin/steam $PKG/usr/lib/steam/steam
+	ln -sf /usr/bin/steam-runtime $PKG/usr/bin/steam
+
 	# blank steamdeps because apt-get
 	ln -sf /bin/true $PKG/usr/bin/steamdeps
 
 	install -d $PKG/etc/ssl/certs
 
-	mv $PKG/usr/lib $PKG/usr/lib32
+	install -Dm 644 lib/udev/rules.d/60-steam-input.rules \
+		$PKG/usr/lib/udev/rules.d/70-steam-input.rules
 
-	sed \
-		-e 's|/usr/lib/$STEAMPACKAGE|/usr/lib32/$STEAMPACKAGE|' \
-		-i $PKG/usr/bin/steam
+	install -Dm 644 lib/udev/rules.d/60-steam-vr.rules \
+		$PKG/usr/lib/udev/rules.d/70-steam-vr.rules
 
 	rm -r $PKG/usr/share/doc
 }
diff --git a/steam/steam-native.desktop b/steam/steam-native.desktop
deleted file mode 100644
index 3668eddb3..000000000
--- a/steam/steam-native.desktop
+++ /dev/null
@@ -1,107 +0,0 @@
-[Desktop Entry]
-Name=Steam (Native)
-Comment=Application for managing and playing games on Steam
-Exec=/usr/bin/steam-native %U
-Icon=steam
-Terminal=false
-Type=Application
-Categories=Network;FileTransfer;Game;
-MimeType=x-scheme-handler/steam;
-Actions=Store;Community;Library;Servers;Screenshots;News;Settings;BigPicture;Friends;
-
-[Desktop Action Store]
-Name=Store
-Name[de]=Shop
-Name[es]=Tienda
-Name[fr]=Magasin
-Name[it]=Negozio
-Name[pt]=Loja
-Name[ru]=Магазин
-Name[zh_CN]=商店
-Name[zh_TW]=商店
-Exec=steam steam://store
-
-[Desktop Action Community]
-Name=Community
-Name[es]=Comunidad
-Name[fr]=Communauté
-Name[it]=Comunità
-Name[pt]=Comunidade
-Name[ru]=Сообщество
-Name[zh_CN]=社区
-Name[zh_TW]=社群
-Exec=steam steam://url/SteamIDControlPage
-
-[Desktop Action Library]
-Name=Library
-Name[de]=Bibliothek
-Name[es]=Biblioteca
-Name[fr]=Bibliothèque
-Name[it]=Libreria
-Name[pt]=Biblioteca
-Name[ru]=Библиотека
-Name[zh_CN]=库
-Name[zh_TW]=遊戲庫
-Exec=steam steam://open/games
-
-[Desktop Action Servers]
-Name=Servers
-Name[de]=Server
-Name[es]=Servidores
-Name[fr]=Serveurs
-Name[it]=Server
-Name[pt]=Servidores
-Name[ru]=Серверы
-Name[zh_CN]=服务器
-Name[zh_TW]=伺服器
-Exec=steam steam://open/servers
-
-[Desktop Action Screenshots]
-Name=Screenshots
-Name[es]=Capturas
-Name[fr]=Captures d'écran
-Name[it]=Screenshot
-Name[ru]=Скриншоты
-Name[zh_CN]=截图
-Name[zh_TW]=螢幕擷圖
-Exec=steam steam://open/screenshots
-
-[Desktop Action News]
-Name=News
-Name[de]=Neuigkeiten
-Name[es]=Noticias
-Name[fr]=Actualités
-Name[it]=Notizie
-Name[pt]=Notícias
-Name[ru]=Новости
-Name[zh_CN]=新闻
-Name[zh_TW]=新聞
-Exec=steam steam://open/news
-
-[Desktop Action Settings]
-Name=Settings
-Name[de]=Einstellungen
-Name[es]=Parámetros
-Name[fr]=Paramètres
-Name[it]=Impostazioni
-Name[pt]=Configurações
-Name[ru]=Настройки
-Name[zh_CN]=设置
-Name[zh_TW]=設定
-Exec=steam steam://open/settings
-
-[Desktop Action BigPicture]
-Name=Big Picture
-Exec=steam steam://open/bigpicture
-
-[Desktop Action Friends]
-Name=Friends
-Name[de]=Freunde
-Name[es]=Amigos
-Name[fr]=Amis
-Name[it]=Amici
-Name[pt]=Amigos
-Name[ru]=Друзья
-Name[zh_CN]=好友
-Name[zh_TW]=好友
-Exec=steam steam://open/friends
diff --git a/steam/steam-native.sh b/steam/steam-native.sh
deleted file mode 100755
index 2f26bbb22..000000000
--- a/steam/steam-native.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-export STEAM_RUNTIME=0
-# Workaround for dbus fatal termination related coredumps (SIGABRT)
-# https://github.com/ValveSoftware/steam-for-linux/issues/4464
-export DBUS_FATAL_WARNINGS=0
-# Override some libraries as these are what games linked against.
-export LD_LIBRARY_PATH="/usr/lib/steam:/usr/lib32/steam${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
-
-prt-get isinst apulse-32 > /dev/null
-
-if [ $? = 0 ]; then
-	exec /usr/bin/apulse-32 /usr/bin/steam "$@"
-else
-	exec /usr/bin/steam "$@"
-fi
diff --git a/steam/steam-runtime.sh b/steam/steam-runtime.sh
new file mode 100644
index 000000000..fc10ad523
--- /dev/null
+++ b/steam/steam-runtime.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/lib/steam/steam "$@"