[ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1

[Roland Hieber <rhi@pengutronix.de>]

The old URL is broken, but the new GitHub project doesn't have the old
releases, so bump the version.

When the rule file is evaluated, the cross pkg-config wrapper may not
exist yet, which will lead to confusing error messages during the build.
But it turns out that calling pkg-config is not actually necessary
because libpng is installed to the standard locations, and fbgrab builds
just fine using '-lpng -lz' in its Makefile.

Also set FBGRAB_CONF_TOOL for uniformity across rule files.

fbgrab.c only says "This program is free Software, see the COPYING
file". COPYING contains a GPL-2.0 license text, therefore the "-only"
part is inferred.

Reported-by: Felicitas Jung <f.jung@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/fbgrab.make | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/rules/fbgrab.make b/rules/fbgrab.make
index eb05a024e4d4..ea7f07f6000a 100644
--- a/rules/fbgrab.make
+++ b/rules/fbgrab.make
@@ -15,22 +15,29 @@ PACKAGES-$(PTXCONF_FBGRAB) += fbgrab
 #
 # Paths and names
 #
-FBGRAB_VERSION	:= 1.0
-FBGRAB_MD5	:= 7af4d8774684182ed690d5da82d6d234
+FBGRAB_VERSION	:= 1.3.1
+FBGRAB_MD5	:= d2f1f9a096954c252335317216dcd501
 FBGRAB		:= fbgrab-$(FBGRAB_VERSION)
 FBGRAB_SUFFIX	:= tar.gz
-FBGRAB_URL	:= http://fbgrab.monells.se/$(FBGRAB).$(FBGRAB_SUFFIX)
+FBGRAB_URL	:= https://github.com/GunnarMonell/fbgrab/archive/$(FBGRAB_VERSION).$(FBGRAB_SUFFIX)
 FBGRAB_SOURCE	:= $(SRCDIR)/$(FBGRAB).$(FBGRAB_SUFFIX)
 FBGRAB_DIR	:= $(BUILDDIR)/$(FBGRAB)
+FBGRAB_LICENSE	:= GPL-2.0-only
+FBGRAB_LICENSE_FILES	:= \
+	file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
+	file://fbgrab.c;startline=6;endline=6;md5=03e379b2e488fbda4e42aa556e9cec93
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+FBGRAB_CONF_TOOL := NO
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
-# overwrite some vars in the makefile
 
-FBGRAB_MAKE_OPT	= \
-	$(CROSS_ENV_CC) \
-	LDLIBS='`eval PATH=$(CROSS_PATH) $(CROSS_PKG_CONFIG) --libs libpng`'
+FBGRAB_MAKE_ENV := $(CROSS_ENV_CC)
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.26.0.rc2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de