[arch-commits] Commit in wine-staging/repos/multilib-x86_64 (8 files)

Felix Yan felixonmars at archlinux.org
Sun Mar 15 12:25:52 UTC 2020


    Date: Sunday, March 15, 2020 @ 12:25:52
  Author: felixonmars
Revision: 597920

archrelease: copy trunk to multilib-x86_64

Added:
  wine-staging/repos/multilib-x86_64/30-win32-aliases.conf
    (from rev 597918, wine-staging/trunk/30-win32-aliases.conf)
  wine-staging/repos/multilib-x86_64/PKGBUILD
    (from rev 597918, wine-staging/trunk/PKGBUILD)
  wine-staging/repos/multilib-x86_64/wine-binfmt.conf
    (from rev 597918, wine-staging/trunk/wine-binfmt.conf)
  wine-staging/repos/multilib-x86_64/wine.install
    (from rev 597918, wine-staging/trunk/wine.install)
Deleted:
  wine-staging/repos/multilib-x86_64/30-win32-aliases.conf
  wine-staging/repos/multilib-x86_64/PKGBUILD
  wine-staging/repos/multilib-x86_64/wine-binfmt.conf
  wine-staging/repos/multilib-x86_64/wine.install

------------------+
 PKGBUILD         |  388 ++++++++++++++++++++++++++---------------------------
 wine-binfmt.conf |    4 
 wine.install     |   14 -
 3 files changed, 205 insertions(+), 201 deletions(-)

Deleted: 30-win32-aliases.conf
===================================================================
(Binary files differ)

Copied: wine-staging/repos/multilib-x86_64/30-win32-aliases.conf (from rev 597918, wine-staging/trunk/30-win32-aliases.conf)
===================================================================
(Binary files differ)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-15 12:25:47 UTC (rev 597919)
+++ PKGBUILD	2020-03-15 12:25:52 UTC (rev 597920)
@@ -1,192 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Eduardo Romero <eduardo at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=wine-staging
-pkgver=5.3
-pkgrel=1
-
-_pkgbasever=${pkgver/rc/-rc}
-
-source=(https://dl.winehq.org/wine/source/5.x/wine-$_pkgbasever.tar.xz{,.sign}
-        "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)
-sha512sums=('40528f46ad10c11758308e3bf21ba73c7af133d4dda386d542acec3a5cb31e01be0eb102b94f9d82a2358e45597bf49bd1e82c463e3a26aff8c0827b5a0894b6'
-            'SKIP'
-            'df14a61c04b134a72dc8662ee331fd234e2c82bf82824cb01443ae6516aba0bdcb579e2dbedc1ada47de0f3a1265c5fe9ef5f8183094d74451845b78d0a81702'
-            '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
-            'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285')
-validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
-              DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
-
-pkgdesc="A compatibility layer for running Windows programs - Staging branch"
-url="https://www.wine-staging.com"
-arch=(x86_64)
-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
-  faudio           lib32-faudio
-  desktop-file-utils
-)
-
-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
-  libcups               lib32-libcups
-  sane
-  libgphoto2
-  gsm
-  ffmpeg
-  samba
-  opencl-headers
-)
-
-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
-  sane
-  libgphoto2
-  gsm
-  ffmpeg
-  cups
-  samba           dosbox
-)
-
-provides=("wine=$pkgver" "wine-wow64=$pkgver")
-conflicts=('wine' 'wine-wow64')
-install=wine.install
-
-prepare() {
-  # Allow ccache to work
-  mv wine-$_pkgbasever $pkgname
-
-  # apply wine-staging patchset
-  pushd wine-staging-$_pkgbasever/patches
-  ./patchinstall.sh DESTDIR="$srcdir/$pkgname" --all
-  popd
-
-  # Doesn't compile without remove these flags as of 4.10
-  export CFLAGS="${CFLAGS/-fno-plt/}"
-  export LDFLAGS="${LDFLAGS/,-z,now/}"
-
-  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
-
-  # Get rid of old build dirs
-  rm -rf $pkgname-{32,64}-build
-  mkdir $pkgname-{32,64}-build
-}
-
-build() {
-  cd "$srcdir"
-
-  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
-
-  msg2 "Building Wine-32..."
-
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  cd "$srcdir/$pkgname-32-build"
-  ../$pkgname/configure \
-    --prefix=/usr \
-    --with-x \
-    --with-gstreamer \
-    --with-xattr \
-    --libdir=/usr/lib32 \
-    --with-wine64="$srcdir/$pkgname-64-build"
-
-  make
-}
-
-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
-
-  # 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"
-}
-
-# vim:set ts=8 sts=2 sw=2 et:

