From d90f0cff16fb09f527b985dd4f779edba9eedb67 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 2 Nov 2020 17:50:30 +0100 Subject: [PATCH 1/5] libgphoto2: Strip trailing space --- libgphoto2-2.5.0-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgphoto2-2.5.0-0.bee b/libgphoto2-2.5.0-0.bee index 54af4508b..6687dadb4 100755 --- a/libgphoto2-2.5.0-0.bee +++ b/libgphoto2-2.5.0-0.bee @@ -25,7 +25,7 @@ PATCHURL[0]="" #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 812b34807dfc8047f1d197314cc345eb39e8fde2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 2 Nov 2020 17:51:03 +0100 Subject: [PATCH 2/5] libgphoto2: Convert to versionless bee file --- libgphoto2-2.5.0-0.bee => libgphoto2.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libgphoto2-2.5.0-0.bee => libgphoto2.be0 (92%) diff --git a/libgphoto2-2.5.0-0.bee b/libgphoto2.be0 similarity index 92% rename from libgphoto2-2.5.0-0.bee rename to libgphoto2.be0 index 6687dadb4..bab3a8c70 100755 --- a/libgphoto2-2.5.0-0.bee +++ b/libgphoto2.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libgphoto2-2.5.0-0 + SRCURL[0]="http://downloads.sourceforge.net/project/gphoto/libgphoto/${PKGVERSION}/libgphoto2-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From daeb3684facace516db85d554f08a99a88a9e37a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 2 Nov 2020 17:51:20 +0100 Subject: [PATCH 3/5] libgphoto2: Securely download source archive with HTTPS --- libgphoto2.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgphoto2.be0 b/libgphoto2.be0 index bab3a8c70..3926eede5 100755 --- a/libgphoto2.be0 +++ b/libgphoto2.be0 @@ -2,7 +2,7 @@ # BEE_VERSION libgphoto2-2.5.0-0 -SRCURL[0]="http://downloads.sourceforge.net/project/gphoto/libgphoto/${PKGVERSION}/libgphoto2-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://downloads.sourceforge.net/project/gphoto/libgphoto/${PKGVERSION}/libgphoto2-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From 80051e415eddd83025a925f16ce93632d6f4fb4e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 2 Nov 2020 17:52:32 +0100 Subject: [PATCH 4/5] libgphoto2: Use current minimal bee file template --- libgphoto2.be0 | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libgphoto2.be0 b/libgphoto2.be0 index 3926eede5..6c1cdbf67 100755 --- a/libgphoto2.be0 +++ b/libgphoto2.be0 @@ -4,19 +4,11 @@ SRCURL[0]="https://downloads.sourceforge.net/project/gphoto/libgphoto/${PKGVERSION}/libgphoto2-${PKGVERSION}.tar.bz2" -PATCHURL[0]="" - -# BEE_CONFIGURE=compat - -# BEE_BUILDTYPE= - -# EXCLUDE=() +# PATCHURL+=() # build_in_sourcedir - - - +# sourcesubdir_append src #mee_extract() { # bee_extract "${@}" @@ -37,3 +29,7 @@ PATCHURL[0]="" #mee_install() { # bee_install #} + +#mee_install_post() { +# exit +#} From 7e7eae655b57dc162d5102aa5aa298f3744289da Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 2 Nov 2020 17:53:55 +0100 Subject: [PATCH 5/5] libgphoto2: Update version from 2.5.0 to 2.5.26 Update to the current version, which is able to build against libjpeg-turbo 1.5.3. Resolves: https://github.molgen.mpg.de/mariux64/bee-files/issues/1982 --- libgphoto2.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgphoto2.be0 b/libgphoto2.be0 index 6c1cdbf67..aba716b07 100755 --- a/libgphoto2.be0 +++ b/libgphoto2.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libgphoto2-2.5.0-0 +# BEE_VERSION libgphoto2-2.5.26-0 SRCURL[0]="https://downloads.sourceforge.net/project/gphoto/libgphoto/${PKGVERSION}/libgphoto2-${PKGVERSION}.tar.bz2"