diff options
| -rw-r--r-- | .SRCINFO | 32 | ||||
| -rw-r--r-- | PKGBUILD | 67 |
2 files changed, 60 insertions, 39 deletions
@@ -1,6 +1,6 @@ pkgbase = wine-git pkgdesc = A compatibility layer for running Windows programs (git version) - pkgver = 3.18.r75.ge55aca8f49 + pkgver = 4.11.r138.g6e97461580 pkgrel = 1 url = https://www.winehq.org/ install = wine-git.install @@ -55,9 +55,16 @@ pkgbase = wine-git makedepends = lib32-gst-plugins-base-libs makedepends = vulkan-icd-loader makedepends = lib32-vulkan-icd-loader - makedepends = samba - makedepends = opencl-headers + makedepends = vkd3d + makedepends = lib32-vkd3d + makedepends = sdl2 + makedepends = lib32-sdl2 + makedepends = libgphoto2 + makedepends = sane + makedepends = gsm makedepends = vulkan-headers + makedepends = opencl-headers + makedepends = samba makedepends = fontconfig makedepends = lib32-fontconfig makedepends = lcms2 @@ -84,6 +91,8 @@ pkgbase = wine-git makedepends = lib32-gcc-libs makedepends = libpcap makedepends = lib32-libpcap + makedepends = faudio + makedepends = lib32-faudio makedepends = desktop-file-utils optdepends = giflib optdepends = lib32-giflib @@ -121,18 +130,25 @@ pkgbase = wine-git optdepends = lib32-gst-plugins-base-libs optdepends = vulkan-icd-loader optdepends = lib32-vulkan-icd-loader + optdepends = vkd3d + optdepends = lib32-vkd3d + optdepends = sdl2 + optdepends = lib32-sdl2 + optdepends = libgphoto2 + optdepends = sane + optdepends = gsm optdepends = cups optdepends = samba optdepends = dosbox - provides = wine=3.18.r75.ge55aca8f49 - provides = bin32-wine=3.18.r75.ge55aca8f49 - provides = wine-wow64=3.18.r75.ge55aca8f49 + provides = wine=4.11.r138.g6e97461580 + provides = bin32-wine=4.11.r138.g6e97461580 + provides = wine-wow64=4.11.r138.g6e97461580 conflicts = wine conflicts = bin32-wine conflicts = wine-wow64 replaces = bin32-wine options = staticlibs - source = wine-git::git://source.winehq.org/git/wine.git + source = git://source.winehq.org/git/wine.git source = 30-win32-aliases.conf source = wine-binfmt.conf sha256sums = SKIP @@ -166,5 +182,7 @@ pkgname = wine-git depends = lib32-gcc-libs depends = libpcap depends = lib32-libpcap + depends = faudio + depends = lib32-faudio depends = desktop-file-utils @@ -1,9 +1,9 @@ -# Maintainer : Daniel Bermond < yahoo-com: danielbermond > +# Maintainer : Daniel Bermond < gmail-com: danielbermond > # Contributor: Sidney Crestani <sidneycrestani@archlinux.net> # Contributor: sxe <sxxe@gmx.de> pkgname=wine-git -pkgver=3.18.r75.ge55aca8f49 +pkgver=4.11.r138.g6e97461580 pkgrel=1 pkgdesc='A compatibility layer for running Windows programs (git version)' arch=('i686' 'x86_64') @@ -23,6 +23,7 @@ _depends=( 'libsm' 'lib32-libsm' 'gcc-libs' 'lib32-gcc-libs' 'libpcap' 'lib32-libpcap' + 'faudio' 'lib32-faudio' 'desktop-file-utils' ) makedepends=('git' 'autoconf' 'ncurses' 'bison' 'perl' 'fontforge' 'flex' @@ -47,9 +48,14 @@ makedepends=('git' 'autoconf' 'ncurses' 'bison' 'perl' 'fontforge' 'flex' 'libxslt' 'lib32-libxslt' 'gst-plugins-base-libs' 'lib32-gst-plugins-base-libs' 'vulkan-icd-loader' 'lib32-vulkan-icd-loader' - 'samba' - 'opencl-headers' + 'vkd3d' 'lib32-vkd3d' + 'sdl2' 'lib32-sdl2' + 'libgphoto2' + 'sane' + 'gsm' 'vulkan-headers' + 'opencl-headers' + 'samba' ) optdepends=( 'giflib' 'lib32-giflib' @@ -70,13 +76,18 @@ optdepends=( 'libxslt' 'lib32-libxslt' 'gst-plugins-base-libs' 'lib32-gst-plugins-base-libs' 'vulkan-icd-loader' 'lib32-vulkan-icd-loader' + 'vkd3d' 'lib32-vkd3d' + 'sdl2' 'lib32-sdl2' + 'libgphoto2' + 'sane' + 'gsm' 'cups' 'samba' 'dosbox' ) options=('staticlibs') -install="$pkgname".install -source=("$pkgname"::'git://source.winehq.org/git/wine.git' +install="${pkgname}.install" +source=('git://source.winehq.org/git/wine.git' '30-win32-aliases.conf' 'wine-binfmt.conf') sha256sums=('SKIP' @@ -99,22 +110,23 @@ else fi prepare() { - cd "$pkgname" + # delete old build dirs (from previous builds) and make new ones + rm -rf "$pkgname"-{32,64}-build + mkdir -p "$pkgname"-32-build + [ "$CARCH" = 'x86_64' ] && mkdir "$pkgname"-64-build + + cd wine # fix path of opencl headers sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure* } pkgver() { - cd "$pkgname" + cd wine git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^wine.//;s/^v//;s/\.rc/rc/' } build() { - # delete old build dirs (from previous builds) and make new ones - rm -rf "$pkgname"-{32,64}-build - mkdir -p "$pkgname"-32-build - # workaround for FS#55128 # https://bugs.archlinux.org/task/55128 # https://bugs.winehq.org/show_bug.cgi?id=43530 @@ -126,36 +138,29 @@ build() { if [ "$CARCH" = 'x86_64' ] then printf '%s\n' ' -> Building Wine-64...' - - mkdir "$pkgname"-64-build cd "$pkgname"-64-build - - ../"$pkgname"/configure \ - --prefix='/usr' \ - --libdir='/usr/lib' \ - --with-x \ - --with-gstreamer \ - --enable-win64 + ../wine/configure \ + --prefix='/usr' \ + --libdir='/usr/lib' \ + --with-x \ + --with-gstreamer \ + --enable-win64 make - local _wine32opts=( '--libdir=/usr/lib32' "--with-wine64=${srcdir}/${pkgname}-64-build" ) - export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' fi # build wine 32-bit printf '%s\n' ' -> Building Wine-32...' - cd "${srcdir}/${pkgname}"-32-build - - ../"$pkgname"/configure \ - --prefix='/usr' \ - --with-x \ - --with-gstreamer \ - ${_wine32opts[@]} + ../wine/configure \ + --prefix='/usr' \ + --with-x \ + --with-gstreamer \ + ${_wine32opts[@]} make } @@ -178,9 +183,7 @@ package() { # package wine 64-bit printf '%s\n' ' -> Packaging Wine-64...' - cd "${srcdir}/${pkgname}"-64-build - make prefix="$pkgdir/usr" \ libdir="$pkgdir/usr/lib" \ dlldir="$pkgdir/usr/lib/wine" install |