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

3 files changed, 69 insertions, 0 deletions

diff --git a/pkg/wld/gen.rc b/pkg/wld/gen.rc
new file mode 100644
index 00000000..957d5444
--- /dev/null
+++ b/pkg/wld/gen.rc
@@ -0,0 +1,68 @@
+cflags=(\
+	-D WITH_WAYLAND_SHM\
+	-D WITH_WAYLAND_DRM\
+	-isystem pkg/fontconfig/src\
+	-isystem pkg/freetype/src/include\
+	-isystem pkg/libdrm/src\
+	-isystem pkg/libdrm/src/include/drm\
+	-isystem '$builddir'/pkg/pixman/include\
+	-isystem '$builddir'/pkg/wayland/include\
+	-I '$outdir' \
+)
+
+hdrs=(drm.h pixman.h wayland.h wld.h)
+for(hdr in $hdrs) {
+	build '$outdir'/include/wld/$hdr copy '$srcdir'/$hdr
+	file include/wld/$hdr '$srcdir'/$hdr 644
+}
+phony headers '$outdir'/include/wld/$hdrs
+
+srcs=(\
+	buffer.c\
+	buffered_surface.c\
+	color.c\
+	context.c\
+	drm.c\
+	dumb.c\
+	font.c\
+	renderer.c\
+	surface.c\
+	pixman.c\
+	wayland.c\
+	wayland-shm.c\
+	wayland-drm.c\
+	wayland-drm-protocol.c.o\
+)
+libs=(\
+	fontconfig/libfontconfig.a.d\
+	freetype/libfreetype.a.d\
+	libdrm/libdrm.a\
+	pixman/libpixman.a\
+	wayland/libwayland-client.a.d\
+)
+
+if(~ intel $config_video_drivers) {
+	cflags=($cflags -D WITH_DRM_INTEL -I pkg/libdrm/src/intel)
+	srcs=($srcs intel.c intel/batch.c)
+	libs=($libs libdrm/libdrm_intel.a.d)
+}
+if(~ nouveau $config_video_drivers) {
+	cflags=($cflags -D WITH_DRM_NOUVEAU -I pkg/libdrm/src/nouveau)
+	srcs=($srcs nouveau.c)
+	libs=($libs libdrm/libdrm_nouveau.a)
+}
+
+cflags $cflags
+
+waylandproto protocol/wayland-drm.xml\
+	protocol/wayland-drm-^(client server)^-protocol.h\
+	wayland-drm-protocol.c
+
+phony deps\
+	'$outdir'/protocol/wayland-drm-client-protocol.h\
+	'$builddir'/pkg/^(fontconfig freetype libdrm)^/fetch.stamp\
+	pkg/^(pixman wayland)^/headers
+
+lib libwld.a -d '$dir'/deps $srcs '$builddir'/pkg/$libs
+
+fetch git
diff --git a/pkg/wld/rev b/pkg/wld/rev
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/pkg/wld/rev
@@ -0,0 +1 @@
+1
diff --git a/pkg/wld/src b/pkg/wld/src
new file mode 160000
+Subproject efe0a1ed1856a2e4a1893ed0f2d7dde43b5627f