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, 100 insertions, 0 deletions

diff --git a/pkg/libdrm/config.h b/pkg/libdrm/config.h
new file mode 100644
index 00000000..e6cf51e8
--- /dev/null
+++ b/pkg/libdrm/config.h
@@ -0,0 +1,61 @@
+#include <config-posix.h>
+
+/* #undef CRAY_STACKSEG_END */
+/* #undef C_ALLOCA */
+#define HAVE_ALLOCA 1
+#define HAVE_ALLOCA_H 1
+/* #undef HAVE_AMDGPU */
+/* #undef HAVE_CAIRO */
+/* #undef HAVE_CUNIT */
+/* #undef HAVE_EXYNOS */
+/* #undef HAVE_FREEDRENO */
+/* #undef HAVE_FREEDRENO_KGSL */
+/* #undef HAVE_INSTALL_TESTS */
+#define HAVE_LIBDRM_ATOMIC_PRIMITIVES 1
+/* #undef HAVE_LIBUDEV */
+/* #undef HAVE_LIB_ATOMIC_OPS */
+#define HAVE_MEMORY_H 1
+/* #undef HAVE_OMAP */
+/* #undef HAVE_SYS_SYSCTL_H */
+/* #undef HAVE_TEGRA */
+/* #undef HAVE_VALGRIND */
+/* #undef HAVE_VC4 */
+#define HAVE_VISIBILITY 1
+/* #undef HAVE_VMWGFX */
+#define LT_OBJDIR ".libs/"
+/* #undef MAJOR_IN_MKDEV */
+/* #undef MAJOR_IN_SYSMACROS */
+#define PACKAGE "libdrm"
+#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI"
+#define PACKAGE_NAME "libdrm"
+#define PACKAGE_STRING "libdrm 2.4.74"
+#define PACKAGE_TARNAME "libdrm"
+#define PACKAGE_URL ""
+#define PACKAGE_VERSION "2.4.74"
+/* #undef STACK_DIRECTION */
+/* #undef UDEV */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+#define VERSION "2.4.74"
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+/* #undef _FILE_OFFSET_BITS */
+/* #undef _LARGE_FILES */
+/* #undef _MINIX */
+/* #undef _POSIX_1_SOURCE */
+/* #undef _POSIX_SOURCE */
+/* #undef size_t */
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
diff --git a/pkg/libdrm/rev b/pkg/libdrm/rev
new file mode 100644
index 00000000..7ed6ff82
--- /dev/null
+++ b/pkg/libdrm/rev
@@ -0,0 +1 @@
+5
diff --git a/pkg/libdrm/src b/pkg/libdrm/src
new file mode 160000
+Subproject dae413e43866d36500538c2801cc66a5a89e426