cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with -fno-common

Browse Source 
While here add license and regenerate all patches with make makepatch.
This commit is contained in:
Stefan Eßer 2020-09-21 15:03:43 +00:00
parent 0a37dcf8fa
commit 2380a3cfc5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=549449
22 changed files with 1598 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
comms/lirc/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= lirc
PORTVERSION= 0.9.0
PORTREVISION= 10
PORTREVISION= 11
PORTEPOCH= 1
CATEGORIES= comms
MASTER_SITES= SF/${PORTNAME}/LIRC/${PORTVERSION}
@ -11,6 +11,9 @@ MASTER_SITES= SF/${PORTNAME}/LIRC/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Linux Infrared Remote Control
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
USES= alias autoreconf gmake libtool localbase python tar:bzip2 xorg
@ -28,9 +31,10 @@ PORTDOCS= html images irxevent.keys lirc.css lirc.hwdb
PORTEXAMPLES= remotes
SUB_FILES= pkg-message lircd.conf
# SMODE2 requires svgalib which is only available on x86
OPTIONS_DEFINE= MINIMAL DEBUG UARTLIRC DOCS EXAMPLES
OPTIONS_DEFINE_i386= SMODE2 # requires svgalib which is...
OPTIONS_DEFINE_amd64= SMODE2 # ...only available on x86
OPTIONS_DEFINE_i386= SMODE2
OPTIONS_DEFINE_amd64= SMODE2
OPTIONS_SUB= yes
MINIMAL_DESC= Build with minimal dependencies

115
comms/lirc/files/patch-configure.ac
View File

