summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2017-06-30 10:31:07 -0300
committerDaniel Bermond2017-06-30 10:31:07 -0300
commit251917e6210830c954b8aae18013deab664c5b9d (patch)
treee4147db75f02458dbd4c67d02520dae2bdcfd21b
parent2a1c08f2575415c9c87eba1c4611ce3d1536ee33 (diff)
downloadaur-251917e6210830c954b8aae18013deab664c5b9d.tar.gz
White spaces and cosmetic changings
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD381
2 files changed, 183 insertions, 208 deletions
diff --git a/.SRCINFO b/.SRCINFO
index acbb9555ab7..7009a4c6829 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Feb 9 22:16:42 UTC 2017
+# Fri Jun 30 13:30:12 UTC 2017
pkgbase = wine-staging-git
- pkgdesc = A compatibility layer for running Windows programs (staging branch, Git version)
+ pkgdesc = A compatibility layer for running Windows programs (staging branch, git version)
pkgver = 2.1.r0.g29d851bf+wine.2.1.r0.ge08ed6cac2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/wine-compholio/wine-staging/
arch = i686
arch = x86_64
@@ -137,12 +137,12 @@ pkgbase = wine-staging-git
optdepends = dosbox
provides = wine=2.1.r0.ge08ed6cac2
provides = wine-wow64=2.1.r0.ge08ed6cac2
+ provides = wine-git=2.1.r0.ge08ed6cac2
provides = wine-staging=2.1.r0.g29d851bf
- provides = wine-git
conflicts = wine
conflicts = wine-wow64
- conflicts = wine-staging
conflicts = wine-git
+ conflicts = wine-staging
options = staticlibs
source = wine-git::git://source.winehq.org/git/wine.git
source = wine-staging-git::git+https://github.com/wine-compholio/wine-staging.git
diff --git a/PKGBUILD b/PKGBUILD
index 2822fe9a152..b6275787196 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,233 +2,208 @@
pkgname=wine-staging-git
pkgver=2.1.r0.g29d851bf+wine.2.1.r0.ge08ed6cac2
-pkgrel=1
-pkgdesc="A compatibility layer for running Windows programs (staging branch, Git version)"
+pkgrel=2
+pkgdesc='A compatibility layer for running Windows programs (staging branch, git version)'
arch=('i686' 'x86_64')
-url="https://github.com/wine-compholio/wine-staging/"
+url='https://github.com/wine-compholio/wine-staging/'
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'
- 'desktop-file-utils'
+ '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'
+ 'desktop-file-utils'
)
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'
- 'alsa-lib' 'lib32-alsa-lib'
- 'libxcomposite' 'lib32-libxcomposite'
- 'mesa' 'lib32-mesa'
- 'libgl' 'lib32-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'
- 'samba'
- 'opencl-headers'
+ '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'
+ 'alsa-lib' 'lib32-alsa-lib'
+ 'libxcomposite' 'lib32-libxcomposite'
+ 'mesa' 'lib32-mesa'
+ 'libgl' 'lib32-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'
+ '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'
- 'libtxc_dxtn' 'lib32-libtxc_dxtn'
- 'libva' 'lib32-libva'
- 'gtk3' 'lib32-gtk3'
- 'gst-plugins-base-libs' 'lib32-gst-plugins-base-libs'
- 'vulkan-icd-loader' 'lib32-vulkan-icd-loader'
- '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'
+ 'libtxc_dxtn' 'lib32-libtxc_dxtn'
+ 'libva' 'lib32-libva'
+ 'gtk3' 'lib32-gtk3'
+ 'gst-plugins-base-libs' 'lib32-gst-plugins-base-libs'
+ 'vulkan-icd-loader' 'lib32-vulkan-icd-loader'
+ 'cups'
+ 'samba'
+ 'dosbox'
)
options=('staticlibs')
-source=(wine-git::'git://source.winehq.org/git/wine.git'
+source=('wine-git'::'git://source.winehq.org/git/wine.git'
"$pkgname"::'git+https://github.com/wine-compholio/wine-staging.git'
'30-win32-aliases.conf')
sha256sums=('SKIP'
'SKIP'
'9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7')
-if [ "$CARCH" = "i686" ]; then
- # Strip lib32 etc. on i686
- _depends=(${_depends[@]/*32-*/})
- makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
- makedepends=(${makedepends[@]/*-multilib*/})
- optdepends=(${optdepends[@]/*32-*/})
- provides=(
- "wine=$(echo ${pkgver} | grep -o '+.*' | cut -c7-)"
- "wine-staging=$(echo ${pkgver} | grep -o '.*+' | sed 's/.\{1\}$//')"
- 'wine-git'
- )
- conflicts=('wine' 'wine-staging' 'wine-git')
+if [ "$CARCH" = 'i686' ]
+then
+ # strip lib32 etc. on i686
+ _depends=("${_depends[@]/*32-*/}")
+ makedepends=("${makedepends[@]/*32-*/}" "${_depends[@]}")
+ makedepends=("${makedepends[@]/*-multilib*/}")
+ optdepends=("${optdepends[@]/*32-*/}")
+ provides=(
+ "wine=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')"
+ "wine-git=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')"
+ "wine-staging=$(printf '%s' "$pkgver" | sed 's/\+wine.*//')"
+ )
+ conflicts=('wine' 'wine-git' 'wine-staging')
else
- makedepends=(${makedepends[@]} ${_depends[@]})
- provides=(
- "wine=$(echo ${pkgver} | grep -o '+.*' | cut -c7-)"
- "wine-wow64=$(echo ${pkgver} | grep -o '+.*' | cut -c7-)"
- "wine-staging=$(echo ${pkgver} | grep -o '.*+' | sed 's/.\{1\}$//')"
- 'wine-git'
- )
- conflicts=('wine' 'wine-wow64' 'wine-staging' 'wine-git')
+ makedepends=("${makedepends[@]}" "${_depends[@]}")
+ provides=(
+ "wine=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')"
+ "wine-wow64=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')"
+ "wine-git=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')"
+ "wine-staging=$(printf '%s' "$pkgver" | sed 's/\+wine.*//')"
+ )
+ conflicts=('wine' 'wine-wow64' 'wine-git' 'wine-staging')
fi
-pkgver() {
- cd "${srcdir}/${pkgname}"
- _staging_tag="$(git tag | sort -r | head -n1 | sed 's/-/./g;s/^v//')"
- _staging_version="$(git describe --long \
- | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//' \
- | sed "s/^latest.release/${_staging_tag}/")"
- cd "${srcdir}/wine-git"
- _wine_version="$(git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')"
-
- printf "%s+%s" "$_staging_version" "$_wine_version"
+prepare() {
+ cd 'wine-git'
+ msg2 'Cleaning wine source code tree...'
+
+ # restore the wine tree to its git origin state, without wine-staging patches
+ # (necessary for reapllying wine-staging patches in succedent builds,
+ # otherwise the patches will fail to be reapplied)
+ git reset --hard HEAD # restore tracked files
+ git clean -xdf # delete untracked files
+
+ # change back to the wine upstream commit that this version of wine-staging is based in
+ msg2 'Changing wine HEAD to the wine-staging base commit...'
+ git checkout "$(../"${pkgname}"/patches/patchinstall.sh --upstream-commit)"
}
-prepare() {
- cd "$srcdir"/wine-git
-
- msg2 "Cleaning the wine source code tree..."
-
- # Restore the wine tree to its git origin state, without wine-staging patches
- #+(necessary for reapllying wine-staging patches in succedent builds,
- #+otherwise the patches will fail to be reapplied)
- git reset --hard HEAD # Restore tracked files
- git clean -d -x -f # Delete untracked files
-
- # Change back to the wine upstream commit that this version of wine-staging is based in
- git checkout $(../"$pkgname"/patches/patchinstall.sh --upstream-commit)
+pkgver() {
+ cd "$pkgname"
+ local _staging_tag="$(git tag | sort -r | head -n1 | sed 's/-/./g;s/^v//')"
+ local _staging_version="$(git describe --long --tags \
+ | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//' \
+ | sed "s/^latest.release/${_staging_tag}/")"
+ cd "${srcdir}/wine-git"
+ local _wine_version="$(git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')"
+
+ printf '%s+%s' "$_staging_version" "$_wine_version"
}
build() {
- cd "${srcdir}"
-
- # Delete old build dirs (from previous builds) and make new ones
- rm --recursive --force "$pkgname"-{32,64}-build
- mkdir --parents "$pkgname"-32-build
-
- # Apply all wine-staging patches
- msg2 "Applying wine-staging patches..."
- ./"$pkgname"/patches/patchinstall.sh DESTDIR="${srcdir}/wine-git" --all
-
-
- # 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 --parents "$pkgname"-64-build
- cd "$pkgname"-64-build
-
- ../wine-git/configure \
- --prefix=/usr \
- --libdir=/usr/lib \
- --with-x \
- --with-gstreamer \
- --enable-win64 \
- --with-xattr
-
- make
-
- _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
-
- ../wine-git/configure \
- --prefix=/usr \
- --with-x \
- --with-gstreamer \
- --with-xattr \
- "${_wine32opts[@]}"
-
- make
-
+ # delete old build dirs (from previous builds) and make new ones
+ rm -rf "$pkgname"-{32,64}-build
+ mkdir -p "$pkgname"-32-build
+
+ # apply all wine-staging patches
+ msg2 'Applying wine-staging patches...'
+ ./"${pkgname}"/patches/patchinstall.sh DESTDIR="${srcdir}/wine-git" --all
+
+ # build wine-staging 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 -p "$pkgname"-64-build
+ cd "$pkgname"-64-build
+ ../wine-git/configure \
+ --prefix='/usr' \
+ --libdir='/usr/lib' \
+ --with-x \
+ --with-gstreamer \
+ --enable-win64 \
+ --with-xattr
+ make
+ local _wine32opts=(
+ '--libdir=/usr/lib32'
+ "--with-wine64=${srcdir}/${pkgname}-64-build"
+ )
+ export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+ fi
+
+ # build wine-staging 32-bit
+ msg2 'Building Wine-32...'
+ cd "${srcdir}/${pkgname}"-32-build
+ ../wine-git/configure \
+ --prefix='/usr' \
+ --with-x \
+ --with-gstreamer \
+ --with-xattr \
+ "${_wine32opts[@]}"
+ make
}
package() {
- 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 "$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
-
-
- # 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"
+ depends=("${_depends[@]}")
+
+ # package wine-staging 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-staging 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"
}