Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/5] package/lirc-tools: bump version to 0.9.4
@ 2016-06-19 13:26 Bernd Kuhls
  2016-06-19 13:26 ` [Buildroot] [PATCH 2/5] package/lirc-tools: add optional support for libusb-compat Bernd Kuhls
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Bernd Kuhls @ 2016-06-19 13:26 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...-build-commandir-unless-we-have-usb.h-191.patch | 54 ++++++++++++++++++++++
 package/lirc-tools/lirc-tools.hash                 |  5 +-
 package/lirc-tools/lirc-tools.mk                   |  2 +-
 3 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 package/lirc-tools/0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch

diff --git a/package/lirc-tools/0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch b/package/lirc-tools/0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch
new file mode 100644
index 0000000..a3f2f3b
--- /dev/null
+++ b/package/lirc-tools/0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch
@@ -0,0 +1,54 @@
+From f346045e0f63289909322a3264e69b967a911636 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Tue, 24 May 2016 19:56:09 +0200
+Subject: [PATCH] Don't build commandir unless we have usb.h (#191).
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+(backported from git master:
+ https://sourceforge.net/p/lirc/git/ci/f346045e0f63289909322a3264e69b967a911636/tree/plugins/Makefile.am?diff=4b26eb383291576b3f56820c6cec5f6a75814807)
+---
+ plugins/Makefile.am | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 3bd89ed..2116658 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -14,6 +14,7 @@ EXTRA_DIST                  = pluginlist.am make-pluginlist.sh
+ plugin_LTLIBRARIES          =
+ 
+ if BUILD_USB
++
+ plugin_LTLIBRARIES          += atilibusb.la
+ atilibusb_la_SOURCES        = atilibusb.c
+ atilibusb_la_LDFLAGS        = $(AM_LDFLAGS) @usb_libs@
+@@ -33,6 +34,14 @@ plugin_LTLIBRARIES          += srm7500libusb.la
+ srm7500libusb_la_SOURCES    = srm7500libusb.c
+ srm7500libusb_la_LDFLAGS    = $(AM_LDFLAGS) @usb_libs@
+ srm7500libusb_la_CFLAGS     = $(AM_CFLAGS) $(LIBUSB_CFLAGS)
++
++if !BSD
++plugin_LTLIBRARIES          += commandir.la
++commandir_la_SOURCES        = commandir.c
++commandir_la_LDFLAGS        = $(AM_LDFLAGS) @usb_libs@
++commandir_la_CFLAGS         = $(AM_CFLAGS) $(LIBUSB_CFLAGS)
++endif
++
+ endif
+ 
+ if BUILD_FTDI
+@@ -99,11 +108,6 @@ if !BSD
+ plugin_LTLIBRARIES          += default.la
+ default_la_SOURCES          = default.c
+ 
+-plugin_LTLIBRARIES          += commandir.la
+-commandir_la_SOURCES        = commandir.c
+-commandir_la_LDFLAGS        = $(AM_LDFLAGS) @usb_libs@
+-commandir_la_CFLAGS         = $(AM_CFLAGS) $(LIBUSB_CFLAGS)
+-
+ plugin_LTLIBRARIES          += hiddev.la
+ hiddev_la_SOURCES           = hiddev.c
+ 
+-- 
+2.8.1
+
diff --git a/package/lirc-tools/lirc-tools.hash b/package/lirc-tools/lirc-tools.hash
index 1acd93d..6ab3bbf 100644
--- a/package/lirc-tools/lirc-tools.hash
+++ b/package/lirc-tools/lirc-tools.hash
@@ -1,2 +1,3 @@
-#hash from http://sourceforge.net/projects/lirc/files/LIRC/0.9.3a/
-sha1 a6cadb916e09de068c967055b48c96d79d38f736 lirc-0.9.3a.tar.bz2
+# hash from http://sourceforge.net/projects/lirc/files/LIRC/0.9.4/
+sha1 79d2300b4864ed85d6468d554ac777f39b6740ac lirc-0.9.4.tar.bz2
+md5 da6aca942154256bff696d1ffa3ef646 lirc-0.9.4.tar.bz2
diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk
index 289b9ed..89a29d5 100644
--- a/package/lirc-tools/lirc-tools.mk
+++ b/package/lirc-tools/lirc-tools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIRC_TOOLS_VERSION = 0.9.3a
+LIRC_TOOLS_VERSION = 0.9.4
 LIRC_TOOLS_SOURCE = lirc-$(LIRC_TOOLS_VERSION).tar.bz2
 LIRC_TOOLS_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/$(LIRC_TOOLS_VERSION)
 LIRC_TOOLS_LICENSE = GPLv2+
-- 
2.8.1

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

* [Buildroot] [PATCH 2/5] package/lirc-tools: add optional support for libusb-compat
  2016-06-19 13:26 [Buildroot] [PATCH 1/5] package/lirc-tools: bump version to 0.9.4 Bernd Kuhls
@ 2016-06-19 13:26 ` Bernd Kuhls
  2016-06-19 13:26 ` [Buildroot] [PATCH 3/5] package/lirc-tools: add optional support for udev Bernd Kuhls
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2016-06-19 13:26 UTC (permalink / raw)
  To: buildroot

lirc-tools has optional support for libusb-compat, see configure.ac,
line 199+.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/lirc-tools/lirc-tools.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk
index 89a29d5..20d0912 100644
--- a/package/lirc-tools/lirc-tools.mk
+++ b/package/lirc-tools/lirc-tools.mk
@@ -17,6 +17,10 @@ LIRC_TOOLS_AUTORECONF = YES
 LIRC_TOOLS_CONF_ENV = XSLTPROC=yes
 LIRC_TOOLS_CONF_OPTS = --without-x
 
+ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
+LIRC_TOOLS_DEPENDENCIES += libusb-compat
+endif
+
 define LIRC_TOOLS_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 package/lirc-tools/S25lircd \
 		$(TARGET_DIR)/etc/init.d/S25lircd
-- 
2.8.1

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

* [Buildroot] [PATCH 3/5] package/lirc-tools: add optional support for udev
  2016-06-19 13:26 [Buildroot] [PATCH 1/5] package/lirc-tools: bump version to 0.9.4 Bernd Kuhls
  2016-06-19 13:26 ` [Buildroot] [PATCH 2/5] package/lirc-tools: add optional support for libusb-compat Bernd Kuhls
