diff options
| author | Michael Forney <mforney@mforney.org> | 2016-06-26 13:27:00 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-06-26 13:27:49 -0700 |
| commit | bc1fe603dac0eb4a102b6d32a4dea68f22619442 (patch) | |
| tree | 7022024d9874b53b9a3666ee1af1f04005b9da3c | |
| parent | 043af3766e4b75dfa5c1c76d49b4f706a0a3f8f9 (diff) | |
Add pixman 0.34.0
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | LICENSE | 1 | ||||
| -rw-r--r-- | desktop/gen.rc | 1 | ||||
| -rw-r--r-- | desktop/pixman/config.h | 48 | ||||
| -rw-r--r-- | desktop/pixman/gen.rc | 58 | ||||
| m--------- | desktop/pixman/src | 0 | ||||
| -rwxr-xr-x | fetch.rc | 1 |
7 files changed, 112 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 6817dcce..08b3a821 100644 --- a/.gitmodules +++ b/.gitmodules @@ -74,6 +74,9 @@ path = desktop/libpciaccess/src url = https://anongit.freedesktop.org/git/xorg/lib/libpciaccess.git ignore = all +[submodule "desktop/pixman/src"] + path = desktop/pixman/src + url = https://anongit.freedesktop.org/git/pixman.git [submodule "desktop/plan9fonts/src"] path = desktop/plan9fonts/src url = https://github.com/rtrn/plan9fonts @@ -31,6 +31,7 @@ desktop/expat/expat_config.h desktop/libdrm/config.h desktop/libffi/fficonfig.h desktop/libpciaccess/config.h +desktop/pixman/config.h desktop/wayland/config.h devel/make/config.h devel/mc/config.h diff --git a/desktop/gen.rc b/desktop/gen.rc index a4a0b9f9..d342a46d 100644 --- a/desktop/gen.rc +++ b/desktop/gen.rc @@ -4,5 +4,6 @@ subgen expat subgen libdrm subgen libffi subgen libpciaccess +subgen pixman subgen plan9fonts subgen wayland diff --git a/desktop/pixman/config.h b/desktop/pixman/config.h new file mode 100644 index 00000000..1ff23a85 --- /dev/null +++ b/desktop/pixman/config.h @@ -0,0 +1,48 @@ +#include <config-posix.h> + +/* #undef AC_APPLE_UNIVERSAL_BUILD */ +#define HAVE_BUILTIN_CLZ /**/ +#define HAVE_FEDIVBYZERO 1 +/* #undef HAVE_FEENABLEEXCEPT */ +#define HAVE_FLOAT128 /**/ +#define HAVE_GCC_VECTOR_EXTENSIONS /**/ +/* #undef HAVE_GETISAX */ +#define HAVE_GETPAGESIZE 1 +/* #undef HAVE_LIBPIXMAN_1 */ +/* #undef HAVE_LIBPNG */ +#define HAVE_MEMORY_H 1 +#define HAVE_PTHREADS /**/ +#define LT_OBJDIR ".libs/" +#define PACKAGE "pixman" +#define PACKAGE_BUGREPORT "pixman@lists.freedesktop.org" +#define PACKAGE_NAME "pixman" +#define PACKAGE_STRING "pixman 0.34.0" +#define PACKAGE_TARNAME "pixman" +#define PACKAGE_URL "" +#define PACKAGE_VERSION "0.34.0" +/* #undef PIXMAN_TIMERS */ +#define SIZEOF_LONG 8 +#define TLS __thread +#define TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR /**/ +/* #undef USE_ARM_IWMMXT */ +/* #undef USE_ARM_NEON */ +/* #undef USE_ARM_SIMD */ +#define USE_GCC_INLINE_ASM 1 +/* #undef USE_LOONGSON_MMI */ +/* #undef USE_MIPS_DSPR2 */ +/* #undef USE_OPENMP */ +/* #undef USE_VMX */ +#define VERSION "0.34.0" +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif +#ifndef __cplusplus +/* #undef inline */ +#endif +/* #undef sqrtf */ diff --git a/desktop/pixman/gen.rc b/desktop/pixman/gen.rc new file mode 100644 index 00000000..ad424741 --- /dev/null +++ b/desktop/pixman/gen.rc @@ -0,0 +1,58 @@ +cflags\ + -D HAVE_CONFIG_H\ + -I include\ + -I '$dir' \ + -I '$outdir'/include + +exprs=(\ + -e s,@PIXMAN_VERSION_MAJOR@,0,\ + -e s,@PIXMAN_VERSION_MINOR@,34,\ + -e s,@PIXMAN_VERSION_MICRO@,0,\ +) let expr $"exprs --\ + build '$outdir'/include/pixman-version.h sed '$srcdir'/pixman/pixman-version.h.in +build '$outdir'/include/pixman.h copy '$srcdir'/pixman/pixman.h + +phony headers '$outdir'/include/^(pixman.h pixman-version.h) + +deps='phony/$dir/headers' + +# processor-specific features +cflags -D 'USE_SSE2=1' -D 'USE_SSSE3=1' -D 'USE_X86_MMX=1' +let cflags '$cflags -mmmx -Winline' -- cc pixman/pixman-mmx.c || $deps +let cflags '$cflags -msse2 -Winline' -- cc pixman/pixman-sse2.c || $deps +let cflags '$cflags -mssse3 -Winline' -- cc pixman/pixman-ssse3.c || $deps +cpuobjs=(pixman-mmx.c pixman-sse2.c pixman-ssse3.c)^.o + +lib libpixman.a -d $"deps pixman/^(\ + pixman.c\ + pixman-access.c\ + pixman-access-accessors.c\ + pixman-bits-image.c\ + pixman-combine32.c\ + pixman-combine-float.c\ + pixman-conical-gradient.c\ + pixman-filter.c\ + pixman-x86.c\ + pixman-mips.c\ + pixman-arm.c\ + pixman-ppc.c\ + pixman-edge.c\ + pixman-edge-accessors.c\ + pixman-fast-path.c\ + pixman-glyph.c\ + pixman-general.c\ + pixman-gradient-walker.c\ + pixman-image.c\ + pixman-implementation.c\ + pixman-linear-gradient.c\ + pixman-matrix.c\ + pixman-noop.c\ + pixman-radial-gradient.c\ + pixman-region16.c\ + pixman-region32.c\ + pixman-solid-fill.c\ + pixman-timer.c\ + pixman-trap.c\ + pixman-utils.c\ + $cpuobjs\ +) diff --git a/desktop/pixman/src b/desktop/pixman/src new file mode 160000 +Subproject 1727aa4ab60a594cbb1cc1bdaa270b7dfad21f0 @@ -95,6 +95,7 @@ fetch desktop/expat git fetch desktop/libpciaccess git fetch desktop/libdrm git fetch desktop/libffi git +fetch desktop/pixman git fetch desktop/plan9fonts git fetch desktop/wayland git fetch devel/cparser git |
