4 files changed, 41 insertions, 67 deletions
diff --git a/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch b/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch
new file mode 100644
index 0000000..5590085
--- /dev/null
+++ b/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch
@@ -0,0 +1,29 @@
+From f064b60df5ebf11a0d3e0ed632a6b989690773f6 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Mon, 21 Feb 2022 22:32:54 +0100
+Subject: [PATCH] pkgconfig: don't include ldflags
+
+This leaks the cross build environment.
+Prevents:
+| ERROR: giblib-1.2.4-r0 do_populate_sysroot: QA Issue: giblib.pc failed sanity test (tmpdir) in path ../giblib/1.2.4-r0/sysroot-destdir/usr/lib/ pkgconfig [pkgconfig]
+
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ giblib.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/giblib.pc.in b/giblib.pc.in
+index df520ae..3049603 100644
+--- a/giblib.pc.in
++++ b/giblib.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: giblib
+ Description: wrapper library for imlib2, and other stuff
+ Version: @VERSION@
+-Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@
++Libs: -L${libdir} -lgiblib @IMLIB_LIBS@
+ Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@
+ 
+-- 
+2.20.1
+
diff --git a/recipes-graphics/scrot/giblib_1.2.4.bb b/recipes-graphics/scrot/giblib_1.2.4.bb
index 587c7fb..4dac98c 100644
--- a/recipes-graphics/scrot/giblib_1.2.4.bb
+++ b/recipes-graphics/scrot/giblib_1.2.4.bb
@@ -1,16 +1,17 @@
 SECTION = "graphic/utils"
 SUMMARY = "giblib is a simple library which wraps imlib2"
 HOMEPAGE = "http://linuxbrit.co.uk/software/"
-LICENSE = "BSD"
+LICENSE = "MIT-feh"
 
 DEPENDS = "imlib2"
 
