summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Bingner <sam@bingner.com>2019-04-03 23:49:15 -1000
committerSam Bingner <sam@bingner.com>2019-04-09 23:20:40 -1000
commitbc22a1677d844ed517d781da667190f97b100ab7 (patch)
tree7305b50c2820444e7efa542e92808529709fc6cb
parent9ca3323a117b3d3e694665d32a3fecfd63dfd1fb (diff)
Begin standardizing lib packages used by ffmpeg
-rw-r--r--data/_ffmpeg/_metadata/description1
l---------data/_ffmpeg/_metadata/gnutls.dep1
-rw-r--r--data/_ffmpeg/_metadata/in.1443.00 (renamed from data/libogg/_metadata/in.1443.00)0
l---------data/_ffmpeg/_metadata/lame.dep (renamed from data/ffmpeg/_metadata/lame.dep)0
l---------data/_ffmpeg/_metadata/libmp3lame0.dep1
l---------data/_ffmpeg/_metadata/libopus.dep (renamed from data/ffmpeg/_metadata/libopus.dep)0
l---------data/_ffmpeg/_metadata/libopus0.dep1
l---------data/_ffmpeg/_metadata/libtheora.dep (renamed from data/ffmpeg/_metadata/libtheora.dep)0
l---------data/_ffmpeg/_metadata/libtheora0.dep1
l---------data/_ffmpeg/_metadata/libvorbis.dep (renamed from data/ffmpeg/_metadata/libvorbis.dep)0
l---------data/_ffmpeg/_metadata/libvorbis0.dep1
l---------data/_ffmpeg/_metadata/libvpx.dep (renamed from data/ffmpeg/_metadata/libvpx.dep)0
l---------data/_ffmpeg/_metadata/libvpx6.dep1
l---------data/_ffmpeg/_metadata/libxvidcore4.dep1
l---------data/_ffmpeg/_metadata/maintainer (renamed from data/libopus/_metadata/maintainer)0
-rw-r--r--data/_ffmpeg/_metadata/priority (renamed from data/libogg/_metadata/priority)0
-rw-r--r--data/_ffmpeg/_metadata/role (renamed from data/libogg/_metadata/role)0
-rw-r--r--data/_ffmpeg/_metadata/section (renamed from data/libogg/_metadata/section)0
-rw-r--r--data/_ffmpeg/_metadata/tags1
-rw-r--r--data/_ffmpeg/_metadata/version1
l---------data/_ffmpeg/_metadata/x264.dep (renamed from data/ffmpeg/_metadata/x264.dep)0
l---------data/_ffmpeg/_metadata/x265.dep (renamed from data/ffmpeg/_metadata/x265.dep)0
l---------data/_ffmpeg/_metadata/xz.dep1
-rw-r--r--data/_ffmpeg/ffmpeg-4.1.3.tar.xz (renamed from data/ffmpeg/ffmpeg-4.1.3.tar.xz)bin8895988 -> 8895988 bytes
-rw-r--r--data/_ffmpeg/make.sh22
-rw-r--r--data/_lame/_metadata/description1
-rw-r--r--data/_lame/_metadata/in.1443.00 (renamed from data/libopus/_metadata/in.1443.00)0
l---------data/_lame/_metadata/license1
l---------data/_lame/_metadata/maintainer (renamed from data/libogg/_metadata/maintainer)0
-rw-r--r--data/_lame/_metadata/name1
l---------data/_lame/_metadata/ncurses.dep1
-rw-r--r--data/_lame/_metadata/priority (renamed from data/libopus/_metadata/priority)0
-rw-r--r--data/_lame/_metadata/role (renamed from data/libopus/_metadata/role)0
-rw-r--r--data/_lame/_metadata/section (renamed from data/libopus/_metadata/section)0
-rw-r--r--data/_lame/_metadata/tags (renamed from data/libogg/_metadata/tags)0
-rw-r--r--data/_lame/_metadata/version1
-rw-r--r--data/_lame/lame-3.100.tar.gz (renamed from data/lame/lame-3.100.tar.gz)bin1524133 -> 1524133 bytes
-rw-r--r--data/_lame/lame_init_old.diff (renamed from data/lame/lame_init_old.diff)0
-rw-r--r--data/_lame/make.sh (renamed from data/libogg/make.sh)0
-rw-r--r--data/_lame/timestamp.diff (renamed from data/lame/timestamp.diff)0
-rw-r--r--data/_libogg/_metadata/description (renamed from data/libogg/_metadata/description)0
-rw-r--r--data/_libogg/_metadata/in.1443.00 (renamed from data/libtheora/_metadata/in.1443.00)0
-rw-r--r--data/_libogg/_metadata/license (renamed from data/libogg/_metadata/license)0
l---------data/_libogg/_metadata/maintainer (renamed from data/libvorbis/_metadata/maintainer)0
-rw-r--r--data/_libogg/_metadata/priority (renamed from data/libtheora/_metadata/priority)0
-rw-r--r--data/_libogg/_metadata/role (renamed from data/libtheora/_metadata/role)0
-rw-r--r--data/_libogg/_metadata/section (renamed from data/libtheora/_metadata/section)0
-rw-r--r--data/_libogg/_metadata/tags (renamed from data/libopus/_metadata/tags)0
-rw-r--r--data/_libogg/_metadata/version (renamed from data/libogg/_metadata/version)0
-rw-r--r--data/_libogg/libogg-1.3.3.tar.gz (renamed from data/libogg/libogg-1.3.3.tar.gz)bin579853 -> 579853 bytes
-rw-r--r--data/_libogg/make.sh4
-rw-r--r--data/_libopus/_metadata/description (renamed from data/libopus/_metadata/description)0
-rw-r--r--data/_libopus/_metadata/in.1443.00 (renamed from data/libvorbis/_metadata/in.1443.00)0
-rw-r--r--data/_libopus/_metadata/license (renamed from data/libopus/_metadata/license)0
l---------data/_libopus/_metadata/maintainer (renamed from data/libtheora/_metadata/maintainer)0
-rw-r--r--data/_libopus/_metadata/priority (renamed from data/libvorbis/_metadata/priority)0
-rw-r--r--data/_libopus/_metadata/role (renamed from data/libvorbis/_metadata/role)0
-rw-r--r--data/_libopus/_metadata/section (renamed from data/libvorbis/_metadata/section)0
-rw-r--r--data/_libopus/_metadata/tags (renamed from data/libtheora/_metadata/tags)0
-rw-r--r--data/_libopus/_metadata/version (renamed from data/libopus/_metadata/version)0
-rw-r--r--data/_libopus/make.sh (renamed from data/libopus/make.sh)0
-rw-r--r--data/_libopus/opus-1.3.tar.gz (renamed from data/libopus/opus-1.3.tar.gz)bin1032750 -> 1032750 bytes
-rw-r--r--data/_libtheora/_metadata/description (renamed from data/libtheora/_metadata/description)0
-rw-r--r--data/_libtheora/_metadata/in.1443.00 (renamed from data/libvpx/_metadata/in.1443.00)0
l---------data/_libtheora/_metadata/libogg0.dep1
l---------data/_libtheora/_metadata/libvorbis0.dep1
-rw-r--r--data/_libtheora/_metadata/license (renamed from data/libtheora/_metadata/license)0
l---------data/_libtheora/_metadata/maintainer (renamed from data/libvpx/_metadata/maintainer)0
-rw-r--r--data/_libtheora/_metadata/priority (renamed from data/libvpx/_metadata/priority)0
-rw-r--r--data/_libtheora/_metadata/role (renamed from data/libvpx/_metadata/role)0
-rw-r--r--data/_libtheora/_metadata/section (renamed from data/libvpx/_metadata/section)0
-rw-r--r--data/_libtheora/_metadata/tags (renamed from data/libvorbis/_metadata/tags)0
-rw-r--r--data/_libtheora/_metadata/version (renamed from data/libtheora/_metadata/version)0
-rw-r--r--data/_libtheora/info.diff (renamed from data/libtheora/info.diff)0
-rw-r--r--data/_libtheora/libtheora-1.1.1.tar.bz2 (renamed from data/libtheora/libtheora-1.1.1.tar.bz2)bin1903175 -> 1903175 bytes
-rw-r--r--data/_libtheora/make.sh (renamed from data/libtheora/make.sh)0
-rw-r--r--data/_libvorbis/_metadata/description (renamed from data/libvorbis/_metadata/description)0
-rw-r--r--data/_libvorbis/_metadata/in.1443.00 (renamed from data/x265/_metadata/in.1443.00)0
l---------data/_libvorbis/_metadata/libogg0.dep1
-rw-r--r--data/_libvorbis/_metadata/license (renamed from data/libvorbis/_metadata/license)0
l---------data/_libvorbis/_metadata/maintainer1
-rw-r--r--data/_libvorbis/_metadata/priority (renamed from data/x265/_metadata/priority)0
-rw-r--r--data/_libvorbis/_metadata/role (renamed from data/x265/_metadata/role)0
-rw-r--r--data/_libvorbis/_metadata/section (renamed from data/x265/_metadata/section)0
-rw-r--r--data/_libvorbis/_metadata/tags (renamed from data/libvpx/_metadata/tags)0
-rw-r--r--data/_libvorbis/_metadata/version (renamed from data/libvorbis/_metadata/version)0
-rw-r--r--data/_libvorbis/make.sh (renamed from data/libvorbis/make.sh)2
-rw-r--r--data/_libvorbis/v1.3.6.tar.gz (renamed from data/libvorbis/v1.3.6.tar.gz)bin1223948 -> 1223948 bytes
-rw-r--r--data/_libvpx/_metadata/description (renamed from data/libvpx/_metadata/description)0
-rw-r--r--data/_libvpx/_metadata/in.1443.000
-rw-r--r--data/_libvpx/_metadata/license (renamed from data/libvpx/_metadata/license)0
l---------data/_libvpx/_metadata/maintainer (renamed from data/x265/_metadata/maintainer)0
-rw-r--r--data/_libvpx/_metadata/priority1
-rw-r--r--data/_libvpx/_metadata/role1
-rw-r--r--data/_libvpx/_metadata/section1
-rw-r--r--data/_libvpx/_metadata/tags (renamed from data/x265/_metadata/tags)0
-rw-r--r--data/_libvpx/_metadata/version (renamed from data/libvpx/_metadata/version)0
-rw-r--r--data/_libvpx/install_name.diff (renamed from data/libvpx/install_name.diff)0
-rw-r--r--data/_libvpx/libvpx-1.8.0.tar.gz (renamed from data/libvpx/libvpx-1.8.0.tar.gz)bin2879302 -> 2879302 bytes
-rw-r--r--data/_libvpx/make.sh14
-rw-r--r--data/_libvpx/toolchain.diff (renamed from data/libvpx/toolchain.diff)0
-rw-r--r--data/_libvpx/vp9symbols.diff (renamed from data/libvpx/vp9symbols.diff)0
-rw-r--r--data/_x264/_metadata/description1
-rw-r--r--data/_x264/_metadata/in.1443.000
l---------data/_x264/_metadata/maintainer1
-rw-r--r--data/_x264/_metadata/name (renamed from data/x264/_metadata/name)0
-rw-r--r--data/_x264/_metadata/priority1
-rw-r--r--data/_x264/_metadata/role1
-rw-r--r--data/_x264/_metadata/section1
-rw-r--r--data/_x264/_metadata/tags1
-rw-r--r--data/_x264/_metadata/version1
-rwxr-xr-xdata/_x264/gas-preprocessor.pl (renamed from data/x264/gas-preprocessor.pl)0
-rw-r--r--data/_x264/make.sh6
-rw-r--r--data/_x264/makefile-error.diff12
-rw-r--r--data/_x264/x264-2945.tar.lzbin0 -> 6290968 bytes
-rw-r--r--data/_x265/_metadata/description (renamed from data/x265/_metadata/description)0
-rw-r--r--data/_x265/_metadata/in.1443.000
-rw-r--r--data/_x265/_metadata/license (renamed from data/x265/_metadata/license)0
l---------data/_x265/_metadata/maintainer1
-rw-r--r--data/_x265/_metadata/name (renamed from data/x265/_metadata/name)0
-rw-r--r--data/_x265/_metadata/priority1
-rw-r--r--data/_x265/_metadata/role1
-rw-r--r--data/_x265/_metadata/section1
-rw-r--r--data/_x265/_metadata/tags1
-rw-r--r--data/_x265/_metadata/version (renamed from data/x265/_metadata/version)0
-rw-r--r--data/_x265/make.sh (renamed from data/x265/make.sh)0
-rw-r--r--data/_x265/x265_3.0.tar.gz (renamed from data/x265/x265_3.0.tar.gz)bin1398519 -> 1398519 bytes
l---------data/ffmpeg/_metadata/_ffmpeg.dep1
l---------data/ffmpeg/_metadata/libavcodec58.dep1
l---------data/ffmpeg/_metadata/libavdevice58.dep1
l---------data/ffmpeg/_metadata/libavfilter7.dep1
l---------data/ffmpeg/_metadata/libavformat58.dep1
l---------data/ffmpeg/_metadata/libavtil56.dep1
l---------data/ffmpeg/_metadata/libavutil56.dep1
l---------data/ffmpeg/_metadata/libmp3lame0.dep1
l---------data/ffmpeg/_metadata/libogg0.dep1
l---------data/ffmpeg/_metadata/libopus0.dep1
l---------data/ffmpeg/_metadata/libpostproc55.dep1
l---------data/ffmpeg/_metadata/libswresample3.dep1
l---------data/ffmpeg/_metadata/libswscale5.dep1
l---------data/ffmpeg/_metadata/libtheora0.dep1
l---------data/ffmpeg/_metadata/libvorbis0.dep1
l---------data/ffmpeg/_metadata/libvpx6.dep1
l---------data/ffmpeg/_metadata/libx264-157.dep1
l---------data/ffmpeg/_metadata/libx265-169.dep1
-rw-r--r--data/ffmpeg/make.sh24
-rw-r--r--data/lame/_metadata/description2
l---------data/lame/_metadata/libmp3lame0.dep1
l---------data/lame/_metadata/libmp3lame0.ver.iphoneos-arm1
l---------[-rw-r--r--]data/lame/_metadata/version2
-rw-r--r--data/lame/make.sh6
-rw-r--r--data/libogg-dev/_metadata/conflicts (renamed from data/libogg/_metadata/conflicts)0
-rw-r--r--data/libogg-dev/_metadata/description1
-rw-r--r--data/libogg-dev/_metadata/in.1443.000
l---------data/libogg-dev/_metadata/libogg0.dep1
l---------data/libogg-dev/_metadata/libogg0.ver.iphoneos-arm1
l---------data/libogg-dev/_metadata/license1
l---------data/libogg-dev/_metadata/maintainer1
-rw-r--r--data/libogg-dev/_metadata/priority1
-rw-r--r--data/libogg-dev/_metadata/role1
-rw-r--r--data/libogg-dev/_metadata/section1
-rw-r--r--data/libogg-dev/_metadata/tags1
l---------data/libogg-dev/_metadata/version1
-rw-r--r--data/libogg-dev/make.sh4
l---------data/libogg0/_metadata/_libogg.dep1
-rw-r--r--data/libogg0/_metadata/conflicts (renamed from data/libogg/_metadata/provides)0
-rw-r--r--data/libogg0/_metadata/description1
-rw-r--r--data/libogg0/_metadata/in.1443.000
l---------data/libogg0/_metadata/license1
l---------data/libogg0/_metadata/maintainer1
-rw-r--r--data/libogg0/_metadata/priority1
-rw-r--r--data/libogg0/_metadata/provides (renamed from data/libogg/_metadata/replaces)0
-rw-r--r--data/libogg0/_metadata/replaces1
-rw-r--r--data/libogg0/_metadata/role1
-rw-r--r--data/libogg0/_metadata/section1
-rw-r--r--data/libogg0/_metadata/tags1
l---------data/libogg0/_metadata/version1
-rw-r--r--data/libogg0/make.sh2
l---------data/libtheora/_metadata/libogg.dep1
l---------data/libtheora/_metadata/libvorbis.dep1
-rw-r--r--data/libvorbis-dev/_metadata/conflicts (renamed from data/libvorbis/_metadata/conflicts)0
-rw-r--r--data/libvorbis-dev/_metadata/description1
-rw-r--r--data/libvorbis-dev/_metadata/in.1443.000
l---------data/libvorbis-dev/_metadata/libogg0.dep1
l---------data/libvorbis-dev/_metadata/libvorbis0.dep1
l---------data/libvorbis-dev/_metadata/libvorbis0.ver.iphoneos-arm1
l---------data/libvorbis-dev/_metadata/libvorbisenc2.dep1
l---------data/libvorbis-dev/_metadata/libvorbisenc2.ver.iphoneos-arm1
l---------data/libvorbis-dev/_metadata/libvorbisfile3.dep1
l---------data/libvorbis-dev/_metadata/libvorbisfile3.ver.iphoneos-arm1
l---------data/libvorbis-dev/_metadata/license1
l---------data/libvorbis-dev/_metadata/maintainer1
-rw-r--r--data/libvorbis-dev/_metadata/priority1
-rw-r--r--data/libvorbis-dev/_metadata/provides (renamed from data/libvorbis/_metadata/provides)0
-rw-r--r--data/libvorbis-dev/_metadata/replaces (renamed from data/libvorbis/_metadata/replaces)0
-rw-r--r--data/libvorbis-dev/_metadata/role1
-rw-r--r--data/libvorbis-dev/_metadata/section1
-rw-r--r--data/libvorbis-dev/_metadata/tags1
l---------data/libvorbis-dev/_metadata/version1
-rw-r--r--data/libvorbis-dev/make.sh4
l---------data/libvorbis/_metadata/libogg.dep1
l---------data/libvorbis0/_metadata/_libvorbis.dep1
-rw-r--r--data/libvorbis0/_metadata/conflicts1
-rw-r--r--data/libvorbis0/_metadata/description1
-rw-r--r--data/libvorbis0/_metadata/in.1443.000
l---------data/libvorbis0/_metadata/libogg0.dep1
l---------data/libvorbis0/_metadata/license1
l---------data/libvorbis0/_metadata/maintainer1
-rw-r--r--data/libvorbis0/_metadata/priority1
-rw-r--r--data/libvorbis0/_metadata/role1
-rw-r--r--data/libvorbis0/_metadata/section1
-rw-r--r--data/libvorbis0/_metadata/tags1
l---------data/libvorbis0/_metadata/version1
-rw-r--r--data/libvorbis0/make.sh2
-rw-r--r--data/libvorbisenc2/_metadata/conflicts1
-rw-r--r--data/libvorbisenc2/_metadata/description1
-rw-r--r--data/libvorbisenc2/_metadata/in.1443.000
l---------data/libvorbisenc2/_metadata/libvorbis0.dep1
l---------data/libvorbisenc2/_metadata/license1
l---------data/libvorbisenc2/_metadata/maintainer1
-rw-r--r--data/libvorbisenc2/_metadata/priority1
-rw-r--r--data/libvorbisenc2/_metadata/role1
-rw-r--r--data/libvorbisenc2/_metadata/section1
-rw-r--r--data/libvorbisenc2/_metadata/tags1
l---------data/libvorbisenc2/_metadata/version1
-rw-r--r--data/libvorbisenc2/make.sh2
-rw-r--r--data/libvorbisfile3/_metadata/conflicts1
-rw-r--r--data/libvorbisfile3/_metadata/description1
-rw-r--r--data/libvorbisfile3/_metadata/in.1443.000
l---------data/libvorbisfile3/_metadata/libvorbis0.dep1
l---------data/libvorbisfile3/_metadata/license1
l---------data/libvorbisfile3/_metadata/maintainer1
-rw-r--r--data/libvorbisfile3/_metadata/priority1
-rw-r--r--data/libvorbisfile3/_metadata/role1
-rw-r--r--data/libvorbisfile3/_metadata/section1
-rw-r--r--data/libvorbisfile3/_metadata/tags1
l---------data/libvorbisfile3/_metadata/version1
-rw-r--r--data/libvorbisfile3/make.sh2
-rw-r--r--data/libvpx-dev/_metadata/description1
-rw-r--r--data/libvpx-dev/_metadata/in.1443.000
l---------data/libvpx-dev/_metadata/libvpx6.dep1
l---------data/libvpx-dev/_metadata/license1
l---------data/libvpx-dev/_metadata/maintainer1
-rw-r--r--data/libvpx-dev/_metadata/priority1
-rw-r--r--data/libvpx-dev/_metadata/role1
-rw-r--r--data/libvpx-dev/_metadata/section1
-rw-r--r--data/libvpx-dev/_metadata/tags1
l---------data/libvpx-dev/_metadata/version1
-rw-r--r--data/libvpx-dev/make.sh3
-rw-r--r--data/libvpx/make.sh14
l---------data/libx264-157/_metadata/_x264.dep1
-rw-r--r--data/libx264-157/_metadata/description1
-rw-r--r--data/libx264-157/_metadata/in.1443.000
l---------data/libx264-157/_metadata/maintainer1
-rw-r--r--data/libx264-157/_metadata/priority1
-rw-r--r--data/libx264-157/_metadata/role1
-rw-r--r--data/libx264-157/_metadata/section1
-rw-r--r--data/libx264-157/_metadata/tags1
l---------data/libx264-157/_metadata/version1
-rw-r--r--data/libx264-157/make.sh2
l---------data/libx264-dev/_metadata/_x264.dep1
-rw-r--r--data/libx264-dev/_metadata/description1
-rw-r--r--data/libx264-dev/_metadata/in.1443.000
l---------data/libx264-dev/_metadata/libx264-157.dep1
l---------data/libx264-dev/_metadata/libx264-157.ver.iphoneos-arm1
l---------data/libx264-dev/_metadata/maintainer1
-rw-r--r--data/libx264-dev/_metadata/priority1
-rw-r--r--data/libx264-dev/_metadata/role1
-rw-r--r--data/libx264-dev/_metadata/section1
-rw-r--r--data/libx264-dev/_metadata/tags1
l---------data/libx264-dev/_metadata/version1
-rw-r--r--data/libx264-dev/make.sh4
-rw-r--r--data/x264/20190402-2245-x264.tar.bz2bin774508 -> 0 bytes
-rw-r--r--data/x264/_metadata/description2
l---------data/x264/_metadata/libx264-157.dep1
l---------data/x264/_metadata/libx264-157.ver.iphoneos-arm1
l---------[-rw-r--r--]data/x264/_metadata/version2
-rw-r--r--data/x264/make.sh8
278 files changed, 244 insertions, 54 deletions
diff --git a/data/_ffmpeg/_metadata/description b/data/_ffmpeg/_metadata/description
new file mode 100644
index 000000000..027cde4da
--- /dev/null
+++ b/data/_ffmpeg/_metadata/description
@@ -0,0 +1 @@
+Tools for transcoding, streaming and playing of multimedia files
diff --git a/data/_ffmpeg/_metadata/gnutls.dep b/data/_ffmpeg/_metadata/gnutls.dep
new file mode 120000
index 000000000..2dbb733a2
--- /dev/null
+++ b/data/_ffmpeg/_metadata/gnutls.dep
@@ -0,0 +1 @@
+../../gnutls \ No newline at end of file
diff --git a/data/libogg/_metadata/in.1443.00 b/data/_ffmpeg/_metadata/in.1443.00
index e69de29bb..e69de29bb 100644
--- a/data/libogg/_metadata/in.1443.00
+++ b/data/_ffmpeg/_metadata/in.1443.00
diff --git a/data/ffmpeg/_metadata/lame.dep b/data/_ffmpeg/_metadata/lame.dep
index ddc2ccf8c..ddc2ccf8c 120000
--- a/data/ffmpeg/_metadata/lame.dep
+++ b/data/_ffmpeg/_metadata/lame.dep
diff --git a/data/_ffmpeg/_metadata/libmp3lame0.dep b/data/_ffmpeg/_metadata/libmp3lame0.dep
new file mode 120000
index 000000000..6699d2958
--- /dev/null
+++ b/data/_ffmpeg/_metadata/libmp3lame0.dep
@@ -0,0 +1 @@
+../../libmp3lame0 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libopus.dep b/data/_ffmpeg/_metadata/libopus.dep
index 25443dffc..25443dffc 120000
--- a/data/ffmpeg/_metadata/libopus.dep
+++ b/data/_ffmpeg/_metadata/libopus.dep
diff --git a/data/_ffmpeg/_metadata/libopus0.dep b/data/_ffmpeg/_metadata/libopus0.dep
new file mode 120000
index 000000000..3af5f2a4e
--- /dev/null
+++ b/data/_ffmpeg/_metadata/libopus0.dep
@@ -0,0 +1 @@
+../../libopus0 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libtheora.dep b/data/_ffmpeg/_metadata/libtheora.dep
index fd6f21fcc..fd6f21fcc 120000
--- a/data/ffmpeg/_metadata/libtheora.dep
+++ b/data/_ffmpeg/_metadata/libtheora.dep
diff --git a/data/_ffmpeg/_metadata/libtheora0.dep b/data/_ffmpeg/_metadata/libtheora0.dep
new file mode 120000
index 000000000..02eb1ef4e
--- /dev/null
+++ b/data/_ffmpeg/_metadata/libtheora0.dep
@@ -0,0 +1 @@
+../../libtheora0 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libvorbis.dep b/data/_ffmpeg/_metadata/libvorbis.dep
index 2196d93e3..2196d93e3 120000
--- a/data/ffmpeg/_metadata/libvorbis.dep
+++ b/data/_ffmpeg/_metadata/libvorbis.dep
diff --git a/data/_ffmpeg/_metadata/libvorbis0.dep b/data/_ffmpeg/_metadata/libvorbis0.dep
new file mode 120000
index 000000000..f85279696
--- /dev/null
+++ b/data/_ffmpeg/_metadata/libvorbis0.dep
@@ -0,0 +1 @@
+../../libvorbis0 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libvpx.dep b/data/_ffmpeg/_metadata/libvpx.dep
index 549f94c3c..549f94c3c 120000
--- a/data/ffmpeg/_metadata/libvpx.dep
+++ b/data/_ffmpeg/_metadata/libvpx.dep
diff --git a/data/_ffmpeg/_metadata/libvpx6.dep b/data/_ffmpeg/_metadata/libvpx6.dep
new file mode 120000
index 000000000..2f5ef034d
--- /dev/null
+++ b/data/_ffmpeg/_metadata/libvpx6.dep
@@ -0,0 +1 @@
+../../libvpx6 \ No newline at end of file
diff --git a/data/_ffmpeg/_metadata/libxvidcore4.dep b/data/_ffmpeg/_metadata/libxvidcore4.dep
new file mode 120000
index 000000000..ae684bdef
--- /dev/null
+++ b/data/_ffmpeg/_metadata/libxvidcore4.dep
@@ -0,0 +1 @@
+../../libxvidcore4 \ No newline at end of file
diff --git a/data/libopus/_metadata/maintainer b/data/_ffmpeg/_metadata/maintainer
index 0c538aadb..0c538aadb 120000
--- a/data/libopus/_metadata/maintainer
+++ b/data/_ffmpeg/_metadata/maintainer
diff --git a/data/libogg/_metadata/priority b/data/_ffmpeg/_metadata/priority
index 134d9bc32..134d9bc32 100644
--- a/data/libogg/_metadata/priority
+++ b/data/_ffmpeg/_metadata/priority
diff --git a/data/libogg/_metadata/role b/data/_ffmpeg/_metadata/role
index 8d0320866..8d0320866 100644
--- a/data/libogg/_metadata/role
+++ b/data/_ffmpeg/_metadata/role
diff --git a/data/libogg/_metadata/section b/data/_ffmpeg/_metadata/section
index 593877746..593877746 100644
--- a/data/libogg/_metadata/section
+++ b/data/_ffmpeg/_metadata/section
diff --git a/data/_ffmpeg/_metadata/tags b/data/_ffmpeg/_metadata/tags
new file mode 100644
index 000000000..ad5d50831
--- /dev/null
+++ b/data/_ffmpeg/_metadata/tags
@@ -0,0 +1 @@
+purpose::console
diff --git a/data/_ffmpeg/_metadata/version b/data/_ffmpeg/_metadata/version
new file mode 100644
index 000000000..de197cc33
--- /dev/null
+++ b/data/_ffmpeg/_metadata/version
@@ -0,0 +1 @@
+4.1.3
diff --git a/data/ffmpeg/_metadata/x264.dep b/data/_ffmpeg/_metadata/x264.dep
index e87b337ed..e87b337ed 120000
--- a/data/ffmpeg/_metadata/x264.dep
+++ b/data/_ffmpeg/_metadata/x264.dep
diff --git a/data/ffmpeg/_metadata/x265.dep b/data/_ffmpeg/_metadata/x265.dep
index de37d9151..de37d9151 120000
--- a/data/ffmpeg/_metadata/x265.dep
+++ b/data/_ffmpeg/_metadata/x265.dep
diff --git a/data/_ffmpeg/_metadata/xz.dep b/data/_ffmpeg/_metadata/xz.dep
new file mode 120000
index 000000000..d5eb7ae54
--- /dev/null
+++ b/data/_ffmpeg/_metadata/xz.dep
@@ -0,0 +1 @@
+../../xz \ No newline at end of file
diff --git a/data/ffmpeg/ffmpeg-4.1.3.tar.xz b/data/_ffmpeg/ffmpeg-4.1.3.tar.xz
index 91336f1a0..91336f1a0 100644
--- a/data/ffmpeg/ffmpeg-4.1.3.tar.xz
+++ b/data/_ffmpeg/ffmpeg-4.1.3.tar.xz
Binary files differ
diff --git a/data/_ffmpeg/make.sh b/data/_ffmpeg/make.sh
new file mode 100644
index 000000000..a61fdbefd
--- /dev/null
+++ b/data/_ffmpeg/make.sh
@@ -0,0 +1,22 @@
+pkg:setup
+ARCH=$(echo ${PKG_TARG} | sed -e s/'-.*'//)
+
+# Arguments taken from:
+# https://github.com/Homebrew/homebrew-core/blob/master/Formula/ffmpeg.rb
+
+# Xz and gnutls included since they are default dependencies.
+
+# WARNING: --enable-gpl and --enable-nonfree can make ffmpeg not legally redistributable.
+# --enable-gpl includes code with the gpl license.
+
+
+./configure --arch=${ARCH} --pkg-config="$(realpath "${PKG_BASE}/util/pkg-config.sh")" \
+ --prefix="$(cat "${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/prefix")" --enable-cross-compile \
+ --cross-prefix="${PKG_TARG}-" --target-os=darwin \
+ --disable-static --enable-shared --disable-debug --disable-stripping \
+ --enable-pthreads --enable-version3 --enable-hardcoded-tables --enable-gnutls \
+ --enable-gpl --enable-libmp3lame --enable-libopus --enable-libtheora \
+ --enable-libvorbis --enable-libvpx --enable-libx264 --enable-libx265 \
+ --enable-libxvid --enable-lzma # --enable-nonfree
+make -j16
+pkg:install
diff --git a/data/_lame/_metadata/description b/data/_lame/_metadata/description
new file mode 100644
index 000000000..df8c84c02
--- /dev/null
+++ b/data/_lame/_metadata/description
@@ -0,0 +1 @@
+open source (lgpl) mp3 encoder
diff --git a/data/libopus/_metadata/in.1443.00 b/data/_lame/_metadata/in.1443.00
index e69de29bb..e69de29bb 100644
--- a/data/libopus/_metadata/in.1443.00
+++ b/data/_lame/_metadata/in.1443.00
diff --git a/data/_lame/_metadata/license b/data/_lame/_metadata/license
new file mode 120000
index 000000000..a278a1931
--- /dev/null
+++ b/data/_lame/_metadata/license
@@ -0,0 +1 @@
+../../../licenses/lgpl-2 \ No newline at end of file
diff --git a/data/libogg/_metadata/maintainer b/data/_lame/_metadata/maintainer
index 573d7ebef..573d7ebef 120000
--- a/data/libogg/_metadata/maintainer
+++ b/data/_lame/_metadata/maintainer
diff --git a/data/_lame/_metadata/name b/data/_lame/_metadata/name
new file mode 100644
index 000000000..2166b11cc
--- /dev/null
+++ b/data/_lame/_metadata/name
@@ -0,0 +1 @@
+LAME
diff --git a/data/_lame/_metadata/ncurses.dep b/data/_lame/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/_lame/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses \ No newline at end of file
diff --git a/data/libopus/_metadata/priority b/data/_lame/_metadata/priority
index 134d9bc32..134d9bc32 100644
--- a/data/libopus/_metadata/priority
+++ b/data/_lame/_metadata/priority
diff --git a/data/libopus/_metadata/role b/data/_lame/_metadata/role
index 8d0320866..8d0320866 100644
--- a/data/libopus/_metadata/role
+++ b/data/_lame/_metadata/role
diff --git a/data/libopus/_metadata/section b/data/_lame/_metadata/section
index 593877746..593877746 100644
--- a/data/libopus/_metadata/section
+++ b/data/_lame/_metadata/section
diff --git a/data/libogg/_metadata/tags b/data/_lame/_metadata/tags
index a8928cec8..a8928cec8 100644
--- a/data/libogg/_metadata/tags
+++ b/data/_lame/_metadata/tags
diff --git a/data/_lame/_metadata/version b/data/_lame/_metadata/version
new file mode 100644
index 000000000..748d07b56
--- /dev/null
+++ b/data/_lame/_metadata/version
@@ -0,0 +1 @@
+3.100
diff --git a/data/lame/lame-3.100.tar.gz b/data/_lame/lame-3.100.tar.gz
index 32336a6d3..32336a6d3 100644
--- a/data/lame/lame-3.100.tar.gz
+++ b/data/_lame/lame-3.100.tar.gz
Binary files differ
diff --git a/data/lame/lame_init_old.diff b/data/_lame/lame_init_old.diff
index 155340bab..155340bab 100644
--- a/data/lame/lame_init_old.diff
+++ b/data/_lame/lame_init_old.diff
diff --git a/data/libogg/make.sh b/data/_lame/make.sh
index 452a4bfd5..452a4bfd5 100644
--- a/data/libogg/make.sh
+++ b/data/_lame/make.sh
diff --git a/data/lame/timestamp.diff b/data/_lame/timestamp.diff
index c828ad740..c828ad740 100644
--- a/data/lame/timestamp.diff
+++ b/data/_lame/timestamp.diff
diff --git a/data/libogg/_metadata/description b/data/_libogg/_metadata/description
index c7a8d1c9b..c7a8d1c9b 100644
--- a/data/libogg/_metadata/description
+++ b/data/_libogg/_metadata/description
diff --git a/data/libtheora/_metadata/in.1443.00 b/data/_libogg/_metadata/in.1443.00
index e69de29bb..e69de29bb 100644
--- a/data/libtheora/_metadata/in.1443.00
+++ b/data/_libogg/_metadata/in.1443.00
diff --git a/data/libogg/_metadata/license b/data/_libogg/_metadata/license
index 6111c6c5a..6111c6c5a 100644
--- a/data/libogg/_metadata/license
+++ b/data/_libogg/_metadata/license
diff --git a/data/libvorbis/_metadata/maintainer b/data/_libogg/_metadata/maintainer
index 573d7ebef..573d7ebef 120000
--- a/data/libvorbis/_metadata/maintainer
+++ b/data/_libogg/_metadata/maintainer
diff --git a/data/libtheora/_metadata/priority b/data/_libogg/_metadata/priority
index 134d9bc32..134d9bc32 100644
--- a/data/libtheora/_metadata/priority
+++ b/data/_libogg/_metadata/priority
diff --git a/data/libtheora/_metadata/role b/data/_libogg/_metadata/role
index 8d0320866..8d0320866 100644
--- a/data/libtheora/_metadata/role
+++ b/data/_libogg/_metadata/role
diff --git a/data/libtheora/_metadata/section b/data/_libogg/_metadata/section
index 593877746..593877746 100644
--- a/data/libtheora/_metadata/section
+++ b/data/_libogg/_metadata/section
diff --git a/data/libopus/_metadata/tags b/data/_libogg/_metadata/tags
index a8928cec8..a8928cec8 100644
--- a/data/libopus/_metadata/tags
+++ b/data/_libogg/_metadata/tags
diff --git a/data/libogg/_metadata/version b/data/_libogg/_metadata/version
index 31e5c8434..31e5c8434 100644
--- a/data/libogg/_metadata/version
+++ b/data/_libogg/_metadata/version
diff --git a/data/libogg/libogg-1.3.3.tar.gz b/data/_libogg/libogg-1.3.3.tar.gz
index b39fdfe49..b39fdfe49 100644
--- a/data/libogg/libogg-1.3.3.tar.gz
+++ b/data/_libogg/libogg-1.3.3.tar.gz
Binary files differ
diff --git a/data/_libogg/make.sh b/data/_libogg/make.sh
new file mode 100644
index 000000000..452a4bfd5
--- /dev/null
+++ b/data/_libogg/make.sh
@@ -0,0 +1,4 @@
+pkg:setup
+pkg:configure
+make
+pkg:install
diff --git a/data/libopus/_metadata/description b/data/_libopus/_metadata/description
index 6b7609806..6b7609806 100644
--- a/data/libopus/_metadata/description
+++ b/data/_libopus/_metadata/description
diff --git a/data/libvorbis/_metadata/in.1443.00 b/data/_libopus/_metadata/in.1443.00
index e69de29bb..e69de29bb 100644
--- a/data/libvorbis/_metadata/in.1443.00
+++ b/data/_libopus/_metadata/in.1443.00
diff --git a/data/libopus/_metadata/license b/data/_libopus/_metadata/license
index 720342c26..720342c26 100644
--- a/data/libopus/_metadata/license
+++ b/data/_libopus/_metadata/license
diff --git a/data/libtheora/_metadata/maintainer b/data/_libopus/_metadata/maintainer
index 0c538aadb..0c538aadb 120000
--- a/data/libtheora/_metadata/maintainer
+++ b/data/_libopus/_metadata/maintainer
diff --git a/data/libvorbis/_metadata/priority b/data/_libopus/_metadata/priority
index 134d9bc32..134d9bc32 100644
--- a/data/libvorbis/_metadata/priority
+++ b/data/_libopus/_metadata/priority
diff --git a/data/libvorbis/_metadata/role b/data/_libopus/_metadata/role
index 8d0320866..8d0320866 100644
--- a/data/libvorbis/_metadata/role
+++ b/data/_libopus/_metadata/role
diff --git a/data/libvorbis/_metadata/section b/data/_libopus/_metadata/section
index 593877746..593877746 100644
--- a/data/libvorbis/_metadata/section
+++ b/data/_libopus/_metadata/section
diff --git a/data/libtheora/_metadata/tags b/data/_libopus/_metadata/tags
index a8928cec8..a8928cec8 100644
--- a/data/libtheora/_metadata/tags
+++ b/data/_libopus/_metadata/tags
diff --git a/data/libopus/_metadata/version b/data/_libopus/_metadata/version
index 7e32cd569..7e32cd569 100644
--- a/data/libopus/_metadata/version
+++ b/data/_libopus/_metadata/version
diff --git a/data/libopus/make.sh b/data/_libopus/make.sh
index e1d3798f9..e1d3798f9 100644
--- a/data/libopus/make.sh
+++ b/data/_libopus/make.sh
diff --git a/data/libopus/opus-1.3.tar.gz b/data/_libopus/opus-1.3.tar.gz
index b2d28cd2f..b2d28cd2f 100644
--- a/data/libopus/opus-1.3.tar.gz
+++ b/data/_libopus/opus-1.3.tar.gz
Binary files differ
diff --git a/data/libtheora/_metadata/description b/data/_libtheora/_metadata/description
index 6eae3e880..6eae3e880 100644
--- a/data/libtheora/_metadata/description
+++ b/data/_libtheora/_metadata/description
diff --git a/data/libvpx/_metadata/in.1443.00 b/data/_libtheora/_metadata/in.1443.00
index e69de29bb..e69de29bb 100644
--- a/data/libvpx/_metadata/in.1443.00
+++ b/data/_libtheora/_metadata/in.1443.00
diff --git a/data/_libtheora/_metadata/libogg0.dep b/data/_libtheora/_metadata/libogg0.dep
new file mode 120000
index 000000000..d6039533a
--- /dev/null
+++ b/data/_libtheora/_metadata/libogg0.dep
@@ -0,0 +1 @@
+../../libogg0 \ No newline at end of file
diff --git a/data/_libtheora/_metadata/libvorbis0.dep b/data/_libtheora/_metadata/libvorbis0.dep
new file mode 120000
index 000000000..f85279696
--- /dev/null
+++ b/data/_libtheora/_metadata/libvorbis0.dep
@@ -0,0 +1 @@
+../../libvorbis0 \ No newline at end of file
diff --git a/data/libtheora/_metadata/license b/data/_libtheora/_metadata/license
index c8ccce4ff..c8ccce4ff 100644
--- a/data/libtheora/_metadata/license
+++ b/data/_libtheora/_metadata/license
diff --git a/data/libvpx/_metadata/maintainer b/data/_libtheora/_metadata/maintainer
index 0c538aadb..0c538aadb 120000
--- a/data/libvpx/_metadata/maintainer
+++ b/data/_libtheora/_metadata/maintainer
diff --git a/data/libvpx/_metadata/priority b/data/_libtheora/_metadata/priority
index 134d9bc32..134d9bc32 100644
--- a/data/libvpx/_metadata/priority
+++ b/data/_libtheora/_metadata/priority
diff --git a/data/libvpx/_metadata/role b/data/_libtheora/_metadata/role
index 8d0320866..8d0320866 100644
--- a/data/libvpx/_metadata/role
+++ b/data/_libtheora/_metadata/role
diff --git a/data/libvpx/_metadata/section b/data/_libtheora/_metadata/section
index 593877746..593877746 100644
--- a/data/libvpx/_metadata/section
+++ b/data/_libtheora/_metadata/section
diff --git a/data/libvorbis/_metadata/tags b/data/_libtheora/_metadata/tags
index a8928cec8..a8928cec8 100644
--- a/data/libvorbis/_metadata/tags
+++ b/data/_libtheora/_metadata/tags
diff --git a/data/libtheora/_metadata/version b/data/_libtheora/_metadata/version
index 524cb5524..524cb5524 100644
--- a/data/libtheora/_metadata/version
+++ b/data/_libtheora/_metadata/version
diff --git a/data/libtheora/info.diff b/data/_libtheora/info.diff
index 7027a7c60..7027a7c60 100644
--- a/data/libtheora/info.diff
+++ b/data/_libtheora/info.diff
diff --git a/data/libtheora/libtheora-1.1.1.tar.bz2 b/data/_libtheora/libtheora-1.1.1.tar.bz2
index 010e2a4ec..010e2a4ec 100644
--- a/data/libtheora/libtheora-1.1.1.tar.bz2
+++ b/data/_libtheora/libtheora-1.1.1.tar.bz2
Binary files differ
diff --git a/data/libtheora/make.sh b/data/_libtheora/make.sh
index c103eecaa..c103eecaa 100644
--- a/data/libtheora/make.sh
+++ b/data/_libtheora/make.sh
diff --git a/data/libvorbis/_metadata/description b/data/_libvorbis/_metadata/description
index eb5bdee7c..eb5bdee7c 100644
--- a/data/libvorbis/_metadata/description
+++ b/data/_libvorbis/_metadata/description
diff --git a/data/x265/_metadata/in.1443.00 b/data/_libvorbis/_metadata/in.1443.00
index e69de29bb..e69de29bb 100644
--- a/data/x265/_metadata/in.1443.00
+++ b/data/_libvorbis/_metadata/in.1443.00
diff --git a/data/_libvorbis/_metadata/libogg0.dep b/data/_libvorbis/_metadata/libogg0.dep
new file mode 120000
index 000000000..d6039533a
--- /dev/null
+++ b/data/_libvorbis/_metadata/libogg0.dep
@@ -0,0 +1 @@
+../../libogg0 \ No newline at end of file
diff --git a/data/libvorbis/_metadata/license b/data/_libvorbis/_metadata/license
index 7cf076b68..7cf076b68 100644
--- a/data/libvorbis/_metadata/license
+++ b/data/_libvorbis/_metadata/license
diff --git a/data/_libvorbis/_metadata/maintainer b/data/_libvorbis/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/_libvorbis/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner \ No newline at end of file
diff --git a/data/x265/_metadata/priority b/data/_libvorbis/_metadata/priority
index 134d9bc32..134d9bc32 100644
--- a/data/x265/_metadata/priority
+++ b/data/_libvorbis/_metadata/priority
diff --git a/data/x265/_metadata/role b/data/_libvorbis/_metadata/role
index 8d0320866..8d0320866 100644
--- a/data/x265/_metadata/role
+++ b/data/_libvorbis/_metadata/role
diff --git a/data/x265/_metadata/section b/data/_libvorbis/_metadata/section
index 593877746..593877746 100644
--- a/data/x265/_metadata/section
+++ b/data/_libvorbis/_metadata/section
diff --git a/data/libvpx/_metadata/tags b/data/_libvorbis/_metadata/tags
index a8928cec8..a8928cec8 100644
--- a/data/libvpx/_metadata/tags
+++ b/data/_libvorbis/_metadata/tags
diff --git a/data/libvorbis/_metadata/version b/data/_libvorbis/_metadata/version
index 95b25aee2..95b25aee2 100644
--- a/data/libvorbis/_metadata/version
+++ b/data/_libvorbis/_metadata/version
diff --git a/data/libvorbis/make.sh b/data/_libvorbis/make.sh
index 66a4b2105..e2797c1a4 100644
--- a/data/libvorbis/make.sh
+++ b/data/_libvorbis/make.sh
@@ -1,5 +1,5 @@
pkg:setup
./autogen.sh
pkg:configure
-make
+pkg:make
pkg:install
diff --git a/data/libvorbis/v1.3.6.tar.gz b/data/_libvorbis/v1.3.6.tar.gz
index 2a2a63000..2a2a63000 100644
--- a/data/libvorbis/v1.3.6.tar.gz
+++ b/data/_libvorbis/v1.3.6.tar.gz
Binary files differ
diff --git a/data/libvpx/_metadata/description b/data/_libvpx/_metadata/description
index 6bf7e93de..6bf7e93de 100644
--- a/data/libvpx/_metadata/description
+++ b/data/_libvpx/_metadata/description
diff --git a/data/_libvpx/_metadata/in.1443.00 b/data/_libvpx/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/_libvpx/_metadata/in.1443.00
diff --git a/data/libvpx/_metadata/license b/data/_libvpx/_metadata/license
index 1ce44343c..1ce44343c 100644
--- a/data/libvpx/_metadata/license
+++ b/data/_libvpx/_metadata/license
diff --git a/data/x265/_metadata/maintainer b/data/_libvpx/_metadata/maintainer
index 0c538aadb..0c538aadb 120000
--- a/data/x265/_metadata/maintainer
+++ b/data/_libvpx/_metadata/maintainer
diff --git a/data/_libvpx/_metadata/priority b/data/_libvpx/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/_libvpx/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/_libvpx/_metadata/role b/data/_libvpx/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/_libvpx/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/_libvpx/_metadata/section b/data/_libvpx/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/_libvpx/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/x265/_metadata/tags b/data/_libvpx/_metadata/tags
index a8928cec8..a8928cec8 100644
--- a/data/x265/_metadata/tags
+++ b/data/_libvpx/_metadata/tags
diff --git a/data/libvpx/_metadata/version b/data/_libvpx/_metadata/version
index 27f9cd322..27f9cd322 100644
--- a/data/libvpx/_metadata/version
+++ b/data/_libvpx/_metadata/version
diff --git a/data/libvpx/install_name.diff b/data/_libvpx/install_name.diff
index fa81908d3..fa81908d3 100644
--- a/data/libvpx/install_name.diff
+++ b/data/_libvpx/install_name.diff
diff --git a/data/libvpx/libvpx-1.8.0.tar.gz b/data/_libvpx/libvpx-1.8.0.tar.gz
index 8dc457e83..8dc457e83 100644
--- a/data/libvpx/libvpx-1.8.0.tar.gz
+++ b/data/_libvpx/libvpx-1.8.0.tar.gz
Binary files differ
diff --git a/data/_libvpx/make.sh b/data/_libvpx/make.sh
new file mode 100644
index 000000000..e844a6965
--- /dev/null
+++ b/data/_libvpx/make.sh
@@ -0,0 +1,14 @@
+pkg:setup
+CROSS="${PKG_TARG}-" ./configure --target="${PKG_TARG}-gcc" --prefix=$(cat "${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/prefix") --disable-static --enable-shared --enable-examples \
+ --enable-pic \
+ --enable-shared \
+ --disable-install-bins \
+ --disable-install-srcs \
+ --size-limit=16384x16384 \
+ --enable-postproc \
+ --enable-multi-res-encoding \
+ --enable-temporal-denoising \
+ --enable-vp9-temporal-denoising \
+ --enable-vp9-postproc
+pkg:make V=1
+pkg:install
diff --git a/data/libvpx/toolchain.diff b/data/_libvpx/toolchain.diff
index 5c25ba44d..5c25ba44d 100644
--- a/data/libvpx/toolchain.diff
+++ b/data/_libvpx/toolchain.diff
diff --git a/data/libvpx/vp9symbols.diff b/data/_libvpx/vp9symbols.diff
index 49c1471d3..49c1471d3 100644
--- a/data/libvpx/vp9symbols.diff
+++ b/data/_libvpx/vp9symbols.diff
diff --git a/data/_x264/_metadata/description b/data/_x264/_metadata/description
new file mode 100644
index 000000000..e5be2a6d7
--- /dev/null
+++ b/data/_x264/_metadata/description
@@ -0,0 +1 @@
+H.264/AVC encoder
diff --git a/data/_x264/_metadata/in.1443.00 b/data/_x264/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/_x264/_metadata/in.1443.00
diff --git a/data/_x264/_metadata/maintainer b/data/_x264/_metadata/maintainer
new file mode 120000
index 000000000..0c538aadb
--- /dev/null
+++ b/data/_x264/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/mac \ No newline at end of file
diff --git a/data/x264/_metadata/name b/data/_x264/_metadata/name
index 0af02d53e..0af02d53e 100644
--- a/data/x264/_metadata/name
+++ b/data/_x264/_metadata/name
diff --git a/data/_x264/_metadata/priority b/data/_x264/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/_x264/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/_x264/_metadata/role b/data/_x264/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/_x264/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/_x264/_metadata/section b/data/_x264/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/_x264/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/_x264/_metadata/tags b/data/_x264/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/_x264/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/_x264/_metadata/version b/data/_x264/_metadata/version
new file mode 100644
index 000000000..a3a6c333c
--- /dev/null
+++ b/data/_x264/_metadata/version
@@ -0,0 +1 @@
+0.157.2945
diff --git a/data/x264/gas-preprocessor.pl b/data/_x264/gas-preprocessor.pl
index 743ce45e7..743ce45e7 100755
--- a/data/x264/gas-preprocessor.pl
+++ b/data/_x264/gas-preprocessor.pl
diff --git a/data/_x264/make.sh b/data/_x264/make.sh
new file mode 100644
index 000000000..19266819f
--- /dev/null
+++ b/data/_x264/make.sh
@@ -0,0 +1,6 @@
+pkg:setup
+cp "${PKG_DATA}"/gas-preprocessor.pl .
+# Host requires perl.
+CC="${PKG_TARG}-gcc" AS="./gas-preprocessor.pl -arch $(echo ${PKG_TARG} | sed -e 's/-.*//') -- ${PKG_TARG}-gcc" pkg:configure --enable-shared --disable-lsmash --enable-strip --cross-prefix="${PKG_TARG}-" --system-libx264
+pkg:make
+pkg:install
diff --git a/data/_x264/makefile-error.diff b/data/_x264/makefile-error.diff
new file mode 100644
index 000000000..0f2ce2815
--- /dev/null
+++ b/data/_x264/makefile-error.diff
@@ -0,0 +1,12 @@
+diff -ur x264-snapshot-20190402-2245/Makefile x264-snapshot-20190402-2245+iPhone/Makefile
+--- x264-snapshot-20190402-2245/Makefile 2019-04-02 10:45:02.000000000 -1000
++++ x264-snapshot-20190402-2245+iPhone/Makefile 2019-04-02 21:24:44.000000000 -1000
+@@ -240,7 +240,7 @@
+
+ $(LIBX264): $(GENERATED) .depend $(OBJS) $(OBJASM)
+ rm -f $(LIBX264)
+- $(AR)$@ $(OBJS) $(OBJASM)
++ $(AR) -r $@ $(OBJS) $(OBJASM)
+ $(if $(RANLIB), $(RANLIB) $@)
+
+ $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO)
diff --git a/data/_x264/x264-2945.tar.lz b/data/_x264/x264-2945.tar.lz
new file mode 100644
index 000000000..7c2aaacf1
--- /dev/null
+++ b/data/_x264/x264-2945.tar.lz
Binary files differ
diff --git a/data/x265/_metadata/description b/data/_x265/_metadata/description
index 2f565c14e..2f565c14e 100644
--- a/data/x265/_metadata/description
+++ b/data/_x265/_metadata/description
diff --git a/data/_x265/_metadata/in.1443.00 b/data/_x265/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/_x265/_metadata/in.1443.00
diff --git a/data/x265/_metadata/license b/data/_x265/_metadata/license
index d5457c936..d5457c936 100644
--- a/data/x265/_metadata/license
+++ b/data/_x265/_metadata/license
diff --git a/data/_x265/_metadata/maintainer b/data/_x265/_metadata/maintainer
new file mode 120000
index 000000000..0c538aadb
--- /dev/null
+++ b/data/_x265/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/mac \ No newline at end of file
diff --git a/data/x265/_metadata/name b/data/_x265/_metadata/name
index 9313b4661..9313b4661 100644
--- a/data/x265/_metadata/name
+++ b/data/_x265/_metadata/name
diff --git a/data/_x265/_metadata/priority b/data/_x265/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/_x265/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/_x265/_metadata/role b/data/_x265/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/_x265/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/_x265/_metadata/section b/data/_x265/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/_x265/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/_x265/_metadata/tags b/data/_x265/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/_x265/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/x265/_metadata/version b/data/_x265/_metadata/version
index 9f55b2ccb..9f55b2ccb 100644
--- a/data/x265/_metadata/version
+++ b/data/_x265/_metadata/version
diff --git a/data/x265/make.sh b/data/_x265/make.sh
index f0aa4aae7..f0aa4aae7 100644
--- a/data/x265/make.sh
+++ b/data/_x265/make.sh
diff --git a/data/x265/x265_3.0.tar.gz b/data/_x265/x265_3.0.tar.gz
index b90ed9671..b90ed9671 100644
--- a/data/x265/x265_3.0.tar.gz
+++ b/data/_x265/x265_3.0.tar.gz
Binary files differ
diff --git a/data/ffmpeg/_metadata/_ffmpeg.dep b/data/ffmpeg/_metadata/_ffmpeg.dep
new file mode 120000
index 000000000..fbdeb149b
--- /dev/null
+++ b/data/ffmpeg/_metadata/_ffmpeg.dep
@@ -0,0 +1 @@
+../../_ffmpeg \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libavcodec58.dep b/data/ffmpeg/_metadata/libavcodec58.dep
new file mode 120000
index 000000000..28121412e
--- /dev/null
+++ b/data/ffmpeg/_metadata/libavcodec58.dep
@@ -0,0 +1 @@
+../../libavcodec58 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libavdevice58.dep b/data/ffmpeg/_metadata/libavdevice58.dep
new file mode 120000
index 000000000..d128c271f
--- /dev/null
+++ b/data/ffmpeg/_metadata/libavdevice58.dep
@@ -0,0 +1 @@
+../../libavdevice58 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libavfilter7.dep b/data/ffmpeg/_metadata/libavfilter7.dep
new file mode 120000
index 000000000..0bfb49e16
--- /dev/null
+++ b/data/ffmpeg/_metadata/libavfilter7.dep
@@ -0,0 +1 @@
+../../libavfilter7 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libavformat58.dep b/data/ffmpeg/_metadata/libavformat58.dep
new file mode 120000
index 000000000..cdcf9037e
--- /dev/null
+++ b/data/ffmpeg/_metadata/libavformat58.dep
@@ -0,0 +1 @@
+../../libavformat58 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libavtil56.dep b/data/ffmpeg/_metadata/libavtil56.dep
new file mode 120000
index 000000000..6c5139121
--- /dev/null
+++ b/data/ffmpeg/_metadata/libavtil56.dep
@@ -0,0 +1 @@
+../../libavtil56 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libavutil56.dep b/data/ffmpeg/_metadata/libavutil56.dep
new file mode 120000
index 000000000..30743e443
--- /dev/null
+++ b/data/ffmpeg/_metadata/libavutil56.dep
@@ -0,0 +1 @@
+../../libavutil56 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libmp3lame0.dep b/data/ffmpeg/_metadata/libmp3lame0.dep
new file mode 120000
index 000000000..6699d2958
--- /dev/null
+++ b/data/ffmpeg/_metadata/libmp3lame0.dep
@@ -0,0 +1 @@
+../../libmp3lame0 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libogg0.dep b/data/ffmpeg/_metadata/libogg0.dep
new file mode 120000
index 000000000..d6039533a
--- /dev/null
+++ b/data/ffmpeg/_metadata/libogg0.dep
@@ -0,0 +1 @@
+../../libogg0 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libopus0.dep b/data/ffmpeg/_metadata/libopus0.dep
new file mode 120000
index 000000000..3af5f2a4e
--- /dev/null
+++ b/data/ffmpeg/_metadata/libopus0.dep
@@ -0,0 +1 @@
+../../libopus0 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libpostproc55.dep b/data/ffmpeg/_metadata/libpostproc55.dep
new file mode 120000
index 000000000..2c2b1f69d
--- /dev/null
+++ b/data/ffmpeg/_metadata/libpostproc55.dep
@@ -0,0 +1 @@
+../../libpostproc55 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libswresample3.dep b/data/ffmpeg/_metadata/libswresample3.dep
new file mode 120000
index 000000000..449f4c2cd
--- /dev/null
+++ b/data/ffmpeg/_metadata/libswresample3.dep
@@ -0,0 +1 @@
+../../libswresample3 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libswscale5.dep b/data/ffmpeg/_metadata/libswscale5.dep
new file mode 120000
index 000000000..55eb2de35
--- /dev/null
+++ b/data/ffmpeg/_metadata/libswscale5.dep
@@ -0,0 +1 @@
+../../libswscale5 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libtheora0.dep b/data/ffmpeg/_metadata/libtheora0.dep
new file mode 120000
index 000000000..02eb1ef4e
--- /dev/null
+++ b/data/ffmpeg/_metadata/libtheora0.dep
@@ -0,0 +1 @@
+../../libtheora0 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libvorbis0.dep b/data/ffmpeg/_metadata/libvorbis0.dep
new file mode 120000
index 000000000..f85279696
--- /dev/null
+++ b/data/ffmpeg/_metadata/libvorbis0.dep
@@ -0,0 +1 @@
+../../libvorbis0 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libvpx6.dep b/data/ffmpeg/_metadata/libvpx6.dep
new file mode 120000
index 000000000..2f5ef034d
--- /dev/null
+++ b/data/ffmpeg/_metadata/libvpx6.dep
@@ -0,0 +1 @@
+../../libvpx6 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libx264-157.dep b/data/ffmpeg/_metadata/libx264-157.dep
new file mode 120000
index 000000000..22e08a533
--- /dev/null
+++ b/data/ffmpeg/_metadata/libx264-157.dep
@@ -0,0 +1 @@
+../../libx264-157 \ No newline at end of file
diff --git a/data/ffmpeg/_metadata/libx265-169.dep b/data/ffmpeg/_metadata/libx265-169.dep
new file mode 120000
index 000000000..f4b3b0a5c
--- /dev/null
+++ b/data/ffmpeg/_metadata/libx265-169.dep
@@ -0,0 +1 @@
+../../libx265-169 \ No newline at end of file
diff --git a/data/ffmpeg/make.sh b/data/ffmpeg/make.sh
index a61fdbefd..c9c892170 100644
--- a/data/ffmpeg/make.sh
+++ b/data/ffmpeg/make.sh
@@ -1,22 +1,2 @@
-pkg:setup
-ARCH=$(echo ${PKG_TARG} | sed -e s/'-.*'//)
-
-# Arguments taken from:
-# https://github.com/Homebrew/homebrew-core/blob/master/Formula/ffmpeg.rb
-
-# Xz and gnutls included since they are default dependencies.
-
-# WARNING: --enable-gpl and --enable-nonfree can make ffmpeg not legally redistributable.
-# --enable-gpl includes code with the gpl license.
-
-
-./configure --arch=${ARCH} --pkg-config="$(realpath "${PKG_BASE}/util/pkg-config.sh")" \
- --prefix="$(cat "${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/prefix")" --enable-cross-compile \
- --cross-prefix="${PKG_TARG}-" --target-os=darwin \
- --disable-static --enable-shared --disable-debug --disable-stripping \
- --enable-pthreads --enable-version3 --enable-hardcoded-tables --enable-gnutls \
- --enable-gpl --enable-libmp3lame --enable-libopus --enable-libtheora \
- --enable-libvorbis --enable-libvpx --enable-libx264 --enable-libx265 \
- --enable-libxvid --enable-lzma # --enable-nonfree
-make -j16
-pkg:install
+pkg: mkdir -p /usr/bin
+cp -a "$(PKG_DEST_ _lame)"/usr/bin/* "${PKG_DEST}"/usr/bin
diff --git a/data/lame/_metadata/description b/data/lame/_metadata/description
index df8c84c02..eeeb13241 100644
--- a/data/lame/_metadata/description
+++ b/data/lame/_metadata/description
@@ -1 +1 @@
-open source (lgpl) mp3 encoder
+MP3 encoding library (frontend)
diff --git a/data/lame/_metadata/libmp3lame0.dep b/data/lame/_metadata/libmp3lame0.dep
new file mode 120000
index 000000000..6699d2958
--- /dev/null
+++ b/data/lame/_metadata/libmp3lame0.dep
@@ -0,0 +1 @@
+../../libmp3lame0 \ No newline at end of file
diff --git a/data/lame/_metadata/libmp3lame0.ver.iphoneos-arm b/data/lame/_metadata/libmp3lame0.ver.iphoneos-arm
new file mode 120000
index 000000000..5ba0ce5f0
--- /dev/null
+++ b/data/lame/_metadata/libmp3lame0.ver.iphoneos-arm
@@ -0,0 +1 @@
+../../libmp3lame0/_metadata/version \ No newline at end of file
diff --git a/data/lame/_metadata/version b/data/lame/_metadata/version
index 748d07b56..09d02d1c7 100644..120000
--- a/data/lame/_metadata/version
+++ b/data/lame/_metadata/version
@@ -1 +1 @@
-3.100
+../../_lame/_metadata/version \ No newline at end of file
diff --git a/data/lame/make.sh b/data/lame/make.sh
index 452a4bfd5..c9c892170 100644
--- a/data/lame/make.sh
+++ b/data/lame/make.sh
@@ -1,4 +1,2 @@
-pkg:setup
-pkg:configure
-make
-pkg:install
+pkg: mkdir -p /usr/bin
+cp -a "$(PKG_DEST_ _lame)"/usr/bin/* "${PKG_DEST}"/usr/bin
diff --git a/data/libogg/_metadata/conflicts b/data/libogg-dev/_metadata/conflicts
index 506ceaa1e..506ceaa1e 100644
--- a/data/libogg/_metadata/conflicts
+++ b/data/libogg-dev/_metadata/conflicts
diff --git a/data/libogg-dev/_metadata/description b/data/libogg-dev/_metadata/description
new file mode 100644
index 000000000..2ba66ad92
--- /dev/null
+++ b/data/libogg-dev/_metadata/description
@@ -0,0 +1 @@
+Ogg bitstream library (development)
diff --git a/data/libogg-dev/_metadata/in.1443.00 b/data/libogg-dev/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libogg-dev/_metadata/in.1443.00
diff --git a/data/libogg-dev/_metadata/libogg0.dep b/data/libogg-dev/_metadata/libogg0.dep
new file mode 120000
index 000000000..d6039533a
--- /dev/null
+++ b/data/libogg-dev/_metadata/libogg0.dep
@@ -0,0 +1 @@
+../../libogg0 \ No newline at end of file
diff --git a/data/libogg-dev/_metadata/libogg0.ver.iphoneos-arm b/data/libogg-dev/_metadata/libogg0.ver.iphoneos-arm
new file mode 120000
index 000000000..b2e9951af
--- /dev/null
+++ b/data/libogg-dev/_metadata/libogg0.ver.iphoneos-arm
@@ -0,0 +1 @@
+../../libogg0/_metadata/version \ No newline at end of file
diff --git a/data/libogg-dev/_metadata/license b/data/libogg-dev/_metadata/license
new file mode 120000
index 000000000..fe021c41f
--- /dev/null
+++ b/data/libogg-dev/_metadata/license
@@ -0,0 +1 @@
+../../_libogg/_metadata/license \ No newline at end of file
diff --git a/data/libogg-dev/_metadata/maintainer b/data/libogg-dev/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/libogg-dev/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner \ No newline at end of file
diff --git a/data/libogg-dev/_metadata/priority b/data/libogg-dev/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/libogg-dev/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/libogg-dev/_metadata/role b/data/libogg-dev/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libogg-dev/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libogg-dev/_metadata/section b/data/libogg-dev/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/libogg-dev/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/libogg-dev/_metadata/tags b/data/libogg-dev/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libogg-dev/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libogg-dev/_metadata/version b/data/libogg-dev/_metadata/version
new file mode 120000
index 000000000..508fca7e9
--- /dev/null
+++ b/data/libogg-dev/_metadata/version
@@ -0,0 +1 @@
+../../_libogg/_metadata/version \ No newline at end of file
diff --git a/data/libogg-dev/make.sh b/data/libogg-dev/make.sh
new file mode 100644
index 000000000..1ee246b11
--- /dev/null
+++ b/data/libogg-dev/make.sh
@@ -0,0 +1,4 @@
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _libogg)"/usr/{include,share} "${PKG_DEST}"/usr/
+cp -a "$(PKG_DEST_ _libogg)"/usr/lib/{lib*.dylib,pkgconfig} "${PKG_DEST}"/usr/lib
+rm "${PKG_DEST}"/usr/lib/lib*.*.dylib
diff --git a/data/libogg0/_metadata/_libogg.dep b/data/libogg0/_metadata/_libogg.dep
new file mode 120000
index 000000000..2e0e576a9
--- /dev/null
+++ b/data/libogg0/_metadata/_libogg.dep
@@ -0,0 +1 @@
+../../_libogg \ No newline at end of file
diff --git a/data/libogg/_metadata/provides b/data/libogg0/_metadata/conflicts
index 506ceaa1e..506ceaa1e 100644
--- a/data/libogg/_metadata/provides
+++ b/data/libogg0/_metadata/conflicts
diff --git a/data/libogg0/_metadata/description b/data/libogg0/_metadata/description
new file mode 100644
index 000000000..2089fc160
--- /dev/null
+++ b/data/libogg0/_metadata/description
@@ -0,0 +1 @@
+Ogg bitstream library
diff --git a/data/libogg0/_metadata/in.1443.00 b/data/libogg0/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libogg0/_metadata/in.1443.00
diff --git a/data/libogg0/_metadata/license b/data/libogg0/_metadata/license
new file mode 120000
index 000000000..fe021c41f
--- /dev/null
+++ b/data/libogg0/_metadata/license
@@ -0,0 +1 @@
+../../_libogg/_metadata/license \ No newline at end of file
diff --git a/data/libogg0/_metadata/maintainer b/data/libogg0/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/libogg0/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner \ No newline at end of file
diff --git a/data/libogg0/_metadata/priority b/data/libogg0/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/libogg0/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/libogg/_metadata/replaces b/data/libogg0/_metadata/provides
index 506ceaa1e..506ceaa1e 100644
--- a/data/libogg/_metadata/replaces
+++ b/data/libogg0/_metadata/provides
diff --git a/data/libogg0/_metadata/replaces b/data/libogg0/_metadata/replaces
new file mode 100644
index 000000000..506ceaa1e
--- /dev/null
+++ b/data/libogg0/_metadata/replaces
@@ -0,0 +1 @@
+ogg
diff --git a/data/libogg0/_metadata/role b/data/libogg0/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libogg0/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libogg0/_metadata/section b/data/libogg0/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/libogg0/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/libogg0/_metadata/tags b/data/libogg0/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libogg0/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libogg0/_metadata/version b/data/libogg0/_metadata/version
new file mode 120000
index 000000000..508fca7e9
--- /dev/null
+++ b/data/libogg0/_metadata/version
@@ -0,0 +1 @@
+../../_libogg/_metadata/version \ No newline at end of file
diff --git a/data/libogg0/make.sh b/data/libogg0/make.sh
new file mode 100644
index 000000000..10a1fb920
--- /dev/null
+++ b/data/libogg0/make.sh
@@ -0,0 +1,2 @@
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _libogg)"/usr/lib/lib*.*.dylib "${PKG_DEST}"/usr/lib
diff --git a/data/libtheora/_metadata/libogg.dep b/data/libtheora/_metadata/libogg.dep
deleted file mode 120000
index c88b8bd5c..000000000
--- a/data/libtheora/_metadata/libogg.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libogg \ No newline at end of file
diff --git a/data/libtheora/_metadata/libvorbis.dep b/data/libtheora/_metadata/libvorbis.dep
deleted file mode 120000
index 2196d93e3..000000000
--- a/data/libtheora/_metadata/libvorbis.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libvorbis \ No newline at end of file
diff --git a/data/libvorbis/_metadata/conflicts b/data/libvorbis-dev/_metadata/conflicts
index fcc8705fd..fcc8705fd 100644
--- a/data/libvorbis/_metadata/conflicts
+++ b/data/libvorbis-dev/_metadata/conflicts
diff --git a/data/libvorbis-dev/_metadata/description b/data/libvorbis-dev/_metadata/description
new file mode 100644
index 000000000..f615ce043
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/description
@@ -0,0 +1 @@
+decoder library for Vorbis General Audio Compression Codec
diff --git a/data/libvorbis-dev/_metadata/in.1443.00 b/data/libvorbis-dev/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/in.1443.00
diff --git a/data/libvorbis-dev/_metadata/libogg0.dep b/data/libvorbis-dev/_metadata/libogg0.dep
new file mode 120000
index 000000000..d6039533a
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/libogg0.dep
@@ -0,0 +1 @@
+../../libogg0 \ No newline at end of file
diff --git a/data/libvorbis-dev/_metadata/libvorbis0.dep b/data/libvorbis-dev/_metadata/libvorbis0.dep
new file mode 120000
index 000000000..f85279696
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/libvorbis0.dep
@@ -0,0 +1 @@
+../../libvorbis0 \ No newline at end of file
diff --git a/data/libvorbis-dev/_metadata/libvorbis0.ver.iphoneos-arm b/data/libvorbis-dev/_metadata/libvorbis0.ver.iphoneos-arm
new file mode 120000
index 000000000..ef0c53714
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/libvorbis0.ver.iphoneos-arm
@@ -0,0 +1 @@
+../../libvorbis0/_metadata/version \ No newline at end of file
diff --git a/data/libvorbis-dev/_metadata/libvorbisenc2.dep b/data/libvorbis-dev/_metadata/libvorbisenc2.dep
new file mode 120000
index 000000000..b0e1f63f6
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/libvorbisenc2.dep
@@ -0,0 +1 @@
+../../libvorbisenc2 \ No newline at end of file
diff --git a/data/libvorbis-dev/_metadata/libvorbisenc2.ver.iphoneos-arm b/data/libvorbis-dev/_metadata/libvorbisenc2.ver.iphoneos-arm
new file mode 120000
index 000000000..29d0be352
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/libvorbisenc2.ver.iphoneos-arm
@@ -0,0 +1 @@
+../../libvorbisenc2/_metadata/version \ No newline at end of file
diff --git a/data/libvorbis-dev/_metadata/libvorbisfile3.dep b/data/libvorbis-dev/_metadata/libvorbisfile3.dep
new file mode 120000
index 000000000..98667d05f
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/libvorbisfile3.dep
@@ -0,0 +1 @@
+../../libvorbisfile3 \ No newline at end of file
diff --git a/data/libvorbis-dev/_metadata/libvorbisfile3.ver.iphoneos-arm b/data/libvorbis-dev/_metadata/libvorbisfile3.ver.iphoneos-arm
new file mode 120000
index 000000000..3b1520dd0
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/libvorbisfile3.ver.iphoneos-arm
@@ -0,0 +1 @@
+../../libvorbisfile3/_metadata/version \ No newline at end of file
diff --git a/data/libvorbis-dev/_metadata/license b/data/libvorbis-dev/_metadata/license
new file mode 120000
index 000000000..ee3d360dd
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/license
@@ -0,0 +1 @@
+../../_libvorbis/_metadata/license \ No newline at end of file
diff --git a/data/libvorbis-dev/_metadata/maintainer b/data/libvorbis-dev/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner \ No newline at end of file
diff --git a/data/libvorbis-dev/_metadata/priority b/data/libvorbis-dev/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/libvorbis/_metadata/provides b/data/libvorbis-dev/_metadata/provides
index fcc8705fd..fcc8705fd 100644
--- a/data/libvorbis/_metadata/provides
+++ b/data/libvorbis-dev/_metadata/provides
diff --git a/data/libvorbis/_metadata/replaces b/data/libvorbis-dev/_metadata/replaces
index fcc8705fd..fcc8705fd 100644
--- a/data/libvorbis/_metadata/replaces
+++ b/data/libvorbis-dev/_metadata/replaces
diff --git a/data/libvorbis-dev/_metadata/role b/data/libvorbis-dev/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libvorbis-dev/_metadata/section b/data/libvorbis-dev/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/libvorbis-dev/_metadata/tags b/data/libvorbis-dev/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libvorbis-dev/_metadata/version b/data/libvorbis-dev/_metadata/version
new file mode 120000
index 000000000..81be3f6f6
--- /dev/null
+++ b/data/libvorbis-dev/_metadata/version
@@ -0,0 +1 @@
+../../_libvorbis/_metadata/version \ No newline at end of file
diff --git a/data/libvorbis-dev/make.sh b/data/libvorbis-dev/make.sh
new file mode 100644
index 000000000..3dd594709
--- /dev/null
+++ b/data/libvorbis-dev/make.sh
@@ -0,0 +1,4 @@
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _libvorbis)"/usr/{include,share} "${PKG_DEST}"/usr/
+cp -a "$(PKG_DEST_ _libvorbis)"/usr/lib/{lib*.dylib,pkgconfig} "${PKG_DEST}"/usr/lib
+rm "${PKG_DEST}"/usr/lib/lib*.*.dylib
diff --git a/data/libvorbis/_metadata/libogg.dep b/data/libvorbis/_metadata/libogg.dep
deleted file mode 120000
index c88b8bd5c..000000000
--- a/data/libvorbis/_metadata/libogg.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libogg \ No newline at end of file
diff --git a/data/libvorbis0/_metadata/_libvorbis.dep b/data/libvorbis0/_metadata/_libvorbis.dep
new file mode 120000
index 000000000..12c168933
--- /dev/null
+++ b/data/libvorbis0/_metadata/_libvorbis.dep
@@ -0,0 +1 @@
+../../_libvorbis \ No newline at end of file
diff --git a/data/libvorbis0/_metadata/conflicts b/data/libvorbis0/_metadata/conflicts
new file mode 100644
index 000000000..fcc8705fd
--- /dev/null
+++ b/data/libvorbis0/_metadata/conflicts
@@ -0,0 +1 @@
+vorbis
diff --git a/data/libvorbis0/_metadata/description b/data/libvorbis0/_metadata/description
new file mode 100644
index 000000000..f615ce043
--- /dev/null
+++ b/data/libvorbis0/_metadata/description
@@ -0,0 +1 @@
+decoder library for Vorbis General Audio Compression Codec
diff --git a/data/libvorbis0/_metadata/in.1443.00 b/data/libvorbis0/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libvorbis0/_metadata/in.1443.00
diff --git a/data/libvorbis0/_metadata/libogg0.dep b/data/libvorbis0/_metadata/libogg0.dep
new file mode 120000
index 000000000..d6039533a
--- /dev/null
+++ b/data/libvorbis0/_metadata/libogg0.dep
@@ -0,0 +1 @@
+../../libogg0 \ No newline at end of file
diff --git a/data/libvorbis0/_metadata/license b/data/libvorbis0/_metadata/license
new file mode 120000
index 000000000..ee3d360dd
--- /dev/null
+++ b/data/libvorbis0/_metadata/license
@@ -0,0 +1 @@
+../../_libvorbis/_metadata/license \ No newline at end of file
diff --git a/data/libvorbis0/_metadata/maintainer b/data/libvorbis0/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/libvorbis0/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner \ No newline at end of file
diff --git a/data/libvorbis0/_metadata/priority b/data/libvorbis0/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/libvorbis0/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/libvorbis0/_metadata/role b/data/libvorbis0/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libvorbis0/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libvorbis0/_metadata/section b/data/libvorbis0/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/libvorbis0/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/libvorbis0/_metadata/tags b/data/libvorbis0/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libvorbis0/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libvorbis0/_metadata/version b/data/libvorbis0/_metadata/version
new file mode 120000
index 000000000..81be3f6f6
--- /dev/null
+++ b/data/libvorbis0/_metadata/version
@@ -0,0 +1 @@
+../../_libvorbis/_metadata/version \ No newline at end of file
diff --git a/data/libvorbis0/make.sh b/data/libvorbis0/make.sh
new file mode 100644
index 000000000..1498a725a
--- /dev/null
+++ b/data/libvorbis0/make.sh
@@ -0,0 +1,2 @@
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _libvorbis)"/usr/lib/libvorbis.*.dylib "${PKG_DEST}/usr/lib"
diff --git a/data/libvorbisenc2/_metadata/conflicts b/data/libvorbisenc2/_metadata/conflicts
new file mode 100644
index 000000000..fcc8705fd
--- /dev/null
+++ b/data/libvorbisenc2/_metadata/conflicts
@@ -0,0 +1 @@
+vorbis
diff --git a/data/libvorbisenc2/_metadata/description b/data/libvorbisenc2/_metadata/description
new file mode 100644
index 000000000..f615ce043
--- /dev/null
+++ b/data/libvorbisenc2/_metadata/description
@@ -0,0 +1 @@
+decoder library for Vorbis General Audio Compression Codec
diff --git a/data/libvorbisenc2/_metadata/in.1443.00 b/data/libvorbisenc2/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libvorbisenc2/_metadata/in.1443.00
diff --git a/data/libvorbisenc2/_metadata/libvorbis0.dep b/data/libvorbisenc2/_metadata/libvorbis0.dep
new file mode 120000
index 000000000..f85279696
--- /dev/null
+++ b/data/libvorbisenc2/_metadata/libvorbis0.dep
@@ -0,0 +1 @@
+../../libvorbis0 \ No newline at end of file
diff --git a/data/libvorbisenc2/_metadata/license b/data/libvorbisenc2/_metadata/license
new file mode 120000
index 000000000..ee3d360dd
--- /dev/null
+++ b/data/libvorbisenc2/_metadata/license
@@ -0,0 +1 @@
+../../_libvorbis/_metadata/license \ No newline at end of file
diff --git a/data/libvorbisenc2/_metadata/maintainer b/data/libvorbisenc2/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/libvorbisenc2/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner \ No newline at end of file
diff --git a/data/libvorbisenc2/_metadata/priority b/data/libvorbisenc2/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/libvorbisenc2/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/libvorbisenc2/_metadata/role b/data/libvorbisenc2/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libvorbisenc2/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libvorbisenc2/_metadata/section b/data/libvorbisenc2/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/libvorbisenc2/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/libvorbisenc2/_metadata/tags b/data/libvorbisenc2/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libvorbisenc2/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libvorbisenc2/_metadata/version b/data/libvorbisenc2/_metadata/version
new file mode 120000
index 000000000..81be3f6f6
--- /dev/null
+++ b/data/libvorbisenc2/_metadata/version
@@ -0,0 +1 @@
+../../_libvorbis/_metadata/version \ No newline at end of file
diff --git a/data/libvorbisenc2/make.sh b/data/libvorbisenc2/make.sh
new file mode 100644
index 000000000..8e555d0d0
--- /dev/null
+++ b/data/libvorbisenc2/make.sh
@@ -0,0 +1,2 @@
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _libvorbis)"/usr/lib/libvorbisenc.*.dylib "${PKG_DEST}/usr/lib"
diff --git a/data/libvorbisfile3/_metadata/conflicts b/data/libvorbisfile3/_metadata/conflicts
new file mode 100644
index 000000000..fcc8705fd
--- /dev/null
+++ b/data/libvorbisfile3/_metadata/conflicts
@@ -0,0 +1 @@
+vorbis
diff --git a/data/libvorbisfile3/_metadata/description b/data/libvorbisfile3/_metadata/description
new file mode 100644
index 000000000..f615ce043
--- /dev/null
+++ b/data/libvorbisfile3/_metadata/description
@@ -0,0 +1 @@
+decoder library for Vorbis General Audio Compression Codec
diff --git a/data/libvorbisfile3/_metadata/in.1443.00 b/data/libvorbisfile3/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libvorbisfile3/_metadata/in.1443.00
diff --git a/data/libvorbisfile3/_metadata/libvorbis0.dep b/data/libvorbisfile3/_metadata/libvorbis0.dep
new file mode 120000
index 000000000..f85279696
--- /dev/null
+++ b/data/libvorbisfile3/_metadata/libvorbis0.dep
@@ -0,0 +1 @@
+../../libvorbis0 \ No newline at end of file
diff --git a/data/libvorbisfile3/_metadata/license b/data/libvorbisfile3/_metadata/license
new file mode 120000
index 000000000..ee3d360dd
--- /dev/null
+++ b/data/libvorbisfile3/_metadata/license
@@ -0,0 +1 @@
+../../_libvorbis/_metadata/license \ No newline at end of file
diff --git a/data/libvorbisfile3/_metadata/maintainer b/data/libvorbisfile3/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/libvorbisfile3/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner \ No newline at end of file
diff --git a/data/libvorbisfile3/_metadata/priority b/data/libvorbisfile3/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/libvorbisfile3/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/libvorbisfile3/_metadata/role b/data/libvorbisfile3/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libvorbisfile3/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libvorbisfile3/_metadata/section b/data/libvorbisfile3/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/libvorbisfile3/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/libvorbisfile3/_metadata/tags b/data/libvorbisfile3/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libvorbisfile3/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libvorbisfile3/_metadata/version b/data/libvorbisfile3/_metadata/version
new file mode 120000
index 000000000..81be3f6f6
--- /dev/null
+++ b/data/libvorbisfile3/_metadata/version
@@ -0,0 +1 @@
+../../_libvorbis/_metadata/version \ No newline at end of file
diff --git a/data/libvorbisfile3/make.sh b/data/libvorbisfile3/make.sh
new file mode 100644
index 000000000..3531049ff
--- /dev/null
+++ b/data/libvorbisfile3/make.sh
@@ -0,0 +1,2 @@
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _libvorbis)"/usr/lib/libvorbisfile.*.dylib "${PKG_DEST}/usr/lib"
diff --git a/data/libvpx-dev/_metadata/description b/data/libvpx-dev/_metadata/description
new file mode 100644
index 000000000..80cb0ebba
--- /dev/null
+++ b/data/libvpx-dev/_metadata/description
@@ -0,0 +1 @@
+VP8/VP9 video codec (development)
diff --git a/data/libvpx-dev/_metadata/in.1443.00 b/data/libvpx-dev/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libvpx-dev/_metadata/in.1443.00
diff --git a/data/libvpx-dev/_metadata/libvpx6.dep b/data/libvpx-dev/_metadata/libvpx6.dep
new file mode 120000
index 000000000..2f5ef034d
--- /dev/null
+++ b/data/libvpx-dev/_metadata/libvpx6.dep
@@ -0,0 +1 @@
+../../libvpx6 \ No newline at end of file
diff --git a/data/libvpx-dev/_metadata/license b/data/libvpx-dev/_metadata/license
new file mode 120000
index 000000000..b44dc6867
--- /dev/null
+++ b/data/libvpx-dev/_metadata/license
@@ -0,0 +1 @@
+../../_libvpx/_metadata/license \ No newline at end of file
diff --git a/data/libvpx-dev/_metadata/maintainer b/data/libvpx-dev/_metadata/maintainer
new file mode 120000
index 000000000..0c538aadb
--- /dev/null
+++ b/data/libvpx-dev/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/mac \ No newline at end of file
diff --git a/data/libvpx-dev/_metadata/priority b/data/libvpx-dev/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/libvpx-dev/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/libvpx-dev/_metadata/role b/data/libvpx-dev/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libvpx-dev/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libvpx-dev/_metadata/section b/data/libvpx-dev/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/libvpx-dev/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/libvpx-dev/_metadata/tags b/data/libvpx-dev/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libvpx-dev/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libvpx-dev/_metadata/version b/data/libvpx-dev/_metadata/version
new file mode 120000
index 000000000..36d467d74
--- /dev/null
+++ b/data/libvpx-dev/_metadata/version
@@ -0,0 +1 @@
+../../_libvpx/_metadata/version \ No newline at end of file
diff --git a/data/libvpx-dev/make.sh b/data/libvpx-dev/make.sh
new file mode 100644
index 000000000..c7744b25e
--- /dev/null
+++ b/data/libvpx-dev/make.sh
@@ -0,0 +1,3 @@
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _libvpx)"/usr/lib/{libvpx.dylib,pkgconfig} "${PKG_DEST}"/usr/lib
+cp -a "$(PKG_DEST_ _libvpx)"/usr/include "${PKG_DEST}"/usr
diff --git a/data/libvpx/make.sh b/data/libvpx/make.sh
deleted file mode 100644
index b05758c7b..000000000
--- a/data/libvpx/make.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-pkg:setup
-CROSS="${PKG_TARG}-" ./configure --target="${PKG_TARG}-gcc" --prefix=$(cat "${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/prefix") --disable-static --enable-shared --enable-examples \
- --enable-pic \
- --enable-shared \
- --disable-install-bins \
- --disable-install-srcs \
- --size-limit=16384x16384 \
- --enable-postproc \
- --enable-multi-res-encoding \
- --enable-temporal-denoising \
- --enable-vp9-temporal-denoising \
- --enable-vp9-postproc
-pkg:make V=1
-pkg:install
diff --git a/data/libx264-157/_metadata/_x264.dep b/data/libx264-157/_metadata/_x264.dep
new file mode 120000
index 000000000..e23af4152
--- /dev/null
+++ b/data/libx264-157/_metadata/_x264.dep
@@ -0,0 +1 @@
+../../_x264 \ No newline at end of file
diff --git a/data/libx264-157/_metadata/description b/data/libx264-157/_metadata/description
new file mode 100644
index 000000000..234868ef2
--- /dev/null
+++ b/data/libx264-157/_metadata/description
@@ -0,0 +1 @@
+x264/AVC video coding library
diff --git a/data/libx264-157/_metadata/in.1443.00 b/data/libx264-157/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libx264-157/_metadata/in.1443.00
diff --git a/data/libx264-157/_metadata/maintainer b/data/libx264-157/_metadata/maintainer
new file mode 120000
index 000000000..0c538aadb
--- /dev/null
+++ b/data/libx264-157/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/mac \ No newline at end of file
diff --git a/data/libx264-157/_metadata/priority b/data/libx264-157/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/libx264-157/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/libx264-157/_metadata/role b/data/libx264-157/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libx264-157/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libx264-157/_metadata/section b/data/libx264-157/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/libx264-157/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/libx264-157/_metadata/tags b/data/libx264-157/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libx264-157/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libx264-157/_metadata/version b/data/libx264-157/_metadata/version
new file mode 120000
index 000000000..e6a3a889d
--- /dev/null
+++ b/data/libx264-157/_metadata/version
@@ -0,0 +1 @@
+../../_x264/_metadata/version \ No newline at end of file
diff --git a/data/libx264-157/make.sh b/data/libx264-157/make.sh
new file mode 100644
index 000000000..eaccd2495
--- /dev/null
+++ b/data/libx264-157/make.sh
@@ -0,0 +1,2 @@
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _x264)"/usr/lib/lib*.*.dylib "${PKG_DEST}/usr/lib"
diff --git a/data/libx264-dev/_metadata/_x264.dep b/data/libx264-dev/_metadata/_x264.dep
new file mode 120000
index 000000000..e23af4152
--- /dev/null
+++ b/data/libx264-dev/_metadata/_x264.dep
@@ -0,0 +1 @@
+../../_x264 \ No newline at end of file
diff --git a/data/libx264-dev/_metadata/description b/data/libx264-dev/_metadata/description
new file mode 100644
index 000000000..02cbec812
--- /dev/null
+++ b/data/libx264-dev/_metadata/description
@@ -0,0 +1 @@
+x264/AVC video coding library (development)
diff --git a/data/libx264-dev/_metadata/in.1443.00 b/data/libx264-dev/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libx264-dev/_metadata/in.1443.00
diff --git a/data/libx264-dev/_metadata/libx264-157.dep b/data/libx264-dev/_metadata/libx264-157.dep
new file mode 120000
index 000000000..22e08a533
--- /dev/null
+++ b/data/libx264-dev/_metadata/libx264-157.dep
@@ -0,0 +1 @@
+../../libx264-157 \ No newline at end of file
diff --git a/data/libx264-dev/_metadata/libx264-157.ver.iphoneos-arm b/data/libx264-dev/_metadata/libx264-157.ver.iphoneos-arm
new file mode 120000
index 000000000..a264216fa
--- /dev/null
+++ b/data/libx264-dev/_metadata/libx264-157.ver.iphoneos-arm
@@ -0,0 +1 @@
+../../libx264-157/_metadata/version \ No newline at end of file
diff --git a/data/libx264-dev/_metadata/maintainer b/data/libx264-dev/_metadata/maintainer
new file mode 120000
index 000000000..0c538aadb
--- /dev/null
+++ b/data/libx264-dev/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/mac \ No newline at end of file
diff --git a/data/libx264-dev/_metadata/priority b/data/libx264-dev/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/libx264-dev/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/libx264-dev/_metadata/role b/data/libx264-dev/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libx264-dev/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libx264-dev/_metadata/section b/data/libx264-dev/_metadata/section
new file mode 100644
index 000000000..593877746
--- /dev/null
+++ b/data/libx264-dev/_metadata/section
@@ -0,0 +1 @@
+Multimedia
diff --git a/data/libx264-dev/_metadata/tags b/data/libx264-dev/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libx264-dev/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libx264-dev/_metadata/version b/data/libx264-dev/_metadata/version
new file mode 120000
index 000000000..e6a3a889d
--- /dev/null
+++ b/data/libx264-dev/_metadata/version
@@ -0,0 +1 @@
+../../_x264/_metadata/version \ No newline at end of file
diff --git a/data/libx264-dev/make.sh b/data/libx264-dev/make.sh
new file mode 100644
index 000000000..fbd1353a8
--- /dev/null
+++ b/data/libx264-dev/make.sh
@@ -0,0 +1,4 @@
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _x264)"/usr/include "${PKG_DEST}"/usr/
+cp -a "$(PKG_DEST_ _x264)"/usr/lib/{lib*.dylib,pkgconfig} "${PKG_DEST}"/usr/lib
+rm "${PKG_DEST}"/usr/lib/lib*.*.dylib
diff --git a/data/x264/20190402-2245-x264.tar.bz2 b/data/x264/20190402-2245-x264.tar.bz2
deleted file mode 100644
index 3a3d709a1..000000000
--- a/data/x264/20190402-2245-x264.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/data/x264/_metadata/description b/data/x264/_metadata/description
index e5be2a6d7..02cbec812 100644
--- a/data/x264/_metadata/description
+++ b/data/x264/_metadata/description
@@ -1 +1 @@
-H.264/AVC encoder
+x264/AVC video coding library (development)
diff --git a/data/x264/_metadata/libx264-157.dep b/data/x264/_metadata/libx264-157.dep
new file mode 120000
index 000000000..22e08a533
--- /dev/null
+++ b/data/x264/_metadata/libx264-157.dep
@@ -0,0 +1 @@
+../../libx264-157 \ No newline at end of file
diff --git a/data/x264/_metadata/libx264-157.ver.iphoneos-arm b/data/x264/_metadata/libx264-157.ver.iphoneos-arm
new file mode 120000
index 000000000..a264216fa
--- /dev/null
+++ b/data/x264/_metadata/libx264-157.ver.iphoneos-arm
@@ -0,0 +1 @@
+../../libx264-157/_metadata/version \ No newline at end of file
diff --git a/data/x264/_metadata/version b/data/x264/_metadata/version
index e5e32af4f..e6a3a889d 100644..120000
--- a/data/x264/_metadata/version
+++ b/data/x264/_metadata/version
@@ -1 +1 @@
-20190402-2245
+../../_x264/_metadata/version \ No newline at end of file
diff --git a/data/x264/make.sh b/data/x264/make.sh
index c8be07a8b..909566a37 100644
--- a/data/x264/make.sh
+++ b/data/x264/make.sh
@@ -1,6 +1,2 @@
-pkg:setup
-cp "${PKG_DATA}"/gas-preprocessor.pl .
-# Host requires perl.
-CC="${PKG_TARG}-gcc" AS="./gas-preprocessor.pl -arch $(echo ${PKG_TARG} | sed -e 's/-.*//') -- ${PKG_TARG}-gcc" pkg:configure --enable-shared --disable-lsmash --enable-strip --cross-prefix="${PKG_TARG}-"
-pkg:make
-pkg:install
+pkg: mkdir -p /usr/bin
+cp -a "$(PKG_DEST_ _x264)"/usr/bin/* "${PKG_DEST}"/usr/bin