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

diff --git a/media/libass/config.h b/media/libass/config.h
deleted file mode 100644
index 71715af2..00000000
--- a/media/libass/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <config-posix.h>
-
-/* #undef CONFIG_ASM */
-/* #undef CONFIG_CORETEXT */
-/* #undef CONFIG_DIRECTWRITE */
-/* #undef CONFIG_FONTCONFIG */
-#define CONFIG_FREETYPE 1
-#define CONFIG_FRIBIDI 1
-/* #undef CONFIG_HARFBUZZ */
-#define CONFIG_ICONV 1
-/* #undef CONFIG_LARGE_TILES */
-/* #undef CONFIG_LIBPNG */
-#define CONFIG_RASTERIZER 1
-#define HAVE_LIBM 1
-#define HAVE_MEMORY_H 1
-#define HAVE__BOOL 1
-#define LT_OBJDIR ".libs/"
-#define PACKAGE "libass"
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_NAME "libass"
-#define PACKAGE_STRING "libass 0.13.4"
-#define PACKAGE_TARNAME "libass"
-#define PACKAGE_URL ""
-#define PACKAGE_VERSION "0.13.4"
-#define VERSION "0.13.4"
diff --git a/media/libass/gen.rc b/media/libass/gen.rc
deleted file mode 100644
index 286c6f26..00000000
--- a/media/libass/gen.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-cflags\
-	-isystem '$builddir'/extra/fribidi/include\
-	-isystem desktop/freetype/src/include\
-	-I include\
-	-I '$dir'
-
-hdrs=(ass.h ass_types.h)
-for(hdr in $hdrs)
-	build '$outdir'/include/ass/$hdr copy '$srcdir'/libass/$hdr
-phony headers '$outdir'/include/ass/$hdrs
-
-phony deps '$builddir'/desktop/freetype/fetch.stamp extra/fribidi/headers
-
-lib libass.a -d '$dir'/deps libass/^(\
-	ass.c ass_cache.c ass_font.c ass_fontselect.c ass_render.c\
-	ass_utils.c ass_bitmap.c ass_blur.c ass_library.c\
-	ass_drawing.c\
-	ass_parse.c ass_render_api.c ass_shaper.c\
-	ass_strtod.c ass_fontconfig.c\
-	ass_string.c\
-	ass_rasterizer.c ass_rasterizer_c.c\
-) '$builddir'/^(\
-	desktop/freetype/libfreetype.a.d\
-	extra/fribidi/libfribidi.a\
-)
-
-fetch git
diff --git a/media/libass/rev b/media/libass/rev
deleted file mode 100644
index 00750edc..00000000
--- a/media/libass/rev
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/media/libass/src b/media/libass/src
deleted file mode 160000
-Subproject 8551555c86f50f978f9ddd55a8d20bceb80d92f