diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-06-12 14:18:48 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-06-12 14:19:38 +0000 |
| commit | b11788ea764649b024cc1317749f5a537c48fb04 (patch) | |
| tree | fd83a4a38f1d73270f0122085dd31f96b0536bf0 | |
| parent | 8a33f44cb3a3beded942a848c45bc27741e1890a (diff) | |
| download | aports-b11788ea764649b024cc1317749f5a537c48fb04.tar.bz2 aports-b11788ea764649b024cc1317749f5a537c48fb04.tar.xz | |
main/wine: upgrade to 1.3.22
| -rw-r--r-- | main/wine/APKBUILD | 8 | ||||
| -rw-r--r-- | main/wine/uclibc-fmaxf-fminf.patch | 21 |
2 files changed, 26 insertions, 3 deletions
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD index c6a654bdea..2e7e3304ec 100644 --- a/main/wine/APKBUILD +++ b/main/wine/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wine -pkgver=1.3.21 +pkgver=1.3.22 pkgrel=0 pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -15,6 +15,7 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev gstreamer-dev gst-plugins-base-dev paxctl" source="http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$pkgver.tar.bz2 dn_skipname.patch + uclibc-fmaxf-fminf.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -46,5 +47,6 @@ package() { "$pkgdir"/usr/bin/wine } -md5sums="dfcefe48a9aae82f7f1aa4d2c6617961 wine-1.3.21.tar.bz2 -6ebeaa64eddf97be3267db236ce84b71 dn_skipname.patch" +md5sums="46f313013644d31ad37b8fc5c2c16467 wine-1.3.22.tar.bz2 +6ebeaa64eddf97be3267db236ce84b71 dn_skipname.patch +1127b41caf4de8f567b9a3d0aff5277f uclibc-fmaxf-fminf.patch" diff --git a/main/wine/uclibc-fmaxf-fminf.patch b/main/wine/uclibc-fmaxf-fminf.patch new file mode 100644 index 0000000000..1f26cb8b96 --- /dev/null +++ b/main/wine/uclibc-fmaxf-fminf.patch @@ -0,0 +1,21 @@ +--- ./dlls/d3dx9_36/mesh.c.orig ++++ ./dlls/d3dx9_36/mesh.c +@@ -40,6 +40,18 @@ + #include "wine/list.h" + #include "d3dx9_36_private.h" + ++#ifdef __UCLIBC__ ++float fmaxf(float a, float b) ++{ ++ return (a > b) ? a : b; ++} ++ ++float fminf(float a, float b) ++{ ++ return (a < b) ? a : b; ++} ++#endif ++ + WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + + typedef struct ID3DXMeshImpl |