[Buildroot] [PATCH v2 1/1] package/linuxconsoletools: bump version to 1.7.0

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH v2 1/1] package/linuxconsoletools: bump version to 1.7.0
@ 2019-11-17 13:59 Koen Martens
  2019-11-18 21:38 ` Thomas Petazzoni
  2019-11-18 21:39 ` Thomas Petazzoni
  0 siblings, 2 replies; 8+ messages in thread
From: Koen Martens @ 2019-11-17 13:59 UTC (permalink / raw)
  To: buildroot

This version changed the (optional) dependency from sdl and
sdl-config to sdl2 and pkg-config. Therefore, the patch that
provided the correct path to sdl-config has been dropped and
the dependency has been changed to BR2_PACKAGE_SDL2.

Somehow, SDL2 fails to build without shared library support,
but this is not explicitly depended on by SDL2, therefore
a dependency to BR2_SHARED_LIBS was added to the force-
feedback utility configuration option.

Signed-off-by: Koen Martens <gmc@sonologic.nl>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 .../linuxconsoletools/0002-sdl-config.patch   | 20 -------------------
 package/linuxconsoletools/Config.in           |  6 +++++-
 .../linuxconsoletools/linuxconsoletools.hash  |  2 +-
 .../linuxconsoletools/linuxconsoletools.mk    |  6 +++---
 4 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 package/linuxconsoletools/0002-sdl-config.patch

diff --git a/package/linuxconsoletools/0002-sdl-config.patch b/package/linuxconsoletools/0002-sdl-config.patch
deleted file mode 100644
index c19c274a83..0000000000
--- a/package/linuxconsoletools/0002-sdl-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Specify sdl-config to use instead of using host sdl-config.
-
-Signed-off-by: Koen Martens <gmc@sonologic.nl>
-
-diff -Naur a/utils/Makefile b/utils/Makefile
---- a/utils/Makefile	2017-06-16 18:48:28.402824790 +0200
-+++ b/utils/Makefile	2017-06-16 18:48:53.898696647 +0200
-@@ -69,10 +69,10 @@
- 	$(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) -lm -o $@
- 
- ffmvforce.o: ffmvforce.c
--	$(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `sdl-config --cflags`
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `${SDL_CONFIG} --cflags`
- 
- ffmvforce: ffmvforce.o
--	$(CC) $^ -o $@ $(LDFLAGS) -g -lm `sdl-config --libs`
-+	$(CC) $^ -o $@ $(LDFLAGS) -g -lm `${SDL_CONFIG} --libs`
- 
- axbtnmap.o: axbtnmap.c axbtnmap.h
- 
diff --git a/package/linuxconsoletools/Config.in b/package/linuxconsoletools/Config.in
index 76150278ae..68e31b81b2 100644
--- a/package/linuxconsoletools/Config.in
+++ b/package/linuxconsoletools/Config.in
@@ -28,9 +28,13 @@ config BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK
 
 config BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK
 	bool "force-feedback utilities"
-	select BR2_PACKAGE_SDL
+	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_SDL2
 	help
 	  Build force-feedback driver utilities (fftest,
 	  ffmvforce, ffset, ffcfstress).
 
+comment "force-feedback utilities need a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
 endif
diff --git a/package/linuxconsoletools/linuxconsoletools.hash b/package/linuxconsoletools/linuxconsoletools.hash
index d1bb5a39ef..caacf70e45 100644
--- a/package/linuxconsoletools/linuxconsoletools.hash
+++ b/package/linuxconsoletools/linuxconsoletools.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	e9d6b05a6c57c7eb3ec7f9f017f46b20e4b55d5a02f930eff1823a13921c5934	linuxconsoletools-1.6.1.tar.bz2
+sha256	95d112f06393806116341d593bda002c8bc44119c1538407623268fed90d8c34	linuxconsoletools-1.7.0.tar.bz2
 sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643	COPYING
diff --git a/package/linuxconsoletools/linuxconsoletools.mk b/package/linuxconsoletools/linuxconsoletools.mk
index b22e136d33..ac8c7805ce 100644
--- a/package/linuxconsoletools/linuxconsoletools.mk
+++ b/package/linuxconsoletools/linuxconsoletools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LINUXCONSOLETOOLS_VERSION = 1.6.1
+LINUXCONSOLETOOLS_VERSION = 1.7.0
 LINUXCONSOLETOOLS_SOURCE = linuxconsoletools-$(LINUXCONSOLETOOLS_VERSION).tar.bz2
 LINUXCONSOLETOOLS_SITE = https://downloads.sourceforge.net/project/linuxconsole
 LINUXCONSOLETOOLS_LICENSE = GPL-2.0+
@@ -21,8 +21,8 @@ endif
 ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK),y)
 LINUXCONSOLETOOLS_MAKE_OPTS += \
 	ENABLE_FORCEFEEDBACK=1 \
