Skip to content
Jump to bottom

Update FFmpeg to 3.1.4 #158

Merged
merged 17 commits into from
Nov 22, 2016
Merged

Update FFmpeg to 3.1.4 #158

merged 17 commits into from
Nov 22, 2016

Commits on Nov 18, 2016

  1. numactl: Update from version 2.0.7 to 2.0.11 

    the newer version need for x265
exclude move_pages.2 from man-pages
    @david
    david committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    d6fad24 View commit details
    Browse the repository at this point in the history

  2. x265: add new libary 

    a library for encoding video streams into the H.265/HEVC format
    @david
    david committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    8745f08 View commit details
    Browse the repository at this point in the history

  3. ffmpeg: update version 2.8.5 to 3.1.4 

    Use HTTPS instead of FTP to securely download the source archive.
Remove `sourcesubdir_append src`
    @david
    david committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    1c60a0c View commit details
    Browse the repository at this point in the history

  4. alsa-plugins: new revision 

    depend on ffmpeg
    @david
    david committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    dae30ab View commit details
    Browse the repository at this point in the history

  5. gegl: new revision 

    depend on ffmpeg
    @david
    david committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    98e9fa8 View commit details
    Browse the repository at this point in the history

  6. java: new revision 

    depend on ffmpeg
    @david
    david committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    6d7c411 View commit details
    Browse the repository at this point in the history

  7. vlc: new revision 

    depend on ffmpeg
    @david
    david committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    ad5b283 View commit details
    Browse the repository at this point in the history

  8. xine-lib: update version 1.2.5 to 1.2.6 

    depend on ffmpeg
    @david
    david committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    8231ebf View commit details
    Browse the repository at this point in the history

  9. x265: Comment out default implementations

    @pmenzel
    pmenzel committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    f82c207 View commit details
    Browse the repository at this point in the history

  10. ffmpeg: Remove trailing spaces

    @pmenzel
    pmenzel committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    c08ce41 View commit details
    Browse the repository at this point in the history

  11. ffmpeg: Securely download source archive 

    Use HTTPS instead of FTP to securely download the source archive.
    @pmenzel
    pmenzel committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    b1b440a View commit details
    Browse the repository at this point in the history

  12. ffmpeg: Realign configure switches

    @pmenzel
    pmenzel committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    de2b318 View commit details
    Browse the repository at this point in the history

  13. ffmpeg: Use bee variable DOCDIR 

    ```
$ bee --print-config | grep DOCDIR
DOCDIR=${DATAROOTDIR}/doc/${PKGNAME}
```
    @pmenzel
    pmenzel committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    ec12333 View commit details
    Browse the repository at this point in the history

  14. ffmpeg: Add start_cmd in front of configure line 

    That way, the actual command is printed on the screen.
    @pmenzel
    pmenzel committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    f40c8b2 View commit details
    Browse the repository at this point in the history

  15. ffmpeg: Use cc instead of gcc 

    `cc` is the generic command for the compiler, and uses the default one,
which might be Clang on some systems.
    @pmenzel
    pmenzel committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    78dd960 View commit details
    Browse the repository at this point in the history

  16. ffmpeg: Fix installation to image directory 

    Currently, files are saved in the wrong directory, and the
image/destination directory is ignored.

Building FFmpeg as a normal user shows this problem.

```
[…]
[BEE] make -j install PREFIX=/usr EPREFIX=/usr BINDIR=/usr/bin SBINDIR=/usr/sbin LIBEXECDIR=/usr/libexec SYSCONFDIR=/etc SHAREDSTATEDIR=/var LOCALSTATEDIR=/var LIBDIR=/usr/lib INCLUDEDIR=/usr/include DATAROOTDIR=/usr/share DATADIR=/usr/share INFODIR=/usr/share/info LOCALEDIR=/usr/share/locale MANDIR=/usr/share/man DOCDIR=/usr/share/doc/ffmpeg DESTDIR=/dev/shm/bee-root/ffmpeg/ffmpeg-3.1.4-0/image
[…]
INSTALL doc/libavfilter.3
install: cannot remove ‘/usr/share/man/man1/ffmpeg.1’: Permission denied
install: cannot create regular file ‘/usr/share/man/man1/ffplay.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffprobe.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffserver.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffmpeg-all.1’: Permission denied
install: cannot create regular file ‘/usr/share/man/man1/ffplay-all.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffprobe-all.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffserver-all.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffmpeg-utils.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffmpeg-scaler.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffmpeg-resampler.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffmpeg-codecs.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffmpeg-bitstream-filters.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffmpeg-formats.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffmpeg-protocols.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffmpeg-devices.1’: Permission denied
install: cannot remove ‘/usr/share/man/man1/ffmpeg-filters.1’: Permission denied
doc/Makefile:152: recipe for target 'install-man' failed
make: *** [install-man] Error 1
make: *** Waiting for unfinished jobs....
INSTALL libavdevice/libavdevice.so
[…]
```

FFmpeg saves the environment variables into `config.mak`, and directly
puts the destination directory in there.

```
prefix=/usr
LIBDIR=$(DESTDIR)${prefix}/lib
SHLIBDIR=$(DESTDIR)${prefix}/lib
INCDIR=$(DESTDIR)${prefix}/include
BINDIR=$(DESTDIR)${prefix}/bin
DATADIR=$(DESTDIR)${prefix}/share/ffmpeg
DOCDIR=$(DESTDIR)/usr/share/doc/ffmpeg
MANDIR=$(DESTDIR)${prefix}/share/man
PKGCONFIGDIR=$(DESTDIR)${prefix}/lib/pkgconfig
```

That doesn’t work with the way `bee_install` does it, which is known
from GNU Autotools. It sets these without `DESTDIR`, and the Makefile
takes care of that.

Therefore, don’t use `bee_install`.

Also remove the unnecessary manual operations to install the binaries.
    @pmenzel
    pmenzel committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    f577968 View commit details
    Browse the repository at this point in the history

  17. ffmpeg: Remove switch setting docdir to default 

    ```
build/configure:  --docdir=DIR             install documentation in DIR [PREFIX/share/doc/ffmpeg]
```
    @pmenzel
    pmenzel committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    a6f4e1b View commit details
    Browse the repository at this point in the history