Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=644029ecd59a71d881dda42ad92b610514b9bcf0
commit 644029ecd59a71d881dda42ad92b610514b9bcf0 Author: DeX77 <[email protected]> Date: Sat Nov 5 21:13:55 2016 +0100 wine-devel-1.9.22-1-x86_64 + add cross32 / version bump diff --git a/source/xapps-extra/wine-devel/FrugalBuild b/source/xapps-extra/wine-devel/FrugalBuild index 43fb886..60c454f 100644 --- a/source/xapps-extra/wine-devel/FrugalBuild +++ b/source/xapps-extra/wine-devel/FrugalBuild @@ -2,45 +2,46 @@ # Maintainer: DeX77 <[email protected]> pkgname=wine-devel -pkgver=1.9.21 +pkgver=1.9.22 pkgrel=1 Finclude wine source=("${source[@]}" \ - https://raw.githubusercontent.com/NP-Hardass/wine-d3d9-patches/master/common.sh - https://raw.githubusercontent.com/NP-Hardass/wine-d3d9-patches/master/generate-d3d9-patch.sh) -signatures=("${signatures[@]}" '' '') + "https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-${pkgver}.tar.gz"; ) +signatures=("${signatures[@]}" '' ) depends+=('mesa-nine' 'libegl' 'gst1-plugins-base') -makedepends+=("git") Fconfopts+=" --with-d3dadapter" -if [[ "$CARCH" == "x86_64" ]] -then - rodepends=('lib32-wine-devel') -fi - build() { - mv $Fsrcdir/*.sh ${_F_cd_path}/ Fcd # Disable optimizations to workaround GCC issues CFLAGS="${CFLAGS//-O2/-O0}" - - # Stupid git - Fexec git config --global user.email "[email protected]" - Fexec git config --global user.name "TheNameless" - - Fexec bash ./generate-d3d9-patch.sh $pkgver - mv wine-d3d9-latest.patch ../ - Fpatch wine-d3d9-latest.patch + Fexec patch -p1 < ../wine-d3d9-patches-wine-d3d9-$pkgver/d3d9-helper.patch || Fdie + Fexec patch -p1 < ../wine-d3d9-patches-wine-d3d9-$pkgver/wine-d3d9.patch || Fdie 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 + } # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
