-
Notifications
You must be signed in to change notification settings - Fork 0
Update FFmpeg to 3.1.4 #158
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
d6fad24
numactl: Update from version 2.0.7 to 2.0.11
david 8745f08
x265: add new libary
david 1c60a0c
ffmpeg: update version 2.8.5 to 3.1.4
david dae30ab
alsa-plugins: new revision
david 98e9fa8
gegl: new revision
david 6d7c411
java: new revision
david ad5b283
vlc: new revision
david 8231ebf
xine-lib: update version 1.2.5 to 1.2.6
david f82c207
x265: Comment out default implementations
pmenzel c08ce41
ffmpeg: Remove trailing spaces
pmenzel b1b440a
ffmpeg: Securely download source archive
pmenzel de2b318
ffmpeg: Realign configure switches
pmenzel ec12333
ffmpeg: Use bee variable `DOCDIR`
pmenzel f40c8b2
ffmpeg: Add `start_cmd` in front of `configure` line
pmenzel 78dd960
ffmpeg: Use `cc` instead of `gcc`
pmenzel f577968
ffmpeg: Fix installation to image directory
pmenzel a6f4e1b
ffmpeg: Remove switch setting docdir to default
pmenzel File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,43 +1,64 @@ | ||
#!/bin/env beesh | ||
#!/usr/bin/env beesh | ||
|
||
# BEE_VERSION ffmpeg-2.8.5-2 | ||
# BEE_VERSION ffmpeg-3.1.4-0 | ||
|
||
SRCURL[0]="http://ffmpeg.org/releases/ffmpeg-${PKGVERSION}.tar.bz2" | ||
SRCURL[0]="https://ffmpeg.org/releases/ffmpeg-${PKGVERSION}.tar.bz2" | ||
|
||
# BEE_BUILDTYPE=autotools | ||
|
||
PATCHURL[0]="" | ||
# PATCHURL+=() | ||
|
||
# BEE_CONFIGURE=compat | ||
# EXCLUDE+=() | ||
|
||
# EXCLUDE="" | ||
# build_in_sourcedir | ||
|
||
B=${S} | ||
# 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() { | ||
./configure \ | ||
--prefix=${PREFIX} \ | ||
--enable-shared \ | ||
--enable-pthreads \ | ||
--enable-gpl \ | ||
--enable-swscale \ | ||
--enable-postproc \ | ||
--enable-libmp3lame \ | ||
--enable-libtheora \ | ||
--enable-libvorbis \ | ||
--enable-libvpx \ | ||
--enable-libx264 \ | ||
--enable-libxvid \ | ||
--enable-swscale | ||
sed -i 's/-lflite"/-lflite -lasound"/' ${S}/configure | ||
start_cmd ${S}/configure \ | ||
--prefix=${PREFIX} \ | ||
--enable-gpl \ | ||
--enable-version3 \ | ||
--disable-static \ | ||
--enable-shared \ | ||
--disable-debug \ | ||
--enable-libass \ | ||
--enable-libfreetype \ | ||
--enable-libmp3lame \ | ||
--enable-libopus \ | ||
--enable-libtheora \ | ||
--enable-libvorbis \ | ||
--enable-libvpx \ | ||
--enable-libx264 \ | ||
--enable-libx265 \ | ||
--enable-x11grab | ||
} | ||
|
||
mee_build() { | ||
bee_build | ||
|
||
cc ${B}/tools/qt-faststart.c -o ${B}/tools/qt-faststart | ||
} | ||
|
||
mee_install() { | ||
set -vx | ||
env | ||
# | ||
# bee_install | ||
# mkdir $D/usr/lib/pkgconfig/ | ||
# cp $S/lib*/*.pc $D/usr/lib/pkgconfig/ | ||
|
||
make install DESTDIR=$D | ||
set +vx | ||
start_cmd make install DESTDIR=${D} | ||
|
||
install -v -m755 -d ${D}/${BINDIR} | ||
install -v -m755 ${B}/tools/qt-faststart ${D}/${BINDIR} | ||
} | ||
## by default this may be 'make install DESTDIR="${D}"' |
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
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
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
#!/usr/bin/env beesh | ||
|
||
# BEE_VERSION numactl-2.0.11-0 | ||
|
||
SRCURL[0]="ftp://oss.sgi.com/www/projects/libnuma/download/numactl-${PKGVERSION}.tar.gz" | ||
|
||
PATCHURL[0]="" | ||
|
||
# BEE_CONFIGURE=compat | ||
|
||
# BEE_BUILDTYPE= | ||
|
||
# EXCLUDE=() | ||
|
||
# build_in_sourcedir | ||
|
||
|
||
|
||
|
||
|
||
#mee_extract() { | ||
# bee_extract "${@}" | ||
#} | ||
|
||
#mee_patch() { | ||
# bee_patch "${@}" | ||
#} | ||
|
||
mee_configure_pre() { | ||
for i in Makefile.am Makefile.in ; do | ||
sed -i 's/move_pages.2//g' ${S}/${i} | ||
done | ||
} | ||
|
||
#mee_configure() { | ||
# bee_configure | ||
#} | ||
|
||
#mee_build() { | ||
# bee_build prefix=${PREFIX} libdir=${LIBDIR} | ||
#} | ||
|
||
#mee_install() { | ||
# bee_install prefix=${D}/${PREFIX} libdir=${D}/${LIBDIR} | ||
#} |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
#!/usr/bin/env beesh | ||
|
||
# BEE_VERSION x265-2.1-0 | ||
|
||
SRCURL="https://bitbucket.org/multicoreware/x265/downloads/x265_${PKGVERSION}.tar.gz" | ||
|
||
PATCHURL="http://www.linuxfromscratch.org/patches/blfs/svn/x265_2.1-enable_static-1.patch" | ||
|
||
# EXCLUDE+=() | ||
|
||
# build_in_sourcedir | ||
|
||
sourcesubdir_append source | ||
|
||
#mee_extract() { | ||
# bee_extract "${@}" | ||
#} | ||
|
||
#mee_patch() { | ||
# bee_patch "${@}" | ||
#} | ||
|
||
mee_configure() { | ||
bee_configure -G "Unix Makefiles" \ | ||
-DENABLE_STATIC=OFF | ||
} | ||
|
||
#mee_build() { | ||
# bee_build | ||
#} | ||
|
||
#mee_install() { | ||
# bee_install | ||
#} | ||
## 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[${PKGVERSION}] 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/ | ||
## |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In der Vorlage wird
PATCHURL+=()
vorgeschlagen. Damit muss sich nicht um die Indexe gekümmert werden.