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

diff --git a/pkg/alsa-lib/patch/0002-Add-include-alsa-symlink.patch b/pkg/alsa-lib/patch/0002-Add-include-alsa-symlink.patch
new file mode 100644
index 00000000..915378df
--- /dev/null
+++ b/pkg/alsa-lib/patch/0002-Add-include-alsa-symlink.patch
@@ -0,0 +1,21 @@
+From e834c59dad7123ffe0fc1d27d4ee4be08f95e328 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Fri, 1 Jul 2016 20:09:02 -0700
+Subject: [PATCH] Add include/alsa symlink
+
+---
+ include/alsa | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 120000 include/alsa
+
+diff --git a/include/alsa b/include/alsa
+new file mode 120000
+index 0000000..945c9b4
+--- /dev/null
++++ b/include/alsa
+@@ -0,0 +1 @@
++.
+\ No newline at end of file
+-- 
+2.9.0
+