* [ptxdist] [PATCH 1/2] fbgrab: remove from staging @ 2020-04-08 10:56 Roland Hieber 2020-04-08 10:56 ` [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1 Roland Hieber 0 siblings, 1 reply; 8+ messages in thread From: Roland Hieber @ 2020-04-08 10:56 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- rules/fbgrab.in | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/rules/fbgrab.in b/rules/fbgrab.in index dfa83fa4e477..909b10da38bd 100644 --- a/rules/fbgrab.in +++ b/rules/fbgrab.in @@ -1,6 +1,4 @@ -## SECTION=staging -## old section: -### SECTION=multimedia_framebuffer +# SECTION=multimedia_framebuffer config FBGRAB select LIBPNG @@ -11,7 +9,3 @@ config FBGRAB linux framebuffer and converting it to a png-picture. For details see: https://github.com/GunnarMonell/fbgrab - - STAGING: remove in ptxdist-2021.04.0 - Old version, broken download and obsolete. There is a new version - on gitub that could be used. -- 2.26.0.rc2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1 2020-04-08 10:56 [ptxdist] [PATCH 1/2] fbgrab: remove from staging Roland Hieber @ 2020-04-08 10:56 ` Roland Hieber 2020-04-08 11:48 ` Michael Olbrich 2020-04-09 8:23 ` Ladislav Michl 0 siblings, 2 replies; 8+ messages in thread From: Roland Hieber @ 2020-04-08 10:56 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber, Felicitas Jung 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1 2020-04-08 10:56 ` [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1 Roland Hieber @ 2020-04-08 11:48 ` Michael Olbrich 2020-04-09 8:23 ` Ladislav Michl 1 sibling, 0 replies; 8+ messages in thread From: Michael Olbrich @ 2020-04-08 11:48 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber, Felicitas Jung On Wed, Apr 08, 2020 at 12:56:40PM +0200, Roland Hieber wrote: > 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. There are patches for the old version. Michael > 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 > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1 2020-04-08 10:56 ` [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1 Roland Hieber 2020-04-08 11:48 ` Michael Olbrich @ 2020-04-09 8:23 ` Ladislav Michl 2020-04-09 9:15 ` Roland Hieber 1 sibling, 1 reply; 8+ messages in thread From: Ladislav Michl @ 2020-04-09 8:23 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber, Felicitas Jung On Wed, Apr 08, 2020 at 12:56:40PM +0200, Roland Hieber wrote: > The old URL is broken, but the new GitHub project doesn't have the old > releases, so bump the version. What about reordering patches, just in case someone does bisecting? This way package is pulled from staging, but still broken... > 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 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1 2020-04-09 8:23 ` Ladislav Michl @ 2020-04-09 9:15 ` Roland Hieber 2020-04-09 12:41 ` Ladislav Michl 0 siblings, 1 reply; 8+ messages in thread From: Roland Hieber @ 2020-04-09 9:15 UTC (permalink / raw) To: ptxdist On Thu, Apr 09, 2020 at 10:23:26AM +0200, Ladislav Michl wrote: > On Wed, Apr 08, 2020 at 12:56:40PM +0200, Roland Hieber wrote: > > The old URL is broken, but the new GitHub project doesn't have the old > > releases, so bump the version. > > What about reordering patches, just in case someone does bisecting? > This way package is pulled from staging, but still broken... It was already broken before moving it out of staging, so that single patch shouldn't do much difference for bisecting. - Roland -- Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1 2020-04-09 9:15 ` Roland Hieber @ 2020-04-09 12:41 ` Ladislav Michl 2020-04-09 12:54 ` Roland Hieber 0 siblings, 1 reply; 8+ messages in thread From: Ladislav Michl @ 2020-04-09 12:41 UTC (permalink / raw) To: ptxdist On Thu, Apr 09, 2020 at 11:15:33AM +0200, Roland Hieber wrote: > On Thu, Apr 09, 2020 at 10:23:26AM +0200, Ladislav Michl wrote: > > On Wed, Apr 08, 2020 at 12:56:40PM +0200, Roland Hieber wrote: > > > The old URL is broken, but the new GitHub project doesn't have the old > > > releases, so bump the version. > > > > What about reordering patches, just in case someone does bisecting? > > This way package is pulled from staging, but still broken... > > It was already broken before moving it out of staging, so that single Sure, that's why it was moved to staging. > patch shouldn't do much difference for bisecting. That "much difference" above is read as "create _yet_ another point of brokeness" ;-) ladis _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1 2020-04-09 12:41 ` Ladislav Michl @ 2020-04-09 12:54 ` Roland Hieber 2020-04-09 13:12 ` Michael Olbrich 0 siblings, 1 reply; 8+ messages in thread From: Roland Hieber @ 2020-04-09 12:54 UTC (permalink / raw) To: Ladislav Michl; +Cc: ptxdist On Thu, Apr 09, 2020 at 02:41:30PM +0200, Ladislav Michl wrote: > On Thu, Apr 09, 2020 at 11:15:33AM +0200, Roland Hieber wrote: > > On Thu, Apr 09, 2020 at 10:23:26AM +0200, Ladislav Michl wrote: > > > On Wed, Apr 08, 2020 at 12:56:40PM +0200, Roland Hieber wrote: > > > > The old URL is broken, but the new GitHub project doesn't have the old > > > > releases, so bump the version. > > > > > > What about reordering patches, just in case someone does bisecting? > > > This way package is pulled from staging, but still broken... > > > > It was already broken before moving it out of staging, so that single > > Sure, that's why it was moved to staging. > > > patch shouldn't do much difference for bisecting. > > That "much difference" above is read as "create _yet_ another point of > brokeness" ;-) In principle I agree with you, but I only saw your comment after sending out the v2. Maybe mol can fix it up during applying. - Roland -- Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1 2020-04-09 12:54 ` Roland Hieber @ 2020-04-09 13:12 ` Michael Olbrich 0 siblings, 0 replies; 8+ messages in thread From: Michael Olbrich @ 2020-04-09 13:12 UTC (permalink / raw) To: ptxdist On Thu, Apr 09, 2020 at 02:54:19PM +0200, Roland Hieber wrote: > On Thu, Apr 09, 2020 at 02:41:30PM +0200, Ladislav Michl wrote: > > On Thu, Apr 09, 2020 at 11:15:33AM +0200, Roland Hieber wrote: > > > On Thu, Apr 09, 2020 at 10:23:26AM +0200, Ladislav Michl wrote: > > > > On Wed, Apr 08, 2020 at 12:56:40PM +0200, Roland Hieber wrote: > > > > > The old URL is broken, but the new GitHub project doesn't have the old > > > > > releases, so bump the version. > > > > > > > > What about reordering patches, just in case someone does bisecting? > > > > This way package is pulled from staging, but still broken... > > > > > > It was already broken before moving it out of staging, so that single > > > > Sure, that's why it was moved to staging. > > > > > patch shouldn't do much difference for bisecting. > > > > That "much difference" above is read as "create _yet_ another point of > > brokeness" ;-) > > In principle I agree with you, but I only saw your comment after sending > out the v2. Maybe mol can fix it up during applying. I'll apply the patches in the correct order. Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-04-09 13:12 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-04-08 10:56 [ptxdist] [PATCH 1/2] fbgrab: remove from staging Roland Hieber 2020-04-08 10:56 ` [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1 Roland Hieber 2020-04-08 11:48 ` Michael Olbrich 2020-04-09 8:23 ` Ladislav Michl 2020-04-09 9:15 ` Roland Hieber 2020-04-09 12:41 ` Ladislav Michl 2020-04-09 12:54 ` Roland Hieber 2020-04-09 13:12 ` Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox