145 lines
4.3 KiB
Diff
145 lines
4.3 KiB
Diff
--- 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. */
|
|
|