@ 2016-06-19 13:26 ` Bernd Kuhls
  2016-06-19 13:26 ` [Buildroot] [PATCH 4/5] package/lirc-tools: add optional support for alsa-lib Bernd Kuhls
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2016-06-19 13:26 UTC (permalink / raw)
  To: buildroot

lirc-tools has optional support for udev, see configure.ac, line 303+.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/lirc-tools/lirc-tools.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk
index 20d0912..59d9f69 100644
--- a/package/lirc-tools/lirc-tools.mk
+++ b/package/lirc-tools/lirc-tools.mk
@@ -17,6 +17,10 @@ LIRC_TOOLS_AUTORECONF = YES
 LIRC_TOOLS_CONF_ENV = XSLTPROC=yes
 LIRC_TOOLS_CONF_OPTS = --without-x
 
+ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+LIRC_TOOLS_DEPENDENCIES += udev
+endif
+
 ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
 LIRC_TOOLS_DEPENDENCIES += libusb-compat
 endif
-- 
2.8.1

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

* [Buildroot] [PATCH 4/5] package/lirc-tools: add optional support for alsa-lib
  2016-06-19 13:26 [Buildroot] [PATCH 1/5] package/lirc-tools: bump version to 0.9.4 Bernd Kuhls
  2016-06-19 13:26 ` [Buildroot] [PATCH 2/5] package/lirc-tools: add optional support for libusb-compat Bernd Kuhls
  2016-06-19 13:26 ` [Buildroot] [PATCH 3/5] package/lirc-tools: add optional support for udev Bernd Kuhls