@ -1,4 +1,4 @@
--- configure.ac.orig
--- configure.ac.orig 2011-03-25 22:28:18 UTC
+++ configure.ac
@@ -97,6 +97,14 @@ case "${host_os}" in
devdir_default="/usr/lirc/dev/"
@ -15,7 +15,7 @@
*)
dnl Unix OSS configuration
@@ -318,70 +326,22 @@ AH_TEMPLATE([SYSCONFDIR],
@@ -310,70 +318,22 @@ AH_TEMPLATE([SYSCONFDIR],
AH_TEMPLATE([USE_SYSLOG],
[define if you want to log to syslog instead of logfile])
@ -90,7 +90,7 @@
dnl dev_input driver requires linux input device api
AC_CHECK_HEADERS(linux/input.h,[
AC_DEFINE(HAVE_LINUX_DEVINPUT)
@@ -411,17 +371,18 @@ AC_CHECK_HEADERS([linux/hiddev.h],[
@@ -403,17 +363,18 @@ AC_CHECK_HEADERS([linux/hiddev.h],[
#endif
]
)
@ -114,3 +114,112 @@
dnl here we see what driver the user wants.
@@ -498,8 +459,8 @@ if test "$driver" = "userspace" -o "$driver" = "all";
;;
atilibusb)
hw_module="${hw_module} hw_atilibusb.o receive.o"
- atilibusb_lib=`${LIBUSB_CONFIG} --libs`
- CFLAGS="$CFLAGS `${LIBUSB_CONFIG} --cflags`"
+ atilibusb_lib=-lusb
+ CFLAGS="$CFLAGS "
;;
atwf83)
hw_module="${hw_module} hw_atwf83.o"
@@ -515,8 +476,8 @@ if test "$driver" = "userspace" -o "$driver" = "all";
;;
awlibusb)
hw_module="${hw_module} hw_awlibusb.o receive.o"
- awlibusb_lib=`${LIBUSB_CONFIG} --libs`
- CFLAGS="$CFLAGS `${LIBUSB_CONFIG} --cflags`"
+ awlibusb_lib=-lusb
+ CFLAGS="$CFLAGS "
;;
bte)
hw_module="${hw_module} hw_bte.o serial.o"
@@ -536,16 +497,16 @@ if test "$driver" = "userspace" -o "$driver" = "all";
;;
commandir)
hw_module="${hw_module} hw_commandir.o receive.o"
- commandir_lib=`${LIBUSB_CONFIG} --libs`
- CFLAGS="$CFLAGS `${LIBUSB_CONFIG} --cflags`"
+ commandir_lib=-lusb
+ CFLAGS="$CFLAGS "
;;
devinput)
hw_module="${hw_module} hw_devinput.o"
;;
dfclibusb)
hw_module="${hw_module} hw_dfclibusb.o receive.o"
- dfclibusb_lib=`${LIBUSB_CONFIG} --libs`
- CFLAGS="$CFLAGS `${LIBUSB_CONFIG} --cflags`"
+ dfclibusb_lib=-lusb
+ CFLAGS="$CFLAGS "
;;
dsp)
hw_module="${hw_module} hw_dsp.o receive.o"
@@ -665,8 +626,8 @@ if test "$driver" = "userspace" -o "$driver" = "all";
#;;
srm7500libusb)
hw_module="${hw_module} hw_srm7500libusb.o receive.o"
- srm7500libusb_lib=`${LIBUSB_CONFIG} --libs`
- CFLAGS="$CFLAGS `${LIBUSB_CONFIG} --cflags`"
+ srm7500libusb_lib=-lusb
+ CFLAGS="$CFLAGS "
;;
tira|tira_raw)
hw_module="${hw_module} hw_tira.o receive.o transmit.o"
@@ -758,8 +719,8 @@ if test "$driver" = "atilibusb"; then
HW_DEFAULT="hw_atilibusb"
lircd_conf="atiusb/lircd.conf.atilibusb"
if test -n "${LIBUSB_CONFIG}"; then
- atilibusb_lib=`${LIBUSB_CONFIG} --libs`
- CFLAGS="$CFLAGS `${LIBUSB_CONFIG} --cflags`"
+ atilibusb_lib=-lusb
+ CFLAGS="$CFLAGS "
fi
fi
@@ -777,8 +738,8 @@ if test "$driver" = "awlibusb"; then
HW_DEFAULT="hw_awlibusb"
lircd_conf="awlibusb/lircd.conf.awlibusb"
if test -n "${LIBUSB_CONFIG}"; then
- awlibusb_lib=`${LIBUSB_CONFIG} --libs`
- CFLAGS="$CFLAGS `${LIBUSB_CONFIG} --cflags`"
+ awlibusb_lib=-lusb
+ CFLAGS="$CFLAGS "
fi
fi
@@ -893,8 +854,8 @@ if test "$driver" = "commandir"; then
lircd_conf="hauppauge/lircd.conf.hauppauge"
lircmd_conf="hauppauge/lircmd.conf.hauppauge"
if test -n "${LIBUSB_CONFIG}"; then
- commandir_lib=`${LIBUSB_CONFIG} --libs`
- CFLAGS="$CFLAGS `${LIBUSB_CONFIG} --cflags`"
+ commandir_lib=-lusb
+ CFLAGS="$CFLAGS "
fi
fi
@@ -931,8 +892,8 @@ if test "$driver" = "dfclibusb"; then
hw_module="hw_dfclibusb.o receive.o"
HW_DEFAULT="hw_dfclibusb"
if test -n "${LIBUSB_CONFIG}"; then
- dfclibusb_lib=`${LIBUSB_CONFIG} --libs`
- CFLAGS="$CFLAGS `${LIBUSB_CONFIG} --cflags`"
+ dfclibusb_lib=-lusb
+ CFLAGS="$CFLAGS "
fi
fi
@@ -1332,8 +1293,8 @@ if test "$driver" = "srm7500libusb"; then
HW_DEFAULT="hw_srm7500libusb"
lircd_conf="philips/lircd.conf.srm7500libusb"
if test -n "${LIBUSB_CONFIG}"; then
- srm7500libusb_lib=`${LIBUSB_CONFIG} --libs`
- CFLAGS="$CFLAGS `${LIBUSB_CONFIG} --cflags`"
+ srm7500libusb_lib=-lusb
+ CFLAGS="$CFLAGS "
fi
fi

2
comms/lirc/files/patch-daemons-Makefile.am → comms/lirc/files/patch-daemons_Makefile.am
View File

@ -1,4 +1,4 @@
--- daemons/Makefile.am.orig
--- daemons/Makefile.am.orig 2011-03-25 22:28:18 UTC
+++ daemons/Makefile.am
@@ -83,7 +83,7 @@ irrecord_SOURCES = irrecord.c \
transmit.c transmit.h

1363
comms/lirc/files/patch-daemons_Makefile.in Normal file
View File

File diff suppressed because it is too large Load Diff

11
comms/lirc/files/patch-daemons__Makefile.in
View File

