[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - cairo/cairo cairo/cairo-1.10.2.patch cairo/pixman cairo/pixman-0.24.0.patch

[Fridrich Strba]

 cairo/cairo-1.10.2.patch  |   12 ++++--------
 cairo/cairo/makefile.mk   |    2 +-
 cairo/pixman-0.24.0.patch |   31 +++++++++++++++++++++++++++++++
 cairo/pixman/makefile.mk  |    2 +-
 4 files changed, 37 insertions(+), 10 deletions(-)

New commits:
commit 2889909e1e7ab5d69391bb6c0a0b37b48adac9ef
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Dec 19 09:43:18 2011 +0100

    Build ps and pdf cairo surfaces with MSVC
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch
index 533efdf..cd6b350 100644
--- a/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo-1.10.2.patch
@@ -9,14 +9,10 @@
  CAIRO_HAS_GL_SURFACE=0
  CAIRO_HAS_DIRECTFB_SURFACE=0
  CAIRO_HAS_VG_SURFACE=0
-@@ -28,9 +28,9 @@
- CAIRO_HAS_SCRIPT_SURFACE=0
- CAIRO_HAS_FT_FONT=0
+@@ -30,7 +30,7 @@
  CAIRO_HAS_FC_FONT=0
--CAIRO_HAS_PS_SURFACE=1
--CAIRO_HAS_PDF_SURFACE=1
-+CAIRO_HAS_PS_SURFACE=0
-+CAIRO_HAS_PDF_SURFACE=0
+ CAIRO_HAS_PS_SURFACE=1
+ CAIRO_HAS_PDF_SURFACE=1
 -CAIRO_HAS_SVG_SURFACE=1
 +CAIRO_HAS_SVG_SURFACE=0
  CAIRO_HAS_TEST_SURFACES=0
@@ -47,7 +43,7 @@
  else
  ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/
 -CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib
-+CAIRO_LIBS += $(top_builddir)/../zlib/zlib.lib
++CAIRO_LIBS += $(ZLIB3RDLIB)
  endif
  
  DEFAULT_CFLAGS = -nologo $(MS_MDFLAGS) $(OPT)
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index ccad5b4..fc0111c 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -96,7 +96,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src
 .ENDIF
 
 .ELSE   # WNT, not GCC
-BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release
+BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=$(ZLIB3RDLIB)
 BUILD_DIR=
 .ENDIF
 
commit 546bb6c9b79bf9571a5089a2e2a5dc8b2642164e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Dec 19 09:42:32 2011 +0100

    Fix MMX build of pixman with MSVC

diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch
index 0611962..c848666 100644
--- a/cairo/pixman-0.24.0.patch
+++ b/cairo/pixman-0.24.0.patch
@@ -103,3 +103,34 @@
   { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
  $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
  if test "${ac_cv_c_bigendian+set}" = set; then
+--- misc/pixman-0.24.0/pixman/pixman-utils.c
++++ misc/build/pixman-0.24.0/pixman/pixman-utils.c
+@@ -27,6 +27,7 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ 
+ #include "pixman-private.h"
+ 
+--- misc/pixman-0.24.0/pixman/pixman-mmx.c	2011-11-06 13:47:42.000000000 -0700
++++ misc/build/pixman-0.24.0/pixman/pixman-mmx.c	2011-12-19 00:41:42.280402800 -0700
+@@ -309,7 +309,7 @@
+ 
+ /* Elemental unaligned loads */
+ 
+-static __inline__ __m64 ldq_u(uint64_t *p)
++static inline __m64 ldq_u(uint64_t *p)
+ {
+ #ifdef USE_X86_MMX
+     /* x86's alignment restrictions are very relaxed. */
+@@ -328,7 +328,7 @@
+ #endif
+ }
+ 
+-static __inline__ uint32_t ldl_u(uint32_t *p)
++static inline uint32_t ldl_u(uint32_t *p)
+ {
+ #ifdef USE_X86_MMX
+     /* x86's alignment restrictions are very relaxed. */
+
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index df9c795..225ae86 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -70,7 +70,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 
 .ELSE   # WNT, not GCC
 BUILD_DIR=pixman
-BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=off SSE2=on CFG=release
+BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release
 .ENDIF
 
 .ELIF "$(GUIBASE)"=="aqua"