From d6fad24e7b6b47b259b87358e0f26c8426a04283 Mon Sep 17 00:00:00 2001
From: david <schrader@molgen.mpg.de>
Date: Thu, 20 Oct 2016 17:16:21 +0200
Subject: [PATCH 01/17] numactl: Update from version 2.0.7 to 2.0.11
the newer version need for x265
exclude move_pages.2 from man-pages
---
numactl-2.0.7-0.bee | 37 -------------------------------------
numactl.be0 | 45 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 37 deletions(-)
delete mode 100755 numactl-2.0.7-0.bee
create mode 100755 numactl.be0
diff --git a/numactl-2.0.7-0.bee b/numactl-2.0.7-0.bee
deleted file mode 100755
index 3e066b770..000000000
--- a/numactl-2.0.7-0.bee
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env beesh
-
-SRCURL[0]="http://oss.sgi.com/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() {
-# bee_configure
-#}
-
-mee_build() {
- bee_build prefix=${PREFIX} libdir=${LIBDIR}
-}
-
-mee_install() {
- bee_install prefix=${D}/${PREFIX} libdir=${D}/${LIBDIR}
-}
diff --git a/numactl.be0 b/numactl.be0
new file mode 100755
index 000000000..2c45534d9
--- /dev/null
+++ b/numactl.be0
@@ -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}
+#}
From 8745f08c77ea73f10ab3a7fb31a49c50714922bd Mon Sep 17 00:00:00 2001
From: david <schrader@molgen.mpg.de>
Date: Thu, 20 Oct 2016 17:19:59 +0200
Subject: [PATCH 02/17] x265: add new libary
a library for encoding video streams into the H.265/HEVC format
---
x265.be0 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100755 x265.be0
diff --git a/x265.be0 b/x265.be0
new file mode 100755
index 000000000..2c6cc9e2c
--- /dev/null
+++ b/x265.be0
@@ -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/
+##
From 1c60a0cdd349e95b35647749edfc1d457bdb5ea1 Mon Sep 17 00:00:00 2001
From: david <schrader@molgen.mpg.de>
Date: Thu, 20 Oct 2016 17:23:04 +0200
Subject: [PATCH 03/17] 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`
---
ffmpeg.be0 | 81 +++++++++++++++++++++++++++++++++++-------------------
1 file changed, 52 insertions(+), 29 deletions(-)
diff --git a/ffmpeg.be0 b/ffmpeg.be0
index 3e2870e9a..f079f1567 100755
--- a/ffmpeg.be0
+++ b/ffmpeg.be0
@@ -1,43 +1,66 @@
-#!/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"
+# 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
+ ${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 \
+ --docdir=${DATAROOTDIR}/doc/${PKGNAME}
+}
+
+mee_build() {
+ bee_build
+
+ gcc ${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
+ bee_install
+
+ install -v -m755 -d ${D}/${BINDIR}
+ install -v -m755 ${B}/{tools/qt-faststart,ffmpeg,ffplay,ffprobe,ffserver} ${D}/${BINDIR}
+ install -v -m755 -d ${D}${DATAROOTDIR}/doc/${PKGNAME}
+ install -v -m644 ${B}/doc/*.txt ${D}${DATAROOTDIR}/doc/${PKGNAME}
}
+## by default this may be 'make install DESTDIR="${D}"'
From dae30ab298bee1514be849543e0954c03604ad71 Mon Sep 17 00:00:00 2001
From: david <schrader@molgen.mpg.de>
Date: Thu, 20 Oct 2016 17:27:47 +0200
Subject: [PATCH 04/17] alsa-plugins: new revision
depend on ffmpeg
---
alsa-plugins.be0 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/alsa-plugins.be0 b/alsa-plugins.be0
index bcfe2e158..bdd17288f 100755
--- a/alsa-plugins.be0
+++ b/alsa-plugins.be0
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh
-# BEE_VERSION alsa-plugins-1.1.1-0
+# BEE_VERSION alsa-plugins-1.1.1-1
## 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.)
From 98e9fa85120be35c27cc34c5e06f58c8b86807dd Mon Sep 17 00:00:00 2001
From: david <schrader@molgen.mpg.de>
Date: Thu, 20 Oct 2016 17:28:51 +0200
Subject: [PATCH 05/17] gegl: new revision
depend on ffmpeg
---
gegl.be0 | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/gegl.be0 b/gegl.be0
index ddc493e40..abf319d47 100755
--- a/gegl.be0
+++ b/gegl.be0
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh
-# BEE_VERSION gegl-0.2.0-1
+# BEE_VERSION gegl-0.2.0-2
## 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.)
@@ -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"
###############################################################################
## Add filename patterns to the EXCLUDE array of files that should not
@@ -51,13 +52,6 @@ mee_configure() {
--without-lua
}
-mee_configure_post() {
- sed -i -e s/^S["HAVE_EXIV2_FALSE"]=""/S["HAVE_EXIV2_FALSE"]="#"/ \
- -i -e s/^S["HAVE_EXIV2_TRUE"]="#"/S["HAVE_EXIV2_TRUE"]=""/ \
- -i -e s/^S["EXIV2_LIBS"]="-lexiv2 "/S["EXIV2_LIBS"]=""/ \
- config.status
-}
-
#mee_build() {
# bee_build
#}
From 6d7c4114e7096c16adfaf92381b8eb1d4d6970fa Mon Sep 17 00:00:00 2001
From: david <schrader@molgen.mpg.de>
Date: Thu, 20 Oct 2016 17:29:47 +0200
Subject: [PATCH 06/17] java: new revision
depend on ffmpeg
---
java.be0 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java.be0 b/java.be0
index 04ec5bc36..735d06b60 100755
--- a/java.be0
+++ b/java.be0
@@ -1,6 +1,6 @@
#!/bin/env beesh
-# BEE_VERSION java-1.8.0_102-0
+# BEE_VERSION java-1.8.0_102-1
# http://www.oracle.com/technetwork/java/javase/downloads/index.html
From ad5b2831a12d0a5668c343bbffd184299bc988a9 Mon Sep 17 00:00:00 2001
From: david <schrader@molgen.mpg.de>
Date: Thu, 20 Oct 2016 17:31:12 +0200
Subject: [PATCH 07/17] vlc: new revision
depend on ffmpeg
---
vlc.be0 | 52 ++--------------------------------------------------
1 file changed, 2 insertions(+), 50 deletions(-)
diff --git a/vlc.be0 b/vlc.be0
index d57156f0d..9df96ad0a 100755
--- a/vlc.be0
+++ b/vlc.be0
@@ -1,48 +1,18 @@
#!/usr/bin/env beesh
-# BEE_VERSION vlc-2.2.4-1
-
-## 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.
+# BEE_VERSION vlc-2.2.4-3
SRCURL[0]="http://download.videolan.org/pub/videolan/vlc/${PKGVERSION}/vlc-${PKGVERSION}.tar.xz"
-###############################################################################
-## Add URLs/pathes to patch files to the PATCHURL array.
-## The sources will be patched in the order of the array.
-
-###############################################################################
-## 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.
+PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/svn/vlc-2.2.4-ffmpeg3-1.patch"
# 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 "${@}"
#}
@@ -64,21 +34,3 @@ mee_configure() {
# 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[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/
-##
From 8231ebf798c35317eb6316f888475b57dfc3d3e2 Mon Sep 17 00:00:00 2001
From: david <schrader@molgen.mpg.de>
Date: Thu, 20 Oct 2016 17:33:57 +0200
Subject: [PATCH 08/17] xine-lib: update version 1.2.5 to 1.2.6
depend on ffmpeg
---
xine-lib.be0 | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/xine-lib.be0 b/xine-lib.be0
index 41c5e989c..b09edcef8 100755
--- a/xine-lib.be0
+++ b/xine-lib.be0
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh
-# BEE_VERSION xine-lib-1.2.5-0
+# BEE_VERSION xine-lib-1.2.6-0
SRCURL[0]="http://sourceforge.net/projects/xine/files/xine-lib/${PKGVERSION}/xine-lib-${PKGVERSION}.tar.xz"
@@ -21,6 +21,21 @@ PATCHURL[0]=""
#}
mee_configure() {
+
+ sed -e 's/avcodec_alloc_frame/av_frame_alloc/' \
+ -e 's/avcodec_free_frame/av_frame_free/' \
+ -i ${S}/src/combined/ffmpeg/ff_{audio,video}_decoder.c \
+ ${S}/src/dxr3/ffmpeg_encoder.c &&
+
+ sed -e 's|wand/magick_wand.h|ImageMagick-6/wand/MagickWand.h|' \
+ -i ${S}/src/video_dec/image.c &&
+
+ sed -e '/xineplug_vo_out_xcbxv_la_LIBADD/s/$(XCB_LIBS)/$(XCBSHM_LIBS) $(XCB_LIBS)/' \
+ -i ${S}/src/video_out/Makefile.in &&
+
+ sed -e 's/\(xcb-shape >= 1.0\)/xcb \1/' \
+ -i ${S}/m4/video_out.m4 &&
+
bee_configure --disable-vcd \
--with-external-dvdnav
}
From f82c2077bd3ab1d5bbe103bd2f4d4d1fa43b43b4 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Fri, 21 Oct 2016 16:53:00 +0200
Subject: [PATCH 09/17] x265: Comment out default implementations
---
x265.be0 | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/x265.be0 b/x265.be0
index 2c6cc9e2c..9ec8e97d6 100755
--- a/x265.be0
+++ b/x265.be0
@@ -16,22 +16,22 @@ sourcesubdir_append source
# bee_extract "${@}"
#}
-mee_patch() {
- bee_patch "${@}"
-}
+#mee_patch() {
+# bee_patch "${@}"
+#}
mee_configure() {
bee_configure -G "Unix Makefiles" \
-DENABLE_STATIC=OFF
}
-mee_build() {
- bee_build
-}
+#mee_build() {
+# bee_build
+#}
-mee_install() {
- bee_install
-}
+#mee_install() {
+# bee_install
+#}
## by default this may be 'make install DESTDIR="${D}"'
###############################################################################
From c08ce419474bf7ae92e9b5bee1f6cb36cd536277 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Fri, 21 Oct 2016 16:23:50 +0200
Subject: [PATCH 10/17] ffmpeg: Remove trailing spaces
---
ffmpeg.be0 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.be0 b/ffmpeg.be0
index f079f1567..5a74d7821 100755
--- a/ffmpeg.be0
+++ b/ffmpeg.be0
@@ -51,7 +51,7 @@ mee_configure() {
mee_build() {
bee_build
-
+
gcc ${B}/tools/qt-faststart.c -o ${B}/tools/qt-faststart
}
From b1b440aa273dcf6984b099eb09f49c800ca7eee4 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Fri, 21 Oct 2016 16:24:44 +0200
Subject: [PATCH 11/17] ffmpeg: Securely download source archive
Use HTTPS instead of FTP to securely download the source archive.
---
ffmpeg.be0 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.be0 b/ffmpeg.be0
index 5a74d7821..c1d20e8e1 100755
--- a/ffmpeg.be0
+++ b/ffmpeg.be0
@@ -2,7 +2,7 @@
# 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
From de2b3189372cafa033565ecedb9a5e41ddb19c0f Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Fri, 21 Oct 2016 16:26:09 +0200
Subject: [PATCH 12/17] ffmpeg: Realign configure switches
---
ffmpeg.be0 | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/ffmpeg.be0 b/ffmpeg.be0
index c1d20e8e1..07f51f1df 100755
--- a/ffmpeg.be0
+++ b/ffmpeg.be0
@@ -30,23 +30,24 @@ SRCURL[0]="https://ffmpeg.org/releases/ffmpeg-${PKGVERSION}.tar.bz2"
mee_configure() {
sed -i 's/-lflite"/-lflite -lasound"/' ${S}/configure
- ${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 \
- --docdir=${DATAROOTDIR}/doc/${PKGNAME}
+ ${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 \
+ --docdir=${DATAROOTDIR}/doc/${PKGNAME}
}
mee_build() {
From ec1233324b565b81ac208bc418187e3da4d315e1 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Fri, 21 Oct 2016 16:27:17 +0200
Subject: [PATCH 13/17] ffmpeg: Use bee variable `DOCDIR`
```
$ bee --print-config | grep DOCDIR
DOCDIR=${DATAROOTDIR}/doc/${PKGNAME}
```
---
ffmpeg.be0 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ffmpeg.be0 b/ffmpeg.be0
index 07f51f1df..0143f3d3b 100755
--- a/ffmpeg.be0
+++ b/ffmpeg.be0
@@ -47,7 +47,7 @@ mee_configure() {
--enable-libx264 \
--enable-libx265 \
--enable-x11grab \
- --docdir=${DATAROOTDIR}/doc/${PKGNAME}
+ --docdir=${DOCDIR}
}
mee_build() {
@@ -61,7 +61,7 @@ mee_install() {
install -v -m755 -d ${D}/${BINDIR}
install -v -m755 ${B}/{tools/qt-faststart,ffmpeg,ffplay,ffprobe,ffserver} ${D}/${BINDIR}
- install -v -m755 -d ${D}${DATAROOTDIR}/doc/${PKGNAME}
- install -v -m644 ${B}/doc/*.txt ${D}${DATAROOTDIR}/doc/${PKGNAME}
+ install -v -m755 -d ${D}${DOCDIR}
+ install -v -m644 ${B}/doc/*.txt ${D}${DOCDIR}
}
## by default this may be 'make install DESTDIR="${D}"'
From f40c8b212d7f191543daecbb633aafbd0290bf16 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Fri, 18 Nov 2016 15:40:10 +0100
Subject: [PATCH 14/17] ffmpeg: Add `start_cmd` in front of `configure` line
That way, the actual command is printed on the screen.
---
ffmpeg.be0 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.be0 b/ffmpeg.be0
index 0143f3d3b..1c6895cdb 100755
--- a/ffmpeg.be0
+++ b/ffmpeg.be0
@@ -30,7 +30,7 @@ SRCURL[0]="https://ffmpeg.org/releases/ffmpeg-${PKGVERSION}.tar.bz2"
mee_configure() {
sed -i 's/-lflite"/-lflite -lasound"/' ${S}/configure
- ${S}/configure \
+ start_cmd ${S}/configure \
--prefix=${PREFIX} \
--enable-gpl \
--enable-version3 \
From 78dd9607cc5e06d41bf7dc431896a1f791708d7f Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Fri, 18 Nov 2016 16:00:14 +0100
Subject: [PATCH 15/17] 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.
---
ffmpeg.be0 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.be0 b/ffmpeg.be0
index 1c6895cdb..a3b9026e6 100755
--- a/ffmpeg.be0
+++ b/ffmpeg.be0
@@ -53,7 +53,7 @@ mee_configure() {
mee_build() {
bee_build
- gcc ${B}/tools/qt-faststart.c -o ${B}/tools/qt-faststart
+ cc ${B}/tools/qt-faststart.c -o ${B}/tools/qt-faststart
}
mee_install() {
From f577968c69c48699341fa22dae34e3ab0fbc1847 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Fri, 18 Nov 2016 16:42:38 +0100
Subject: [PATCH 16/17] ffmpeg: Fix installation to image directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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.
---
ffmpeg.be0 | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/ffmpeg.be0 b/ffmpeg.be0
index a3b9026e6..f5862c4f5 100755
--- a/ffmpeg.be0
+++ b/ffmpeg.be0
@@ -57,11 +57,9 @@ mee_build() {
}
mee_install() {
- bee_install
+ start_cmd make install DESTDIR=${D}
install -v -m755 -d ${D}/${BINDIR}
- install -v -m755 ${B}/{tools/qt-faststart,ffmpeg,ffplay,ffprobe,ffserver} ${D}/${BINDIR}
- install -v -m755 -d ${D}${DOCDIR}
- install -v -m644 ${B}/doc/*.txt ${D}${DOCDIR}
+ install -v -m755 ${B}/tools/qt-faststart ${D}/${BINDIR}
}
## by default this may be 'make install DESTDIR="${D}"'
From a6f4e1b9e5cca1f99d28fe7e8dcef796a5298f30 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Fri, 18 Nov 2016 17:29:31 +0100
Subject: [PATCH 17/17] ffmpeg: Remove switch setting docdir to default
```
build/configure: --docdir=DIR install documentation in DIR [PREFIX/share/doc/ffmpeg]
```
---
ffmpeg.be0 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/ffmpeg.be0 b/ffmpeg.be0
index f5862c4f5..20352393d 100755
--- a/ffmpeg.be0
+++ b/ffmpeg.be0
@@ -46,8 +46,7 @@ mee_configure() {
--enable-libvpx \
--enable-libx264 \
--enable-libx265 \
- --enable-x11grab \
- --docdir=${DOCDIR}
+ --enable-x11grab
}
mee_build() {