summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2017-10-10 15:32:42 -0300
committerDaniel Bermond2017-10-10 15:32:42 -0300
commitee8952e9c82fafae05cd40e5f62d7f1bb81298c6 (patch)
treedd674e482ffe248b50a29592e3b3155cd3ce3376
parent8d9c6e2bb2fa12ce18d84d785822ee346fedc74a (diff)
downloadaur-ee8952e9c82fafae05cd40e5f62d7f1bb81298c6.tar.gz
Cosmetic changes (first commit after package adoption)
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD328
2 files changed, 177 insertions, 167 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f0985f4ee0c..48e1a7869e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,14 @@
+# Generated by mksrcinfo v8
+# Tue Oct 10 18:32:25 UTC 2017
pkgbase = wine-git
- pkgdesc = A compatibility layer for running Windows programs. GIT version.
+ pkgdesc = A compatibility layer for running Windows programs (git version)
pkgver = 2.1.r285.gd00f7315e0
- pkgrel = 1
- url = http://www.winehq.com
+ pkgrel = 2
+ url = https://www.winehq.org
arch = i686
arch = x86_64
license = LGPL
+ makedepends = git
makedepends = autoconf
makedepends = ncurses
makedepends = bison
@@ -54,7 +57,6 @@ pkgbase = wine-git
makedepends = lib32-gst-plugins-base-libs
makedepends = samba
makedepends = opencl-headers
- makedepends = git
makedepends = fontconfig
makedepends = lib32-fontconfig
makedepends = lcms2
@@ -130,9 +132,9 @@ pkgbase = wine-git
source = wine-git::git://source.winehq.org/git/wine.git
source = 30-win32-aliases.conf
source = 0001-winhlp32-Workaround-a-bug-in-Flex.patch
- md5sums = SKIP
- md5sums = 1ff4e467f59409272088d92173a0f801
- md5sums = 224fde0d5ed5160548db1d70bf9abb20
+ sha256sums = SKIP
+ sha256sums = 9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7
+ sha256sums = 140f489aeea9ff9bd605eb5b6f763fabeea51897ffa1138a6e5b01c4784b646c
pkgname = wine-git
depends = fontconfig
diff --git a/PKGBUILD b/PKGBUILD
index 8d0ef5acd2a..eb6b0b8174d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,182 +1,190 @@
-# Maintainer: Sidney Crestani <sidneycrestani@archlinux.net>
-# Old Maintainer: sxe <sxxe@gmx.de>
-# Based on the wine package in the multilib repository
+# Maintainer : Daniel Bermond < yahoo-com: danielbermond >
+# Contributor: Sidney Crestani <sidneycrestani@archlinux.net>
+# Contributor: sxe <sxxe@gmx.de>
pkgname=wine-git
-_gitname="wine"
pkgver=2.1.r285.gd00f7315e0
-pkgrel=1
-pkgdesc="A compatibility layer for running Windows programs. GIT version."
-url="http://www.winehq.com"
+pkgrel=2
+pkgdesc='A compatibility layer for running Windows programs (git version)'
arch=('i686' 'x86_64')
-options=(staticlibs)
-license=(LGPL)
-source=('wine-git::git://source.winehq.org/git/wine.git'
- '30-win32-aliases.conf'
- '0001-winhlp32-Workaround-a-bug-in-Flex.patch')
-md5sums=('SKIP'
- '1ff4e467f59409272088d92173a0f801'
- '224fde0d5ed5160548db1d70bf9abb20')
-
+url='https://www.winehq.org'
+license=('LGPL')
_depends=(
- 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
- desktop-file-utils
+ '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'
+ 'desktop-file-utils'
)
-
-makedepends=(autoconf ncurses bison perl fontforge flex
- 'gcc>=4.5.0-2' 'gcc-multilib>=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
- libpulse lib32-libpulse
- alsa-lib lib32-alsa-lib
- libxcomposite lib32-libxcomposite
- mesa lib32-mesa
- libgl lib32-libgl
- opencl-icd-loader lib32-opencl-icd-loader
- libxslt lib32-libxslt
- gst-plugins-base-libs lib32-gst-plugins-base-libs
- samba
- opencl-headers
- git
+makedepends=('git' 'autoconf' 'ncurses' 'bison' 'perl' 'fontforge' 'flex'
+ 'gcc>=4.5.0-2' 'gcc-multilib>=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'
+ 'libpulse' 'lib32-libpulse'
+ 'alsa-lib' 'lib32-alsa-lib'
+ 'libxcomposite' 'lib32-libxcomposite'
+ 'mesa' 'lib32-mesa'
+ 'libgl' 'lib32-libgl'
+ 'opencl-icd-loader' 'lib32-opencl-icd-loader'
+ 'libxslt' 'lib32-libxslt'
+ 'gst-plugins-base-libs' 'lib32-gst-plugins-base-libs'
+ '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
- gst-plugins-base-libs lib32-gst-plugins-base-libs
- cups
- samba dosbox
+ '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'
+ 'gst-plugins-base-libs' 'lib32-gst-plugins-base-libs'
+ 'cups'
+ 'samba'
+ 'dosbox'
)
-
-if [[ $CARCH == i686 ]]; then
- # Strip lib32 etc. on i686
- _depends=(${_depends[@]/*32-*/})
- makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
- makedepends=(${makedepends[@]/*-multilib*/})
- optdepends=(${optdepends[@]/*32-*/})
+options=('staticlibs')
+source=("$pkgname"::'git://source.winehq.org/git/wine.git'
+ '30-win32-aliases.conf'
+ '0001-winhlp32-Workaround-a-bug-in-Flex.patch')
+sha256sums=('SKIP'
+ '9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7'
+ '140f489aeea9ff9bd605eb5b6f763fabeea51897ffa1138a6e5b01c4784b646c')
+
+if [ "$CARCH" = 'i686' ]
+then
+ # strip lib32 etc. on i686
+ _depends=(${_depends[@]/*32-*/})
+ makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
+ makedepends=(${makedepends[@]/*-multilib*/})
+ optdepends=(${optdepends[@]/*32-*/})
else
- makedepends=(${makedepends[@]} ${_depends[@]})
- provides=("bin32-wine=$pkgver" "wine=$pkgver" "wine-wow64=$pkgver")
- conflicts=('bin32-wine' 'wine' 'wine-wow64')
- replaces=('bin32-wine')
+ makedepends=(${makedepends[@]} ${_depends[@]})
+ provides=("bin32-wine=$pkgver" "wine=$pkgver" "wine-wow64=$pkgver")
+ conflicts=('bin32-wine' 'wine' 'wine-wow64')
+ replaces=('bin32-wine')
fi
-pkgver() {
- #date +%Y%m%d
- cd "$srcdir/$pkgname"
- git describe --always --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g;s/^wine.//'
-
-}
-
prepare() {
- # Allow ccache to work
- cd "$srcdir"
-
- # https://bugs.winehq.org/show_bug.cgi?id=42132
- (cd $pkgname; patch -p1 -i ../0001-winhlp32-Workaround-a-bug-in-Flex.patch)
-
- sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
+ # https://bugs.winehq.org/show_bug.cgi?id=42132
+ cd "$pkgname"
+ patch -p1 -i "${srcdir}/0001-winhlp32-Workaround-a-bug-in-Flex.patch"
+
+ # fix path of opencl headers
+ 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-build
+pkgver() {
+ cd "$pkgname"
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^wine.//;s/^v//'
}
build() {
- cd "$srcdir"
-
- if [[ $CARCH == x86_64 ]]; then
- msg2 "Building Wine-64..."
-
- mkdir $pkgname-64-build
- cd "$srcdir/$pkgname-64-build"
- ../$pkgname/configure \
- --prefix=/usr \
- --libdir=/usr/lib \
- --with-x \
- --with-gstreamer \
- --enable-win64
- # Gstreamer was disabled for FS#33655
-
+ # 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
+ export CFLAGS="${CFLAGS/-fno-plt/}"
+ export LDFLAGS="${LDFLAGS/,-z,now/}"
+
+ # build wine 64-bit
+ # (according to the wine wiki, this 64-bit/32-bit building order is mandatory)
+ if [ "$CARCH" = 'x86_64' ]
+ then
+ msg2 'Building Wine-64...'
+
+ mkdir "$pkgname"-64-build
+ cd "$pkgname"-64-build
+
+ ../"$pkgname"/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
+ msg2 'Building Wine-32...'
+
+ cd "${srcdir}/${pkgname}"-32-build
+
+ ../"$pkgname"/configure \
+ --prefix='/usr' \
+ --with-x \
+ --with-gstreamer \
+ ${_wine32opts[@]}
make
-
- _wine32opts=(
- --libdir=/usr/lib32
- --with-wine64="$srcdir/$pkgname-64-build"
- )
-
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- fi
-
- msg2 "Building Wine-32..."
- cd "$srcdir/$pkgname-32-build"
- ../$pkgname/configure \
- --prefix=/usr \
- --with-x \
- --with-gstreamer \
- "${_wine32opts[@]}"
-
- make
}
package() {
- depends=(${_depends[@]})
-
- msg2 "Packaging Wine-32..."
- cd "$srcdir/$pkgname-32-build"
-
- if [[ $CARCH == i686 ]]; then
- make prefix="$pkgdir/usr" install
- else
- 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
- fi
-
- # 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"
+ depends=(${_depends[@]})
+
+ # package wine 32-bit
+ # (according to the wine wiki, this reverse 32-bit/64-bit packaging order is important)
+ msg2 'Packaging Wine-32...'
+
+ cd "$pkgname"-32-build
+
+ if [ "$CARCH" = 'i686' ]
+ then
+ make prefix="$pkgdir/usr" install
+ else
+ make prefix="$pkgdir/usr" \
+ libdir="$pkgdir/usr/lib32" \
+ dlldir="$pkgdir/usr/lib32/wine" install
+
+ # package wine 64-bit
+ msg2 'Packaging Wine-64...'
+
+ cd "${srcdir}/${pkgname}"-64-build
+
+ make prefix="$pkgdir/usr" \
+ libdir="$pkgdir/usr/lib" \
+ dlldir="$pkgdir/usr/lib/wine" install
+ fi
+
+ # 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"
}