From 293f5a93b77d92fd65db7f3d0df654f102e46cfb Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sun, 11 Dec 2016 16:04:20 -0800 Subject: 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 --- media/ffmpeg/protocols.awk | 59 ---------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 media/ffmpeg/protocols.awk (limited to 'media/ffmpeg/protocols.awk') diff --git a/media/ffmpeg/protocols.awk b/media/ffmpeg/protocols.awk deleted file mode 100644 index fb0bab68..00000000 --- a/media/ffmpeg/protocols.awk +++ /dev/null @@ -1,59 +0,0 @@ -/^#define/ && $3 { - cfg[$2] = 1 -} - -func proto(name) { - if (cfg["CONFIG_" toupper(name) "_PROTOCOL"]) - print "&ff_" name "_protocol," -} - -END { - print "static const URLProtocol *url_protocols[] = {" - proto("async") - proto("bluray") - proto("cache") - proto("concat") - proto("crypto") - proto("data") - proto("ffrtmpcrypt") - proto("ffrtmphttp") - proto("file") - proto("ftp") - proto("gopher") - proto("hls") - proto("http") - proto("httpproxy") - proto("https") - proto("icecast") - proto("mmsh") - proto("mmst") - proto("md5") - proto("pipe") - proto("rtmp") - proto("rtmpe") - proto("rtmps") - proto("rtmpt") - proto("rtmpte") - proto("rtmpts") - proto("rtp") - proto("sctp") - proto("srtp") - proto("subfile") - proto("tee") - proto("tcp") - proto("tls_gnutls") - proto("tls_schannel") - proto("tls_securetransport") - proto("tls_openssl") - proto("udp") - proto("udplite") - proto("unix") - proto("librtmp") - proto("librtmpe") - proto("librtmps") - proto("librtmpt") - proto("librtmpte") - proto("libssh") - proto("libsmbclient") - print "NULL};" -} -- cgit v1.2.3