Update FFmpeg to 3.1.4 #158
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| cmake -G "Unix Makefiles" \ | ||
| -DCMAKE_INSTALL_PREFIX=${D}/${PREFIX} \ | ||
| -DENABLE_STATIC=OFF \ | ||
| ${S}/source |
There was a problem hiding this comment.
Why is this necessary? Can’t you just pass this to bee_configure?
|
don't merge problems with package numactl |
|
package numactl is fixed |
|
bee update numactl-2.0.11-0 |
+ bee update numactl-2.0.11-0
installing /src/mariux/beeroot/packages/numactl-2.0.11-0.x86_64.bee.tar.bz2 ..
Conflicts with installed package found: man-pages-4.04-0.x86_64:
/usr/share/man/man2/move_pages.2
removing numactl-2.0.7-0.x86_64 ..
I guess this is right and the page should be excluded from man-pages |
Maybe this is not relevant. Basic vlc works. |
|
yes this work when the branch add-libdvbpsi is merged I have build this revision with installed libdvbpsi On 11/18/16 13:06, Donald Buczek wrote:
IT-Abteilung |
|
tested on theinternet. 👍 |
|
this are only typo and spelling changes On 11/18/16 12:56, Donald Buczek wrote:
IT-Abteilung |
|
ok I have excluded this man-page |
the newer version need for x265 exclude move_pages.2 from man-pages
| @@ -15,7 +15,8 @@ SRCURL[0]="http://ftp.gtk.org/pub/gegl/${PKGVERSION[2]}/gegl-${PKGVERSION}.tar.b | |||
| ## Add URLs/pathes to patch files to the PATCHURL array. | |||
| ## The sources will be patched in the order of the array. | |||
|
|
|||
| PATCHURL="http://www.linuxfromscratch.org/patches/blfs/7.9/gegl-0.2.0-ffmpeg2-1.patch" | |||
| PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/7.9/gegl-0.2.0-ffmpeg2-1.patch" | |||
| PATCHURL[1]="/src/mariux/beeroot/downloads/gegl-without-exiv2.patch" | |||
There was a problem hiding this comment.
In der Vorlage wird PATCHURL+=() vorgeschlagen. Damit muss sich nicht um die Indexe gekümmert werden.
|
Als Nutzer kann ich |
|
ich kann nicht nach vollziehen was du gemacht hast bei mir gehts |
depend on ffmpeg
depend on ffmpeg
depend on ffmpeg
depend on ffmpeg
depend on ffmpeg
| --enable-libxvid \ | ||
| --enable-swscale | ||
| sed -i 's/-lflite"/-lflite -lasound"/' ${S}/configure | ||
| bee_configure \ |
There was a problem hiding this comment.
My suggestion to use bee_configure was wrong, as FFmpeg does not use GNU Autotools, but a configure script written by themselves. Sorry.
|
now the old ffmpeg bee-file is back |
|
Der Schalter Eigentlich sollte das aber standardmäßig verwendet werden. |
|
The line below (prepended |
pmenzel
force-pushed
the
update-ffmpeg
branch
from
ad3bd14
to
489c6bf
Compare
|
@david, it now works for me. Sorry for suggesting In my opinion, just remove the broken files from |
pmenzel
force-pushed
the
update-ffmpeg
branch
from
489c6bf
to
d1ab634
Compare
Use HTTPS instead of FTP to securely download the source archive.
pmenzel
force-pushed
the
update-ffmpeg
branch
from
fa06d7f
to
9f4b426
Compare
```
$ bee --print-config | grep DOCDIR
DOCDIR=${DATAROOTDIR}/doc/${PKGNAME}
```
That way, the actual command is printed on the screen.
`cc` is the generic command for the compiler, and uses the default one, which might be Clang on some systems.
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.
``` build/configure: --docdir=DIR install documentation in DIR [PREFIX/share/doc/ffmpeg] ```
pmenzel
force-pushed
the
update-ffmpeg
branch
from
9f4b426
to
a6f4e1b
Compare
|
@pmenzel Ok I have removed the broken files and x265 and ffmpeg are rebuilded |
|
@donald, any objections? If not, I’d merge this in the afternoon. |
|
Hurray! |
Sign in
to join this conversation on GitHub.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.