[arch-commits] Commit in steam/trunk (5 files)
Levente Polyak
anthraxx at archlinux.org
Fri Dec 9 01:54:44 UTC 2016
Date: Friday, December 9, 2016 @ 01:54:43
Author: anthraxx
Revision: 198497
upgpkg: steam 1.0.0.54-1
- use upstream udev rules with some edits
- adding general workaround for libc++/libgcc
Added:
steam/trunk/steam-runtime.sh
Modified:
steam/trunk/PKGBUILD
steam/trunk/steam-native.sh
Deleted:
steam/trunk/80-steam-controller-permission.rules
steam/trunk/steam-native.desktop
--------------------------------------+
80-steam-controller-permission.rules | 3
PKGBUILD | 48 ++++++++++----
steam-native.desktop | 107 ---------------------------------
steam-native.sh | 4 -
steam-runtime.sh | 4 +
5 files changed, 40 insertions(+), 126 deletions(-)
Deleted: 80-steam-controller-permission.rules
===================================================================
--- 80-steam-controller-permission.rules 2016-12-08 21:40:28 UTC (rev 198496)
+++ 80-steam-controller-permission.rules 2016-12-09 01:54:43 UTC (rev 198497)
@@ -1,3 +0,0 @@
-#USB devices
-SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0660", TAG+="uaccess"
-KERNEL=="uinput", SUBSYSTEM=="misc", OPTIONS+="static_node=uinput", TAG+="uaccess"
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-12-08 21:40:28 UTC (rev 198496)
+++ PKGBUILD 2016-12-09 01:54:43 UTC (rev 198497)
@@ -3,7 +3,7 @@
# Contributor: K900 <k0009000 at gmail.com>
pkgname=steam
-pkgver=1.0.0.53
+pkgver=1.0.0.54
pkgrel=1
pkgdesc="Valve's digital software delivery system"
url='http://steampowered.com/'
@@ -13,34 +13,52 @@
depends_x86_64=('lib32-libgl' 'lib32-gcc-libs' 'lib32-libx11' 'lib32-libxss' 'lib32-alsa-plugins')
optdepends=('steam-native-runtime: steam native runtime support')
source=(http://repo.steampowered.com/${pkgname}/pool/${pkgname}/s/${pkgname}/${pkgname}_${pkgver}.tar.gz
+ steam-runtime.sh
steam-native.sh
- steam-native.desktop
- alsa_sdl_audiodriver.patch
- 80-steam-controller-permission.rules)
-sha512sums=('72f73dd26390a5f8d5fd33289a5418f9c6596a603e8a272e26c48d14f6dfd685a5dbc53eeef84aec5f105037e1225c28010afbdebc3f8e2aa0f682570b6d3832'
- '1fb84e481c6c417cd095f5ae73d04a27936851a6bc60ed39a118173532b697d3bd0cc0adf6ddd746f6791440ab0b36407fb0230b13337bda316bb6d8af5169cd'
- '088db8265e9f35a61c3ff1e26654c1d3d53fe51ca6791f8210db0edc21e8ddc698c4c943895b9682e8d34c93675548d7b6a5bc687f02228e0cc85e267d12df33'
- '5c6117d86cb95071246434851bae3bf7d1c2174b0c8744e33e9c98ccc22efae0c956e1d7e3969c572aa96259b1b8164992d265541bce49a24daa12555d825fd5'
- 'f2b45659524a23e97ac271629ae525823f3d613e94f3fb72dfb67a21b7edfda6d07bff623187582c6d0888501e98536d114ccb27d9a7d7065c51fc11f7d8b18f')
+ alsa_sdl_audiodriver.patch)
+sha512sums=('deeacc61d2bd43dfe1c055ae63fc2dfca79c4884eede883215b6434f57a86900f9f61c91cca7fba928582528acc5610c4a3fbf1e2059e8a7e039e78707d7b65b'
+ 'da40f8e814f547f6a14901d753a2ffed1a4cf83df9200ee86e83a470b57b3103c3fbfb7cc77166ff1db646cbb306d6a41e79450cc1ea113d68a2defc55168ee2'
+ 'ca25f9de518ef0ae6a2754d06461efb196b3dfdbc1baa6a3933db1a1d11dc1f14b0f0ffcecfb831bf11d9f994686d5c97a1dac22e23065ec75546118fd140226'
+ '5c6117d86cb95071246434851bae3bf7d1c2174b0c8744e33e9c98ccc22efae0c956e1d7e3969c572aa96259b1b8164992d265541bce49a24daa12555d825fd5')
prepare() {
- patch -d "${pkgname}" -Np1 < "${srcdir}/alsa_sdl_audiodriver.patch"
+ cd ${pkgname}
+ patch -Np1 < "${srcdir}/alsa_sdl_audiodriver.patch"
+
+ # apply roundups for udev rules
+ sed -r 's|("0666")|"0660", TAG+="uaccess"|g' -i lib/udev/rules.d/99-steam-controller-perms.rules
+ sed -r 's|("misc")|\1, OPTIONS+="static_node=uinput"|g' -i lib/udev/rules.d/99-steam-controller-perms.rules
+ sed -r 's|(, TAG\+="uaccess")|, MODE="0660"\1|g' -i lib/udev/rules.d/60-HTC-Vive-perms.rules
+
+ # separated runtime/native desktop files
+ cp steam{,-native}.desktop
+ sed -r 's|(Name=Steam)|\1 (Runtime)|' -i steam.desktop
+ sed -r 's|(/usr/bin/steam)|\1-runtime|' -i steam.desktop
+ sed -r 's|(Name=Steam)|\1 (Native)|' -i steam-native.desktop
+ sed -r 's|(/usr/bin/steam)|\1-native|' -i steam-native.desktop
}
package() {
- make -C "${pkgname}" DESTDIR="${pkgdir}" install
+ cd ${pkgname}
+ make DESTDIR="${pkgdir}" install
+ install -Dm 755 "${srcdir}/steam-runtime.sh" "${pkgdir}/usr/bin/steam-runtime"
install -Dm 755 "${srcdir}/steam-native.sh" "${pkgdir}/usr/bin/steam-native"
- install -Dm 644 "${srcdir}/steam-native.desktop" -t "${pkgdir}/usr/share/applications"
+ install -d "${pkgdir}/usr/lib/steam"
+ mv "${pkgdir}/usr/bin/steam" "${pkgdir}/usr/lib/steam/steam"
+ ln -sf /usr/bin/steam-runtime "${pkgdir}/usr/bin/steam"
+ install -Dm 644 steam-native.desktop -t "${pkgdir}/usr/share/applications"
install -Dm 644 "${pkgdir}/usr/share/doc/steam/steam_install_agreement.txt" \
"${pkgdir}/usr/share/licenses/steam/LICENSE"
+ install -Dm 644 debian/changelog -t "${pkgdir}/usr/share/doc/${pkgname}"
# blank steamdeps because apt-get
ln -sf /usr/bin/true "${pkgdir}/usr/bin/steamdeps"
- install -Dm 644 "${srcdir}/80-steam-controller-permission.rules" \
- "${pkgdir}/usr/lib/udev/rules.d/80-steam-controller-permission.rules"
-
+ install -Dm 644 lib/udev/rules.d/99-steam-controller-perms.rules \
+ "${pkgdir}/usr/lib/udev/rules.d/70-steam-controller.rules"
+ install -Dm 644 lib/udev/rules.d/60-HTC-Vive-perms.rules \
+ "${pkgdir}/usr/lib/udev/rules.d/70-htc-vive.rules"
}
# vim: ts=2 sw=2 et:
Deleted: steam-native.desktop
===================================================================
--- steam-native.desktop 2016-12-08 21:40:28 UTC (rev 198496)
+++ steam-native.desktop 2016-12-09 01:54:43 UTC (rev 198497)
@@ -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
Modified: steam-native.sh
===================================================================
--- steam-native.sh 2016-12-08 21:40:28 UTC (rev 198496)
+++ steam-native.sh 2016-12-09 01:54:43 UTC (rev 198497)
@@ -3,4 +3,6 @@
# Workaround for dbus fatal termination related coredumps (SIGABRT)
# https://github.com/ValveSoftware/steam-for-linux/issues/4464
export DBUS_FATAL_WARNINGS=0
-exec /usr/bin/steam "$@"
+# Override some libraries as these are what games linked against.
+export LD_LIBRARY_PATH="/usr/lib/steam:/usr/lib32/steam"
+exec /usr/lib/steam/steam "$@"
Added: steam-runtime.sh
===================================================================
--- steam-runtime.sh (rev 0)
+++ steam-runtime.sh 2016-12-09 01:54:43 UTC (rev 198497)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Override some libraries to avoid incompatibillity
+export LD_PRELOAD='/usr/$LIB/libstdc++.so.6 /usr/$LIB/libgcc_s.so.1 /usr/$LIB/libxcb.so.1 /usr/$LIB/libgpg-error.so'
+exec /usr/lib/steam/steam "$@"
Property changes on: steam/trunk/steam-runtime.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
More information about the arch-commits
mailing list