summaryrefslogtreecommitdiff
path: root/data/_ffmpeg
diff options
context:
space:
mode:
authorSam Bingner <sam@bingner.com>2019-04-04 15:53:54 -1000
committerSam Bingner <sam@bingner.com>2019-04-09 23:20:41 -1000
commitd2ae0eca5e0c7b0e014e9274f554ab776020d537 (patch)
tree878bd5ef9a7ee2a4d83540061d8b5b59f067fcd9 /data/_ffmpeg
parentbc22a1677d844ed517d781da667190f97b100ab7 (diff)
Complete standardization of ffmpeg libs
Diffstat (limited to 'data/_ffmpeg')
l---------data/_ffmpeg/_metadata/libopus.dep1
l---------data/_ffmpeg/_metadata/libtheora.dep1
l---------data/_ffmpeg/_metadata/libvorbis.dep1
l---------data/_ffmpeg/_metadata/libvpx.dep1
l---------data/_ffmpeg/_metadata/libx264-157.dep1
l---------data/_ffmpeg/_metadata/libx265-169.dep1
l---------data/_ffmpeg/_metadata/x264.dep1
l---------data/_ffmpeg/_metadata/x265.dep1
-rw-r--r--data/_ffmpeg/make.sh15
9 files changed, 9 insertions, 14 deletions
diff --git a/data/_ffmpeg/_metadata/libopus.dep b/data/_ffmpeg/_metadata/libopus.dep
deleted file mode 120000
index 25443dffc..000000000
--- a/data/_ffmpeg/_metadata/libopus.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libopus \ No newline at end of file
diff --git a/data/_ffmpeg/_metadata/libtheora.dep b/data/_ffmpeg/_metadata/libtheora.dep
deleted file mode 120000
index fd6f21fcc..000000000
--- a/data/_ffmpeg/_metadata/libtheora.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libtheora \ No newline at end of file
diff --git a/data/_ffmpeg/_metadata/libvorbis.dep b/data/_ffmpeg/_metadata/libvorbis.dep
deleted file mode 120000
index 2196d93e3..000000000
--- a/data/_ffmpeg/_metadata/libvorbis.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libvorbis \ No newline at end of file
diff --git a/data/_ffmpeg/_metadata/libvpx.dep b/data/_ffmpeg/_metadata/libvpx.dep
deleted file mode 120000
index 549f94c3c..000000000
--- a/data/_ffmpeg/_metadata/libvpx.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libvpx \ 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/_metadata/x264.dep b/data/_ffmpeg/_metadata/x264.dep
deleted file mode 120000
index e87b337ed..000000000
--- a/data/_ffmpeg/_metadata/x264.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../x264 \ No newline at end of file
diff --git a/data/_ffmpeg/_metadata/x265.dep b/data/_ffmpeg/_metadata/x265.dep
deleted file mode 120000
index de37d9151..000000000
--- a/data/_ffmpeg/_metadata/x265.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../x265 \ No newline at end of file
diff --git a/data/_ffmpeg/make.sh b/data/_ffmpeg/make.sh
index a61fdbefd..cae4473a0 100644
--- a/data/_ffmpeg/make.sh
+++ b/data/_ffmpeg/make.sh
@@ -10,13 +10,12 @@ ARCH=$(echo ${PKG_TARG} | sed -e s/'-.*'//)
# --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
+./configure --arch=${ARCH} --pkg-config=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