[arch-commits] Commit in wine-staging/repos/multilib-x86_64 (8 files)
Felix Yan
felixonmars at archlinux.org
Sun Jul 5 18:53:21 UTC 2020
Date: Sunday, July 5, 2020 @ 18:53:18
Author: felixonmars
Revision: 657906
archrelease: copy trunk to multilib-x86_64
Added:
wine-staging/repos/multilib-x86_64/30-win32-aliases.conf
(from rev 657905, wine-staging/trunk/30-win32-aliases.conf)
wine-staging/repos/multilib-x86_64/PKGBUILD
(from rev 657905, wine-staging/trunk/PKGBUILD)
wine-staging/repos/multilib-x86_64/wine-binfmt.conf
(from rev 657905, wine-staging/trunk/wine-binfmt.conf)
wine-staging/repos/multilib-x86_64/wine.install
(from rev 657905, 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 | 397 ++++++++++++++++++++++++++---------------------------
wine-binfmt.conf | 4
wine.install | 14 -
3 files changed, 209 insertions(+), 206 deletions(-)
Deleted: 30-win32-aliases.conf
===================================================================
(Binary files differ)
Copied: wine-staging/repos/multilib-x86_64/30-win32-aliases.conf (from rev 657905, wine-staging/trunk/30-win32-aliases.conf)
===================================================================
(Binary files differ)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-05 18:53:00 UTC (rev 657905)
+++ PKGBUILD 2020-07-05 18:53:18 UTC (rev 657906)
@@ -1,197 +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.11
-pkgrel=2
-
-_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"
- $pkgname-desktop-path.patch::https://github.com/wine-staging/wine-staging/commit/102af10c89164cff0be68d6b4072de9050b1000b.patch
- 30-win32-aliases.conf
- wine-binfmt.conf)
-sha512sums=('fac78a98e03e0305c85fff393b7c5d46a3fbe11aff4a0153771187d3ad0212189d1fa88947fc9fe0da7bd8327eb71283f28ff866c4d8b2bc759a2ad2197fc9a1'
- 'SKIP'
- 'a5cff848077f937d8f910d6f8b4efc033435c99bc6eeb8cf2a39e812b09c9fad5602e91e761eb1a006a1487299f7d81ecf7597d104fcafd076a8692e086af1a5'
- '9eaa888992f4535c3d00a2502f3815801da4ff6da3448e4605778c308fbec56547550595ab0c5bc64aebb8105a6f740e18e3e0efd585ae3eaf2d1f8701217788'
- '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
-
- # https://bugs.winehq.org/show_bug.cgi?id=49415
- patch -d wine-staging-$_pkgbasever -p1 < $pkgname-desktop-path.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:
Copied: wine-staging/repos/multilib-x86_64/PKGBUILD (from rev 657905, wine-staging/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-07-05 18:53:18 UTC (rev 657906)
@@ -0,0 +1,200 @@
+# 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.12
+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"
+ $pkgname-build-fix.patch::https://github.com/wine-staging/wine-staging/commit/3f3a05f91c85cb5ccdc4c8185bcc862c6e96cd52.patch
+ $pkgname-build-fix-again.patch::https://github.com/wine-staging/wine-staging/commit/3dd8d0e647ee0bd304f4d2e265580f1ba536bf0d.patch
+ 30-win32-aliases.conf
+ wine-binfmt.conf)
+sha512sums=('1272b143d64ed6083cd797474f18dbd2bca7a38d488474ae5f054f47789b4fc1d386c7bbf8aa1bd86f9507908fc799b4f45e10e1d8c628c5bd52c42b1d74c8a8'
+ 'SKIP'
+ '1ad23128b6d6183b8e5e814214c2ff2b6f1173e8f599248e6e38fa78c20701ac7295e87c2fdc809787ab284e1270ff0dc9edbc5adc80b1fc2067f0fc4cb0ac16'
+ 'a38b69923a35ed8dc69bd7fd1d19ed605641b7e0812544f8c50b9e0d0ad0ae65d189466efdb1c6904e67ce4d9c6ebb31a465e4c4a05bc406860f6649aa96aad6'
+ '2ff1373f0ddf00b4c25cd0d7877242365839c9e0b657a0a3e6468c6b5f3cf34d12cb07b7f2867d22d6f01bca42ef5ba238f080785a228ee4f8499ad00bf2296a'
+ '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
+
+ # https://bugs.winehq.org/show_bug.cgi?id=49514
+ patch -d wine-staging-$_pkgbasever -p1 < $pkgname-build-fix.patch
+ patch -d wine-staging-$_pkgbasever -p1 < $pkgname-build-fix-again.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-07-05 18:53:00 UTC (rev 657905)
+++ wine-binfmt.conf 2020-07-05 18:53:18 UTC (rev 657906)
@@ -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 657905, wine-staging/trunk/wine-binfmt.conf)
===================================================================
--- wine-binfmt.conf (rev 0)
+++ wine-binfmt.conf 2020-07-05 18:53:18 UTC (rev 657906)
@@ -0,0 +1,2 @@
+# Start WINE on Windows executables
+:DOSWin:M::MZ::/usr/bin/wine:
Deleted: wine.install
===================================================================
--- wine.install 2020-07-05 18:53:00 UTC (rev 657905)
+++ wine.install 2020-07-05 18:53:18 UTC (rev 657906)
@@ -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 657905, wine-staging/trunk/wine.install)
===================================================================
--- wine.install (rev 0)
+++ wine.install 2020-07-05 18:53:18 UTC (rev 657906)
@@ -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