system/wine: Updated for version 1.4.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

4 files changed, 7 insertions, 91 deletions

diff --git a/system/wine/README b/system/wine/README
index 80a4cc1110..2001dad2f7 100644
--- a/system/wine/README
+++ b/system/wine/README
@@ -6,9 +6,6 @@ script like this:  OPENGL=NO ./wine.SlackBuild
 If you wish to apply an unoffical patch that might fix up some problems
 running IE in wine, then do this: IEFIX=YES ./wine.SlackBuild
 
-If you want to use the fallout3 patch to fix problems with nvidia cards while
-running this game, then do this: FALLOUT3=YES ./wine.SlackBuild
-
 If you want to apply the DIB engine patches use DIB=YES ./wine.SlackBuild.
 
 (There is an environment variable, WINEDIB, which can be set with 
diff --git a/system/wine/fallout3.diff b/system/wine/fallout3.diff
deleted file mode 100644
index f81098f166..0000000000
--- a/system/wine/fallout3.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naur wine-1.1.44-orig/dlls/wined3d/device.c wine-1.1.44/dlls/wined3d/device.c
---- wine-1.1.44-orig/dlls/wined3d/device.c	2010-05-07 19:20:29.000000000 +0100
-+++ wine-1.1.44/dlls/wined3d/device.c	2010-06-11 03:36:48.000000000 +0100
-@@ -188,6 +188,8 @@
-     stream_info->position_transformed = declaration->position_transformed;
-     if (declaration->position_transformed) use_vshader = FALSE;
- 
-+    This->patch_fallout3_mask_of_states &= 0xff ^ PATCH_FALLOUT3_FLAG_ALPHA_TEST_CAN_BE_USED;
-+
-     /* Translate the declaration into strided data. */
-     for (i = 0; i < declaration->element_count; ++i)
-     {
-@@ -301,6 +303,14 @@
-             {
-                 stream_info->swizzle_map |= 1 << idx;
-             }
-+
-+            if( ( (IWineD3DVertexShaderImpl*)(This->stateBlock->vertexShader) )->attributes[idx].usage 
-+               == WINED3DDECLUSAGE_TEXCOORD 
-+              )
-+            {
-+                This->patch_fallout3_mask_of_states |= PATCH_FALLOUT3_FLAG_ALPHA_TEST_CAN_BE_USED;
-+            }
-+
-             stream_info->use_map |= 1 << idx;
-         }
-     }
-diff -Naur wine-1.1.44-orig/dlls/wined3d/drawprim.c wine-1.1.44/dlls/wined3d/drawprim.c
---- wine-1.1.44-orig/dlls/wined3d/drawprim.c	2010-05-07 19:20:29.000000000 +0100
-+++ wine-1.1.44/dlls/wined3d/drawprim.c	2010-06-11 03:36:48.000000000 +0100
-@@ -37,6 +37,15 @@
- static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type,
-         UINT count, UINT idx_size, const void *idx_data, UINT start_idx)
- {
-+    IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
-+    GLboolean gl_alpha_test = glIsEnabled( GL_ALPHA_TEST );
-+
-+    if( ( 0 == ( This->patch_fallout3_mask_of_states & PATCH_FALLOUT3_FLAG_ALPHA_TEST_CAN_BE_USED ) )
-+     && ( gl_alpha_test ) ) 
-+    {
-+        glDisable( GL_ALPHA_TEST );
-+    }
-+ 
-     if (idx_size)
-     {
-         TRACE("(%p) : glElements(%x, %d, ...)\n", iface, primitive_type, count);
-@@ -53,6 +62,13 @@
-         glDrawArrays(primitive_type, start_idx, count);
-         checkGLcall("glDrawArrays");
-     }
-+
-+    if( ( 0 == ( This->patch_fallout3_mask_of_states & PATCH_FALLOUT3_FLAG_ALPHA_TEST_CAN_BE_USED ) )
-+     && ( gl_alpha_test ) ) 
-+    {
-+        glEnable( GL_ALPHA_TEST );
-+    }
-+
- }
- 
- /*
-diff -Naur wine-1.1.44-orig/dlls/wined3d/wined3d_private.h wine-1.1.44/dlls/wined3d/wined3d_private.h
---- wine-1.1.44-orig/dlls/wined3d/wined3d_private.h	2010-05-07 19:20:29.000000000 +0100
-+++ wine-1.1.44/dlls/wined3d/wined3d_private.h	2010-06-11 03:40:07.000000000 +0100
-@@ -1711,8 +1711,12 @@
- #define PATCHMAP_HASHFUNC(x) ((x) % PATCHMAP_SIZE) /* Primitive and simple function */
-     struct list             patches[PATCHMAP_SIZE];
-     struct WineD3DRectPatch *currentPatch;
-+    UINT8 patch_fallout3_mask_of_states;
- };
- 
-+#define PATCH_FALLOUT3_FLAG_ALPHA_TEST_CAN_BE_USED 0x01
-+
-+
- BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *context) DECLSPEC_HIDDEN;
- void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *context) DECLSPEC_HIDDEN;
- void device_get_draw_rect(IWineD3DDeviceImpl *device, RECT *rect) DECLSPEC_HIDDEN;
diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild
index 46f343c6bd..4af7af3edd 100644
--- a/system/wine/wine.SlackBuild
+++ b/system/wine/wine.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wine
-VERSION=${VERSION:-1.2.3}
+VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,8 +50,8 @@ IEFIX=${IEFIX:-NO}
 # the run the script like:   OPENGL=NO ./wine.SlackBuild
 OPENGL=${OPENGL:-YES}
 
-# This patch is for Fallout3. It may conflict with other apps though.
-FALLOUT3=${FALLOUT3:-NO}
+# Apply DIB patch.
+DIB=${DIB:-NO}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -94,11 +94,6 @@ if [ "$OPENGL" = "YES" ]; then
     do_opengl="without"
 fi
 
-# If FALLOUT3=YES then apply patch.
-if [ "$FALLOUT3" = "YES" ]; then
-	patch --verbose -p1 < $CWD/fallout3.diff
-fi
-
 # If DIB=YES then apply DIB patches.
 if [ "$DIB" = "YES" ]; then
 	mkdir dib
diff --git a/system/wine/wine.info b/system/wine/wine.info
index db00cb1dd1..6a3de22bbe 100644
--- a/system/wine/wine.info
+++ b/system/wine/wine.info
@@ -1,12 +1,12 @@
 PRGNAM="wine"
-VERSION="1.2.3"
+VERSION="1.4"
 HOMEPAGE="http://www.winehq.com/"
-DOWNLOAD="http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2.3.tar.bz2 \
+DOWNLOAD="http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.4.tar.bz2 \
           http://www.unrealize.co.uk/source/dibeng-max-2010-11-12.zip"
-MD5SUM="a18ca677d1e01d1596d6692a8f3997e5 \
+MD5SUM="6594ab86a4b1fb2c09dadfb4ea7fc4af \
         97159d77631da13952fe87e846cf1f3b"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
 MAINTAINER="David Woodfall"
 EMAIL="dave@dawoodfall.net"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"