Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config

4 files changed, 106 insertions, 0 deletions

diff --git a/pkg/pixman/config.h b/pkg/pixman/config.h
new file mode 100644
index 00000000..1ff23a85
--- /dev/null
+++ b/pkg/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/pkg/pixman/gen.rc b/pkg/pixman/gen.rc
new file mode 100644
index 00000000..408007a7
--- /dev/null
+++ b/pkg/pixman/gen.rc
@@ -0,0 +1,57 @@
+cflags\
+	-D HAVE_CONFIG_H\
+	-I include\
+	-I '$dir' \
+	-I '$outdir'/include
+
+build '$outdir'/include/pixman-version.h sed '$srcdir'/pixman/pixman-version.h.in ; exprs=(\
+	-e s,@PIXMAN_VERSION_MAJOR@,0,\
+	-e s,@PIXMAN_VERSION_MINOR@,34,\
+	-e s,@PIXMAN_VERSION_MICRO@,0,\
+) with expr $"exprs
+build '$outdir'/include/pixman.h copy '$srcdir'/pixman/pixman.h
+
+phony headers '$outdir'/include/^(pixman.h pixman-version.h)
+
+# processor-specific features
+cflags -D 'USE_SSE2=1' -D 'USE_SSSE3=1' -D 'USE_X86_MMX=1'
+cc pixman/pixman-mmx.c '||' $deps ; with cflags '$cflags -mmmx -Winline'
+cc pixman/pixman-sse2.c '||' $deps ; with cflags '$cflags -msse2 -Winline'
+cc pixman/pixman-ssse3.c '||' $deps ; with cflags '$cflags -mssse3 -Winline'
+cpuobjs=(pixman-mmx.c pixman-sse2.c pixman-ssse3.c)^.o
+
+lib libpixman.a -d '$dir'/headers 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\
+)
+
+fetch git
diff --git a/pkg/pixman/rev b/pkg/pixman/rev
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/pkg/pixman/rev
@@ -0,0 +1 @@
+1
diff --git a/pkg/pixman/src b/pkg/pixman/src
new file mode 160000
+Subproject 1727aa4ab60a594cbb1cc1bdaa270b7dfad21f0