@ 2016-06-19 13:26 ` Bernd Kuhls
  2016-06-19 13:26 ` [Buildroot] [PATCH 5/5] package/lirc-tools: add optional support for portaudio Bernd Kuhls
  2016-06-26 20:54 ` [Buildroot] [PATCH 1/5] package/lirc-tools: bump version to 0.9.4 Thomas Petazzoni
  4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2016-06-19 13:26 UTC (permalink / raw)
  To: buildroot

lirc-tools has optional support for alsa-lib, see configure.ac,
line 230+.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/lirc-tools/lirc-tools.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk
index 59d9f69..88ec2c9 100644
--- a/package/lirc-tools/lirc-tools.mk
+++ b/package/lirc-tools/lirc-tools.mk
@@ -21,6 +21,10 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 LIRC_TOOLS_DEPENDENCIES += udev
 endif
 
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+LIRC_TOOLS_DEPENDENCIES += alsa-lib
+endif
+
 ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
 LIRC_TOOLS_DEPENDENCIES += libusb-compat
 endif
-- 
2.8.1

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

* [Buildroot] [PATCH 5/5] package/lirc-tools: add optional support for portaudio
  2016-06-19 13:26 [Buildroot] [PATCH 1/5] package/lirc-tools: bump version to 0.9.4 Bernd Kuhls
                   ` (2 preceding siblings ...)
  2016-06-19 13:26 ` [Buildroot] [PATCH 4/5] package/lirc-tools: add optional support for alsa-lib Bernd Kuhls
@ 2016-06-19 13:26 ` Bernd Kuhls
  2016-06-26 20:54 ` [Buildroot] [PATCH 1/5] package/lirc-tools: bump version to 0.9.4 Thomas Petazzoni
  4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2016-06-19 13:26 UTC (permalink / raw)
  To: buildroot

lirc-tools has optional support for portaudio, see configure.ac,
line 218+.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/lirc-tools/lirc-tools.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk
index 88ec2c9..69861ab 100644
--- a/package/lirc-tools/lirc-tools.mk
+++ b/package/lirc-tools/lirc-tools.mk
@@ -29,6 +29,10 @@ ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
 LIRC_TOOLS_DEPENDENCIES += libusb-compat
 endif
 
+ifeq ($(BR2_PACKAGE_PORTAUDIO),y)
+LIRC_TOOLS_DEPENDENCIES += portaudio
+endif
+
 define LIRC_TOOLS_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 package/lirc-tools/S25lircd \
 		$(TARGET_DIR)/etc/init.d/S25lircd
-- 
2.8.1

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

* [Buildroot] [PATCH 1/5] package/lirc-tools: bump version to 0.9.4
  2016-06-19 13:26 [Buildroot] [PATCH 1/5] package/lirc-tools: bump version to 0.9.4 Bernd Kuhls
                   ` (3 preceding siblings ...)
  2016-06-19 13:26 ` [Buildroot] [PATCH 5/5] package/lirc-tools: add optional support for portaudio Bernd Kuhls
@ 2016-06-26 20:54 ` Thomas Petazzoni
  4 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2016-06-26 20:54 UTC (permalink / raw)
  To: buildroot

Hello,

On Sun, 19 Jun 2016 15:26:36 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  ...-build-commandir-unless-we-have-usb.h-191.patch | 54 ++++++++++++++++++++++
>  package/lirc-tools/lirc-tools.hash                 |  5 +-
>  package/lirc-tools/lirc-tools.mk                   |  2 +-
>  3 files changed, 58 insertions(+), 3 deletions(-)
>  create mode 100644 package/lirc-tools/0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch

Entire series applied to master. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

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

end of thread, other threads:[~2016-06-26 20:54 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-19 13:26 [Buildroot] [PATCH 1/5] package/lirc-tools: bump version to 0.9.4 Bernd Kuhls
2016-06-19 13:26 ` [Buildroot] [PATCH 2/5] package/lirc-tools: add optional support for libusb-compat Bernd Kuhls
2016-06-19 13:26 ` [Buildroot] [PATCH 3/5] package/lirc-tools: add optional support for udev Bernd Kuhls
2016-06-19 13:26 ` [Buildroot] [PATCH 4/5] package/lirc-tools: add optional support for alsa-lib Bernd Kuhls
2016-06-19 13:26 ` [Buildroot] [PATCH 5/5] package/lirc-tools: add optional support for portaudio Bernd Kuhls
2016-06-26 20:54 ` [Buildroot] [PATCH 1/5] package/lirc-tools: bump version to 0.9.4 Thomas Petazzoni

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