[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                         |    1 
 patches/dev300/cairo-pixman-makefile-mk.diff |   10 +--
 patches/dev300/slideshow-colorspace-fix.diff |   68 ---------------------------
 3 files changed, 5 insertions(+), 74 deletions(-)

New commits:
commit 8f08a32bd883e6fa3263ce61d5bfef2f4127d80d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 14 12:09:17 2009 +0300

    slideshow-colorspace-fix.diff is upstream
    
    * patches/dev300/slideshow-colorspace-fix.diff: Delete.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 895b85d..6ecf821 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2750,7 +2750,6 @@ cppcanvas-fix-roundcorners.diff, rodo
 sd-more-title-styles.diff, i#23221, thorsten
 officecfg-bighandles-default.diff, thorsten
 
-slideshow-colorspace-fix.diff, thorsten
 slideshow-cutblack.diff, thorsten
 canvas-colorspace-fix.diff, thorsten
 
diff --git a/patches/dev300/slideshow-colorspace-fix.diff b/patches/dev300/slideshow-colorspace-fix.diff
deleted file mode 100644
index ca21452..0000000
--- a/patches/dev300/slideshow-colorspace-fix.diff
+++ /dev/null
@@ -1,68 +0,0 @@
---- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-07-28 23:08:34.000000000 +0200
-+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx	2008-07-28 23:31:16.000000000 +0200
-@@ -569,10 +569,10 @@
-         static const OGLFormat lcl_RGB24[] = 
-         {
-             // 24 bit RGB
-+            {3, GL_BGR, GL_UNSIGNED_BYTE},
-             {3, GL_RGB, GL_UNSIGNED_BYTE},
--//            {3, GL_BGR, GL_UNSIGNED_BYTE},
--            {3, GL_RGB, GL_UNSIGNED_BYTE},
-- //           {3, GL_BGR, GL_UNSIGNED_BYTE}
-+            {3, GL_BGR, GL_UNSIGNED_BYTE},
-+            {3, GL_RGB, GL_UNSIGNED_BYTE}
-         };
- 
- #if defined(GL_VERSION_1_2) && defined(GLU_VERSION_1_3)
-@@ -580,37 +580,37 @@
-         static const OGLFormat lcl_RGB16[] = 
-         {
-             // 16 bit RGB
--            {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5},
-             {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV},
-             {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5},
--            {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV}
-+            {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV},
-+            {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5}
-         };
- 
-         static const OGLFormat lcl_ARGB16_4[] = 
-         {
-             // 16 bit ARGB
--            {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4},
--//            {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4},
-- //           {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV},
--            {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4_REV}
-+            {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4_REV},
-+            {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV},
-+            {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4},
-+            {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4}
-         };
- 
-         static const OGLFormat lcl_ARGB16_5[] = 
-         {
-             // 16 bit ARGB
--            {4, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1},
-- //           {4, GL_BGRA, GL_UNSIGNED_SHORT_5_5_5_1},
--  //          {4, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV},
--            {4, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV}
-+            {4, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV},
-+            {4, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV},
-+            {4, GL_BGRA, GL_UNSIGNED_SHORT_5_5_5_1},
-+            {4, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1}
-         };
- 
-         static const OGLFormat lcl_ARGB32[] = 
-         {
-             // 32 bit ARGB
--            {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8},
--//            {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8},
--  //          {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV},
--            {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV}
-+            {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV},
-+            {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV},
-+            {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8},
-+            {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8}
-         };
- 
-         const uno::Sequence<sal_Int8> aComponentTags(
commit 6f5ee3be6d066fe4be799c31791308f150f1e510
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 14 12:07:22 2009 +0300

    Adapt cairo-pixman-makefile-mk.diff for dev300-m54
    
    * patches/dev300/cairo-pixman-makefile-mk.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/cairo-pixman-makefile-mk.diff b/patches/dev300/cairo-pixman-makefile-mk.diff
index 8116049..24f9839 100644
--- a/patches/dev300/cairo-pixman-makefile-mk.diff
+++ b/patches/dev300/cairo-pixman-makefile-mk.diff
@@ -1,5 +1,5 @@
---- cairo/pixman/makefile.mk	2009-03-05 10:22:54.000000000 +0100
-+++ cairo/pixman/makefile.mk	2009-03-05 10:23:25.000000000 +0100
+--- cairo/pixman/makefile.mk
++++ cairo/pixman/makefile.mk
 @@ -89,7 +89,7 @@
  .ELSE
  # ----------- Unix ---------------------------------------------------------
@@ -10,11 +10,11 @@
 
  .IF "$(OS)$(COM)"=="SOLARISC52"
 @@ -135,7 +135,7 @@
- OUT2LIB+=pixman$/release$/*.lib
  .ENDIF
  .ELSE
+ .IF "$(CPUNAME)"=="X86_64"
 -OUT2LIB+=pixman$/.libs$/libpixman-1.so
 +OUT2LIB+=pixman$/.libs$/libpixman-1.so*
+ .ELSE
+ OUT2LIB+=pixman$/.libs$/libpixman-1.a
  .ENDIF
- 
- # --- Targets ------------------------------------------------------