diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-09-13 11:15:17 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-09-13 11:15:17 +0000 |
| commit | 5450ef2df9517e6cf8b23eeda69ded9d6036319e (patch) | |
| tree | 4e48c52874866fe388ece8f65e203b266212f26e | |
| parent | 83034c5eccfc66cade38c53faea2524b7d472da0 (diff) | |
| download | aports-5450ef2df9517e6cf8b23eeda69ded9d6036319e.tar.bz2 aports-5450ef2df9517e6cf8b23eeda69ded9d6036319e.tar.xz | |
x11/wine: new aport
A compatibility layer for running Windows programs
http://www.winehq.com
| -rw-r--r-- | x11/wine/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch | 39 | ||||
| -rw-r--r-- | x11/wine/APKBUILD | 26 |
2 files changed, 65 insertions, 0 deletions
diff --git a/x11/wine/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch b/x11/wine/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch new file mode 100644 index 0000000000..05ac314166 --- /dev/null +++ b/x11/wine/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch @@ -0,0 +1,39 @@ +From 0454ace14774654c3670a2a29613bed5039991c5 Mon Sep 17 00:00:00 2001 +From: Roderick Colenbrander <thunderbird2k@gmail.com> +Date: Thu, 3 Sep 2009 13:51:44 +0200 +Subject: [PATCH] Always adjust the color_shifts pointer when SelectBitmap is called. This fixes a regression in Steam (bug 19916). + +--- + dlls/winex11.drv/bitmap.c | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c +index 4d635aa..fee2dbc 100644 +--- a/dlls/winex11.drv/bitmap.c ++++ b/dlls/winex11.drv/bitmap.c +@@ -110,10 +110,6 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) + if (physDev->depth != physBitmap->pixmap_depth) + { + physDev->depth = physBitmap->pixmap_depth; +- if(physDev->depth == 1) +- physDev->color_shifts = NULL; +- else +- physDev->color_shifts = &physBitmap->pixmap_color_shifts; + wine_tsx11_lock(); + XFreeGC( gdi_display, physDev->gc ); + physDev->gc = XCreateGC( gdi_display, physDev->drawable, 0, NULL ); +@@ -122,6 +118,12 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) + XFlush( gdi_display ); + wine_tsx11_unlock(); + } ++ ++ if(physDev->depth == 1) ++ physDev->color_shifts = NULL; ++ else ++ physDev->color_shifts = &physBitmap->pixmap_color_shifts; ++ + return hbitmap; + } + +-- +1.6.0.4 diff --git a/x11/wine/APKBUILD b/x11/wine/APKBUILD new file mode 100644 index 0000000000..aae298c830 --- /dev/null +++ b/x11/wine/APKBUILD @@ -0,0 +1,26 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=wine +pkgver=1.1.29 +pkgrel=0 +pkgdesc="A compatibility layer for running Windows programs" +url="http://www.winehq.com" +license="LGPL" +subpackages="$pkgname-dev $pkgname-doc" +makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev + libxcursor-dev libxrandr-dev libxdamage-dev mesa-dev flex bison" +# lcms +source="http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$pkgver.tar.bz2 + 0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch" + +build () +{ + cd "$srcdir"/$pkgname-$pkgver + patch -Np1 -i "$srcdir"/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch + ./configure --prefix=/usr --sysconfdir=/etc --with-x + make depend || return 1 + make || return 1 + make prefix="$pkgdir"/usr install || return 1 + mkdir -p "$pkgdir"/etc/wine +} +md5sums="c3a9218840a80b29932cee49f2d45d9d wine-1.1.29.tar.bz2 +63c4a6aee199039d35e6b57fa505e887 0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch" |