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

1 files changed, 38 insertions, 0 deletions

diff --git a/pkg/libdrm/gen.rc b/pkg/libdrm/gen.rc
new file mode 100644
index 00000000..26806e70
--- /dev/null
+++ b/pkg/libdrm/gen.rc
@@ -0,0 +1,38 @@
+cflags\
+	-D HAVE_CONFIG_H\
+	-I include\
+	-I '$dir' \
+	-I '$srcdir' \
+	-I '$srcdir'/include/drm
+
+lib libdrm.a\
+	xf86drm.c\
+	xf86drmHash.c\
+	xf86drmRandom.c\
+	xf86drmSL.c\
+	xf86drmMode.c
+
+if(~ intel $config_video_drivers) {
+	cflags -D 'HAVE_INTEL=1' -isystem pkg/libpciaccess/src/include
+	lib libdrm_intel.a -d '$builddir'/pkg/libpciaccess/fetch.stamp intel/^(\
+		intel_bufmgr.c\
+		intel_bufmgr_fake.c\
+		intel_bufmgr_gem.c\
+		intel_decode.c\
+		mm.c\
+	) '$builddir'/pkg/libpciaccess/libpciaccess.a
+}
+
+if(~ nouveau $config_video_drivers) {
+	cflags -D 'HAVE_NOUVEAU=1'
+	lib libdrm_nouveau.a nouveau/^(\
+		nouveau.c\
+		pushbuf.c\
+		bufctx.c\
+		abi16.c\
+	)
+}
+
+status=()
+
+fetch git