Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2efb18dd96bb68bd67caf1dee1afb491fc04b3a3
commit 2efb18dd96bb68bd67caf1dee1afb491fc04b3a3 Author: DeX77 <[email protected]> Date: Thu Jan 25 14:17:18 2018 +0100 wine-devel-3.0-1-x86_64 * version bump diff --git a/source/include/wine.sh b/source/include/wine.sh index 0a15974..8928d95 100644 --- a/source/include/wine.sh +++ b/source/include/wine.sh @@ -54,7 +54,7 @@ wine-devel) conflicts=('wine' 'lib32-wine-devel') provides=('wine' 'lib32-wine-devel') replaces=('lib32-wine-devel') - source=(https://dl.winehq.org/wine/source/${pkgver%.*}.x/wine-$pkgver.tar.xz \ + source=(https://dl.winehq.org/wine/source/${pkgver}/wine-$pkgver.tar.xz \ 0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch ) ;; diff --git a/source/xapps-extra/wine-devel/FrugalBuild b/source/xapps-extra/wine-devel/FrugalBuild index 53c3bce..6232e46 100644 --- a/source/xapps-extra/wine-devel/FrugalBuild +++ b/source/xapps-extra/wine-devel/FrugalBuild @@ -2,18 +2,16 @@ # Maintainer: DeX77 <[email protected]> pkgname=wine-devel -pkgver=2.22 -_d3d9ver=2.20 +pkgver=3.0 +_d3d9ver=2.21 pkgrel=1 Finclude wine ## don't include cross32 is included from wine.sh source=("${source[@]}" \ "https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-${_d3d9ver}.tar.gz" ) signatures=("${signatures[@]}" '' ) -depends+=('mesa-nine' 'libegl') -depends+=('lib32-mesa-nine' 'lib32-libegl') - -Fconfopts+=" --with-d3dadapter" +depends+=('mesa-nine>=17.3.3-3' 'libegl') +depends+=('lib32-mesa-nine>=17.3.3-3' 'lib32-libegl') build() { @@ -36,6 +34,9 @@ build() Fexec cd 32Bit_build || Fdie Fcross32_prepare + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + export PKG_CONFIG_LIBDIR="/usr/lib32/pkgconfig" + Fmake --libdir=/usr/lib32 --with-wine64="$Fsrcdir/${_F_cd_path}/64Bit_build" Fmakeinstall libdir="$Fpkgdir/usr/lib32" dlldir="$Fpkgdir/usr/lib32/wine" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
