From 025fa15bd614af20c94fd3fb62005965d02a92b3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Dec 2019 15:13:49 +0100 Subject: [PATCH 01/15] libde265: Add version 1.0.3 --- libde265.be0 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 libde265.be0 diff --git a/libde265.be0 b/libde265.be0 new file mode 100755 index 000000000..58a187f44 --- /dev/null +++ b/libde265.be0 @@ -0,0 +1,35 @@ +#!/usr/bin/env beesh + +# BEE_VERSION libde265-1.0.3-0 + +SRCURL[0]="https://github.com/strukturag/libde265/releases/download/v${PKGVERSION}/libde265-${PKGVERSION}.tar.gz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +#mee_install_post() { +# exit +#} From 46011486cebc6158c21b82fab526b438f687423b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 13 Dec 2019 11:48:23 +0100 Subject: [PATCH 02/15] libde265: Use autogen --- libde265.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libde265.be0 b/libde265.be0 index 58a187f44..965fbe469 100755 --- a/libde265.be0 +++ b/libde265.be0 @@ -4,6 +4,8 @@ SRCURL[0]="https://github.com/strukturag/libde265/releases/download/v${PKGVERSION}/libde265-${PKGVERSION}.tar.gz" +BEE_BUILDTYPE=autogen + # PATCHURL+=() # build_in_sourcedir From dfff4fb0469f4d3ef86a6d2dc4b52533a9779037 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 13 Dec 2019 12:16:45 +0100 Subject: [PATCH 03/15] libde265: Build in source directory --- libde265.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libde265.be0 b/libde265.be0 index 965fbe469..250d1f006 100755 --- a/libde265.be0 +++ b/libde265.be0 @@ -8,7 +8,7 @@ BEE_BUILDTYPE=autogen # PATCHURL+=() -# build_in_sourcedir +build_in_sourcedir # sourcesubdir_append src From 4e2804f6e22861ecf1261aebb6bacd707df31427 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 13 Dec 2019 12:59:25 +0100 Subject: [PATCH 04/15] libde265: Disable --disable-sherlock265 to prevent build errors [Fixed in the master branch][1]. https://github.com/strukturag/libde265/issues/141 --- libde265.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libde265.be0 b/libde265.be0 index 250d1f006..8b058e015 100755 --- a/libde265.be0 +++ b/libde265.be0 @@ -20,9 +20,10 @@ build_in_sourcedir # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-sherlock265 +} #mee_build() { # bee_build From d4d7770473afcc32a49bd04fd1dd1208d54f7f5e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 13 Dec 2019 13:04:55 +0100 Subject: [PATCH 05/15] libde265: Do not build static version of library --- libde265.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libde265.be0 b/libde265.be0 index 8b058e015..a3af88940 100755 --- a/libde265.be0 +++ b/libde265.be0 @@ -22,7 +22,8 @@ build_in_sourcedir mee_configure() { bee_configure \ - --disable-sherlock265 + --disable-sherlock265 \ + --disable-static } #mee_build() { From 87c5a56af3474b8ce298717d095cc8e62b3e7ac8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Dec 2019 15:05:50 +0100 Subject: [PATCH 06/15] libheif: Add version 1.6.0 > libheif is an ISO/IEC 23008-12:2017 HEIF file format decoder and > encoder. > > HEIF is a new image file format employing HEVC (h.265) image coding > for the best compression ratios currently possible. > > libheif makes use of libde265 for the actual image decoding and x265 > for encoding. Alternative codecs for, e.g., AVC and JPEG can be provided > as plugins. There is experimental code for an AV1 plugin (for AVIF > format support) in the 'avif' branch. --- libheif.be0 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 libheif.be0 diff --git a/libheif.be0 b/libheif.be0 new file mode 100755 index 000000000..3fcfba3bd --- /dev/null +++ b/libheif.be0 @@ -0,0 +1,35 @@ +#!/usr/bin/env beesh + +# BEE_VERSION libheif-1.6.0-0 + +SRCURL[0]="https://github.com/strukturag/libheif/releases/download/v${PKGVERSION}/libheif-${PKGVERSION}.tar.gz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +#mee_install_post() { +# exit +#} From e550df2af61a0810f2378c0f68d131d29afd1bcd Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 13 Dec 2019 13:10:17 +0100 Subject: [PATCH 07/15] libheif: Use Autotools over non-working CMake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The install Make target generated by the project’s CMake configuration does not work. --- libheif.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libheif.be0 b/libheif.be0 index 3fcfba3bd..ea26d6ef1 100755 --- a/libheif.be0 +++ b/libheif.be0 @@ -6,6 +6,8 @@ SRCURL[0]="https://github.com/strukturag/libheif/releases/download/v${PKGVERSION # PATCHURL+=() +BEE_BUILDTYPE=autotools + # build_in_sourcedir # sourcesubdir_append src From 86e4655824783ded2d0dc588c2344230760ff686 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 13 Dec 2019 13:14:02 +0100 Subject: [PATCH 08/15] libheif: Disable go bindings Building outside the source directory causes issues. can't load package: package heif-test.go: cannot find package "heif-test.go" in any of: /usr/lib/go/src/heif-test.go (from $GOROOT) /dev/shm/bee-root/libheif/libheif-1.6.0-0/build/examples/src/heif-test.go (from $GOPATH) $ ls -lR /dev/shm/bee-root/libheif/libheif-1.6.0-0/build/examples/src/ /dev/shm/bee-root/libheif/libheif-1.6.0-0/build/examples/src/: total 0 drwxr-xr-x 3 root root 60 Dec 13 13:11 github.com /dev/shm/bee-root/libheif/libheif-1.6.0-0/build/examples/src/github.com: total 0 drwxr-xr-x 3 root root 60 Dec 13 13:11 strukturag /dev/shm/bee-root/libheif/libheif-1.6.0-0/build/examples/src/github.com/strukturag: total 0 drwxr-xr-x 2 root root 60 Dec 13 13:11 libheif /dev/shm/bee-root/libheif/libheif-1.6.0-0/build/examples/src/github.com/strukturag/libheif: total 0 lrwxrwxrwx 1 root root 62 Dec 13 13:11 go -> /dev/shm/bee-root/libheif/libheif-1.6.0-0/build/examples/../go --- libheif.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libheif.be0 b/libheif.be0 index ea26d6ef1..d11a6f144 100755 --- a/libheif.be0 +++ b/libheif.be0 @@ -20,9 +20,10 @@ BEE_BUILDTYPE=autotools # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-go +} #mee_build() { # bee_build From 96a99b7a5979390ccbabaf8460697c37ae43cd55 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 13 Dec 2019 13:16:29 +0100 Subject: [PATCH 09/15] libheif: Do not build static versions of library --- libheif.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libheif.be0 b/libheif.be0 index d11a6f144..685c32f57 100755 --- a/libheif.be0 +++ b/libheif.be0 @@ -22,7 +22,8 @@ BEE_BUILDTYPE=autotools mee_configure() { bee_configure \ - --disable-go + --disable-go \ + --disable-static } #mee_build() { From 00eaf55421f916282b045c0ef98ffc8b3c1a72ab Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 16 Dec 2019 14:40:09 +0100 Subject: [PATCH 10/15] libde265: autotools --- libde265.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libde265.be0 b/libde265.be0 index a3af88940..cfed6d049 100755 --- a/libde265.be0 +++ b/libde265.be0 @@ -4,7 +4,7 @@ SRCURL[0]="https://github.com/strukturag/libde265/releases/download/v${PKGVERSION}/libde265-${PKGVERSION}.tar.gz" -BEE_BUILDTYPE=autogen +BEE_BUILDTYPE=autotools # PATCHURL+=() From 5924331f807fced407a7eb8c53805788b09f0963 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 16 Dec 2019 15:12:57 +0100 Subject: [PATCH 11/15] imagemagick: Update version from 6.9.10p56 to 6.9.10p78 https://legacy.imagemagick.org/script/changelog.php --- imagemagick.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imagemagick.be0 b/imagemagick.be0 index 65367fe06..03f7301de 100755 --- a/imagemagick.be0 +++ b/imagemagick.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION imagemagick-6.9.10p56-0 +# BEE_VERSION imagemagick-6.9.10p78-0 XPKGVERSION=$(echo ${PKGVERSION} | sed -e 's/p/-/') SRCURL[0]="https://github.com/ImageMagick/ImageMagick6/archive/${XPKGVERSION}.tar.gz imagemagick-${XPKGVERSION}.tar.gz" From 9a0141ac313ff7f8a2a7e813498e169ab238f88d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 16 Dec 2019 15:14:34 +0100 Subject: [PATCH 12/15] imagemagick: Use bee variable `DATADIR` --- imagemagick.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imagemagick.be0 b/imagemagick.be0 index 03f7301de..6dcb2c887 100755 --- a/imagemagick.be0 +++ b/imagemagick.be0 @@ -7,7 +7,7 @@ SRCURL[0]="https://github.com/ImageMagick/ImageMagick6/archive/${XPKGVERSION}.ta PATCHURL[0]="" -EXCLUDE="^/usr/share/doc" +EXCLUDE="^${DATADIR}/doc" mee_patch() { bee_patch From cf8006eacc076f16e8453ef44775b7157ff7fe37 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 16 Dec 2019 15:15:22 +0100 Subject: [PATCH 13/15] imagemagick: Comment default lines --- imagemagick.be0 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/imagemagick.be0 b/imagemagick.be0 index 6dcb2c887..77177a720 100755 --- a/imagemagick.be0 +++ b/imagemagick.be0 @@ -5,25 +5,25 @@ XPKGVERSION=$(echo ${PKGVERSION} | sed -e 's/p/-/') SRCURL[0]="https://github.com/ImageMagick/ImageMagick6/archive/${XPKGVERSION}.tar.gz imagemagick-${XPKGVERSION}.tar.gz" -PATCHURL[0]="" +# PATCHURL[0]="" EXCLUDE="^${DATADIR}/doc" -mee_patch() { - bee_patch -} +#mee_patch() { +# bee_patch +#} -mee_configure() { - bee_configure -} +#mee_configure() { +# bee_configure +#} -mee_build() { - bee_build -} +#mee_build() { +# bee_build +#} -mee_install() { - bee_install -} +#mee_install() { +# bee_install +#} mee_install_post() { local tgt=${D}/etc/ImageMagick-6/policy.xml From 9bad7bf185d8b7722dd886c1bd3cea44d12693cb Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 16 Dec 2019 15:18:26 +0100 Subject: [PATCH 14/15] =?UTF-8?q?imagemagick:=20Use=20Bash=E2=80=99s=20pat?= =?UTF-8?q?tern=20substitution?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- imagemagick.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/imagemagick.be0 b/imagemagick.be0 index 77177a720..7bd73a1a5 100755 --- a/imagemagick.be0 +++ b/imagemagick.be0 @@ -2,8 +2,7 @@ # BEE_VERSION imagemagick-6.9.10p78-0 -XPKGVERSION=$(echo ${PKGVERSION} | sed -e 's/p/-/') -SRCURL[0]="https://github.com/ImageMagick/ImageMagick6/archive/${XPKGVERSION}.tar.gz imagemagick-${XPKGVERSION}.tar.gz" +SRCURL[0]="https://github.com/ImageMagick/ImageMagick6/archive/${PKGVERSION/p/-}.tar.gz imagemagick-${PKGVERSION/p/-}.tar.gz" # PATCHURL[0]="" From 9ecdd4aa4ff68ee5a96bc30cdf118328124f4fe1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 16 Dec 2019 15:19:23 +0100 Subject: [PATCH 15/15] imagemagick: Explicitly delete doc directory Use of `EXCLUDES` is deprecated. `--disable-docs` also does not build the wanted manual pages. `DOCDIR` cannot be used, as `/usr/share/doc/ImageMagick-6` is used by ImageMagick (which is strange, because we should pathe the name to configure). --- imagemagick.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imagemagick.be0 b/imagemagick.be0 index 7bd73a1a5..b347c5c06 100755 --- a/imagemagick.be0 +++ b/imagemagick.be0 @@ -6,8 +6,6 @@ SRCURL[0]="https://github.com/ImageMagick/ImageMagick6/archive/${PKGVERSION/p/-} # PATCHURL[0]="" -EXCLUDE="^${DATADIR}/doc" - #mee_patch() { # bee_patch #} @@ -25,6 +23,8 @@ EXCLUDE="^${DATADIR}/doc" #} mee_install_post() { + start_cmd rm -rf ${D}/${DATADIR}/doc + local tgt=${D}/etc/ImageMagick-6/policy.xml cp -p -v ${tgt} ${tgt}.raw xmllint --format ${tgt}.raw > ${tgt}