-	SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
-LINUXCONSOLETOOLS_DEPENDENCIES += sdl
+	CFLAGS="--std=gnu99"
+LINUXCONSOLETOOLS_DEPENDENCIES += sdl2 host-pkgconf
 endif
 
 define LINUXCONSOLETOOLS_BUILD_CMDS
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 1/1] package/linuxconsoletools: bump version to 1.7.0
  2019-11-17 13:59 [Buildroot] [PATCH v2 1/1] package/linuxconsoletools: bump version to 1.7.0 Koen Martens
@ 2019-11-18 21:38 ` Thomas Petazzoni
       [not found]   ` <20191119064433.GB32125@coltrane>
  2019-11-18 21:39 ` Thomas Petazzoni
  1 sibling, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2019-11-18 21:38 UTC (permalink / raw)
  To: buildroot

Hello Koen,

Thanks for your contribution and this new version of your patch!

On Sun, 17 Nov 2019 14:59:13 +0100
Koen Martens <gmc@sonologic.nl> wrote:

> This version changed the (optional) dependency from sdl and
> sdl-config to sdl2 and pkg-config. Therefore, the patch that
> provided the correct path to sdl-config has been dropped and
> the dependency has been changed to BR2_PACKAGE_SDL2.
> 
> Somehow, SDL2 fails to build without shared library support,
> but this is not explicitly depended on by SDL2,

I don't understand why you say that, because:

config BR2_PACKAGE_SDL2
        bool "sdl2"
        depends on !BR2_STATIC_LIBS

> therefore
> a dependency to BR2_SHARED_LIBS was added to the force-
> feedback utility configuration option.

The reason you have to do this is because a "select" is "stronger" than
a "depends on", so if you "select BR2_PACKAGE_SDL2", the depends on of
BR2_PACKAGE_SDL2 on !BR2_STATIC_LIBS is ignored, and that's why you
have to replicate this depends on !BR2_STATIC_LIBS.

> -LINUXCONSOLETOOLS_VERSION = 1.6.1
> +LINUXCONSOLETOOLS_VERSION = 1.7.0
>  LINUXCONSOLETOOLS_SOURCE = linuxconsoletools-$(LINUXCONSOLETOOLS_VERSION).tar.bz2
>  LINUXCONSOLETOOLS_SITE = https://downloads.sourceforge.net/project/linuxconsole
>  LINUXCONSOLETOOLS_LICENSE = GPL-2.0+
> @@ -21,8 +21,8 @@ endif
>  ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK),y)
>  LINUXCONSOLETOOLS_MAKE_OPTS += \
>  	ENABLE_FORCEFEEDBACK=1 \
> -	SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
> -LINUXCONSOLETOOLS_DEPENDENCIES += sdl
> +	CFLAGS="--std=gnu99"

This looks wrong because you're no longer passing TARGET_CFLAGS, so
this should be:

	CFLAGS="$(TARGET_CFLAGS) -std=gnu99"

(I think the option is -std, not --std).

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

[parent not found: <20191119064433.GB32125@coltrane>]

* [Buildroot] [PATCH v2 1/1] package/linuxconsoletools: bump version to 1.7.0
       [not found]   ` <20191119064433.GB32125@coltrane>
@ 2019-11-19  8:12     ` Thomas Petazzoni
  2019-11-19  9:49       ` Koen Martens
  2019-11-19 20:01       ` Koen Martens
  0 siblings, 2 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2019-11-19  8:12 UTC (permalink / raw)
  To: buildroot

Hello Koen,

On Tue, 19 Nov 2019 07:44:33 +0100
Koen Martens <gmc@sonologic.nl> wrote:

> > I don't understand why you say that, because:
> > 
> > config BR2_PACKAGE_SDL2
> >         bool "sdl2"
> >         depends on !BR2_STATIC_LIBS  
> 
> Well, it doesn't pick up that dependency is what i meant, so i need
> to depend on it in this package explicitly as well.

OK, I guess I was confused by the formulation. Having to replicate
those "depends on" is perfectly normal in the context of Buildroot, but
your commit log made it sound like there was something unusual.

> > This looks wrong because you're no longer passing TARGET_CFLAGS, so
> > this should be:
> > 
> > 	CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
> > 
> > (I think the option is -std, not --std).  
> 
> I'll see if I can find some time to address your comments. Might be a week
> or two before I find the time.

OK, then I'll guess I'll try to apply the patch and do the fixup
locally. Of course, I'll notify you if I do that.

> Meanwhile, I'm unsubscribing from the list again since it is just too
> much. I'll resubscribe when I have a new patch ready.

You don't have to unsubscribe each time: you can switch to nomail mode,
i.e a mode where you are subscribed to the mailing list, but you do not
receive all the e-mails. This allows you to send patches whenever you
want, without being flooded by the admittedly significant mailing list
traffic. Since we always Cc: contributors when replying to their
patches, you would receive our replies even if you're in nomail mode.
Just login to the mailman web interface, and you will be able to switch
to nomail.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 1/1] package/linuxconsoletools: bump version to 1.7.0
  2019-11-19  8:12     ` Thomas Petazzoni
