Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=90c10c792632eb39ebf37356d515f040070bef5e
commit 90c10c792632eb39ebf37356d515f040070bef5e Author: DeX77 <[email protected]> Date: Sat Nov 5 20:20:13 2016 +0100 wine-1.8.5-2-x86_64 + add cross32 diff --git a/source/include/wine.sh b/source/include/wine.sh index f558676..62dd412 100644 --- a/source/include/wine.sh +++ b/source/include/wine.sh @@ -20,29 +20,37 @@ url="http://www.winehq.org"; groups=('xapps-extra') depends=('lcms2' 'openal' 'libglu' 'libldap' 'libpcap' 'libpulse' 'libmpg123' 'libgphoto2' 'gettext' \ - 'libxcursor' 'libxi' 'libxrandr' 'libxinerama' 'libxcomposite' 'sane-backends' 'v4l-utils' 'libxrender' 'libxslt' - ) + 'libxcursor' 'libxi' 'libxrandr' 'libxinerama' 'libxcomposite' 'sane-backends' 'v4l-utils' 'libxrender' 'libxslt') +#32 bit +depends+=('lib32-lcms2' 'lib32-libxcursor' 'lib32-libxi' 'lib32-libxrandr' 'lib32-libxinerama' 'lib32-libxcomposite' \ + 'lib32-libxrender' 'lib32-libxslt' 'lib32-freetype2') makedepends=('x11-protos' 'cups') _F_cd_path="wine-$pkgver" -options=('genscriptlet') -archs=('i686' 'x86_64') +options=('genscriptlet' 'nostrip') +archs=('x86_64') +_F_conf_configure="../configure" -Fconfopts+=" --libdir=/usr/lib" +F32confopts+=" --libdir=/usr/lib32" + +Finclude cross32 case "$pkgname" in wine) pkgdesc="An Open Source implementation of the Windows API on top of X and Unix. (Stable)" up2date="Flasttar https://dl.winehq.org/wine/source/1.8/"; - conflicts=('wine-devel') + conflicts=('wine-devel' 'lib32-wine-devel') + provides=('lib32-wine-devel') + replaces=('lib32-wine-devel') ;; wine-devel) pkgdesc="An Open Source implementation of the Windows API on top of X and Unix. (Development)" _F_archive_name="wine" up2date="Flasttar https://dl.winehq.org/wine/source/1.9/"; - conflicts=('wine') - provides=('wine') + conflicts=('wine' 'lib32-wine') + provides=('wine' 'lib32-wine') + replaces=('lib32-wine') ;; default) @@ -52,21 +60,30 @@ default) esac -if [[ "$CARCH" == "x86_64" ]] -then - Fconfopts="--enable-win64" - rodepends=('lib32-wine') -fi - source=(https://dl.winehq.org/wine/source/${pkgver%.*}/wine-$pkgver.tar.bz2) signatures=("${source[@]}.sign") build() { + Fcd Fsed 'lib64' 'lib' configure.ac Fautoreconf - Fbuild + Fexec mkdir 64Bit_build || Fdie + Fexec cd 64Bit_build || Fdie + Fmake --enable-win64 + + Fexec cd .. || Fdie + Fexec mkdir 32Bit_build || Fdie + Fexec cd 32Bit_build || Fdie + Fcross32_prepare + + Fmake --libdir=/usr/lib32 --with-wine64="$Fsrcdir/${_F_cd_path}/64Bit_build" + Fmakeinstall libdir="$Fpkgdir/usr/lib32" dlldir="$Fpkgdir/usr/lib32/wine" + + Fexec cd ../64Bit_build || Fdie + Fmakeinstall libdir="$Fpkgdir/usr/lib" dlldir="$Fpkgdir/usr/lib/wine" + Fexec cp $Fincdir/wine.conf $Fsrcdir Ffile /etc/binfmt.d/wine.conf } diff --git a/source/xapps-extra/wine/FrugalBuild b/source/xapps-extra/wine/FrugalBuild index 1f81695..977d164 100644 --- a/source/xapps-extra/wine/FrugalBuild +++ b/source/xapps-extra/wine/FrugalBuild @@ -4,7 +4,7 @@ pkgname=wine pkgver=1.8.5 -pkgrel=1 +pkgrel=2 Finclude wine # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
