Re: [ptxdist] [APPLIED] fbgrab: remove from staging

[Michael Olbrich <mol@pengutronix.de>]

Thanks, applied as 55444051c1c5ed5fba6bbe43204cee216f41dee3.

Michael

[sent from post-receive hook]

On Thu, 09 Apr 2020 18:54:26 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> The old URL is broken, but the new GitHub project doesn't have the old
> releases, so bump the version.
> 
> Remove patches, the respective issues have been fixed upstream.
> 
> 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>
> Message-Id: <20200409091122.3597-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch b/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch
> deleted file mode 100644
> index e783991b3289..000000000000
> --- a/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From: Roland Hostettler <r.hostettler@gmx.ch>
> -Date: Tue, 16 Aug 2011 17:35:19 +0200
> -Subject: [PATCH] make makefile cross compilation aware
> -
> -The upstream makefile is not usable for cross compilation.
> -[wsa] Simplified 'strip' support
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> -Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> ----
> - Makefile |   11 +++++------
> - 1 file changed, 5 insertions(+), 6 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index 14c63cb..8ae5dc8 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -4,13 +4,12 @@
> - ###
> - 
> - fbgrab: fbgrab.c
> --	splint +posixlib fbgrab.c
> --	gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
> -+#	splint +posixlib fbgrab.c
> -+	${CC} ${CPPFLAGS} fbgrab.c ${LDLIBS} -o fbgrab
> - 
> - install:
> --	strip fbgrab
> --	install fbgrab /usr/bin/fbgrab
> --	install fbgrab.1.man /usr/man/man1/fbgrab.1
> -+	install -s fbgrab ${DESTDIR}/usr/bin/fbgrab
> -+	install fbgrab.1.man ${DESTDIR}/usr/man/man1/fbgrab.1
> - 
> - clean:
> --	rm -f fbgrab *~ \#*\#
> -\ No newline at end of file
> -+	rm -f fbgrab *~ \#*\#
> diff --git a/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch b/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch
> deleted file mode 100644
> index 22474f7ca4cb..000000000000
> --- a/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Tue, 16 Aug 2011 17:36:49 +0200
> -Subject: [PATCH] fbgrab: include zlib.h
> -
> -Newer libpng versions do not include zlib.h in their api any more, so if
> -we use symbols from there, we should include zlib.h directly.
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ----
> - fbgrab.c |    1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/fbgrab.c b/fbgrab.c
> -index fc89f5a..0c959f6 100644
> ---- a/fbgrab.c
> -+++ b/fbgrab.c
> -@@ -23,6 +23,7 @@
> - #include <getopt.h>
> - #include <sys/vt.h>   /* to handle vt changing */
> - #include <png.h>      /* PNG lib */
> -+#include <zlib.h>     /* zlib */
> - #include <linux/fb.h> /* to handle framebuffer ioctls */
> - 
> - #define	VERSION	"1.0 beta 1"
> diff --git a/patches/fbgrab-1.0/series b/patches/fbgrab-1.0/series
> deleted file mode 100644
> index 45420ced9d62..000000000000
> --- a/patches/fbgrab-1.0/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-make-makefile-cross-compilation-aware.patch
> -0002-fbgrab-include-zlib.h.patch
> -# 07f6b94abfd5520604fa320ff0fa961c  - git-ptx-patches magic
> 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

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de