@ 2019-11-19  9:49       ` Koen Martens
  2019-11-19 20:01       ` Koen Martens
  1 sibling, 0 replies; 8+ messages in thread
From: Koen Martens @ 2019-11-19  9:49 UTC (permalink / raw)
  To: buildroot

On 2019-11-19 09:12, Thomas Petazzoni wrote:
> Hello Koen,
> 
> On Tue, 19 Nov 2019 07:44:33 +0100
> Koen Martens <gmc@sonologic.nl> wrote:
> 
>> > I don't understand why you say that, because:
>> >
>> > config BR2_PACKAGE_SDL2
>> >         bool "sdl2"
>> >         depends on !BR2_STATIC_LIBS
>> 
>> Well, it doesn't pick up that dependency is what i meant, so i need
>> to depend on it in this package explicitly as well.
> 
> OK, I guess I was confused by the formulation. Having to replicate
> those "depends on" is perfectly normal in the context of Buildroot, but
> your commit log made it sound like there was something unusual.

That is probably because I was a bit confused by the behaviour, given 
that
I'm not a Kconfig guru. Arnout explained it to me, and I understand it
better now. I'll see about rewording the commit message.

>> > This looks wrong because you're no longer passing TARGET_CFLAGS, so
>> > this should be:
>> >
>> > 	CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
>> >
>> > (I think the option is -std, not --std).
>> 
>> I'll see if I can find some time to address your comments. Might be a 
>> week
>> or two before I find the time.
> 
> OK, then I'll guess I'll try to apply the patch and do the fixup
> locally. Of course, I'll notify you if I do that.

I don't think there is any hurry, the update doesn't introduce any 
spectacular
new features or bugfixes, so it can wait. You're probably busy enough as 
it is.
I'll see if I can expedite things a bit.

>> Meanwhile, I'm unsubscribing from the list again since it is just too
>> much. I'll resubscribe when I have a new patch ready.
> 
> You don't have to unsubscribe each time: you can switch to nomail mode,
> i.e a mode where you are subscribed to the mailing list, but you do not
> receive all the e-mails. This allows you to send patches whenever you
> want, without being flooded by the admittedly significant mailing list
> traffic. Since we always Cc: contributors when replying to their
> patches, you would receive our replies even if you're in nomail mode.
> Just login to the mailman web interface, and you will be able to switch
> to nomail.

Ah thanks, that's an excellent suggestion. I'm a bit out of practice 
with this
whole mailman thing.

Cheers,

Koen

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 1/1] package/linuxconsoletools: bump version to 1.7.0
  2019-11-19  8:12     ` Thomas Petazzoni
  2019-11-19  9:49       ` Koen Martens
@ 2019-11-19 20:01       ` Koen Martens
  1 sibling, 0 replies; 8+ messages in thread
From: Koen Martens @ 2019-11-19 20:01 UTC (permalink / raw)
  To: buildroot



On 19 November 2019 09:12:57 CET, Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
>Hello Koen,
>
>
>> I'll see if I can find some time to address your comments. Might be a
>week
>> or two before I find the time.
>
>OK, then I'll guess I'll try to apply the patch and do the fixup
>locally. Of course, I'll notify you if I do that.

Managed to arrange to work from home tomorrow, which saves me 2 hours, so will look at this tomorrow

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 1/1] package/linuxconsoletools: bump version to 1.7.0
  2019-11-17 13:59 [Buildroot] [PATCH v2 1/1] package/linuxconsoletools: bump version to 1.7.0 Koen Martens
  2019-11-18 21:38 ` Thomas Petazzoni
@ 2019-11-18 21:39 ` Thomas Petazzoni
  2019-11-19  6:42   ` Koen Martens
  1 sibling, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2019-11-18 21:39 UTC (permalink / raw)
  To: buildroot

On Sun, 17 Nov 2019 14:59:13 +0100
Koen Martens <gmc@sonologic.nl> wrote:

> This version changed the (optional) dependency from sdl and
> sdl-config to sdl2 and pkg-config. Therefore, the patch that
> provided the correct path to sdl-config has been dropped and
> the dependency has been changed to BR2_PACKAGE_SDL2.
> 
> Somehow, SDL2 fails to build without shared library support,
> but this is not explicitly depended on by SDL2, therefore
> a dependency to BR2_SHARED_LIBS was added to the force-
> feedback utility configuration option.
> 
> Signed-off-by: Koen Martens <gmc@sonologic.nl>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
>  .../linuxconsoletools/0002-sdl-config.patch   | 20 -------------------

Minor additional nit: ideally the commit log should explain why this
patch is dropped.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 1/1] package/linuxconsoletools: bump version to 1.7.0
  2019-11-18 21:39 ` Thomas Petazzoni
@ 2019-11-19  6:42   ` Koen Martens
  2019-11-19  8:10     ` Thomas Petazzoni
  0 siblings, 1 reply; 8+ messages in thread
From: Koen Martens @ 2019-11-19  6:42 UTC (permalink / raw)
  To: buildroot

On Mon, Nov 18, 2019 at 10:39:39PM +0100, Thomas Petazzoni wrote:
> On Sun, 17 Nov 2019 14:59:13 +0100
> Koen Martens <gmc@sonologic.nl> wrote:
> > This version changed the (optional) dependency from sdl and
> > sdl-config to sdl2 and pkg-config. Therefore, the patch that
> > provided the correct path to sdl-config has been dropped and
> > the dependency has been changed to BR2_PACKAGE_SDL2.
> > 
> > Somehow, SDL2 fails to build without shared library support,
> > but this is not explicitly depended on by SDL2, therefore
> > a dependency to BR2_SHARED_LIBS was added to the force-
> > feedback utility configuration option.
> > 
> > Signed-off-by: Koen Martens <gmc@sonologic.nl>
> > Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> > ---
> >  .../linuxconsoletools/0002-sdl-config.patch   | 20 -------------------
> 
> Minor additional nit: ideally the commit log should explain why this
> patch is dropped.

It does, please read the first paragraph.

Koen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20191119/cb32fa3e/attachment.asc>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH v2 1/1] package/linuxconsoletools: bump version to 1.7.0
  2019-11-19  6:42   ` Koen Martens
@ 2019-11-19  8:10     ` Thomas Petazzoni
  0 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2019-11-19  8:10 UTC (permalink / raw)
  To: buildroot

On Tue, 19 Nov 2019 07:42:11 +0100
Koen Martens <gmc@sonologic.nl> wrote:

> On Mon, Nov 18, 2019 at 10:39:39PM +0100, Thomas Petazzoni wrote:
> > On Sun, 17 Nov 2019 14:59:13 +0100
> > Koen Martens <gmc@sonologic.nl> wrote:  
> > > This version changed the (optional) dependency from sdl and
> > > sdl-config to sdl2 and pkg-config. Therefore, the patch that
> > > provided the correct path to sdl-config has been dropped and
> > > the dependency has been changed to BR2_PACKAGE_SDL2.
> > > 
> > > Somehow, SDL2 fails to build without shared library support,
> > > but this is not explicitly depended on by SDL2, therefore
> > > a dependency to BR2_SHARED_LIBS was added to the force-
> > > feedback utility configuration option.
> > > 
> > > Signed-off-by: Koen Martens <gmc@sonologic.nl>
> > > Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> > > ---
> > >  .../linuxconsoletools/0002-sdl-config.patch   | 20 -------------------  
> > 
> > Minor additional nit: ideally the commit log should explain why this
> > patch is dropped.  
> 
> It does, please read the first paragraph.

Indeed, my bad, sorry about that.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2019-11-19 20:01 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-17 13:59 [Buildroot] [PATCH v2 1/1] package/linuxconsoletools: bump version to 1.7.0 Koen Martens
2019-11-18 21:38 ` Thomas Petazzoni
     [not found]   ` <20191119064433.GB32125@coltrane>
2019-11-19  8:12     ` Thomas Petazzoni
2019-11-19  9:49       ` Koen Martens
2019-11-19 20:01       ` Koen Martens
2019-11-18 21:39 ` Thomas Petazzoni
2019-11-19  6:42   ` Koen Martens
2019-11-19  8:10     ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox