Make wine-lol install in parallel to other wine packages

4 files changed, 87 insertions, 170 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 066576c258c3..2d7b20e78062 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wine-lol
 	pkgdesc = A compatibility layer for running Windows programs - Staging branch with League Of Legends fixes
 	pkgver = 4.8
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.wine-staging.com
 	install = wine.install
 	arch = x86_64
@@ -13,53 +13,29 @@ pkgbase = wine-lol
 	makedepends = fontforge
 	makedepends = flex
 	makedepends = gcc>=4.5.0-2
-	makedepends = giflib
 	makedepends = lib32-giflib
-	makedepends = libpng
 	makedepends = lib32-libpng
-	makedepends = gnutls
 	makedepends = lib32-gnutls
-	makedepends = libxinerama
 	makedepends = lib32-libxinerama
-	makedepends = libxcomposite
 	makedepends = lib32-libxcomposite
-	makedepends = libxmu
 	makedepends = lib32-libxmu
-	makedepends = libxxf86vm
 	makedepends = lib32-libxxf86vm
-	makedepends = libldap
 	makedepends = lib32-libldap
-	makedepends = mpg123
 	makedepends = lib32-mpg123
-	makedepends = openal
 	makedepends = lib32-openal
-	makedepends = v4l-utils
 	makedepends = lib32-v4l-utils
-	makedepends = alsa-lib
 	makedepends = lib32-alsa-lib
-	makedepends = libxcomposite
 	makedepends = lib32-libxcomposite
-	makedepends = mesa
 	makedepends = lib32-mesa
-	makedepends = mesa-libgl
 	makedepends = lib32-mesa-libgl
-	makedepends = opencl-icd-loader
 	makedepends = lib32-opencl-icd-loader
-	makedepends = libxslt
 	makedepends = lib32-libxslt
-	makedepends = libpulse
 	makedepends = lib32-libpulse
-	makedepends = libva
 	makedepends = lib32-libva
-	makedepends = gtk3
 	makedepends = lib32-gtk3
-	makedepends = gst-plugins-base-libs
 	makedepends = lib32-gst-plugins-base-libs
-	makedepends = vulkan-icd-loader
 	makedepends = lib32-vulkan-icd-loader
-	makedepends = sdl2
 	makedepends = lib32-sdl2
-	makedepends = vkd3d
 	makedepends = lib32-vkd3d
 	makedepends = sane
 	makedepends = libgphoto2
@@ -67,79 +43,43 @@ pkgbase = wine-lol
 	makedepends = ffmpeg
 	makedepends = samba
 	makedepends = opencl-headers
-	depends = attr
 	depends = lib32-attr
-	depends = fontconfig
 	depends = lib32-fontconfig
-	depends = lcms2
 	depends = lib32-lcms2
-	depends = libxml2
 	depends = lib32-libxml2
-	depends = libxcursor
 	depends = lib32-libxcursor
-	depends = libxrandr
 	depends = lib32-libxrandr
-	depends = libxdamage
 	depends = lib32-libxdamage
-	depends = libxi
 	depends = lib32-libxi
-	depends = gettext
 	depends = lib32-gettext
-	depends = freetype2
 	depends = lib32-freetype2
-	depends = glu
 	depends = lib32-glu
-	depends = libsm
 	depends = lib32-libsm
-	depends = gcc-libs
 	depends = lib32-gcc-libs
-	depends = libpcap
 	depends = lib32-libpcap
 	depends = desktop-file-utils
 	depends = wine-lol-glibc
-	optdepends = giflib
 	optdepends = lib32-giflib
-	optdepends = libpng
 	optdepends = lib32-libpng
-	optdepends = libldap
 	optdepends = lib32-libldap
-	optdepends = gnutls
 	optdepends = lib32-gnutls
-	optdepends = mpg123
 	optdepends = lib32-mpg123
-	optdepends = openal
 	optdepends = lib32-openal
-	optdepends = v4l-utils
 	optdepends = lib32-v4l-utils
-	optdepends = libpulse
 	optdepends = lib32-libpulse
-	optdepends = alsa-plugins
 	optdepends = lib32-alsa-plugins
-	optdepends = alsa-lib
 	optdepends = lib32-alsa-lib
-	optdepends = libjpeg-turbo
 	optdepends = lib32-libjpeg-turbo
-	optdepends = libxcomposite
 	optdepends = lib32-libxcomposite
-	optdepends = libxinerama
 	optdepends = lib32-libxinerama
-	optdepends = ncurses
 	optdepends = lib32-ncurses
-	optdepends = opencl-icd-loader
 	optdepends = lib32-opencl-icd-loader
-	optdepends = libxslt
 	optdepends = lib32-libxslt
-	optdepends = libva
 	optdepends = lib32-libva
-	optdepends = gtk3
 	optdepends = lib32-gtk3
-	optdepends = gst-plugins-base-libs
 	optdepends = lib32-gst-plugins-base-libs
-	optdepends = vulkan-icd-loader
 	optdepends = lib32-vulkan-icd-loader
-	optdepends = sdl2
 	optdepends = lib32-sdl2
-	optdepends = vkd3d
 	optdepends = lib32-vkd3d
 	optdepends = sane
 	optdepends = libgphoto2
@@ -148,22 +88,15 @@ pkgbase = wine-lol
 	optdepends = cups
 	optdepends = samba
 	optdepends = dosbox
-	provides = wine=4.8
-	provides = wine-wow64=4.8
-	conflicts = wine
-	conflicts = wine-wow64
-	conflicts = wine-staging
 	options = staticlibs
 	source = https://dl.winehq.org/wine/source/4.x/wine-4.8.tar.xz
 	source = wine-staging-v4.8.tar.gz::https://github.com/wine-staging/wine-staging/archive/v4.8.tar.gz
 	source = 30-win32-aliases.conf
-	source = wine-binfmt.conf
 	source = wine-lol–poc1-wine.diff::https://bugs.winehq.org/attachment.cgi?id=64481
 	source = wine-lol-patch-stub.diff::https://bugs.winehq.org/attachment.cgi?id=64496
 	sha512sums = ad91c31aad86b9932777a1c5a84760f41c63cfbb5d79f1a8afd132a8948667283f85e081a454cfc0904544394eaabb00fb986eba15efd8a8409db38e793f3dab
 	sha512sums = f2e7fbe1ed0f77bd307185d0f7aa9e837e64f86ae98828db25e05c998ec07a9dd57dc9f3e6b093310c95ff2a517825d36420d7bd9fc9028d11bc29321ac3559e
 	sha512sums = 6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb
-	sha512sums = bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285
 	sha512sums = ed9c36aee756ee8fba0b08a3ff895893df1c771077964cbe5ce1a23f66addf7212c8ca8e601cf14e5dae82af4b275d0a11c7207acd7dc4f48fdb1216d819f9dd
 	sha512sums = 159b075f11607114ee81ef801c77969c7b630b024a8a698b5f20a208f2cf780a2109f055d420e4292b774f3e5524a05b4c05d446d5217f1c050adb12b7409e45
 
diff --git a/PKGBUILD b/PKGBUILD
index 026074d2fbfd..bc00f0c5c436 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,20 +14,18 @@
 
 pkgname=wine-lol
 pkgver=4.8
