From: Koen Martens <gmc@sonologic.nl>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 1/1] package/linuxconsoletools: bump version to 1.7.0
Date: Wed, 20 Nov 2019 17:14:09 +0100 [thread overview]
Message-ID: <20191120161408.GA28902@coltrane> (raw)
This version changed the (optional) dependency from sdl and
sdl-config to sdl2 and pkg-config. Therefore, the patch
0002-sdl-config.patch has been dropped and the dependency
has been changed to BR2_PACKAGE_SDL2.
Since SDL2 (required to build force-feedback utilities)
requires shared library support to compile, a dependency
on !BR2_STATIC_LIBS was added to the configuration option
that enables force-feedback utilities.
Signed-off-by: Koen Martens <gmc@sonologic.nl>
---
.../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..614099fdee 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..f26d874d96 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="$(TARGET_CFLAGS) -std=gnu99"
+LINUXCONSOLETOOLS_DEPENDENCIES += sdl2 host-pkgconf
endif
define LINUXCONSOLETOOLS_BUILD_CMDS
--
2.17.1
next reply other threads:[~2019-11-20 16:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 16:14 Koen Martens [this message]
2019-11-20 21:32 ` [Buildroot] [PATCH v3 1/1] package/linuxconsoletools: bump version to 1.7.0 Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191120161408.GA28902@coltrane \
--to=gmc@sonologic.nl \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.