diff options
| author | Sam Bingner <sam@bingner.com> | 2019-04-03 17:05:18 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2019-04-09 23:20:38 -1000 |
| commit | 26040b640593e6513abc856a17c46373541a431c (patch) | |
| tree | 3157af19e858770484ced4b718464e49466e8be2 /data/ffmpeg | |
| parent | e845d8242bab7bd2104192196962528790684d5d (diff) | |
Remove old ffmpeg and commit description/name changes
Diffstat (limited to 'data/ffmpeg')
| -rw-r--r-- | data/ffmpeg/_metadata/description | 2 | ||||
| -rw-r--r-- | data/ffmpeg/_metadata/name | 1 | ||||
| -rw-r--r-- | data/ffmpeg/make.sh | 15 |
3 files changed, 8 insertions, 10 deletions
diff --git a/data/ffmpeg/_metadata/description b/data/ffmpeg/_metadata/description index 5e5462f65..027cde4da 100644 --- a/data/ffmpeg/_metadata/description +++ b/data/ffmpeg/_metadata/description @@ -1 +1 @@ -Play, record, convert, and stream audio and video +Tools for transcoding, streaming and playing of multimedia files diff --git a/data/ffmpeg/_metadata/name b/data/ffmpeg/_metadata/name deleted file mode 100644 index 41840c50c..000000000 --- a/data/ffmpeg/_metadata/name +++ /dev/null @@ -1 +0,0 @@ -FFmpeg diff --git a/data/ffmpeg/make.sh b/data/ffmpeg/make.sh index 7b3acf690..a61fdbefd 100644 --- a/data/ffmpeg/make.sh +++ b/data/ffmpeg/make.sh @@ -1,11 +1,6 @@ pkg:setup ARCH=$(echo ${PKG_TARG} | sed -e s/'-.*'//) -_args='--enable-pthreads --enable-version3 --enable-hardcoded-tables --enable-gnutls ' -_args+='--enable-gpl --enable-libmp3lame --enable-libopus --enable-libtheora ' -_args+='--enable-libvorbis --enable-libvpx --enable-libx264 --enable-libx265 ' -_args+='--enable-libxvid --enable-lzma' - # Arguments taken from: # https://github.com/Homebrew/homebrew-core/blob/master/Formula/ffmpeg.rb @@ -16,8 +11,12 @@ _args+='--enable-libxvid --enable-lzma' ./configure --arch=${ARCH} --pkg-config="$(realpath "${PKG_BASE}/util/pkg-config.sh")" \ - --prefix=/usr --enable-cross-compile --cross-prefix=${PKG_TARG}- --target-os=darwin \ + --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 \ - ${_args} # --enable-nonfree -make + --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 |