Replace convert with jhead

In some cases, ImageMagick needs more RAM than available on Raspberry Pi Zero. Thus, image rotation is exchanged with jhead. Relates to #33
avanc · May 24, 2021 · 63b7a68 · 63b7a68
1 parent a8a0cd8
commit 63b7a68
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
@@ -23,6 +23,7 @@ BR2_PACKAGE_GZIP=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_NTFS_3G=y
+BR2_PACKAGE_JHEAD=y
 BR2_PACKAGE_PHOTOFRAME=y
 BR2_PACKAGE_FBSET=y
 # BR2_PACKAGE_FBV_GIF is not set

diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
@@ -23,6 +23,7 @@ BR2_PACKAGE_GZIP=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_NTFS_3G=y
+BR2_PACKAGE_JHEAD=y
 BR2_PACKAGE_PHOTOFRAME=y
 BR2_PACKAGE_FBSET=y
 # BR2_PACKAGE_FBV_GIF is not set

diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig
@@ -23,6 +23,7 @@ BR2_PACKAGE_GZIP=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_NTFS_3G=y
+BR2_PACKAGE_JHEAD=y
 BR2_PACKAGE_PHOTOFRAME=y
 BR2_PACKAGE_FBSET=y
 # BR2_PACKAGE_FBV_GIF is not set

diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
@@ -5,6 +5,7 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi"
 BR2_OPTIMIZE_2=y
 BR2_GLOBAL_PATCH_DIR="board/raspberrypi"
 BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
 BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
 BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/raspberrypi/tools/archive/5caa7046982f0539cf5380f94da04b31129ed521.tar.gz"
 BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH="arm-bcm2708/arm-linux-gnueabihf/bin"
@@ -20,8 +21,8 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/a896a00ebffd0b016627f65ff236b660e66e782b.tar.gz"
-BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/f0eeafb5d9109c2a1d512f045d7326a8a1d33e7e.tar.gz"
+BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox.config"
@@ -30,6 +31,7 @@ BR2_PACKAGE_GZIP=y
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_NTFS_3G=y
+BR2_PACKAGE_JHEAD=y
 BR2_PACKAGE_PHOTOFRAME=y
 BR2_PACKAGE_FBSET=y
 # BR2_PACKAGE_FBV_GIF is not set

diff --git a/package/photoframe/photoframe.sh b/package/photoframe/photoframe.sh
@@ -145,7 +145,9 @@ function start {
     echo $IMAGE
 
     IMAGE2=/tmp/photoframe.image
-    convert -auto-orient "$IMAGE" "$IMAGE2"                                               
+    cp $IMAGE $IMAGE2
+#    convert -auto-orient "$IMAGE" "$IMAGE2"                                               
+    jhead -autorot $IMAGE2
     fbv $PARAMS_FBV "$IMAGE2"
     error_display
     sleep $SLIDESHOW_DELAY