summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsxe2016-05-14 11:35:32 +0200
committersxe2016-05-14 11:35:32 +0200
commit4562cdb2b1419d3be62dd2afb31eadc0c9a8ff28 (patch)
tree0eb1d2ee02ec4c889b70e00db0c6675e5e6b6a94
parenta7297684a139f0f30c0c6709de58c1ff9eba7e9f (diff)
downloadaur-4562cdb2b1419d3be62dd2afb31eadc0c9a8ff28.tar.gz
Merged latest changes form wine PKGBUILD.
-rw-r--r--.SRCINFO45
-rw-r--r--PKGBUILD118
2 files changed, 86 insertions, 77 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eecdb3357fb..0fb0c8df950 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
+# Generated by mksrcinfo v8
+# Sat May 14 09:35:18 UTC 2016
pkgbase = wine-git
pkgdesc = A compatibility layer for running Windows programs. Latest GIT version.
- pkgver = 1.7.34.r0.gb34b2ca
- pkgrel = 2
+ pkgver = 1.9.9.r118.ge1970c8
+ pkgrel = 1
url = http://www.winehq.com
- install = wine-git.install
arch = i686
arch = x86_64
license = LGPL
@@ -13,7 +14,6 @@ pkgbase = wine-git
makedepends = perl
makedepends = fontforge
makedepends = flex
- makedepends = prelink
makedepends = gcc>=4.5.0-2
makedepends = gcc-multilib>=4.5.0-2
makedepends = giflib
@@ -30,28 +30,37 @@ pkgbase = wine-git
makedepends = lib32-libxmu
makedepends = libxxf86vm
makedepends = lib32-libxxf86vm
- makedepends = libxml2
- makedepends = lib32-libxml2
makedepends = libldap
makedepends = lib32-libldap
- makedepends = lcms
- makedepends = lib32-lcms
makedepends = mpg123
makedepends = lib32-mpg123
makedepends = openal
makedepends = lib32-openal
makedepends = v4l-utils
makedepends = lib32-v4l-utils
+ makedepends = libpulse
+ makedepends = lib32-libpulse
makedepends = alsa-lib
makedepends = lib32-alsa-lib
makedepends = libxcomposite
makedepends = lib32-libxcomposite
makedepends = mesa
makedepends = lib32-mesa
+ makedepends = libcl
+ makedepends = lib32-libcl
+ makedepends = libxslt
+ makedepends = lib32-libxslt
+ makedepends = gst-plugins-base-libs
+ makedepends = lib32-gst-plugins-base-libs
makedepends = samba
+ makedepends = opencl-headers
makedepends = git
makedepends = fontconfig
makedepends = lib32-fontconfig
+ makedepends = lcms2
+ makedepends = lib32-lcms2
+ makedepends = libxml2
+ makedepends = lib32-libxml2
makedepends = libxcursor
makedepends = lib32-libxcursor
makedepends = libxrandr
@@ -70,6 +79,8 @@ pkgbase = wine-git
makedepends = lib32-libsm
makedepends = gcc-libs
makedepends = lib32-gcc-libs
+ makedepends = libpcap
+ makedepends = lib32-libpcap
makedepends = desktop-file-utils
optdepends = giflib
optdepends = lib32-giflib
@@ -79,10 +90,6 @@ pkgbase = wine-git
optdepends = lib32-libldap
optdepends = gnutls
optdepends = lib32-gnutls
- optdepends = lcms
- optdepends = lib32-lcms
- optdepends = libxml2
- optdepends = lib32-libxml2
optdepends = mpg123
optdepends = lib32-mpg123
optdepends = openal
@@ -105,12 +112,19 @@ pkgbase = wine-git
optdepends = lib32-ncurses
optdepends = libcl
optdepends = lib32-libcl
+ optdepends = libxslt
+ optdepends = lib32-libxslt
+ optdepends = gst-plugins-base-libs
+ optdepends = lib32-gst-plugins-base-libs
optdepends = cups
optdepends = samba
optdepends = dosbox
+ provides = bin32-wine=1.9.9.r118.ge1970c8
+ provides = wine-wow64=1.9.9.r118.ge1970c8
conflicts = bin32-wine
conflicts = wine-wow64
replaces = bin32-wine
+ options = staticlibs
source = wine-git::git://source.winehq.org/git/wine.git
source = 30-win32-aliases.conf
md5sums = SKIP
@@ -119,6 +133,10 @@ pkgbase = wine-git
pkgname = wine-git
depends = fontconfig
depends = lib32-fontconfig
+ depends = lcms2
+ depends = lib32-lcms2
+ depends = libxml2
+ depends = lib32-libxml2
depends = libxcursor
depends = lib32-libxcursor
depends = libxrandr
@@ -137,6 +155,7 @@ pkgname = wine-git
depends = lib32-libsm
depends = gcc-libs
depends = lib32-gcc-libs
+ depends = libpcap
+ depends = lib32-libpcap
depends = desktop-file-utils
- provides = wine=
diff --git a/PKGBUILD b/PKGBUILD
index 0d775271ec8..8394a86c8ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
pkgname=wine-git
_gitname="wine"
-pkgver=1.7.34.r0.gb34b2ca
-pkgrel=2
+pkgver=1.9.9.r118.ge1970c8
+pkgrel=1
pkgdesc="A compatibility layer for running Windows programs. Latest GIT version."
url="http://www.winehq.com"
arch=('i686' 'x86_64')
-license='LGPL'
-install='wine-git.install'
+options=(staticlibs)
+license=(LGPL)
source=('wine-git::git://source.winehq.org/git/wine.git'
'30-win32-aliases.conf')
@@ -18,6 +18,8 @@ md5sums=('SKIP'
_depends=(
fontconfig lib32-fontconfig
+ lcms2 lib32-lcms2
+ libxml2 lib32-libxml2
libxcursor lib32-libxcursor
libxrandr lib32-libxrandr
libxdamage lib32-libxdamage
@@ -27,61 +29,57 @@ _depends=(
glu lib32-glu
libsm lib32-libsm
gcc-libs lib32-gcc-libs
+ libpcap lib32-libpcap
desktop-file-utils
)
-makedepends=(autoconf ncurses bison perl fontforge flex prelink
+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
- libxml2 lib32-libxml2
- libldap lib32-libldap
- lcms lib32-lcms
- mpg123 lib32-mpg123
- openal lib32-openal
- v4l-utils lib32-v4l-utils
- alsa-lib lib32-alsa-lib
- libxcomposite lib32-libxcomposite
- mesa lib32-mesa
+ 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
+ libcl lib32-libcl
+ libxslt lib32-libxslt
+ gst-plugins-base-libs lib32-gst-plugins-base-libs
samba
+ opencl-headers
git
)
optdepends=(
- giflib lib32-giflib
- libpng lib32-libpng
- libldap lib32-libldap
- gnutls lib32-gnutls
- lcms lib32-lcms
- libxml2 lib32-libxml2
- 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
- libcl lib32-libcl
+ 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
+ libcl lib32-libcl
+ libxslt lib32-libxslt
+ gst-plugins-base-libs lib32-gst-plugins-base-libs
cups
samba dosbox
)
-# Check if libowfat is installed.
-# It has to be removed because WINE cannot be build if installed.
-# Thanks to haagch
-if [ -f /usr/lib/libowfat.a ]; then
- msg2 "Error: libowfat.a detected. Please remove the libowfat package. WINE cannot be build if installed."
- exit 0;
-fi
-
if [[ $CARCH == i686 ]]; then
# Strip lib32 etc. on i686
_depends=(${_depends[@]/*32-*/})
@@ -90,6 +88,7 @@ if [[ $CARCH == i686 ]]; then
optdepends=(${optdepends[@]/*32-*/})
else
makedepends=(${makedepends[@]} ${_depends[@]})
+ provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
conflicts=('bin32-wine' 'wine-wow64')
replaces=('bin32-wine')
fi
@@ -100,22 +99,21 @@ pkgver() {
git describe --always --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g;s/^wine.//'
}
-build() {
+prepare() {
+ # Allow ccache to work
cd "$srcdir"
- # ncurses fix
- sed -i 's|libncurses|libncursesw|g' "$srcdir/$pkgname/configure"
- sed -i 's|lncurses|lncursesw|g' "$srcdir/$pkgname/configure"
+ 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
+}
- # These additional CPPFLAGS solve FS#27662 and FS#34195
- export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
+build() {
+ cd "$srcdir"
if [[ $CARCH == x86_64 ]]; then
-
msg2 "Building Wine-64..."
mkdir $pkgname-64-build
@@ -124,7 +122,7 @@ build() {
--prefix=/usr \
--libdir=/usr/lib \
--with-x \
- --without-gstreamer \
+ --with-gstreamer \
--enable-win64
# Gstreamer was disabled for FS#33655
@@ -143,23 +141,15 @@ build() {
../$pkgname/configure \
--prefix=/usr \
--with-x \
- --without-gstreamer \
+ --with-gstreamer \
"${_wine32opts[@]}"
- # These additional flags solve FS#23277
- make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2"
+ make
}
package() {
depends=(${_depends[@]})
- gitver=$(cd "$srcdir/$pkgname" && git describe --long | sed -r 's/^wine-//;s/([^-]*-g)/r\1/;s/-/./g')
- provides=("wine=$gitver")
- if [[ $CARCH == x86_64 ]]; then
- provides[2]="bin32-wine=$gitver"
- provides[3]="wine-wow64=$gitver"
- fi
-
msg2 "Packaging Wine-32..."
cd "$srcdir/$pkgname-32-build"