Copied: wine-staging/repos/multilib-x86_64/PKGBUILD (from rev 597918, wine-staging/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-15 12:25:52 UTC (rev 597920)
@@ -0,0 +1,196 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Eduardo Romero <eduardo at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=wine-staging
+pkgver=5.4
+pkgrel=1
+
+_pkgbasever=${pkgver/rc/-rc}
+
+source=(https://dl.winehq.org/wine/source/5.x/wine-$_pkgbasever.tar.xz{,.sign}
+        "wine-staging-v$_pkgbasever.tar.gz::https://github.com/wine-staging/wine-staging/archive/v$_pkgbasever.tar.gz"
+        wine-staging-x3daudio1_7.patch::https://github.com/wine-staging/wine-staging/commit/a1246b5e921ea950851e4a971fb3dae535d7b982.patch
+        30-win32-aliases.conf
+        wine-binfmt.conf)
+sha512sums=('892e8b875484ada01eaddab4ea50992f95cf3ced6730f8e2ca1f0765770d7fa53a21080c526772b9b3ac83b3559d3d68e83ad3af3afbe9d6f931d833afde7e98'
+            'SKIP'
+            'd4958e73cea34a4a722f516487116d9f77a22099cb80b9c79f2468fbe28855acec131dacecfd255a9934fb88bcf34809bfb2e2e518d89ac23bcae125b6d6c86b'
+            '5ae86f2eb6a396099e8c45dda444ff94f08c089bbb7b1e818bb9d7069f362e6aa082832dcfa07247cc3fd8a49fcd36a6965e9face260fbfb00b55612de501a44'
+            '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
+            'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285')
+validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
+              DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
+
+pkgdesc="A compatibility layer for running Windows programs - Staging branch"
+url="https://www.wine-staging.com"
+arch=(x86_64)
+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
+  faudio           lib32-faudio
+  desktop-file-utils
+)
+
+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
+  libcups               lib32-libcups
+  sane
+  libgphoto2
+  gsm
+  ffmpeg
+  samba
+  opencl-headers
+)
+
+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
+  sane
+  libgphoto2
+  gsm
+  ffmpeg
+  cups
+  samba           dosbox
+)
+
+provides=("wine=$pkgver" "wine-wow64=$pkgver")
+conflicts=('wine' 'wine-wow64')
+install=wine.install
+
+prepare() {
+  # Allow ccache to work
+  mv wine-$_pkgbasever $pkgname
+
+  patch -d wine-staging-$_pkgbasever -p1 -i ../wine-staging-x3daudio1_7.patch
+
+  # apply wine-staging patchset
+  pushd wine-staging-$_pkgbasever/patches
+  ./patchinstall.sh DESTDIR="$srcdir/$pkgname" --all
+  popd
+
+  # Doesn't compile without remove these flags as of 4.10
+  export CFLAGS="${CFLAGS/-fno-plt/}"
+  export LDFLAGS="${LDFLAGS/,-z,now/}"
+
+  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
+
+  # Get rid of old build dirs
+  rm -rf $pkgname-{32,64}-build
+  mkdir $pkgname-{32,64}-build
+}
+
+build() {
+  cd "$srcdir"
+
+  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
+
+  msg2 "Building Wine-32..."
+
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  cd "$srcdir/$pkgname-32-build"
+  ../$pkgname/configure \
+    --prefix=/usr \
+    --with-x \
+    --with-gstreamer \
+    --with-xattr \
+    --libdir=/usr/lib32 \
+    --with-wine64="$srcdir/$pkgname-64-build"
+
+  make
+}
+
+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
+
+  # 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"
+}
+
+# vim:set ts=8 sts=2 sw=2 et:

Deleted: wine-binfmt.conf
===================================================================
--- wine-binfmt.conf	2020-03-15 12:25:47 UTC (rev 597919)
+++ wine-binfmt.conf	2020-03-15 12:25:52 UTC (rev 597920)
@@ -1,2 +0,0 @@
-# Start WINE on Windows executables
-:DOSWin:M::MZ::/usr/bin/wine:

Copied: wine-staging/repos/multilib-x86_64/wine-binfmt.conf (from rev 597918, wine-staging/trunk/wine-binfmt.conf)
===================================================================
--- wine-binfmt.conf	                        (rev 0)
+++ wine-binfmt.conf	2020-03-15 12:25:52 UTC (rev 597920)
@@ -0,0 +1,2 @@
+# Start WINE on Windows executables
+:DOSWin:M::MZ::/usr/bin/wine:

Deleted: wine.install
===================================================================
--- wine.install	2020-03-15 12:25:47 UTC (rev 597919)
+++ wine.install	2020-03-15 12:25:52 UTC (rev 597920)
@@ -1,7 +0,0 @@
-post_install() {
-  echo "Run 'systemctl restart systemd-binfmt' in order to make the wine binfmt available on your system."
-}
-
-post_remove() {
-  echo "binfmt binary formats will be updated at reboot"
-}

Copied: wine-staging/repos/multilib-x86_64/wine.install (from rev 597918, wine-staging/trunk/wine.install)
===================================================================
--- wine.install	                        (rev 0)
+++ wine.install	2020-03-15 12:25:52 UTC (rev 597920)
@@ -0,0 +1,7 @@
+post_install() {
+  echo "Run 'systemctl restart systemd-binfmt' in order to make the wine binfmt available on your system."
+}
+
+post_remove() {
+  echo "binfmt binary formats will be updated at reboot"
+}



More information about the arch-commits mailing list