[Libreoffice-commits] .: cairo/pixman cairo/pixman-0.24.0.android.patch cairo/pixman-0.24.0.patch cairo/pixman-0.24.4.android.patch cairo/pixman-0.24.4.patch ooo.lst.in
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Apr 10 05:06:49 PDT 2012
cairo/pixman-0.24.0.android.patch | 13 ---
cairo/pixman-0.24.0.patch | 145 --------------------------------------
cairo/pixman-0.24.4.android.patch | 13 +++
cairo/pixman-0.24.4.patch | 145 ++++++++++++++++++++++++++++++++++++++
cairo/pixman/makefile.mk | 4 -
ooo.lst.in | 2
6 files changed, 161 insertions(+), 161 deletions(-)
New commits:
commit 619b314317ae370fbff54900524adbae397cb860
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Apr 10 14:06:19 2012 +0200
Upgrade pixman to 0.24.4
diff --git a/cairo/pixman-0.24.0.android.patch b/cairo/pixman-0.24.0.android.patch
deleted file mode 100644
index f9a52f0..0000000
--- a/cairo/pixman-0.24.0.android.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- misc/pixman-0.24.0/ltmain.sh
-+++ misc/build/pixman-0.24.0/ltmain.sh
-@@ -3228,6 +3228,10 @@
- fi
- else
-
-+ # Force no versioning suffix for Android
-+
-+ version_type=none
-+
- # Parse the version information argument.
- save_ifs="$IFS"; IFS=':'
- set dummy $vinfo 0 0 0
diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch
deleted file mode 100644
index 39122cd..0000000
--- a/cairo/pixman-0.24.0.patch
+++ /dev/null
@@ -1,145 +0,0 @@
---- misc/pixman-0.24.0/Makefile.win32.common 2011-12-16 15:30:44.653987145 +0100
-+++ misc/build/pixman-0.24.0/Makefile.win32.common 2011-12-16 15:30:37.288130250 +0100
-@@ -1 +1,54 @@
--dummy
-+LIBRARY = pixman-1
-+
-+CC = cl
-+LD = link
-+AR = lib
-+PERL = perl
-+
-+ifeq ($(top_builddir),)
-+top_builddir = $(top_srcdir)
-+endif
-+
-+CFG_VAR = $(CFG)
-+ifeq ($(CFG_VAR),)
-+CFG_VAR = release
-+endif
-+
-+ifeq ($(CFG_VAR),debug)
-+CFG_CFLAGS = -MD -Od -Zi
-+CFG_LDFLAGS = -DEBUG
-+else
-+CFG_CFLAGS = -MD -O2
-+CFG_LDFLAGS =
-+endif
-+
-+# Package definitions, to be used instead of those provided in config.h
-+PKG_CFLAGS = -DPACKAGE=$(LIBRARY) -DPACKAGE_VERSION="" -DPACKAGE_BUGREPORT=""
-+
-+BASE_CFLAGS = -nologo -I. -I$(top_srcdir) -I$(top_srcdir)/pixman
-+
-+PIXMAN_CFLAGS = $(BASE_CFLAGS) $(PKG_CFLAGS) $(CFG_CFLAGS) $(CFLAGS)
-+PIXMAN_LDFLAGS = -nologo $(CFG_LDFLAGS) $(LDFLAGS)
-+PIXMAN_ARFLAGS = -nologo $(LDFLAGS)
-+
-+
-+inform:
-+ifneq ($(CFG),release)
-+ifneq ($(CFG),debug)
-+ifneq ($(CFG),)
-+ @echo "Invalid specified configuration option: "$(CFG)"."
-+ @echo
-+ @echo "Possible choices for configuration are 'release' and 'debug'"
-+ @exit 1
-+endif
-+ @echo "Using default RELEASE configuration... (use CFG=release or CFG=debug)"
-+endif
-+endif
-+
-+
-+$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES)
-+ @mkdir -p $(CFG_VAR)
-+ @$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
-+
-+clean: inform
-+ @$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0
---- misc/pixman-0.24.0/Makefile.in 2011-11-06 22:11:25.000000000 +0100
-+++ misc/build/pixman-0.24.0/Makefile.in 2011-12-16 09:06:45.317211035 +0100
-@@ -272,7 +272,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pixman demos test
-+SUBDIRS = pixman
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pixman-1.pc
- GPGKEY = 6FF7C1A8
---- misc/pixman-0.24.0/config.sub 2008-08-30 00:27:25.000000000 +0200
-+++ misc/build/pixman-0.24.0/config.sub 2011-12-16 09:05:14.595773609 +0100
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1247,7 +1247,7 @@
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+ | -udi* | -linux-androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
---- misc/pixman-0.24.0/configure 2011-11-06 22:11:27.000000000 +0100
-+++ misc/build/pixman-0.24.0/configure 2011-12-16 09:06:16.482898083 +0100
-@@ -20202,6 +20202,13 @@
-
-
-
-+# getisax is falsely detected when using OOo build script on Linux/FBSD...
-+case "$build_os" in
-+ linux-gnu*)
-+ ;;
-+ freebsd*)
-+ ;;
-+ *)
-
- for ac_func in getisax
- do
-@@ -20304,6 +20311,8 @@
- done
-
-
-+ ;;
-+esac
- { $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-0.24.4.android.patch b/cairo/pixman-0.24.4.android.patch
new file mode 100644
index 0000000..ae0626e
--- /dev/null
+++ b/cairo/pixman-0.24.4.android.patch
@@ -0,0 +1,13 @@
+--- misc/pixman-0.24.4/ltmain.sh
++++ misc/build/pixman-0.24.4/ltmain.sh
+@@ -3228,6 +3228,10 @@
+ fi
+ else
+
++ # Force no versioning suffix for Android
++
++ version_type=none
++
+ # Parse the version information argument.
+ save_ifs="$IFS"; IFS=':'
+ set dummy $vinfo 0 0 0
diff --git a/cairo/pixman-0.24.4.patch b/cairo/pixman-0.24.4.patch
new file mode 100644
index 0000000..c16ac84
--- /dev/null
+++ b/cairo/pixman-0.24.4.patch
@@ -0,0 +1,145 @@
+--- misc/pixman-0.24.4/Makefile.win32.common 2011-12-16 15:30:44.653987145 +0100
++++ misc/build/pixman-0.24.4/Makefile.win32.common 2011-12-16 15:30:37.288130250 +0100
+@@ -1 +1,54 @@
+-dummy
++LIBRARY = pixman-1
++
++CC = cl
++LD = link
++AR = lib
++PERL = perl
++
++ifeq ($(top_builddir),)
++top_builddir = $(top_srcdir)
++endif
++
++CFG_VAR = $(CFG)
++ifeq ($(CFG_VAR),)
++CFG_VAR = release
++endif
++
++ifeq ($(CFG_VAR),debug)
++CFG_CFLAGS = -MD -Od -Zi
++CFG_LDFLAGS = -DEBUG
++else
++CFG_CFLAGS = -MD -O2
++CFG_LDFLAGS =
++endif
++
++# Package definitions, to be used instead of those provided in config.h
++PKG_CFLAGS = -DPACKAGE=$(LIBRARY) -DPACKAGE_VERSION="" -DPACKAGE_BUGREPORT=""
++
++BASE_CFLAGS = -nologo -I. -I$(top_srcdir) -I$(top_srcdir)/pixman
++
++PIXMAN_CFLAGS = $(BASE_CFLAGS) $(PKG_CFLAGS) $(CFG_CFLAGS) $(CFLAGS)
++PIXMAN_LDFLAGS = -nologo $(CFG_LDFLAGS) $(LDFLAGS)
++PIXMAN_ARFLAGS = -nologo $(LDFLAGS)
++
++
++inform:
++ifneq ($(CFG),release)
++ifneq ($(CFG),debug)
++ifneq ($(CFG),)
++ @echo "Invalid specified configuration option: "$(CFG)"."
++ @echo
++ @echo "Possible choices for configuration are 'release' and 'debug'"
++ @exit 1
++endif
++ @echo "Using default RELEASE configuration... (use CFG=release or CFG=debug)"
++endif
++endif
++
++
++$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES)
++ @mkdir -p $(CFG_VAR)
++ @$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
++
++clean: inform
++ @$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0
+--- misc/pixman-0.24.4/Makefile.in 2011-11-06 22:11:25.000000000 +0100
++++ misc/build/pixman-0.24.4/Makefile.in 2011-12-16 09:06:45.317211035 +0100
+@@ -272,7 +272,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = pixman demos test
++SUBDIRS = pixman
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = pixman-1.pc
+ GPGKEY = 6FF7C1A8
+--- misc/pixman-0.24.4/config.sub 2008-08-30 00:27:25.000000000 +0200
++++ misc/build/pixman-0.24.4/config.sub 2011-12-16 09:05:14.595773609 +0100
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+@@ -1247,7 +1247,7 @@
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++ | -udi* | -linux-androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+--- misc/pixman-0.24.4/configure 2011-11-06 22:11:27.000000000 +0100
++++ misc/build/pixman-0.24.4/configure 2011-12-16 09:06:16.482898083 +0100
+@@ -20202,6 +20202,13 @@
+
+
+
++# getisax is falsely detected when using OOo build script on Linux/FBSD...
++case "$build_os" in
++ linux-gnu*)
++ ;;
++ freebsd*)
++ ;;
++ *)
+
+ for ac_func in getisax
+ do
+@@ -20304,6 +20311,8 @@
+ done
+
+
++ ;;
++esac
+ { $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.4/pixman/pixman-utils.c
++++ misc/build/pixman-0.24.4/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.4/pixman/pixman-mmx.c 2011-11-06 13:47:42.000000000 -0700
++++ misc/build/pixman-0.24.4/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 f4dab40..307f852 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -43,10 +43,10 @@ all:
# --- Files --------------------------------------------------------
-PIXMANVERSION=0.24.0
+PIXMANVERSION=0.24.4
TARFILE_NAME=pixman-$(PIXMANVERSION)
-TARFILE_MD5=db5ffcd50064421176e8afb7b85fd1a7
+TARFILE_MD5=c63f411b3ad147db2bcce1bf262a0e02
ADDITIONAL_FILES=Makefile.win32.common
diff --git a/ooo.lst.in b/ooo.lst.in
index 00f57db..eef3c26 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -1,7 +1,7 @@
http://dev-www.libreoffice.org/src
86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz
63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
-db5ffcd50064421176e8afb7b85fd1a7-pixman-0.24.0.tar.bz2
+c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
More information about the Libreoffice-commits
mailing list