CVS commit: pkgsrc/comms/lirc

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Jun 24 19:01:51 UTC 2019

Modified Files:
        pkgsrc/comms/lirc: Makefile distinfo
        pkgsrc/comms/lirc/patches: patch-daemons_transmit.c
            patch-daemons_transmit.h

Log Message:
lirc: fix build on Arch Linux

* Remove inlining for send_data()
* Add Linux specific missing include for major()
* Bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/comms/lirc/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/comms/lirc/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/lirc/patches/patch-daemons_transmit.c \
    pkgsrc/comms/lirc/patches/patch-daemons_transmit.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/comms/lirc/Makefile
diff -u pkgsrc/comms/lirc/Makefile:1.7 pkgsrc/comms/lirc/Makefile:1.8
--- pkgsrc/comms/lirc/Makefile:1.7      Tue Feb 27 23:56:07 2018
+++ pkgsrc/comms/lirc/Makefile  Mon Jun 24 19:01:51 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2018/02/27 23:56:07 khorben Exp $
+# $NetBSD: Makefile,v 1.8 2019/06/24 19:01:51 triaxx Exp $
 #
 
 DISTNAME=      lirc-0.9.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    comms
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lirc/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/comms/lirc/distinfo
diff -u pkgsrc/comms/lirc/distinfo:1.3 pkgsrc/comms/lirc/distinfo:1.4
--- pkgsrc/comms/lirc/distinfo:1.3      Mon May  2 02:32:14 2016
+++ pkgsrc/comms/lirc/distinfo  Mon Jun 24 19:01:51 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2016/05/02 02:32:14 dholland Exp $
+$NetBSD: distinfo,v 1.4 2019/06/24 19:01:51 triaxx Exp $
 
 SHA1 (lirc-0.9.0.tar.bz2) = 8456bf7101d4f2d31d61c5073357a4981b458581
 RMD160 (lirc-0.9.0.tar.bz2) = d8f1cf3a03573be36787e87adc71beba3e678a37
@@ -6,7 +6,8 @@ SHA512 (lirc-0.9.0.tar.bz2) = e91534c63e
 Size (lirc-0.9.0.tar.bz2) = 857286 bytes
 SHA1 (patch-daemons_config__file.c) = 1a0c581aab83217e02abca7e3080ab8abba74d8c
 SHA1 (patch-daemons_config__file.h) = 5f0e21dc8ceffff9d5d82f05bd92f6dc8041813d
+SHA1 (patch-daemons_hw__default.c) = f25ad50c0f3966904d0e37e47e50e6bc4b40df46
 SHA1 (patch-daemons_receive.c) = 4b2df8f3a954b51dd1df433aabdc515b49ab3e23
 SHA1 (patch-daemons_receive.h) = 82bb820eb9766cec02f20b3b2fbd1f5d7d9b5d68
-SHA1 (patch-daemons_transmit.c) = 53ee2de7599c94945151acae9ec004bbfc1e71fc
-SHA1 (patch-daemons_transmit.h) = e5ffa99809003e1035978d148162cd624c4264c7
+SHA1 (patch-daemons_transmit.c) = c84c913ca0b9c239abff1aebef1be3ae8ae5c25b
+SHA1 (patch-daemons_transmit.h) = 675a52d98db95016fbef2e81400f78fc68ecb66f

Index: pkgsrc/comms/lirc/patches/patch-daemons_transmit.c
diff -u pkgsrc/comms/lirc/patches/patch-daemons_transmit.c:1.1 pkgsrc/comms/lirc/patches/patch-daemons_transmit.c:1.2
--- pkgsrc/comms/lirc/patches/patch-daemons_transmit.c:1.1      Mon May  2 02:32:14 2016
+++ pkgsrc/comms/lirc/patches/patch-daemons_transmit.c  Mon Jun 24 19:01:51 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-daemons_transmit.c,v 1.1 2016/05/02 02:32:14 dholland Exp $
+$NetBSD: patch-daemons_transmit.c,v 1.2 2019/06/24 19:01:51 triaxx Exp $
 
 Patch up gcc inline mess.
 
---- daemons/transmit.c~        2011-03-25 22:28:18.000000000 +0000
+--- daemons/transmit.c.orig    2011-03-25 22:28:18.000000000 +0000
 +++ daemons/transmit.c
 @@ -27,7 +27,7 @@ struct sbuf send_buffer;
  static void send_signals(lirc_t * signals, int n);
@@ -13,3 +13,12 @@ Patch up gcc inline mess.
  {
        (*code) &= ~((((ir_code) 1) << bit));
        (*code) |= ((ir_code) (data ? 1 : 0) << bit);
+@@ -179,7 +179,7 @@ inline void send_trail(struct ir_remote
+       }
+ }
+ 
+-inline void send_data(struct ir_remote *remote, ir_code data, int bits, int done)
++void send_data(struct ir_remote *remote, ir_code data, int bits, int done)
+ {
+       int i;
+       int all_bits = bit_count(remote);
Index: pkgsrc/comms/lirc/patches/patch-daemons_transmit.h
diff -u pkgsrc/comms/lirc/patches/patch-daemons_transmit.h:1.1 pkgsrc/comms/lirc/patches/patch-daemons_transmit.h:1.2
--- pkgsrc/comms/lirc/patches/patch-daemons_transmit.h:1.1      Mon May  2 02:32:14 2016
+++ pkgsrc/comms/lirc/patches/patch-daemons_transmit.h  Mon Jun 24 19:01:51 2019
@@ -1,15 +1,16 @@
-$NetBSD: patch-daemons_transmit.h,v 1.1 2016/05/02 02:32:14 dholland Exp $
+$NetBSD: patch-daemons_transmit.h,v 1.2 2019/06/24 19:01:51 triaxx Exp $
 
 Patch up gcc inline mess.
 
---- daemons/transmit.h~        2011-03-25 22:28:18.000000000 +0000
+--- daemons/transmit.h.orig    2011-03-25 22:28:18.000000000 +0000
 +++ daemons/transmit.h
-@@ -29,7 +29,7 @@ struct sbuf {
+@@ -29,7 +29,8 @@ struct sbuf {
  };
  
  void init_send_buffer(void);
 -inline void set_bit(ir_code * code, int bit, int data);
 +void set_bit(ir_code * code, int bit, int data);
++void send_data(struct ir_remote *remote, ir_code data, int bits, int done);
  int init_send(struct ir_remote *remote, struct ir_ncode *code);
  int init_sim(struct ir_remote *remote, struct ir_ncode *code, int repeat_preset);