Issue %3003 - Move libpixman to its own directory

74 files changed, 158 insertions, 161 deletions

diff --git a/libs/cairo/libpixman/src/moz.build b/libs/cairo/libpixman/src/moz.build
deleted file mode 100644
index d03e72e7a..000000000
--- a/libs/cairo/libpixman/src/moz.build
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS += [
-    'pixman-version.h',
-    'pixman.h',
-]
-
-if CONFIG['GNU_CC']:
-    if CONFIG['HAVE_ARM_NEON']:
-        SOURCES += [
-            'pixman-arm-neon-asm-bilinear.S',
-            'pixman-arm-neon-asm.S',
-        ]
-    if CONFIG['HAVE_ARM_SIMD']:
-        SOURCES += [
-            'pixman-arm-simd-asm-scaled.S',
-            'pixman-arm-simd-asm.S',
-        ]
-    if CONFIG['CLANG_CXX']:
-        ASFLAGS += [
-            '-no-integrated-as',
-        ]
-
-SOURCES += [
-    'pixman-access-accessors.c',
-    'pixman-access.c',
-    'pixman-arm.c',
-    'pixman-bits-image.c',
-    'pixman-combine-float.c',
-    'pixman-combine32.c',
-    'pixman-conical-gradient.c',
-    'pixman-edge-accessors.c',
-    'pixman-edge.c',
-    'pixman-fast-path.c',
-    'pixman-filter.c',
-    'pixman-general.c',
-    'pixman-glyph.c',
-    'pixman-gradient-walker.c',
-    'pixman-image.c',
-    'pixman-implementation.c',
-    'pixman-linear-gradient.c',
-    'pixman-matrix.c',
-    'pixman-mips.c',
-    'pixman-noop.c',
-    'pixman-ppc.c',
-    'pixman-radial-gradient.c',
-    'pixman-region16.c',
-    'pixman-region32.c',
-    'pixman-solid-fill.c',
-    'pixman-trap.c',
-    'pixman-utils.c',
-    'pixman-x86.c',
-    'pixman.c',
-]
-
-# We allow warnings for third-party code that can be updated from upstream.
-ALLOW_COMPILER_WARNINGS = True
-
-FINAL_LIBRARY = 'gkmedias'
-LOCAL_INCLUDES += [
-    '../../cairo/src',
-]
-
-if CONFIG['MOZ_USE_PTHREADS']:
-    DEFINES['HAVE_PTHREADS'] = True
-
-DEFINES['PACKAGE'] = 'mozpixman'
-
-DEFINES['_USE_MATH_DEFINES'] = True
-
-use_mmx = False
-use_sse2 = False
-use_vmx = False
-use_arm_simd_gcc = False
-use_arm_neon_gcc = False
-if '86' in CONFIG['OS_TEST']:
-    use_sse2 = True
-    if '64' not in CONFIG['OS_TEST']:
-        if CONFIG['_MSC_VER']:
-            use_mmx = True
-    if CONFIG['GNU_CC']:
-        use_mmx = True
-elif 'ppc' in CONFIG['OS_TEST']:
-    if CONFIG['GNU_CC']:
-        use_vmx = True
-elif 'arm' in CONFIG['OS_TEST']:
-    if CONFIG['HAVE_ARM_SIMD']:
-        use_arm_simd_gcc = True
-    if CONFIG['HAVE_ARM_NEON']:
-        use_arm_neon_gcc = True
-
-if use_mmx:
-    DEFINES['USE_MMX'] = True
-    SOURCES += ['pixman-mmx.c']
-    SOURCES['pixman-mmx.c'].flags += CONFIG['MMX_FLAGS']
-    if CONFIG['GNU_CC']:
-        SOURCES['pixman-mmx.c'].flags += [
-            '-Winline',
-            '--param', 'inline-unit-growth=10000',
-            '--param', 'large-function-growth=10000',
-        ]
-
-if use_sse2:
-    DEFINES['USE_SSE'] = True
-    DEFINES['USE_SSE2'] = True
-    SOURCES += ['pixman-sse2.c']
-    SOURCES['pixman-sse2.c'].flags += CONFIG['SSE_FLAGS'] + CONFIG['SSE2_FLAGS']
-    if CONFIG['GNU_CC']:
-        SOURCES['pixman-sse2.c'].flags += ['-Winline']
-
-if use_vmx:
-    DEFINES['USE_VMX'] = True
-    SOURCES += ['pixman-vmx.c']
-    SOURCES['pixman-vmx.c'].flags += ['-maltivec']
-
-if use_arm_simd_gcc:
-    DEFINES['USE_ARM_SIMD'] = True
-    SOURCES += ['pixman-arm-simd.c']
-
-if use_arm_neon_gcc:
-    DEFINES['USE_ARM_NEON'] = True
-    SOURCES += ['pixman-arm-neon.c']
-    SOURCES['pixman-arm-neon.c'].flags += CONFIG['NEON_FLAGS']
-
-# Suppress warnings in third-party code.
-if CONFIG['_MSC_VER']:
-    CFLAGS += [
-        '-wd4047', # different levels of indirection
-        '-wd4101', # unreferenced local variable
-        '-wd4133', # 'function' : incompatible types
-        '-wd4146', # unary minus operator applied to unsigned type
-        '-wd4311', # 'variable' : pointer truncation from 'type' to 'type'
-    ]
-
-if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
-    CFLAGS += [
-        '-Wno-address',
-        '-Wno-missing-field-initializers',
-        '-Wno-sign-compare',
-        '-Wno-incompatible-pointer-types',
-        '-Wno-unused',                      # too many unused warnings; ignore
-    ]
-
-if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
-    CFLAGS += [
-        '-Wno-incompatible-pointer-types',
-        '-Wno-tautological-compare',
-        '-Wno-tautological-constant-out-of-range-compare',
-    ]
-
-if CONFIG['CLANG_CL']:
-    CFLAGS += [
-        '-Wno-unused-variable',
-    ]
diff --git a/libs/cairo/moz.build b/libs/cairo/moz.build
index e8728d28f..2aed0f42f 100644
--- a/libs/cairo/moz.build
+++ b/libs/cairo/moz.build
@@ -4,7 +4,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['cairo/src']
-
-if CONFIG['MOZ_TREE_PIXMAN']:
-    DIRS += ['libpixman/src']
-
diff --git a/libs/cairo/libpixman/AUTHORS b/libs/libpixman/AUTHORS
index a7798bdf1..a7798bdf1 100644
--- a/libs/cairo/libpixman/AUTHORS
+++ b/libs/libpixman/AUTHORS
diff --git a/libs/cairo/libpixman/COPYING b/libs/libpixman/COPYING
index 47c05f154..47c05f154 100644
--- a/libs/cairo/libpixman/COPYING
+++ b/libs/libpixman/COPYING
diff --git a/libs/cairo/libpixman/INSTALL b/libs/libpixman/INSTALL
index 5458714e1..5458714e1 100644
--- a/libs/cairo/libpixman/INSTALL
+++ b/libs/libpixman/INSTALL
diff --git a/libs/cairo/libpixman/NEWS b/libs/libpixman/NEWS
index e69de29bb..e69de29bb 100644
--- a/libs/cairo/libpixman/NEWS
+++ b/libs/libpixman/NEWS
diff --git a/libs/cairo/libpixman/README b/libs/libpixman/README
index e69de29bb..e69de29bb 100644
--- a/libs/cairo/libpixman/README
+++ b/libs/libpixman/README
diff --git a/libs/cairo/libpixman/TODO b/libs/libpixman/TODO
index 6649c698a..6649c698a 100644
--- a/libs/cairo/libpixman/TODO
+++ b/libs/libpixman/TODO
diff --git a/libs/libpixman/moz.build b/libs/libpixman/moz.build
new file mode 100644
index 000000000..f8f60a5e1
--- /dev/null
+++ b/libs/libpixman/moz.build
@@ -0,0 +1,155 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+EXPORTS += [
+  'src/pixman-version.h',
+  'src/pixman.h',
+]
+
+if CONFIG['GNU_CC']:
+  if CONFIG['HAVE_ARM_NEON']:
+    SOURCES += [
+      'src/pixman-arm-neon-asm-bilinear.S',
+      'src/pixman-arm-neon-asm.S',
+    ]
+  if CONFIG['HAVE_ARM_SIMD']:
+    SOURCES += [
+      'src/pixman-arm-simd-asm-scaled.S',
+      'src/pixman-arm-simd-asm.S',
+    ]
+  if CONFIG['CLANG_CXX']:
+    ASFLAGS += [
+      '-no-integrated-as',
+    ]
+
+SOURCES += [
+  'src/pixman-access-accessors.c',
+  'src/pixman-access.c',
+  'src/pixman-arm.c',
+  'src/pixman-bits-image.c',
+  'src/pixman-combine-float.c',
+  'src/pixman-combine32.c',
+  'src/pixman-conical-gradient.c',
+  'src/pixman-edge-accessors.c',
+  'src/pixman-edge.c',
+  'src/pixman-fast-path.c',
+  'src/pixman-filter.c',
+  'src/pixman-general.c',
+  'src/pixman-glyph.c',
+  'src/pixman-gradient-walker.c',
+  'src/pixman-image.c',
+  'src/pixman-implementation.c',
+  'src/pixman-linear-gradient.c',
+  'src/pixman-matrix.c',
+  'src/pixman-mips.c',
+  'src/pixman-noop.c',
+  'src/pixman-ppc.c',
+  'src/pixman-radial-gradient.c',
+  'src/pixman-region16.c',
+  'src/pixman-region32.c',
+  'src/pixman-solid-fill.c',
+  'src/pixman-trap.c',
+  'src/pixman-utils.c',
+  'src/pixman-x86.c',
+  'src/pixman.c',
+]
+
+# We allow warnings for third-party code that can be updated from upstream.
+ALLOW_COMPILER_WARNINGS = True
+
+FINAL_LIBRARY = 'gkmedias'
+LOCAL_INCLUDES += [
+  '../cairo/cairo/src',
+]
+
+if CONFIG['MOZ_USE_PTHREADS']:
+  DEFINES['HAVE_PTHREADS'] = True
+
+DEFINES['PACKAGE'] = 'mozpixman'
+
+DEFINES['_USE_MATH_DEFINES'] = True
+
+use_mmx = False
+use_sse2 = False
+use_vmx = False
+use_arm_simd_gcc = False
+use_arm_neon_gcc = False
+if '86' in CONFIG['OS_TEST']:
+  use_sse2 = True
+  if '64' not in CONFIG['OS_TEST']:
+    if CONFIG['_MSC_VER']:
+      use_mmx = True
+  if CONFIG['GNU_CC']:
+    use_mmx = True
+elif 'ppc' in CONFIG['OS_TEST']:
+  if CONFIG['GNU_CC']:
+    use_vmx = True
+elif 'arm' in CONFIG['OS_TEST']:
+  if CONFIG['HAVE_ARM_SIMD']:
+    use_arm_simd_gcc = True
+  if CONFIG['HAVE_ARM_NEON']:
+    use_arm_neon_gcc = True
+
+if use_mmx:
+  DEFINES['USE_MMX'] = True
+  SOURCES += ['src/pixman-mmx.c']
+  SOURCES['src/pixman-mmx.c'].flags += CONFIG['MMX_FLAGS']
+  if CONFIG['GNU_CC']:
+    SOURCES['src/pixman-mmx.c'].flags += [
+      '-Winline',
+      '--param', 'inline-unit-growth=10000',
+      '--param', 'large-function-growth=10000',
+    ]
+
+if use_sse2:
+  DEFINES['USE_SSE'] = True
+  DEFINES['USE_SSE2'] = True
+  SOURCES += ['src/pixman-sse2.c']
+  SOURCES['src/pixman-sse2.c'].flags += CONFIG['SSE_FLAGS'] + CONFIG['SSE2_FLAGS']
+  if CONFIG['GNU_CC']:
+    SOURCES['src/pixman-sse2.c'].flags += ['-Winline']
+
+if use_vmx:
+  DEFINES['USE_VMX'] = True
+  SOURCES += ['src/pixman-vmx.c']
+  SOURCES['src/pixman-vmx.c'].flags += ['-maltivec']
+
+if use_arm_simd_gcc:
+  DEFINES['USE_ARM_SIMD'] = True
+  SOURCES += ['src/pixman-arm-simd.c']
+
+if use_arm_neon_gcc:
+  DEFINES['USE_ARM_NEON'] = True
+  SOURCES += ['src/pixman-arm-neon.c']
+  SOURCES['src/pixman-arm-neon.c'].flags += CONFIG['NEON_FLAGS']
+
+# Suppress warnings in third-party code.
+if CONFIG['_MSC_VER']:
+  CFLAGS += [
+    '-wd4047', # different levels of indirection
+    '-wd4101', # unreferenced local variable
+    '-wd4133', # 'function' : incompatible types
+    '-wd4146', # unary minus operator applied to unsigned type
+    '-wd4311', # 'variable' : pointer truncation from 'type' to 'type'
+  ]
+
+if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
+  CFLAGS += [
+    '-Wno-address',
+    '-Wno-missing-field-initializers',
+    '-Wno-sign-compare',
+    '-Wno-incompatible-pointer-types',
+    '-Wno-unused',                      # too many unused warnings; ignore
+  ]
+
+if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
+  CFLAGS += [
+    '-Wno-incompatible-pointer-types',
+    '-Wno-tautological-compare',
+    '-Wno-tautological-constant-out-of-range-compare',
+  ]
+
+if CONFIG['CLANG_CL']:
+  CFLAGS += ['-Wno-unused-variable']
diff --git a/libs/cairo/libpixman/src/dither/blue-noise-64x64.h b/libs/libpixman/src/dither/blue-noise-64x64.h
index 93c8805b5..93c8805b5 100644
--- a/libs/cairo/libpixman/src/dither/blue-noise-64x64.h
+++ b/libs/libpixman/src/dither/blue-noise-64x64.h
diff --git a/libs/cairo/libpixman/src/dither/make-blue-noise.c b/libs/libpixman/src/dither/make-blue-noise.c
index f9974b4d4..f9974b4d4 100644
--- a/libs/cairo/libpixman/src/dither/make-blue-noise.c
+++ b/libs/libpixman/src/dither/make-blue-noise.c
diff --git a/libs/cairo/libpixman/src/loongson-mmintrin.h b/libs/libpixman/src/loongson-mmintrin.h
index 0e79e8648..0e79e8648 100644
--- a/libs/cairo/libpixman/src/loongson-mmintrin.h
+++ b/libs/libpixman/src/loongson-mmintrin.h
diff --git a/libs/cairo/libpixman/src/meson.build b/libs/libpixman/src/meson.build
index f48357f26..f48357f26 100644
--- a/libs/cairo/libpixman/src/meson.build
+++ b/libs/libpixman/src/meson.build
diff --git a/libs/cairo/libpixman/src/pixman-access-accessors.c b/libs/libpixman/src/pixman-access-accessors.c
index 3263582f1..3263582f1 100644
--- a/libs/cairo/libpixman/src/pixman-access-accessors.c
+++ b/libs/libpixman/src/pixman-access-accessors.c
diff --git a/libs/cairo/libpixman/src/pixman-access.c b/libs/libpixman/src/pixman-access.c
index 7c5ce783f..7c5ce783f 100644
--- a/libs/cairo/libpixman/src/pixman-access.c
+++ b/libs/libpixman/src/pixman-access.c
diff --git a/libs/cairo/libpixman/src/pixman-accessor.h b/libs/libpixman/src/pixman-accessor.h
index 8e0b03621..8e0b03621 100644
--- a/libs/cairo/libpixman/src/pixman-accessor.h
+++ b/libs/libpixman/src/pixman-accessor.h
diff --git a/libs/cairo/libpixman/src/pixman-arm-asm.h b/libs/libpixman/src/pixman-arm-asm.h
index ee7854108..ee7854108 100644
--- a/libs/cairo/libpixman/src/pixman-arm-asm.h
+++ b/libs/libpixman/src/pixman-arm-asm.h
diff --git a/libs/cairo/libpixman/src/pixman-arm-common.h b/libs/libpixman/src/pixman-arm-common.h
index 953768830..953768830 100644
--- a/libs/cairo/libpixman/src/pixman-arm-common.h
+++ b/libs/libpixman/src/pixman-arm-common.h
diff --git a/libs/cairo/libpixman/src/pixman-arm-neon-asm-bilinear.S b/libs/libpixman/src/pixman-arm-neon-asm-bilinear.S
index 0fd92d61c..0fd92d61c 100644
--- a/libs/cairo/libpixman/src/pixman-arm-neon-asm-bilinear.S
+++ b/libs/libpixman/src/pixman-arm-neon-asm-bilinear.S
diff --git a/libs/cairo/libpixman/src/pixman-arm-neon-asm.S b/libs/libpixman/src/pixman-arm-neon-asm.S
index 7e949a38f..7e949a38f 100644
--- a/libs/cairo/libpixman/src/pixman-arm-neon-asm.S
+++ b/libs/libpixman/src/pixman-arm-neon-asm.S
diff --git a/libs/cairo/libpixman/src/pixman-arm-neon-asm.h b/libs/libpixman/src/pixman-arm-neon-asm.h
index bdcf6a9d4..bdcf6a9d4 100644
--- a/libs/cairo/libpixman/src/pixman-arm-neon-asm.h
+++ b/libs/libpixman/src/pixman-arm-neon-asm.h
diff --git a/libs/cairo/libpixman/src/pixman-arm-neon.c b/libs/libpixman/src/pixman-arm-neon.c
index be761c965..be761c965 100644
--- a/libs/cairo/libpixman/src/pixman-arm-neon.c
+++ b/libs/libpixman/src/pixman-arm-neon.c
diff --git a/libs/cairo/libpixman/src/pixman-arm-simd-asm-scaled.S b/libs/libpixman/src/pixman-arm-simd-asm-scaled.S
index e050292e0..e050292e0 100644
--- a/libs/cairo/libpixman/src/pixman-arm-simd-asm-scaled.S
+++ b/libs/libpixman/src/pixman-arm-simd-asm-scaled.S
diff --git a/libs/cairo/libpixman/src/pixman-arm-simd-asm.S b/libs/libpixman/src/pixman-arm-simd-asm.S
index a74a0a8f3..a74a0a8f3 100644
--- a/libs/cairo/libpixman/src/pixman-arm-simd-asm.S
+++ b/libs/libpixman/src/pixman-arm-simd-asm.S
diff --git a/libs/cairo/libpixman/src/pixman-arm-simd-asm.h b/libs/libpixman/src/pixman-arm-simd-asm.h
index da153c3f5..da153c3f5 100644
--- a/libs/cairo/libpixman/src/pixman-arm-simd-asm.h
+++ b/libs/libpixman/src/pixman-arm-simd-asm.h
diff --git a/libs/cairo/libpixman/src/pixman-arm-simd.c b/libs/libpixman/src/pixman-arm-simd.c
index f0d14540b..f0d14540b 100644
--- a/libs/cairo/libpixman/src/pixman-arm-simd.c
+++ b/libs/libpixman/src/pixman-arm-simd.c
diff --git a/libs/cairo/libpixman/src/pixman-arm.c b/libs/libpixman/src/pixman-arm.c
index 4a2ae8539..4a2ae8539 100644
--- a/libs/cairo/libpixman/src/pixman-arm.c
+++ b/libs/libpixman/src/pixman-arm.c
diff --git a/libs/cairo/libpixman/src/pixman-bits-image.c b/libs/libpixman/src/pixman-bits-image.c
index 4cfabe318..4cfabe318 100644
--- a/libs/cairo/libpixman/src/pixman-bits-image.c
+++ b/libs/libpixman/src/pixman-bits-image.c
diff --git a/libs/cairo/libpixman/src/pixman-combine-float.c b/libs/libpixman/src/pixman-combine-float.c
index f5145bc9d..f5145bc9d 100644
--- a/libs/cairo/libpixman/src/pixman-combine-float.c
+++ b/libs/libpixman/src/pixman-combine-float.c
diff --git a/libs/cairo/libpixman/src/pixman-combine32.c b/libs/libpixman/src/pixman-combine32.c
index 4a89384d9..4a89384d9 100644
--- a/libs/cairo/libpixman/src/pixman-combine32.c
+++ b/libs/libpixman/src/pixman-combine32.c
diff --git a/libs/cairo/libpixman/src/pixman-combine32.h b/libs/libpixman/src/pixman-combine32.h
index 59bb2477a..59bb2477a 100644
--- a/libs/cairo/libpixman/src/pixman-combine32.h
+++ b/libs/libpixman/src/pixman-combine32.h
diff --git a/libs/cairo/libpixman/src/pixman-compiler.h b/libs/libpixman/src/pixman-compiler.h
index d852f9379..d852f9379 100644
--- a/libs/cairo/libpixman/src/pixman-compiler.h
+++ b/libs/libpixman/src/pixman-compiler.h
diff --git a/libs/cairo/libpixman/src/pixman-conical-gradient.c b/libs/libpixman/src/pixman-conical-gradient.c
index a39e20c4e..a39e20c4e 100644
--- a/libs/cairo/libpixman/src/pixman-conical-gradient.c
+++ b/libs/libpixman/src/pixman-conical-gradient.c
diff --git a/libs/cairo/libpixman/src/pixman-edge-accessors.c b/libs/libpixman/src/pixman-edge-accessors.c
index ea3a31e2f..ea3a31e2f 100644
--- a/libs/cairo/libpixman/src/pixman-edge-accessors.c
+++ b/libs/libpixman/src/pixman-edge-accessors.c
diff --git a/libs/cairo/libpixman/src/pixman-edge-imp.h b/libs/libpixman/src/pixman-edge-imp.h
index a4698eddb..a4698eddb 100644
--- a/libs/cairo/libpixman/src/pixman-edge-imp.h
+++ b/libs/libpixman/src/pixman-edge-imp.h
diff --git a/libs/cairo/libpixman/src/pixman-edge.c b/libs/libpixman/src/pixman-edge.c
index ad6dfc4cf..ad6dfc4cf 100644
--- a/libs/cairo/libpixman/src/pixman-edge.c
+++ b/libs/libpixman/src/pixman-edge.c
diff --git a/libs/cairo/libpixman/src/pixman-fast-path.c b/libs/libpixman/src/pixman-fast-path.c
index 4b7a6f897..4b7a6f897 100644
--- a/libs/cairo/libpixman/src/pixman-fast-path.c
+++ b/libs/libpixman/src/pixman-fast-path.c
diff --git a/libs/cairo/libpixman/src/pixman-filter.c b/libs/libpixman/src/pixman-filter.c
index 5f3b752f9..5f3b752f9 100644
--- a/libs/cairo/libpixman/src/pixman-filter.c
+++ b/libs/libpixman/src/pixman-filter.c
diff --git a/libs/cairo/libpixman/src/pixman-general.c b/libs/libpixman/src/pixman-general.c
index 7e5a0d09c..7e5a0d09c 100644
--- a/libs/cairo/libpixman/src/pixman-general.c
+++ b/libs/libpixman/src/pixman-general.c
diff --git a/libs/cairo/libpixman/src/pixman-glyph.c b/libs/libpixman/src/pixman-glyph.c
index 96a349ab4..96a349ab4 100644
--- a/libs/cairo/libpixman/src/pixman-glyph.c
+++ b/libs/libpixman/src/pixman-glyph.c
diff --git a/libs/cairo/libpixman/src/pixman-gradient-walker.c b/libs/libpixman/src/pixman-gradient-walker.c
index fb7f401da..fb7f401da 100644
--- a/libs/cairo/libpixman/src/pixman-gradient-walker.c
+++ b/libs/libpixman/src/pixman-gradient-walker.c
diff --git a/libs/cairo/libpixman/src/pixman-image.c b/libs/libpixman/src/pixman-image.c
index db29ff5b4..db29ff5b4 100644
--- a/libs/cairo/libpixman/src/pixman-image.c
+++ b/libs/libpixman/src/pixman-image.c
diff --git a/libs/cairo/libpixman/src/pixman-implementation.c b/libs/libpixman/src/pixman-implementation.c
index 2c7de4c68..2c7de4c68 100644
--- a/libs/cairo/libpixman/src/pixman-implementation.c
+++ b/libs/libpixman/src/pixman-implementation.c
diff --git a/libs/cairo/libpixman/src/pixman-inlines.h b/libs/libpixman/src/pixman-inlines.h
index f785910f8..f785910f8 100644
--- a/libs/cairo/libpixman/src/pixman-inlines.h
+++ b/libs/libpixman/src/pixman-inlines.h
diff --git a/libs/cairo/libpixman/src/pixman-linear-gradient.c b/libs/libpixman/src/pixman-linear-gradient.c
index 3f528508a..3f528508a 100644
--- a/libs/cairo/libpixman/src/pixman-linear-gradient.c
+++ b/libs/libpixman/src/pixman-linear-gradient.c
diff --git a/libs/cairo/libpixman/src/pixman-matrix.c b/libs/libpixman/src/pixman-matrix.c
index 81b6e613e..81b6e613e 100644
--- a/libs/cairo/libpixman/src/pixman-matrix.c
+++ b/libs/libpixman/src/pixman-matrix.c
diff --git a/libs/cairo/libpixman/src/pixman-mips-dspr2-asm.S b/libs/libpixman/src/pixman-mips-dspr2-asm.S
index 9dad163b7..9dad163b7 100644
--- a/libs/cairo/libpixman/src/pixman-mips-dspr2-asm.S
+++ b/libs/libpixman/src/pixman-mips-dspr2-asm.S
diff --git a/libs/cairo/libpixman/src/pixman-mips-dspr2-asm.h b/libs/libpixman/src/pixman-mips-dspr2-asm.h
index e23856619..e23856619 100644
--- a/libs/cairo/libpixman/src/pixman-mips-dspr2-asm.h
+++ b/libs/libpixman/src/pixman-mips-dspr2-asm.h
diff --git a/libs/cairo/libpixman/src/pixman-mips-dspr2.c b/libs/libpixman/src/pixman-mips-dspr2.c
index 87969ae70..87969ae70 100644
--- a/libs/cairo/libpixman/src/pixman-mips-dspr2.c
+++ b/libs/libpixman/src/pixman-mips-dspr2.c
diff --git a/libs/cairo/libpixman/src/pixman-mips-dspr2.h b/libs/libpixman/src/pixman-mips-dspr2.h
index 57b38359e..57b38359e 100644
--- a/libs/cairo/libpixman/src/pixman-mips-dspr2.h
+++ b/libs/libpixman/src/pixman-mips-dspr2.h
diff --git a/libs/cairo/libpixman/src/pixman-mips-memcpy-asm.S b/libs/libpixman/src/pixman-mips-memcpy-asm.S
index 9ad6da537..9ad6da537 100644
--- a/libs/cairo/libpixman/src/pixman-mips-memcpy-asm.S
+++ b/libs/libpixman/src/pixman-mips-memcpy-asm.S
diff --git a/libs/cairo/libpixman/src/pixman-mips.c b/libs/libpixman/src/pixman-mips.c
index 304881383..304881383 100644
--- a/libs/cairo/libpixman/src/pixman-mips.c
+++ b/libs/libpixman/src/pixman-mips.c
diff --git a/libs/cairo/libpixman/src/pixman-mmx.c b/libs/libpixman/src/pixman-mmx.c
index d7cf2659d..d7cf2659d 100644
--- a/libs/cairo/libpixman/src/pixman-mmx.c
+++ b/libs/libpixman/src/pixman-mmx.c
diff --git a/libs/cairo/libpixman/src/pixman-noop.c b/libs/libpixman/src/pixman-noop.c
index e59890492..e59890492 100644
--- a/libs/cairo/libpixman/src/pixman-noop.c
+++ b/libs/libpixman/src/pixman-noop.c
diff --git a/libs/cairo/libpixman/src/pixman-ppc.c b/libs/libpixman/src/pixman-ppc.c
index a6e7bb0cf..a6e7bb0cf 100644
--- a/libs/cairo/libpixman/src/pixman-ppc.c
+++ b/libs/libpixman/src/pixman-ppc.c
diff --git a/libs/cairo/libpixman/src/pixman-private.h b/libs/libpixman/src/pixman-private.h
index a0459dac1..a0459dac1 100644
--- a/libs/cairo/libpixman/src/pixman-private.h
+++ b/libs/libpixman/src/pixman-private.h
diff --git a/libs/cairo/libpixman/src/pixman-radial-gradient.c b/libs/libpixman/src/pixman-radial-gradient.c
index e8e99c98b..e8e99c98b 100644
--- a/libs/cairo/libpixman/src/pixman-radial-gradient.c
+++ b/libs/libpixman/src/pixman-radial-gradient.c
diff --git a/libs/cairo/libpixman/src/pixman-region.c b/libs/libpixman/src/pixman-region.c
index 59bc9c797..59bc9c797 100644
--- a/libs/cairo/libpixman/src/pixman-region.c
+++ b/libs/libpixman/src/pixman-region.c
diff --git a/libs/cairo/libpixman/src/pixman-region16.c b/libs/libpixman/src/pixman-region16.c
index d88d3380f..d88d3380f 100644
--- a/libs/cairo/libpixman/src/pixman-region16.c
+++ b/libs/libpixman/src/pixman-region16.c
diff --git a/libs/cairo/libpixman/src/pixman-region32.c b/libs/libpixman/src/pixman-region32.c
index abd6b1a93..abd6b1a93 100644
--- a/libs/cairo/libpixman/src/pixman-region32.c
+++ b/libs/libpixman/src/pixman-region32.c
diff --git a/libs/cairo/libpixman/src/pixman-solid-fill.c b/libs/libpixman/src/pixman-solid-fill.c
index 4694ebc70..4694ebc70 100644
--- a/libs/cairo/libpixman/src/pixman-solid-fill.c
+++ b/libs/libpixman/src/pixman-solid-fill.c
diff --git a/libs/cairo/libpixman/src/pixman-sse2.c b/libs/libpixman/src/pixman-sse2.c
index ce4e75f24..ce4e75f24 100644
--- a/libs/cairo/libpixman/src/pixman-sse2.c
+++ b/libs/libpixman/src/pixman-sse2.c
diff --git a/libs/cairo/libpixman/src/pixman-ssse3.c b/libs/libpixman/src/pixman-ssse3.c
index 680d6b95a..680d6b95a 100644
--- a/libs/cairo/libpixman/src/pixman-ssse3.c
+++ b/libs/libpixman/src/pixman-ssse3.c
diff --git a/libs/cairo/libpixman/src/pixman-timer.c b/libs/libpixman/src/pixman-timer.c
index f5ae18e89..f5ae18e89 100644
--- a/libs/cairo/libpixman/src/pixman-timer.c
+++ b/libs/libpixman/src/pixman-timer.c
diff --git a/libs/cairo/libpixman/src/pixman-trap.c b/libs/libpixman/src/pixman-trap.c
index 91766fdbf..91766fdbf 100644
--- a/libs/cairo/libpixman/src/pixman-trap.c
+++ b/libs/libpixman/src/pixman-trap.c
diff --git a/libs/cairo/libpixman/src/pixman-utils.c b/libs/libpixman/src/pixman-utils.c
index 2c2dddd64..2c2dddd64 100644
--- a/libs/cairo/libpixman/src/pixman-utils.c
+++ b/libs/libpixman/src/pixman-utils.c
diff --git a/libs/cairo/libpixman/src/pixman-version.h b/libs/libpixman/src/pixman-version.h
index 8b0e77427..8b0e77427 100644
--- a/libs/cairo/libpixman/src/pixman-version.h
+++ b/libs/libpixman/src/pixman-version.h
diff --git a/libs/cairo/libpixman/src/pixman-version.h.in b/libs/libpixman/src/pixman-version.h.in
index 64778a595..64778a595 100644
--- a/libs/cairo/libpixman/src/pixman-version.h.in
+++ b/libs/libpixman/src/pixman-version.h.in
diff --git a/libs/cairo/libpixman/src/pixman-vmx.c b/libs/libpixman/src/pixman-vmx.c
index 52de37e69..52de37e69 100644
--- a/libs/cairo/libpixman/src/pixman-vmx.c
+++ b/libs/libpixman/src/pixman-vmx.c
diff --git a/libs/cairo/libpixman/src/pixman-x86.c b/libs/libpixman/src/pixman-x86.c
index 2c702e5c3..2c702e5c3 100644
--- a/libs/cairo/libpixman/src/pixman-x86.c
+++ b/libs/libpixman/src/pixman-x86.c
diff --git a/libs/cairo/libpixman/src/pixman.c b/libs/libpixman/src/pixman.c
index c09b52808..c09b52808 100644
--- a/libs/cairo/libpixman/src/pixman.c
+++ b/libs/libpixman/src/pixman.c
diff --git a/libs/cairo/libpixman/src/pixman.h b/libs/libpixman/src/pixman.h
index 66bc9abb1..66bc9abb1 100644
--- a/libs/cairo/libpixman/src/pixman.h
+++ b/libs/libpixman/src/pixman.h
diff --git a/libs/cairo/libpixman/src/solaris-hwcap.mapfile b/libs/libpixman/src/solaris-hwcap.mapfile
index 87efce1e3..87efce1e3 100644
--- a/libs/cairo/libpixman/src/solaris-hwcap.mapfile
+++ b/libs/libpixman/src/solaris-hwcap.mapfile
diff --git a/libs/moz.build b/libs/moz.build
index d70c84387..e0fe13c87 100644
--- a/libs/moz.build
+++ b/libs/moz.build
@@ -59,6 +59,9 @@ if not CONFIG['MOZ_SYSTEM_JPEG']:
 if CONFIG['MOZ_TREE_CAIRO']:
     DIRS += ['cairo']
 
+if CONFIG['MOZ_TREE_PIXMAN']:
+    DIRS += ['libpixman']
+
 if CONFIG['MOZ_TREMOR']:
     DIRS += ['libtremor']