-MIRRORS_prepend () {
+MIRRORS:prepend () {
 }
 
 SRC_URI = " \
-    http://pkgs.fedoraproject.org/repo/pkgs/giblib/giblib-${PV}.tar.gz/c810ef5389baf24882a1caca2954385e/giblib-${PV}.tar.gz \
+    https://pkgs.fedoraproject.org/repo/pkgs/giblib/giblib-${PV}.tar.gz/c810ef5389baf24882a1caca2954385e/giblib-${PV}.tar.gz \
     file://fix-giblib-binconfig-paths.patch \
+    file://0001-pkgconfig-don-t-include-ldflags.patch \
 "
 LIC_FILES_CHKSUM = "file://COPYING;md5=dd3cb8d7a69f3d0b2a52a46c92389011"
 SRC_URI[md5sum] = "c810ef5389baf24882a1caca2954385e"
@@ -18,14 +19,14 @@ SRC_URI[sha256sum] = "176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922eb
 
 PR = "r0"
 
-do_compile_prepend () {
+do_compile:prepend () {
     #remove linkerpath to host libraries
     sed -i -e 's:-L/usr/lib\s::' Makefile
     sed -i -e 's:-L/usr/lib\s::' giblib/Makefile
     export DESTDIR=${D}
 }
 
-do_compile_append () {
+do_compile:append () {
     for i in $(find ${B} -name "*?.pc") ; do
         sed -i -e s:${STAGING_DIR_TARGET}::g \
                -e s:/${TARGET_SYS}::g \
@@ -33,7 +34,7 @@ do_compile_append () {
     done
 }
 
-FILES_${PN}-doc = "/usr/doc"
+FILES:${PN}-doc = "/usr/doc"
 
 inherit autotools-brokensep binconfig pkgconfig
 
diff --git a/recipes-graphics/scrot/imlib2_git.bb b/recipes-graphics/scrot/imlib2_git.bb
deleted file mode 100644
index ee7f2e2..0000000
--- a/recipes-graphics/scrot/imlib2_git.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation"
-LICENSE = "MIT & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
-
-DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
-PROVIDES = "virtual/imlib2"
-PV = "1.4.6+gitr${SRCPV}"
-SRCREV = "560a58e61778d84953944f744a025af6ce986334"
-
-inherit autotools binconfig pkgconfig
-SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git"
-S = "${WORKDIR}/git"
-
-# autotools-brokensep
-B = "${S}"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib"
-PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff"
-PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
-PACKAGECONFIG[id3] = "--with-id3,--without-id3,libid3tag"
-
-EXTRA_OECONF = "--with-x \
-                --x-includes=${STAGING_INCDIR} \
-                --x-libraries=${STAGING_LIBDIR} "
-
-# TODO: Use more fine granular version
-#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:"
-OE_LT_RPATH_ALLOW = "any"
-OE_LT_RPATH_ALLOW[export]="1"
-
-PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters ${PN}-bin imlib2-themes "
-FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
-FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/ ${prefix}/src/debug/"
-FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}"
-FILES_${PN}-bin = "${bindir}"
-FILES_imlib2-themes = "${datadir}/imlib2/data"
-FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
-FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so"
-FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug"
-FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug"
-
-# png.so jpeg.so id3.so are also provided by lightmediascanner
-PRIVATE_LIBS_imlib2-loaders = "pnm.so lbm.so argb.so tiff.so zlib.so bmp.so tga.so gif.so xpm.so bz2.so"
-
-PRIVATE_LIBS_imlib2-filters = "bumpmap.so colormod.so testfilter.so"
-
-do_configure_prepend() {
-    autopoint || touch config.rpath
-}
-
-do_install_prepend () {
-    for i in `find ${B}/ -name "*.pc" -type f` ; do \
-        sed -i -e 's:-L${STAGING_LIBDIR}:-L\$\{libdir\}:g' -e 's:-I${STAGING_LIBDIR}:-I\$\{libdir\}:g' -e 's:-I${STAGING_INCDIR}:-I\$\{includedir\}:g' $i
-    done
-}
diff --git a/recipes-graphics/scrot/scrot_0.8.bb b/recipes-graphics/scrot/scrot_0.8.bb
index 6a0b6dc..e394658 100644
--- a/recipes-graphics/scrot/scrot_0.8.bb
+++ b/recipes-graphics/scrot/scrot_0.8.bb
@@ -2,16 +2,16 @@ SECTION = "graphic/utils"
 SUMMARY = "scrot (SCReen shOT), screen capture utility"
 DESCRIPTION = "scrot (SCReen shOT) is a simple commandline screen capture utility that uses imlib2 to grab and save images"
 HOMEPAGE = "http://linuxbrit.co.uk/software/"
-LICENSE = "BSD"
+LICENSE = "MIT-feh"
 
-RDEPENDS_${PN} = "imlib2-loaders"
+RDEPENDS:${PN} = "imlib2-loaders"
 DEPENDS = "imlib2 giblib"
 
-MIRRORS_prepend () {
+MIRRORS:prepend () {
 }
 
 SRC_URI = " \
-    http://pkgs.fedoraproject.org/repo/pkgs/scrot/scrot-${PV}.tar.gz/ccae904d225609571bdd3b03445c1e88/scrot-${PV}.tar.gz \
+    https://pkgs.fedoraproject.org/repo/pkgs/scrot/scrot-${PV}.tar.gz/ccae904d225609571bdd3b03445c1e88/scrot-${PV}.tar.gz \
     file://fix-scrot-include-paths.patch \
 "
 LIC_FILES_CHKSUM = "file://COPYING;md5=dd3cb8d7a69f3d0b2a52a46c92389011"
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "613d1cf524c2b62ce3c65f1232ea4f05c7daf248d5e82ff2a6892c9809
 
 PR = "r0"
 
-FILES_${PN}-doc += "/usr/doc"
+FILES:${PN}-doc += "/usr/doc"
 
 inherit autotools