-pkgrel=3
+pkgrel=4
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(https://dl.winehq.org/wine/source/4.x/wine-$_pkgbasever.tar.xz
         "wine-staging-v$_pkgbasever.tar.gz::https://github.com/wine-staging/wine-staging/archive/v$_pkgbasever.tar.gz"
         30-win32-aliases.conf
-        wine-binfmt.conf
         wine-lol–poc1-wine.diff::https://bugs.winehq.org/attachment.cgi?id=64481
         wine-lol-patch-stub.diff::https://bugs.winehq.org/attachment.cgi?id=64496)
 sha512sums=('ad91c31aad86b9932777a1c5a84760f41c63cfbb5d79f1a8afd132a8948667283f85e081a454cfc0904544394eaabb00fb986eba15efd8a8409db38e793f3dab'
             'f2e7fbe1ed0f77bd307185d0f7aa9e837e64f86ae98828db25e05c998ec07a9dd57dc9f3e6b093310c95ff2a517825d36420d7bd9fc9028d11bc29321ac3559e'
             '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
-            'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285'
             'ed9c36aee756ee8fba0b08a3ff895893df1c771077964cbe5ce1a23f66addf7212c8ca8e601cf14e5dae82af4b275d0a11c7207acd7dc4f48fdb1216d819f9dd'
             '159b075f11607114ee81ef801c77969c7b630b024a8a698b5f20a208f2cf780a2109f055d420e4292b774f3e5524a05b4c05d446d5217f1c050adb12b7409e45')
 
@@ -38,50 +36,50 @@ options=(staticlibs)
 license=(LGPL)
 
 depends=(
-  attr             lib32-attr
-  fontconfig       lib32-fontconfig
-  lcms2            lib32-lcms2
-  libxml2          lib32-libxml2
-  libxcursor       lib32-libxcursor
-  libxrandr        lib32-libxrandr
-  libxdamage       lib32-libxdamage
-  libxi            lib32-libxi
-  gettext          lib32-gettext
-  freetype2        lib32-freetype2
-  glu              lib32-glu
-  libsm            lib32-libsm
-  gcc-libs         lib32-gcc-libs
-  libpcap          lib32-libpcap
+  lib32-attr
+  lib32-fontconfig
+  lib32-lcms2
+  lib32-libxml2
+  lib32-libxcursor
+  lib32-libxrandr
+  lib32-libxdamage
+  lib32-libxi
+  lib32-gettext
+  lib32-freetype2
+  lib32-glu
+  lib32-libsm
+  lib32-gcc-libs
+  lib32-libpcap
   desktop-file-utils
   wine-lol-glibc
 )
 
 makedepends=(autoconf ncurses bison perl fontforge flex
   'gcc>=4.5.0-2'
-  giflib                lib32-giflib
-  libpng                lib32-libpng
-  gnutls                lib32-gnutls
-  libxinerama           lib32-libxinerama
-  libxcomposite         lib32-libxcomposite
-  libxmu                lib32-libxmu
-  libxxf86vm            lib32-libxxf86vm
-  libldap               lib32-libldap
-  mpg123                lib32-mpg123
-  openal                lib32-openal
-  v4l-utils             lib32-v4l-utils
-  alsa-lib              lib32-alsa-lib
-  libxcomposite         lib32-libxcomposite
-  mesa                  lib32-mesa
-  mesa-libgl            lib32-mesa-libgl
-  opencl-icd-loader     lib32-opencl-icd-loader
-  libxslt               lib32-libxslt
-  libpulse              lib32-libpulse
-  libva                 lib32-libva
-  gtk3                  lib32-gtk3
-  gst-plugins-base-libs lib32-gst-plugins-base-libs
-  vulkan-icd-loader     lib32-vulkan-icd-loader
-  sdl2                  lib32-sdl2
-  vkd3d                 lib32-vkd3d
+  lib32-giflib
+  lib32-libpng
+  lib32-gnutls
+  lib32-libxinerama
+  lib32-libxcomposite
+  lib32-libxmu
+  lib32-libxxf86vm
+  lib32-libldap
+  lib32-mpg123
+  lib32-openal
+  lib32-v4l-utils
+  lib32-alsa-lib
+  lib32-libxcomposite
+  lib32-mesa
+  lib32-mesa-libgl
+  lib32-opencl-icd-loader
+  lib32-libxslt
+  lib32-libpulse
+  lib32-libva
+  lib32-gtk3
+  lib32-gst-plugins-base-libs
+  lib32-vulkan-icd-loader
+  lib32-sdl2
+  lib32-vkd3d
   sane
   libgphoto2
   gsm
@@ -91,28 +89,28 @@ makedepends=(autoconf ncurses bison perl fontforge flex
 )
 
 optdepends=(
-  giflib                lib32-giflib
-  libpng                lib32-libpng
-  libldap               lib32-libldap
-  gnutls                lib32-gnutls
-  mpg123                lib32-mpg123
-  openal                lib32-openal
-  v4l-utils             lib32-v4l-utils
-  libpulse              lib32-libpulse
-  alsa-plugins          lib32-alsa-plugins
-  alsa-lib              lib32-alsa-lib
-  libjpeg-turbo         lib32-libjpeg-turbo
-  libxcomposite         lib32-libxcomposite
-  libxinerama           lib32-libxinerama
-  ncurses               lib32-ncurses
-  opencl-icd-loader     lib32-opencl-icd-loader
-  libxslt               lib32-libxslt
-  libva                 lib32-libva
-  gtk3                  lib32-gtk3
-  gst-plugins-base-libs lib32-gst-plugins-base-libs
-  vulkan-icd-loader     lib32-vulkan-icd-loader
-  sdl2                  lib32-sdl2
-  vkd3d                 lib32-vkd3d
+  lib32-giflib
+  lib32-libpng
+  lib32-libldap
+  lib32-gnutls
+  lib32-mpg123
+  lib32-openal
+  lib32-v4l-utils
+  lib32-libpulse
+  lib32-alsa-plugins
+  lib32-alsa-lib
+  lib32-libjpeg-turbo
+  lib32-libxcomposite
+  lib32-libxinerama
+  lib32-ncurses
+  lib32-opencl-icd-loader
+  lib32-libxslt
+  lib32-libva
+  lib32-gtk3
+  lib32-gst-plugins-base-libs
+  lib32-vulkan-icd-loader
+  lib32-sdl2
+  lib32-vkd3d
   sane
   libgphoto2
   gsm
@@ -121,8 +119,6 @@ optdepends=(
   samba           dosbox
 )
 
-provides=("wine=$pkgver" "wine-wow64=$pkgver")
-conflicts=('wine' 'wine-wow64' 'wine-staging')
 install=wine.install
 
 prepare() {
@@ -154,23 +150,15 @@ prepare() {
 build() {
   cd "$srcdir"
 
-  # Prepare "rpath" to link against wine-lol-glibc, export it via LDFLAGS
-  _RPATH="-rpath=/usr/wine-lol-glibc/lib,-rpath=/usr/wine-lol-glibc/lib32"
-  export LDFLAGS="$LDFLAGS,$_RPATH"
+  # We need RPATH to include wine-lol-glibc and our custom wine-lib setup path
+  _RPATH="-rpath=/usr/wine-lol-glibc/lib32,-rpath=/opt/wine-lol/lib32"
+  # Dyamic linker has to be the one in wine-lol-glibc
+  _LINKER="-dynamic-linker=/usr/wine-lol-glibc/lib32/ld-linux.so.2"
+  # Export all this via LDFLAGS
+  export LDFLAGS="$LDFLAGS,$_RPATH,$_LINKER"
 
-  msg2 "Building Wine-64..."
-
-  cd "$srcdir/$pkgname-64-build"
-  ../$pkgname/configure \
-    --prefix=/usr \
-    --libdir=/usr/lib \
-    --with-x \
-    --with-gstreamer \
-    --enable-win64 \
-    --with-xattr
-
-  make depend LDRPATH_INSTALL="-Wl,$_RPATH" # Use wine-lib-glibc for -install
-  make
+  # Make sure everything builds for 32bit
+  export CFLAGS="-m32 $CFLAGS"
 
   msg2 "Building Wine-32..."
 
@@ -178,14 +166,13 @@ build() {
   cd "$srcdir/$pkgname-32-build"
 
   ../$pkgname/configure \
-    --prefix=/usr \
+    --prefix=/opt/wine-lol \
     --with-x \
     --with-gstreamer \
     --with-xattr \
-    --libdir=/usr/lib32 \
-    --with-wine64="$srcdir/$pkgname-64-build"
+    --libdir=/opt/wine-lol/lib32
 
-  make depend LDRPATH_INSTALL="-Wl,$_RPATH" # Use wine-lib-glibc for -install
+  make depend LDRPATH_INSTALL="-Wl,$_RPATH,$_LINKER" # Use wine-lib-glibc for -install
   make
 }
 
@@ -193,21 +180,14 @@ package() {
   msg2 "Packaging Wine-32..."
   cd "$srcdir/$pkgname-32-build"
 
-  make prefix="$pkgdir/usr" \
-    libdir="$pkgdir/usr/lib32" \
-    dlldir="$pkgdir/usr/lib32/wine" install
-
-  msg2 "Packaging Wine-64..."
-  cd "$srcdir/$pkgname-64-build"
-  make prefix="$pkgdir/usr" \
-    libdir="$pkgdir/usr/lib" \
-    dlldir="$pkgdir/usr/lib/wine" install
+  make prefix="$pkgdir/opt/wine-lol" \
+    libdir="$pkgdir/opt/wine-lol/lib32" \
+    dlldir="$pkgdir/opt/wine-lol/lib32/wine" install
 
   # Font aliasing settings for Win32 applications
   install -d "$pkgdir"/etc/fonts/conf.{avail,d}
-  install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/etc/fonts/conf.avail"
-  ln -s ../conf.avail/30-win32-aliases.conf "$pkgdir/etc/fonts/conf.d/30-win32-aliases.conf"
-  install -Dm 644 "$srcdir/wine-binfmt.conf" "$pkgdir/usr/lib/binfmt.d/wine.conf"
+  install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/etc/fonts/conf.avail/30-wine-lol-win32-aliases.conf"
+  ln -s ../conf.avail/30-wine-lol-win32-aliases.conf "$pkgdir/etc/fonts/conf.d/30-wine-lol-win32-aliases.conf"
 }
 
 # vim:set ts=8 sts=2 sw=2 et:
diff --git a/wine-binfmt.conf b/wine-binfmt.conf
deleted file mode 100644
index 4d4307336587..000000000000
--- a/wine-binfmt.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Start WINE on Windows executables
-:DOSWin:M::MZ::/usr/bin/wine:
diff --git a/wine.install b/wine.install
index cbe10cc59dc7..61f8d73846ed 100644
--- a/wine.install
+++ b/wine.install
@@ -1,7 +1,13 @@
 post_install() {
-  echo "Run 'systemctl restart systemd-binfmt' in order to make the wine binfmt available on your system."
+  echo
+  echo 'Please note:'
+  echo 'You have to call the League Of Legends executable with the command'
+  echo '"/opt/wine-lol/bin/wine" instead of just "wine".'
+  echo 'This allows you to have an up-to-date wine-staging installed in'
+  echo 'parallel to this "special LoL wine build"'
+  echo
 }
 
-post_remove() {
-  echo "binfmt binary formats will be updated at reboot"
+post_upgrade() {
+  post_install
 }