From f2990e2851464c02270dc47d425986d844b065e8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 17:36:59 +0200 Subject: [PATCH 01/19] ffmpeg: Update version from 3.1.4 to 3.3.4 The change-log is available on-line [1]. [1] https://github.com/FFmpeg/FFmpeg/blob/master/Changelog --- ffmpeg.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg.be0 b/ffmpeg.be0 index 20352393d..0628421e7 100755 --- a/ffmpeg.be0 +++ b/ffmpeg.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION ffmpeg-3.1.4-0 +# BEE_VERSION ffmpeg-3.3.4-0 SRCURL[0]="https://ffmpeg.org/releases/ffmpeg-${PKGVERSION}.tar.bz2" From 104ee4cddf84a4fd9e2a426024ec7141f88a69b5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 17:38:17 +0200 Subject: [PATCH 02/19] ffmpeg: Remove unknown option `--enable-x11grab` From [1]: > - Removed the legacy X11 screen grabber, use XCB instead [1] https://github.com/FFmpeg/FFmpeg/blob/master/Changelog --- ffmpeg.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ffmpeg.be0 b/ffmpeg.be0 index 0628421e7..cc3345182 100755 --- a/ffmpeg.be0 +++ b/ffmpeg.be0 @@ -45,8 +45,7 @@ mee_configure() { --enable-libvorbis \ --enable-libvpx \ --enable-libx264 \ - --enable-libx265 \ - --enable-x11grab + --enable-libx265 } mee_build() { From e5b766ce7d549053b6b6252eebfaf88f3c35b80a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 17:44:57 +0200 Subject: [PATCH 03/19] gegl: Update version from 0.2.10 to 0.3.20 Also, update the URL to the one documented in the book *Linux from Scratch* [1]. --- gegl.be0 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gegl.be0 b/gegl.be0 index abf319d47..19e539397 100755 --- a/gegl.be0 +++ b/gegl.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gegl-0.2.0-2 +# BEE_VERSION gegl-0.3.20-0 ## 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.) @@ -9,14 +9,13 @@ ## 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[0]="http://ftp.gtk.org/pub/gegl/${PKGVERSION[2]}/gegl-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://download.gimp.org/pub/gegl/${PKGVERSION[2]}/gegl-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -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" +# PATCHURL[0]="" ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not From 0c48d1080a0d70068f1f6956518af7f1e0b1434c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 17:46:30 +0200 Subject: [PATCH 04/19] gegle: Strip trailing space --- gegl.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gegl.be0 b/gegl.be0 index 19e539397..a38ddc0d3 100755 --- a/gegl.be0 +++ b/gegl.be0 @@ -48,7 +48,7 @@ mee_configure() { bee_configure --disable-docs \ --without-vala \ --without-graphviz \ - --without-lua + --without-lua } #mee_build() { From f7b415d9dfd1cca78fbf0ad9229b05d09c8a8ff4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 17:47:13 +0200 Subject: [PATCH 05/19] babl: Strip trailing space --- babl-0.1.10-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babl-0.1.10-0.bee b/babl-0.1.10-0.bee index cdd9db518..afd529742 100755 --- a/babl-0.1.10-0.bee +++ b/babl-0.1.10-0.bee @@ -43,7 +43,7 @@ SRCURL[0]="http://ftp.gtk.org/pub/babl/${PKGVERSION[2]}/babl-${PKGVERSION}.tar.b #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From e8799e364b5cb12984f30a5076df74d7b81d3a9f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 17:56:52 +0200 Subject: [PATCH 06/19] bable: Update source URL Use the URL documented in the book *Linux from Scratch* [1]. Also, this has the benefit, that the source is downloaded more securely over HTTPS. [1] http://www.linuxfromscratch.org/blfs/view/svn/general/babl.html --- babl-0.1.10-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babl-0.1.10-0.bee b/babl-0.1.10-0.bee index afd529742..edd025ae4 100755 --- a/babl-0.1.10-0.bee +++ b/babl-0.1.10-0.bee @@ -7,7 +7,7 @@ ## 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[0]="http://ftp.gtk.org/pub/babl/${PKGVERSION[2]}/babl-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://download.gimp.org/pub/babl/${PKGVERSION[2]}/babl-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 3e532037effdf53f89a23bd0cb8adaf9fc640713 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 17:57:16 +0200 Subject: [PATCH 07/19] babl: Convert to versionless bee file --- babl-0.1.10-0.bee => babl.be0 | 2 ++ 1 file changed, 2 insertions(+) rename babl-0.1.10-0.bee => babl.be0 (98%) diff --git a/babl-0.1.10-0.bee b/babl.be0 similarity index 98% rename from babl-0.1.10-0.bee rename to babl.be0 index edd025ae4..f620af1bc 100755 --- a/babl-0.1.10-0.bee +++ b/babl.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION babl-0.1.10-0 + ## 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 ddf9c43a4993f8c1295a8c3e1b4f372eca3c05af Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 17:57:36 +0200 Subject: [PATCH 08/19] babl: Update version from 0.1.10 to 0.1.30 The newer version is required by GEGL 0.3.20. --- babl.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babl.be0 b/babl.be0 index f620af1bc..f5cbc324e 100755 --- a/babl.be0 +++ b/babl.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION babl-0.1.10-0 +# BEE_VERSION babl-0.1.30-0 ## 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 10f8858ef7032649a0080f71f6b6bc7d842d8af7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 18:00:27 +0200 Subject: [PATCH 09/19] babl: Run test suite after build --- babl.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/babl.be0 b/babl.be0 index f5cbc324e..5d08f82b7 100755 --- a/babl.be0 +++ b/babl.be0 @@ -48,9 +48,10 @@ SRCURL[0]="https://download.gimp.org/pub/babl/${PKGVERSION[2]}/babl-${PKGVERSION # bee_configure #} -#mee_build() { -# bee_build -#} +mee_build() { + bee_build + start_cmd make check +} #mee_install() { # bee_install From bd91e9913c1a4939bb27d5ed04d726e30e3d897d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 18:15:14 +0200 Subject: [PATCH 10/19] gegl: Run test suite after build --- gegl.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gegl.be0 b/gegl.be0 index a38ddc0d3..649db3c30 100755 --- a/gegl.be0 +++ b/gegl.be0 @@ -51,9 +51,10 @@ mee_configure() { --without-lua } -#mee_build() { -# bee_build -#} +mee_build() { + bee_build + start_cmd make check +} #mee_install() { # bee_install From f13962b33d4f941d82c09ace637498f0e9ac185d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 18:24:46 +0200 Subject: [PATCH 11/19] exiv2: Strip trailing spaces --- exiv2-0.21.1-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exiv2-0.21.1-0.bee b/exiv2-0.21.1-0.bee index 0f6620474..61812dee9 100755 --- a/exiv2-0.21.1-0.bee +++ b/exiv2-0.21.1-0.bee @@ -19,7 +19,7 @@ mee_patch() { } mee_configure() { - bee_configure + bee_configure } mee_build() { From 0d198730a9773ba7e29a63271da9bc9754d4731c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 18:25:19 +0200 Subject: [PATCH 12/19] exiv2: Convert to versionless bee file --- exiv2-0.21.1-0.bee => exiv2.be0 | 2 ++ 1 file changed, 2 insertions(+) rename exiv2-0.21.1-0.bee => exiv2.be0 (91%) diff --git a/exiv2-0.21.1-0.bee b/exiv2.be0 similarity index 91% rename from exiv2-0.21.1-0.bee rename to exiv2.be0 index 61812dee9..028d64b47 100755 --- a/exiv2-0.21.1-0.bee +++ b/exiv2.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION exiv2-0.21.1-0 + SRCURL[0]="http://www.exiv2.org/exiv2-${PKGVERSION}.tar.gz" PATCHURL[0]="" From d7fa121177e314d998a933c1d10588e17d080d27 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 18:29:56 +0200 Subject: [PATCH 13/19] exiv2: Recreate bee file --- exiv2.be0 | 94 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 73 insertions(+), 21 deletions(-) diff --git a/exiv2.be0 b/exiv2.be0 index 028d64b47..172a9fdab 100755 --- a/exiv2.be0 +++ b/exiv2.be0 @@ -1,33 +1,85 @@ -#!/bin/env beesh +#!/usr/bin/env beesh # BEE_VERSION exiv2-0.21.1-0 -SRCURL[0]="http://www.exiv2.org/exiv2-${PKGVERSION}.tar.gz" +## 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.) -PATCHURL[0]="" +############################################################################### +## 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_CONFIGURE=compat +SRCURL[0]="http://www.exiv2.org/builds/exiv2-${PKGVERSION}.tar.gz" -# EXCLUDE="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. -B=${S} +# PATCHURL+=() -mee_extract() { - bee_extract ${@} -} +############################################################################### +## 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. -mee_patch() { - bee_patch ${@} -} +# EXCLUDE+=() -mee_configure() { - bee_configure -} +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. -mee_build() { - bee_build -} +# build_in_sourcedir -mee_install() { - bee_install -} +############################################################################### +## 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() { +# 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 e5afeda692d6a5b8404b55850c7372d5947677ce Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 18:30:46 +0200 Subject: [PATCH 14/19] exiv2: Update version from 0.21.1 to 0.26 Hard-code the part *trunk* in the archive name in the source URL. --- exiv2.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exiv2.be0 b/exiv2.be0 index 172a9fdab..a7f83e7af 100755 --- a/exiv2.be0 +++ b/exiv2.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION exiv2-0.21.1-0 +# BEE_VERSION exiv2-0.26-0 ## 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.) @@ -9,7 +9,7 @@ ## 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[0]="http://www.exiv2.org/builds/exiv2-${PKGVERSION}.tar.gz" +SRCURL[0]="http://www.exiv2.org/builds/exiv2-${PKGVERSION}-trunk.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 7e5c0905da7c1e98e6f5dcd463fcbd7ead6a0e62 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 18:38:05 +0200 Subject: [PATCH 15/19] exiv2: Enable managing video and web image metadata From the book *Beyond Linux From Scratch* [1]: > --enable-video: This switch enables managing video metadata. > > --enable-webready: This switch enables managing web image metadata. This results in the configuration below. ``` -- ------------------------------------------------------------------ -- exiv2 0.26 configure results -- Building PNG support: YES -- Building shared library: YES -- XMP metadata support: YES -- Building static libxmp: YES -- Native language support: YES -- Conversion of Windows XP tags: YES -- Nikon lens database: YES -- Commercial build: NO -- Build the unit tests: YES -- Building translations files: NO -- Building video support: NO -- Building webready support: NO -- ------------------------------------------------------------------ ``` [1] http://www.linuxfromscratch.org/blfs/view/svn/general/exiv2.html --- exiv2.be0 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/exiv2.be0 b/exiv2.be0 index a7f83e7af..a3b747cca 100755 --- a/exiv2.be0 +++ b/exiv2.be0 @@ -53,9 +53,11 @@ SRCURL[0]="http://www.exiv2.org/builds/exiv2-${PKGVERSION}-trunk.tar.gz" # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --enable-video \ + --enable-webready +} #mee_build() { # bee_build From 3eaf14c4ded101eae626416fae93c2bfe3608542 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 18:45:54 +0200 Subject: [PATCH 16/19] gegl: Disable test suite Currently, the test suite fails when building outside the source tree [1]. [1] https://bugzilla.gnome.org/show_bug.cgi?id=788144 --- gegl.be0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gegl.be0 b/gegl.be0 index 649db3c30..092855d82 100755 --- a/gegl.be0 +++ b/gegl.be0 @@ -51,10 +51,10 @@ mee_configure() { --without-lua } -mee_build() { - bee_build - start_cmd make check -} +#mee_build() { +# bee_build +# start_cmd make check +#} #mee_install() { # bee_install From bd4340e5479b495bc9d67b37a868771279efc654 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 18:48:07 +0200 Subject: [PATCH 17/19] gegl: Create Graphviz API --- gegl.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/gegl.be0 b/gegl.be0 index 092855d82..71b44e373 100755 --- a/gegl.be0 +++ b/gegl.be0 @@ -47,7 +47,6 @@ SRCURL[0]="https://download.gimp.org/pub/gegl/${PKGVERSION[2]}/gegl-${PKGVERSION mee_configure() { bee_configure --disable-docs \ --without-vala \ - --without-graphviz \ --without-lua } From 84259945c208dedf20d2451852616b850c984c18 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 18:48:28 +0200 Subject: [PATCH 18/19] gegl: Create Lua API --- gegl.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gegl.be0 b/gegl.be0 index 71b44e373..cb04e3256 100755 --- a/gegl.be0 +++ b/gegl.be0 @@ -46,8 +46,7 @@ SRCURL[0]="https://download.gimp.org/pub/gegl/${PKGVERSION[2]}/gegl-${PKGVERSION mee_configure() { bee_configure --disable-docs \ - --without-vala \ - --without-lua + --without-vala } #mee_build() { From 2c6a9daaa7493e4b53b60300b3cc2ed1a34904a0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 25 Sep 2017 18:50:57 +0200 Subject: [PATCH 19/19] gimp: Rebuild against new GEGL 0.3.20 Follow the instructions of the book *Beyond Linux From Scratch* and fix some issues with GEGL 0.3.20 [1]. Increment the revision. [1] http://www.linuxfromscratch.org/blfs/view/svn/xsoft/gimp.html --- gimp.be0 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gimp.be0 b/gimp.be0 index 9917e27c1..b6750740f 100755 --- a/gimp.be0 +++ b/gimp.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gimp-2.8.22-0 +# BEE_VERSION gimp-2.8.22-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.) @@ -49,9 +49,11 @@ SRCURL[0]="https://download.gimp.org/mirror/pub/gimp/v${PKGVERSION[2]}/gimp-${PK # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + bee_patch "${@}" + start_cmd sed -i '/gegl/s/2/3/' configure + start_cmd sed -i '70,75 d' app/core/gimpparamspecs-duplicate.c +} #mee_configure() { # bee_configure