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

5 files changed, 97 insertions, 0 deletions

diff --git a/pkg/libpciaccess/config.h b/pkg/libpciaccess/config.h
new file mode 100644
index 00000000..d325750e
--- /dev/null
+++ b/pkg/libpciaccess/config.h
@@ -0,0 +1,46 @@
+#include <config-posix.h>
+
+#define HAVE_ERR_H 1
+/* #undef HAVE_MACHINE_MTRR_H */
+/* #undef HAVE_MACHINE_SYSARCH_H */
+#define HAVE_MEMORY_H 1
+/* #undef HAVE_MTRR */
+/* #undef HAVE_PCI_IO_PC_DOMAIN */
+/* #undef HAVE_ZLIB */
+/* #undef LINUX_ROM */
+#define LT_OBJDIR ".libs/"
+#define PACKAGE "libpciaccess"
+#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess"
+#define PACKAGE_NAME "libpciaccess"
+#define PACKAGE_STRING "libpciaccess 0.13.4"
+#define PACKAGE_TARNAME "libpciaccess"
+#define PACKAGE_URL ""
+#define PACKAGE_VERSION "0.13.4"
+#define PACKAGE_VERSION_MAJOR 0
+#define PACKAGE_VERSION_MINOR 13
+#define PACKAGE_VERSION_PATCHLEVEL 4
+#define PCIIDS_PATH "/share/hwdata"
+#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 "0.13.4"
+#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 */
diff --git a/pkg/libpciaccess/gen.rc b/pkg/libpciaccess/gen.rc
new file mode 100644
index 00000000..ab0fb6ff
--- /dev/null
+++ b/pkg/libpciaccess/gen.rc
@@ -0,0 +1,20 @@
+cflags\
+	-D HAVE_CONFIG_H\
+	-I include\
+	-I '$dir' \
+	-I '$srcdir'/include
+
+lib libpciaccess.a src/^(\
+	common_bridge.c\
+	common_iterator.c\
+	common_init.c\
+	common_interface.c\
+	common_io.c\
+	common_capability.c\
+	common_device_name.c\
+	common_map.c\
+	common_vgaarb.c\
+	linux_sysfs.c linux_devmem.c\
+)
+
+fetch git
diff --git a/pkg/libpciaccess/patch/0001-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch b/pkg/libpciaccess/patch/0001-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
new file mode 100644
index 00000000..c9a955b2
--- /dev/null
+++ b/pkg/libpciaccess/patch/0001-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
@@ -0,0 +1,30 @@
+From a371658cdd5df0ca35cce64de9694edd27106a06 Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Fri, 1 May 2015 16:36:50 +0200
+Subject: [PATCH] linux_sysfs.c: Include <limits.h> for PATH_MAX
+
+Fixes compilation with musl libc.
+
+Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+Signed-off-by: Felix Janda <felix.janda@posteo.de>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+ src/linux_sysfs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
+index 50d94cf..3f95e53 100644
+--- a/src/linux_sysfs.c
++++ b/src/linux_sysfs.c
+@@ -45,6 +45,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <sys/mman.h>
+ #include <dirent.h>
+ #include <errno.h>
+-- 
+2.9.0
+
diff --git a/pkg/libpciaccess/rev b/pkg/libpciaccess/rev
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/pkg/libpciaccess/rev
@@ -0,0 +1 @@
+1
diff --git a/pkg/libpciaccess/src b/pkg/libpciaccess/src
new file mode 160000
+Subproject bbd1acdd1d25b9a68f4b7913a4094af20d7cf78