From 593482b1d36788156d881a4cc33d41ff0d281e33 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Wed, 12 Aug 2020 12:35:26 +0200 Subject: [PATCH] ffmpeg: update to 4.3.0 + compatlibs - cleanup be0 - update from 2.4.5 to 4.3.0 - add compat files for 2.4.5 --- ffmpeg.be0 | 12 ++-- ffmpeg_compat-1.0.0-2.bee | 116 -------------------------------------- ffmpeg_compat.be0 | 79 ++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 124 deletions(-) delete mode 100755 ffmpeg_compat-1.0.0-2.bee create mode 100755 ffmpeg_compat.be0 diff --git a/ffmpeg.be0 b/ffmpeg.be0 index 954587b43..e3fa5d44e 100755 --- a/ffmpeg.be0 +++ b/ffmpeg.be0 @@ -1,8 +1,9 @@ #!/usr/bin/env beesh -# BEE_VERSION ffmpeg-3.4.5-0 +# BEE_VERSION ffmpeg-4.3-0 -SRCURL[0]="https://ffmpeg.org/releases/ffmpeg-${PKGVERSION}.tar.bz2" +# SRCURL[0]="https://ffmpeg.org/releases/ffmpeg-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://beehive.molgen.mpg.de/ed9b3002fb491d704b548a97e1d00391/ffmpeg-4.3.tar.bz2" # BEE_BUILDTYPE=autotools @@ -14,12 +15,6 @@ SRCURL[0]="https://ffmpeg.org/releases/ffmpeg-${PKGVERSION}.tar.bz2" # sourcesubdir_append src -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - #mee_extract() { # bee_extract "${@}" #} @@ -60,4 +55,5 @@ mee_install() { install -v -m755 -d ${D}/${BINDIR} install -v -m755 ${B}/tools/qt-faststart ${D}/${BINDIR} } + ## by default this may be 'make install DESTDIR="${D}"' diff --git a/ffmpeg_compat-1.0.0-2.bee b/ffmpeg_compat-1.0.0-2.bee deleted file mode 100755 index ad705f82a..000000000 --- a/ffmpeg_compat-1.0.0-2.bee +++ /dev/null @@ -1,116 +0,0 @@ -#!/usr/bin/env beesh - -## this file was created by bee init and should be executed to build a -## bee-package. (Additional hints are located at the end of this file.) - -############################################################################### -## The source URL(s) define the location of the sources that will be -## downloaded. Version variables may be used to simplify reuse of this bee-file. - -SRCURL=() - -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. - -# PATCHURL+=() - -############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - -EXCLUDE+=() - -############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source -## directory. - -# build_in_sourcedir - -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - -# sourcesubdir_append src - - -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - -#mee_extract() { -# bee_extract "${@}" -#} - -#mee_patch() { -# bee_patch "${@}" -#} - -#mee_configure() { -# bee_configure -#} - -#mee_build() { -# bee_build -#} - -mee_install() { - cd ${D} - tar xpf /src/mariux/beeroot/packages/ffmpeg-1.2.4-2.x86_64.bee.tar.bz2 \ - /usr/lib/libavcodec.so.54 \ - /usr/lib/libavcodec.so.54.92.100 \ - /usr/lib/libavfilter.so.3 \ - /usr/lib/libavfilter.so.3.42.103 \ - /usr/lib/libavformat.so.54 \ - /usr/lib/libavformat.so.54.63.104 \ - /usr/lib/libavutil.so.52 \ - /usr/lib/libavutil.so.52.18.100 \ - /usr/lib/libpostproc.so.52 \ - /usr/lib/libpostproc.so.52.2.100 \ - /usr/lib/libswresample.so.0 \ - /usr/lib/libswresample.so.0.17.102 \ - /usr/lib/libswscale.so.2 \ - /usr/lib/libswscale.so.2.2.100 - - tar xpf /src/mariux/beeroot/packages/ffmpeg-0.6.1-0.x86_64.bee.tar.bz2 \ - /usr/lib/libavcodec.so.52 \ - /usr/lib/libavcodec.so.52.72.2 \ - /usr/lib/libavformat.so.52 \ - /usr/lib/libavformat.so.52.64.2 \ - /usr/lib/libavutil.so.50 \ - /usr/lib/libavutil.so.50.15.1 \ - /usr/lib/libswscale.so.0 \ - /usr/lib/libswscale.so.0.11.0 - - tar xpf /src/mariux/beeroot/packages/libvpx-0.9.5-0.x86_64.bee.tar.bz2 \ - /usr/lib/libvpx.so.0 \ - /usr/lib/libvpx.so.0.9 \ - /usr/lib/libvpx.so.0.9.5 - - tar xpf /src/mariux/beeroot/packages/x264-20110322_2245-0.x86_64.bee.tar.bz2 \ - /usr/lib/libx264.so.114 -} -## by default this may be 'make install DESTDIR="${D}"' - -############################################################################### -## -## Additional hints: -## -## The name of this bee-file should follow the following naming convention: -## pkgname-pkgversion-pkgrevision.bee -## -## You may remove all comments as long as SRCURL[0] is set. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -## diff --git a/ffmpeg_compat.be0 b/ffmpeg_compat.be0 new file mode 100755 index 000000000..d041a2342 --- /dev/null +++ b/ffmpeg_compat.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION ffmpeg_compat-1.0.1-1 + +SRCURL[0]="https://beehive.molgen.mpg.de/98308cc7b342c455773911a04fd9dbbc/ffmpeg-3.4.5-0.x86_64.bee.tar.bz2" +SRCURL[1]="https://beehive.molgen.mpg.de/2fb9df854714faf7c0cbb708db54c115/ffmpeg-1.2.4-2.x86_64.bee.tar.bz2" +SRCURL[2]="https://beehive.molgen.mpg.de/9b86a91409b3f2076206ee3980ab69d8/ffmpeg-0.6.1-0.x86_64.bee.tar.bz2" +SRCURL[3]="https://beehive.molgen.mpg.de/63c3b56f060ac7ea1cefdea687359cc7/libvpx-0.9.5-0.x86_64.bee.tar.bz2" +SRCURL[4]="https://beehive.molgen.mpg.de/aa8efbb6625170c1ef639c06576f8b88/x264-20110322_2245-0.x86_64.bee.tar.bz2" +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +mee_install() { + cd ${D} + tar xpf ${F}/ffmpeg-3.4.5-0.x86_64.bee.tar.bz2 \ + /usr/lib/libavcodec.so.57 \ + /usr/lib/libavcodec.so.57.107.100 \ + /usr/lib/libavformat.so.57 \ + /usr/lib/libavformat.so.57.83.100 \ + /usr/lib/libavutil.so.55 \ + /usr/lib/libavutil.so.55.78.100 \ + /usr/lib/libpostproc.so.54 \ + /usr/lib/libpostproc.so.54.7.100 \ + /usr/lib/libswscale.so.4 \ + /usr/lib/libswscale.so.4.8.100 \ + /usr/lib/libswresample.so.2 \ + /usr/lib/libswresample.so.2.9.100 + + tar xpf ${F}/ffmpeg-1.2.4-2.x86_64.bee.tar.bz2 \ + /usr/lib/libavcodec.so.54 \ + /usr/lib/libavcodec.so.54.92.100 \ + /usr/lib/libavfilter.so.3 \ + /usr/lib/libavfilter.so.3.42.103 \ + /usr/lib/libavformat.so.54 \ + /usr/lib/libavformat.so.54.63.104 \ + /usr/lib/libavutil.so.52 \ + /usr/lib/libavutil.so.52.18.100 \ + /usr/lib/libpostproc.so.52 \ + /usr/lib/libpostproc.so.52.2.100 \ + /usr/lib/libswresample.so.0 \ + /usr/lib/libswresample.so.0.17.102 \ + /usr/lib/libswscale.so.2 \ + /usr/lib/libswscale.so.2.2.100 + + tar xpf ${F}/ffmpeg-0.6.1-0.x86_64.bee.tar.bz2 \ + /usr/lib/libavcodec.so.52 \ + /usr/lib/libavcodec.so.52.72.2 \ + /usr/lib/libavformat.so.52 \ + /usr/lib/libavformat.so.52.64.2 \ + /usr/lib/libavutil.so.50 \ + /usr/lib/libavutil.so.50.15.1 \ + /usr/lib/libswscale.so.0 \ + /usr/lib/libswscale.so.0.11.0 + + tar xpf ${F}/libvpx-0.9.5-0.x86_64.bee.tar.bz2 \ + /usr/lib/libvpx.so.0 \ + /usr/lib/libvpx.so.0.9 \ + /usr/lib/libvpx.so.0.9.5 + + tar xpf ${F}/x264-20110322_2245-0.x86_64.bee.tar.bz2 \ + /usr/lib/libx264.so.114 +}