From 26040b640593e6513abc856a17c46373541a431c Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Wed, 3 Apr 2019 17:05:18 -1000 Subject: Remove old ffmpeg and commit description/name changes --- data/ffmpeg/_metadata/description | 2 +- data/ffmpeg/_metadata/name | 1 - data/ffmpeg/make.sh | 15 +++++++-------- data/ffmpeg_/_metadata/depiction | 1 - data/ffmpeg_/_metadata/description | 1 - data/ffmpeg_/_metadata/faac.dep | 1 - data/ffmpeg_/_metadata/faad.dep | 1 - data/ffmpeg_/_metadata/in.1443.00 | 0 data/ffmpeg_/_metadata/lame.dep | 1 - data/ffmpeg_/_metadata/license | 1 - data/ffmpeg_/_metadata/maintainer | 1 - data/ffmpeg_/_metadata/name | 1 - data/ffmpeg_/_metadata/priority | 1 - data/ffmpeg_/_metadata/role | 1 - data/ffmpeg_/_metadata/section | 1 - data/ffmpeg_/_metadata/tags | 1 - data/ffmpeg_/_metadata/version | 1 - data/ffmpeg_/_metadata/vorbis.dep | 1 - data/ffmpeg_/ffmpeg-4.0.2.tar.gz | Bin 13004482 -> 0 bytes data/ffmpeg_/make.sh | 12 ------------ data/libxvidcore-dev/_metadata/description | 2 +- 21 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 data/ffmpeg/_metadata/name delete mode 100644 data/ffmpeg_/_metadata/depiction delete mode 100644 data/ffmpeg_/_metadata/description delete mode 120000 data/ffmpeg_/_metadata/faac.dep delete mode 120000 data/ffmpeg_/_metadata/faad.dep delete mode 100644 data/ffmpeg_/_metadata/in.1443.00 delete mode 120000 data/ffmpeg_/_metadata/lame.dep delete mode 120000 data/ffmpeg_/_metadata/license delete mode 120000 data/ffmpeg_/_metadata/maintainer delete mode 100644 data/ffmpeg_/_metadata/name delete mode 100644 data/ffmpeg_/_metadata/priority delete mode 100644 data/ffmpeg_/_metadata/role delete mode 100644 data/ffmpeg_/_metadata/section delete mode 100644 data/ffmpeg_/_metadata/tags delete mode 100644 data/ffmpeg_/_metadata/version delete mode 120000 data/ffmpeg_/_metadata/vorbis.dep delete mode 100644 data/ffmpeg_/ffmpeg-4.0.2.tar.gz delete mode 100644 data/ffmpeg_/make.sh 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 diff --git a/data/ffmpeg_/_metadata/depiction b/data/ffmpeg_/_metadata/depiction deleted file mode 100644 index aa037f4f3..000000000 --- a/data/ffmpeg_/_metadata/depiction +++ /dev/null @@ -1 +0,0 @@ -http://cydia.saurik.com/info/ffmpeg/ diff --git a/data/ffmpeg_/_metadata/description b/data/ffmpeg_/_metadata/description deleted file mode 100644 index 1e12ccc73..000000000 --- a/data/ffmpeg_/_metadata/description +++ /dev/null @@ -1 +0,0 @@ -multimedia streaming and recording library diff --git a/data/ffmpeg_/_metadata/faac.dep b/data/ffmpeg_/_metadata/faac.dep deleted file mode 120000 index dda1d09cb..000000000 --- a/data/ffmpeg_/_metadata/faac.dep +++ /dev/null @@ -1 +0,0 @@ -../../faac \ No newline at end of file diff --git a/data/ffmpeg_/_metadata/faad.dep b/data/ffmpeg_/_metadata/faad.dep deleted file mode 120000 index 54224a0b1..000000000 --- a/data/ffmpeg_/_metadata/faad.dep +++ /dev/null @@ -1 +0,0 @@ -../../faad \ No newline at end of file diff --git a/data/ffmpeg_/_metadata/in.1443.00 b/data/ffmpeg_/_metadata/in.1443.00 deleted file mode 100644 index e69de29bb..000000000 diff --git a/data/ffmpeg_/_metadata/lame.dep b/data/ffmpeg_/_metadata/lame.dep deleted file mode 120000 index ddc2ccf8c..000000000 --- a/data/ffmpeg_/_metadata/lame.dep +++ /dev/null @@ -1 +0,0 @@ -../../lame \ No newline at end of file diff --git a/data/ffmpeg_/_metadata/license b/data/ffmpeg_/_metadata/license deleted file mode 120000 index 9c13a9a0f..000000000 --- a/data/ffmpeg_/_metadata/license +++ /dev/null @@ -1 +0,0 @@ -../../../licenses/gpl-2 \ No newline at end of file diff --git a/data/ffmpeg_/_metadata/maintainer b/data/ffmpeg_/_metadata/maintainer deleted file mode 120000 index 573d7ebef..000000000 --- a/data/ffmpeg_/_metadata/maintainer +++ /dev/null @@ -1 +0,0 @@ -../../../people/sbingner \ No newline at end of file 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_/_metadata/priority b/data/ffmpeg_/_metadata/priority deleted file mode 100644 index 134d9bc32..000000000 --- a/data/ffmpeg_/_metadata/priority +++ /dev/null @@ -1 +0,0 @@ -optional diff --git a/data/ffmpeg_/_metadata/role b/data/ffmpeg_/_metadata/role deleted file mode 100644 index 52b4d7301..000000000 --- a/data/ffmpeg_/_metadata/role +++ /dev/null @@ -1 +0,0 @@ -hacker diff --git a/data/ffmpeg_/_metadata/section b/data/ffmpeg_/_metadata/section deleted file mode 100644 index 593877746..000000000 --- a/data/ffmpeg_/_metadata/section +++ /dev/null @@ -1 +0,0 @@ -Multimedia diff --git a/data/ffmpeg_/_metadata/tags b/data/ffmpeg_/_metadata/tags deleted file mode 100644 index a8928cec8..000000000 --- a/data/ffmpeg_/_metadata/tags +++ /dev/null @@ -1 +0,0 @@ -purpose::library diff --git a/data/ffmpeg_/_metadata/version b/data/ffmpeg_/_metadata/version deleted file mode 100644 index e6e945aa5..000000000 --- a/data/ffmpeg_/_metadata/version +++ /dev/null @@ -1 +0,0 @@ -13202 diff --git a/data/ffmpeg_/_metadata/vorbis.dep b/data/ffmpeg_/_metadata/vorbis.dep deleted file mode 120000 index aafc6d771..000000000 --- a/data/ffmpeg_/_metadata/vorbis.dep +++ /dev/null @@ -1 +0,0 @@ -../../vorbis \ No newline at end of file diff --git a/data/ffmpeg_/ffmpeg-4.0.2.tar.gz b/data/ffmpeg_/ffmpeg-4.0.2.tar.gz deleted file mode 100644 index 6deabe048..000000000 Binary files a/data/ffmpeg_/ffmpeg-4.0.2.tar.gz and /dev/null differ diff --git a/data/ffmpeg_/make.sh b/data/ffmpeg_/make.sh deleted file mode 100644 index 1760afb65..000000000 --- a/data/ffmpeg_/make.sh +++ /dev/null @@ -1,12 +0,0 @@ -pkg:setup -ARCH=$(echo ${PKG_TARG} | sed -e s/'-.*'//) -./configure --arch=${ARCH} \ - --prefix=/usr --enable-gpl --enable-postproc --enable-swscale \ - --enable-avfilter \ - --enable-cross-compile --cross-prefix=${PKG_TARG}- --target-os=darwin \ - --disable-static --enable-shared --disable-debug --disable-stripping \ - --enable-libfdk-aac \ - --enable-libmp3lame \ - --enable-libvorbis --enable-nonfree -make -pkg:install diff --git a/data/libxvidcore-dev/_metadata/description b/data/libxvidcore-dev/_metadata/description index 56d76540b..41216220d 100644 --- a/data/libxvidcore-dev/_metadata/description +++ b/data/libxvidcore-dev/_metadata/description @@ -1 +1 @@ -High-performance, high-quality MPEG-4 video library +Open source MPEG-4 video codec (development) -- cgit v1.2.3