@ -1,11 +0,0 @@
--- daemons/Makefile.in.orig
+++ daemons/Makefile.in
@@ -1108,8 +1108,6 @@ uninstall-am: uninstall-binPROGRAMS unin
@SANDBOXED_FALSE@@USE_FIFOS_FALSE@uninstall-local: rmdev
install-data-local:
- test "$(lircd_conf)" = "" || test -e $(DESTDIR)$(sysconfdir)/$(PACKAGE)/lircd.conf || ($(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lirc && $(INSTALL_DATA) $(top_srcdir)/remotes/$(lircd_conf) $(DESTDIR)$(sysconfdir)/$(PACKAGE)/lircd.conf)
- test "$(lircmd_conf)" = "" || test -e $(DESTDIR)$(sysconfdir)/$(PACKAGE)/lircmd.conf || ($(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lirc && $(INSTALL_DATA) $(top_srcdir)/remotes/$(lircmd_conf) $(DESTDIR)$(sysconfdir)/$(PACKAGE)/lircmd.conf)
mkdev:
test -e $(DESTDIR)$(varrundir)/$(PACKAGE)/lircd || ($(mkinstalldirs) $(DESTDIR)$(varrundir)/lirc && @mknod@ $(DESTDIR)$(varrundir)/$(PACKAGE)/lircd p)

6
comms/lirc/files/patch-daemons__dump_config.c → comms/lirc/files/patch-daemons_dump__config.c
View File

@ -1,6 +1,6 @@
--- daemons/dump_config.c.orig
--- daemons/dump_config.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/dump_config.c
@@ -120,11 +120,11 @@ void fprint_remote_head(FILE * f, struct
@@ -120,11 +120,11 @@ void fprint_remote_head(FILE * f, struct ir_remote *re
if (!is_raw(rem)) {
if (rem->pre_data_bits > 0) {
fprintf(f, " pre_data_bits %d\n", rem->pre_data_bits);
@ -14,7 +14,7 @@
}
if (rem->pre_p != 0 && rem->pre_s != 0) {
fprintf(f, " pre %5u %5u\n", (__u32) rem->pre_p, (__u32) rem->pre_s);
@@ -151,15 +151,15 @@ void fprint_remote_head(FILE * f, struct
@@ -151,15 +151,15 @@ void fprint_remote_head(FILE * f, struct ir_remote *re
if (rem->min_code_repeat > 0) {
fprintf(f, " min_code_repeat %d\n", rem->min_code_repeat);
}

2
comms/lirc/files/patch-daemons__hw-types.c → comms/lirc/files/patch-daemons_hw-types.c
View File

@ -1,4 +1,4 @@
--- daemons/hw-types.c.orig
--- daemons/hw-types.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/hw-types.c
@@ -105,7 +105,7 @@ struct hardware *hw_list[] = {
&hw_awlibusb,

13
comms/lirc/files/patch-daemons_hw__bte.c Normal file
View File

@ -0,0 +1,13 @@
--- daemons/hw_bte.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/hw_bte.c
@@ -56,8 +56,8 @@
#include "lircd.h"
#include "hw_bte.h"
-struct timeval start, end, last;
-lirc_t gap, signal_length;
+extern struct timeval start, end, last;
+extern lirc_t gap, signal_length;
ir_code pre, code;
#define BTE_CAN_SEND 0

17
comms/lirc/files/patch-daemons_hw__creative.c Normal file
View File

@ -0,0 +1,17 @@
--- daemons/hw_creative.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/hw_creative.c
@@ -39,10 +39,11 @@
extern struct ir_remote *repeat_remote, *last_remote;
-unsigned char b[NUMBYTES];
+extern unsigned char b[NUMBYTES];
struct timeval start, end, last;
-lirc_t gap, signal_length;
-ir_code pre, code;
+extern lirc_t gap;
+lirc_t signal_length;
+extern ir_code pre, code;
struct hardware hw_creative = {
LIRC_IRTTY, /* default device */

2
comms/lirc/files/patch-daemons__hw_default.c → comms/lirc/files/patch-daemons_hw__default.c
View File

@ -1,4 +1,4 @@
--- daemons/hw_default.c.orig
--- daemons/hw_default.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/hw_default.c
@@ -38,6 +38,20 @@
#include "transmit.h"

8
comms/lirc/files/patch-daemons__hw_devinput.c → comms/lirc/files/patch-daemons_hw__devinput.c
View File

@ -1,6 +1,6 @@
--- daemons/hw_devinput.c.orig
--- daemons/hw_devinput.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/hw_devinput.c
@@ -376,9 +376,15 @@ int devinput_decode(struct ir_remote *re
@@ -376,9 +376,15 @@ int devinput_decode(struct ir_remote *remote, ir_code
return 1;
}
@ -16,7 +16,7 @@
int rd;
ir_code value;
@@ -399,6 +405,56 @@ char *devinput_rec(struct ir_remote *rem
@@ -399,6 +405,56 @@ char *devinput_rec(struct ir_remote *remotes)
LOGPRINTF(1, "time %ld.%06ld type %d code %d value %d", event.time.tv_sec, event.time.tv_usec, event.type,
event.code, event.value);
@ -73,7 +73,7 @@
value = (unsigned)event.value;
#ifdef EV_SW
if (value == 2 && (event.type == EV_KEY || event.type == EV_SW)) {
@@ -418,6 +474,9 @@ char *devinput_rec(struct ir_remote *rem
@@ -418,6 +474,9 @@ char *devinput_rec(struct ir_remote *remotes)
if (event.value == 2) {
repeat_state = RPT_YES;
} else {

13
comms/lirc/files/patch-daemons_hw__ea65.c Normal file
View File

@ -0,0 +1,13 @@
--- daemons/hw_ea65.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/hw_ea65.c
@@ -50,8 +50,8 @@
#define TIMEOUT 60000
#define CODE_LENGTH 24
-struct timeval start, end, last;
-ir_code code;
+extern struct timeval start, end, last;
+extern ir_code code;
struct hardware hw_ea65 = {
LIRC_IRTTY, /* default device */

10
comms/lirc/files/patch-daemons__hw_hiddev.c → comms/lirc/files/patch-daemons_hw__hiddev.c
View File

@ -1,4 +1,4 @@
--- daemons/hw_hiddev.c.orig
--- daemons/hw_hiddev.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/hw_hiddev.c
@@ -22,9 +22,17 @@
#include <stdio.h>
@ -47,7 +47,7 @@
return 0;
}
@@ -235,8 +249,40 @@ int hiddev_decode(struct ir_remote *remo
@@ -235,8 +249,40 @@ int hiddev_decode(struct ir_remote *remote, ir_code *
return 1;
}
@ -88,7 +88,7 @@
struct hiddev_event event;
struct hiddev_event asus_events[8];
int rd;
@@ -253,9 +299,41 @@ char *hiddev_rec(struct ir_remote *remot
@@ -253,9 +299,41 @@ char *hiddev_rec(struct ir_remote *remotes)
last = end;
gettimeofday(&start, NULL);
@ -131,7 +131,7 @@
logperror(LOG_ERR, NULL);
hiddev_deinit();
return 0;
@@ -515,6 +593,7 @@ char *sb0540_rec(struct ir_remote *remot
@@ -515,6 +593,7 @@ char *sb0540_rec(struct ir_remote *remotes)
}
#endif
@ -139,7 +139,7 @@
/*
* Apple Mac mini USB IR Receiver specific code.
*
@@ -566,6 +645,7 @@ char *macmini_rec(struct ir_remote *remo
@@ -566,6 +645,7 @@ char *macmini_rec(struct ir_remote *remotes)
return decode_all(remotes);
}

15
comms/lirc/files/patch-daemons_hw__irman.c Normal file
View File

@ -0,0 +1,15 @@
--- daemons/hw_irman.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/hw_irman.c
@@ -40,9 +40,9 @@
extern struct ir_remote *repeat_remote, *last_remote;
unsigned char *codestring;
-struct timeval start, end, last;
-lirc_t gap;
-ir_code code;
+extern struct timeval start, end, last;
+extern lirc_t gap;
+extern ir_code code;
#define CODE_LENGTH 64

13
comms/lirc/files/patch-daemons_hw__livedrive__common.c Normal file
View File

@ -0,0 +1,13 @@
--- daemons/hw_livedrive_common.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/hw_livedrive_common.c
@@ -38,8 +38,8 @@
#include "lircd.h"
#include "hw_livedrive_common.h"
-struct timeval start, end, last;
-ir_code pre, code;
+extern struct timeval start, end, last;
+extern ir_code pre, code;
int livedrive_init(void)
{

14
comms/lirc/files/patch-daemons_hw__silitek.c Normal file
View File

@ -0,0 +1,14 @@
--- daemons/hw_silitek.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/hw_silitek.c
@@ -41,8 +41,9 @@
extern struct ir_remote *repeat_remote, *last_remote;
unsigned char b[NUMBYTES];
-ir_code code;
-struct timeval current, last;
+extern ir_code code;
+struct timeval current;
+extern struct timeval last;
int do_repeat;
struct hardware hw_silitek = {

2
comms/lirc/files/patch-daemons__hw_srm7500libusb.c → comms/lirc/files/patch-daemons_hw__srm7500libusb.c
View File

@ -1,4 +1,4 @@
--- daemons/hw_srm7500libusb.c.orig
--- daemons/hw_srm7500libusb.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/hw_srm7500libusb.c
@@ -54,6 +54,23 @@
#define USB_TIMEOUT (1000*10)

4
comms/lirc/files/patch-daemons__ir_remote.c → comms/lirc/files/patch-daemons_ir__remote.c
View File

@ -1,6 +1,6 @@
--- daemons/ir_remote.c.orig
--- daemons/ir_remote.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/ir_remote.c
@@ -490,7 +490,7 @@ int write_message(char *buffer, size_t s
@@ -490,7 +490,7 @@ int write_message(char *buffer, size_t size, const cha
{
int len;

6
comms/lirc/files/patch-daemons__lircd.c → comms/lirc/files/patch-daemons_lircd.c
View File

@ -1,6 +1,6 @@
--- daemons/lircd.c.orig
--- daemons/lircd.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/lircd.c
@@ -1318,7 +1318,7 @@ int send_remote(int fd, char *message, s
@@ -1318,7 +1318,7 @@ int send_remote(int fd, char *message, struct ir_remot
codes = remote->codes;
while (codes->name != NULL) {
@ -9,7 +9,7 @@
if (len >= PACKET_SIZE + 1) {
len = sprintf(buffer, "code_too_long\n");
}
@@ -1338,7 +1338,7 @@ int send_name(int fd, char *message, str
@@ -1338,7 +1338,7 @@ int send_name(int fd, char *message, struct ir_ncode *
(write_socket_len(fd, protocol_string[P_BEGIN]) && write_socket_len(fd, message)
&& write_socket_len(fd, protocol_string[P_SUCCESS]) && write_socket_len(fd, protocol_string[P_DATA])))
return (0);

4
comms/lirc/files/patch-daemons__lircmd.c → comms/lirc/files/patch-daemons_lircmd.c
View File

@ -1,4 +1,4 @@
--- daemons/lircmd.c.orig
--- daemons/lircmd.c.orig 2011-03-25 22:28:18 UTC
+++ daemons/lircmd.c
@@ -277,9 +277,9 @@ setup_error:
return -1;
@ -11,7 +11,7 @@
struct input_event event;
memset(&event, 0, sizeof(event));
@@ -299,8 +299,8 @@ void write_uinput(__u16 type, __u16 code
@@ -299,8 +299,8 @@ void write_uinput(__u16 type, __u16 code, __s32 value)
syslog(LOG_ERR, "%m");
}
}

9
comms/lirc/files/patch-drivers__lirc.h → comms/lirc/files/patch-drivers_lirc.h
View File

@ -1,6 +1,6 @@
--- drivers/lirc.h.orig
--- drivers/lirc.h.orig 2011-03-25 22:28:18 UTC
+++ drivers/lirc.h
@@ -9,12 +9,17 @@
@@ -9,11 +9,16 @@
#if defined(__linux__)
#include <linux/types.h>
#include <linux/ioctl.h>
@ -10,12 +10,11 @@
#elif defined(_CYGWIN_)
#define __USE_LINUX_IOCTL_DEFS
#include <sys/ioctl.h>
#endif
+#endif
+#ifndef __linux__
+#include <stdint.h>
+#define __u32 uint32_t
+#define __u64 uint64_t
+#endif
#endif
#define PULSE_BIT 0x01000000
#define PULSE_MASK 0x00FFFFFF

8
comms/lirc/files/patch-tools__irsend.c → comms/lirc/files/patch-tools_irsend.c
View File

@ -1,6 +1,6 @@
--- tools/irsend.c.orig
--- tools/irsend.c.orig 2011-03-25 22:28:18 UTC
+++ tools/irsend.c
@@ -40,6 +40,9 @@
@@ -41,6 +41,9 @@
#include <errno.h>
#include <signal.h>
#include <limits.h>
@ -8,5 +8,5 @@
+#include <netinet/in.h>
+#endif
#define PACKET_SIZE 256
/* three seconds */
#include <stdint.h>