10 files changed, 0 insertions, 284 deletions

diff --git a/multimedia/v4l-utils/files/patch-Make.rules b/multimedia/v4l-utils/files/patch-Make.rules
deleted file mode 100644
index 23ed35a13bef..000000000000
--- a/multimedia/v4l-utils/files/patch-Make.rules
+++ /dev/null
@@ -1,26 +0,0 @@
---- ../Make.rules.orig	2010-08-26 17:19:37.000000000 +0200
-+++ ../Make.rules	2010-11-04 20:26:22.000000000 +0100
-@@ -7,8 +7,8 @@ CFLAGS += -Wall -Wpointer-arith
- CXXFLAGS := $(CFLAGS)
- CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
- 
--PREFIX = /usr/local
--LIBDIR = $(PREFIX)/lib
-+PREFIX ?= /usr/local
-+LIBDIR ?= $(PREFIX)/lib
- # subdir below LIBDIR in which to install the libv4lx libc wrappers
- LIBSUBDIR = libv4l
- 
-@@ -22,10 +22,10 @@ LIB_RELEASE = 0
- # And last various rules
- 
- %.o: %.c
--	$(CC) -Wp,-MMD,"$*.d",-MQ,"$@",-MP -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+	$(CC) -MMD -MF "$*.d" -MQ "$@" -MP -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
- 
- %.o: %.cpp
--	$(CXX) -Wp,-MMD,"$*.d",-MQ,"$@",-MP -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
-+	$(CXX) -MMD -MF "$*.d" -MQ "$@" -MP -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
- 
- %.so:
- 	$(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(LIB_RELEASE) -o $@.$(LIB_RELEASE) $^ $(LIBS_$*)
diff --git a/multimedia/v4l-utils/files/patch-Makefile b/multimedia/v4l-utils/files/patch-Makefile
deleted file mode 100644
index 645b2f73573e..000000000000
--- a/multimedia/v4l-utils/files/patch-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./Makefile.orig	2011-02-09 23:04:27.000000000 +0100
-+++ ./Makefile	2011-06-03 19:08:13.000000000 +0200
-@@ -1,4 +1,5 @@
--SUBDIRS=libv4l2util decode_tm6000 keytable rds v4l2-compliance v4l2-ctl v4l2-dbg xc3028-firmware
-+#SUBDIRS=libv4l2util decode_tm6000 keytable rds v4l2-compliance v4l2-ctl v4l2-dbg xc3028-firmware
-+SUBDIRS=libv4l2util decode_tm6000 keytable v4l2-compliance v4l2-ctl v4l2-dbg
- 
- all install: 
- 	@for i in $(SUBDIRS); do \
-@@ -10,6 +11,7 @@
- 		$(MAKE) -C v4l2-sysfs-path $@; \
- 	fi
- 
-+ifdef WITH_QV4L2
- 	# Test whether qmake is installed, and whether it is for qt4.
- 	@if which qmake-qt4 >/dev/null 2>&1; then \
- 		QMAKE=qmake-qt4; \
-@@ -24,6 +26,7 @@
- 			$(MAKE) -C qv4l2 -f Makefile.install $@; \
- 		fi \
- 	fi
-+endif
- 
- sync-with-kernel:
- 	$(MAKE) -C keytable $@
diff --git a/multimedia/v4l-utils/files/patch-decode_tm6000__decode_tm6000.c b/multimedia/v4l-utils/files/patch-decode_tm6000__decode_tm6000.c
deleted file mode 100644
index ee2d3f5022d9..000000000000
--- a/multimedia/v4l-utils/files/patch-decode_tm6000__decode_tm6000.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./decode_tm6000/decode_tm6000.c.orig	2011-02-09 23:04:27.000000000 +0100
-+++ ./decode_tm6000/decode_tm6000.c	2011-06-03 19:08:13.000000000 +0200
-@@ -41,6 +41,8 @@
- 	{ 0, 0, 0, 0, 0, 0 }
- };
- 
-+#define devname dev_name
-+
- static char outbuf[692224];
- static int debug=0, audio=0, use_mmap=1, nbufs=4;
- static float freq_mhz=193.25;
diff --git a/multimedia/v4l-utils/files/patch-keytable__Makefile b/multimedia/v4l-utils/files/patch-keytable__Makefile
deleted file mode 100644
index 181a3cc40549..000000000000
--- a/multimedia/v4l-utils/files/patch-keytable__Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- keytable/Makefile.orig	2011-06-01 13:23:03.000000000 +0200
-+++ keytable/Makefile	2011-06-04 09:43:14.000000000 +0200
-@@ -34,12 +34,14 @@
- install: $(TARGETS)
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)/etc
- 	install -m 755 $(TARGETS) $(DESTDIR)$(PREFIX)/bin
--	install -m 644 -p rc_maps.cfg $(DESTDIR)/etc
--	install -m 755 -d $(DESTDIR)/etc/rc_keymaps
--	install -m 644 -p rc_keymaps/* $(DESTDIR)/etc/rc_keymaps
--	install -m 755 -d $(DESTDIR)/lib/udev/rules.d
--	install -m 644 -p 70-infrared.rules $(DESTDIR)/lib/udev/rules.d
--	install -m 755 -d $(DESTDIR)$(MANDIR)/man1
--	install -m 644 -p ir-keytable.1 $(DESTDIR)$(MANDIR)/man1
-+	install -m 644 -p rc_maps.cfg $(DESTDIR)$(PREFIX)/etc
-+	install -m 755 -d $(DESTDIR)$(PREFIX)/etc/rc_keymaps
-+	install -m 644 -p rc_keymaps/* $(DESTDIR)$(PREFIX)/etc/rc_keymaps
-+ifdef UDEV
-+	install -m 755 -d $(DESTDIR)$(PREFIX)/etc/udev/rules.d
-+	install -m 644 -p 70-infrared.rules $(DESTDIR)$(PREFIX)/etc/udev/rules.d
-+endif
-+	install -m 755 -d $(DESTDIR)$(PREFIX)/man/man1
-+	install -m 644 -p ir-keytable.1 $(DESTDIR)$(PREFIX)/man/man1
- 
- include ../../Make.rules
diff --git a/multimedia/v4l-utils/files/patch-keytable__keytable.c b/multimedia/v4l-utils/files/patch-keytable__keytable.c
deleted file mode 100644
index f34d2009aa4b..000000000000
--- a/multimedia/v4l-utils/files/patch-keytable__keytable.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./keytable/keytable.c.orig	2011-02-09 23:04:27.000000000 +0100
-+++ ./keytable/keytable.c	2011-06-03 19:08:13.000000000 +0200
-@@ -28,7 +28,11 @@
- #include "parse.h"
- 
- /* Default place where the keymaps will be stored */
-+#ifndef __FreeBSD__
- #define CFGDIR "/etc/rc_keymaps"
-+#else
-+#define CFGDIR PREFIX "/etc/rc_keymaps"
-+#endif
- 
- struct input_keymap_entry_v2 {
- #define KEYMAP_BY_INDEX	(1 << 0)
-@@ -137,6 +141,10 @@
- 	"--sysdev [ir class (f. ex. rc0)]\n"
- 	"[for using the rc0 sysdev]";
- 
-+#ifdef __FreeBSD__
-+#define devname dev_name
-+#endif
-+
- /* Static vars to store the parameters */
- static char *devclass = "rc0";
- static char *devname = NULL;
diff --git a/multimedia/v4l-utils/files/patch-libv4l2util__v4l2_driver.c b/multimedia/v4l-utils/files/patch-libv4l2util__v4l2_driver.c
deleted file mode 100644
index e9690ce5ac82..000000000000
--- a/multimedia/v4l-utils/files/patch-libv4l2util__v4l2_driver.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./libv4l2util/v4l2_driver.c.orig	2011-02-09 23:04:27.000000000 +0100
-+++ ./libv4l2util/v4l2_driver.c	2011-06-03 19:08:13.000000000 +0200
-@@ -15,7 +15,11 @@
- #include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
-+#ifndef __FreeBSD__
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
diff --git a/multimedia/v4l-utils/files/patch-qv4l2__v4l2-api.h b/multimedia/v4l-utils/files/patch-qv4l2__v4l2-api.h
deleted file mode 100644
index 3b5df556261a..000000000000
--- a/multimedia/v4l-utils/files/patch-qv4l2__v4l2-api.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./qv4l2/v4l2-api.h.orig	2011-02-09 23:04:27.000000000 +0100
-+++ ./qv4l2/v4l2-api.h	2011-06-03 19:08:13.000000000 +0200
-@@ -24,6 +24,10 @@
- #include <linux/videodev2.h>
- #include <libv4lconvert.h>
- 
-+#ifdef __FreeBSD__
-+typedef off_t __off64_t;
-+#endif
-+
- class v4l2
- {
- public:
diff --git a/multimedia/v4l-utils/files/patch-v4l2-ctl__ivtv-ctl.c b/multimedia/v4l-utils/files/patch-v4l2-ctl__ivtv-ctl.c
deleted file mode 100644
index 2563313399d0..000000000000
--- a/multimedia/v4l-utils/files/patch-v4l2-ctl__ivtv-ctl.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./v4l2-ctl/ivtv-ctl.c.orig	2011-02-09 23:04:27.000000000 +0100
-+++ ./v4l2-ctl/ivtv-ctl.c	2011-06-03 19:20:05.000000000 +0200
-@@ -498,7 +498,13 @@
- 			if (ioctl(fd, VIDEO_GET_EVENT, &ev) < 0) {
- 				fprintf(stderr, "ioctl: VIDEO_GET_EVENT failed\n");
- 				break;
--			} else if (ev.timestamp == 0) {
-+			}
-+#ifndef __FreeBSD__
-+			else if (ev.timestamp == 0)
-+#else
-+			else if (ev.timestamp.tv_sec == 0)
-+#endif
-+			{
- 				unsigned long long pts = 0, frame = 0;
- 				struct timeval tv;
- 				gettimeofday(&tv, NULL);
diff --git a/multimedia/v4l-utils/files/patch-v4l2-ctl__v4l2-ctl.cpp b/multimedia/v4l-utils/files/patch-v4l2-ctl__v4l2-ctl.cpp
deleted file mode 100644
index ce0621f59375..000000000000
--- a/multimedia/v4l-utils/files/patch-v4l2-ctl__v4l2-ctl.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
---- v4l2-ctl/v4l2-ctl.cpp.orig
-+++ v4l2-ctl/v4l2-ctl.cpp
-@@ -21,7 +21,6 @@
-  */
- 
- #include <unistd.h>
--#include <features.h>		/* Uses _GNU_SOURCE to define getsubopt in stdlib.h */
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -36,7 +35,6 @@
- #include <sys/time.h>
- #include <dirent.h>
- #include <math.h>
--#include <sys/klog.h>
- 
- #include <linux/videodev2.h>
- #include <libv4l2.h>
-@@ -1644,9 +1642,50 @@ static void list_devices()
- 	}
- }
- 
-+#if __FreeBSD_version < 1000000
-+/* from FreeBSD src/lib/libc/string/strchrnul.c: */
-+
-+char *strchrnul(const char *p, int ch);
-+
-+char *
-+strchrnul(const char *p, int ch)
-+{
-+	char c;
-+
-+	c = ch;
-+	for (;; ++p) {
-+		if (*p == c || *p == '\0')
-+			return ((char *)p);
-+	}
-+	/* NOTREACHED */
-+}
-+#endif
-+
-+int
-+my_getsubopt (char **optionp, char *const *tokens, char **valuep)
-+{
-+          char *endp, *vstart;
-+          int cnt;
-+
-+          if (**optionp == '\0')
-+            return -1;
-+
-+          /* Find end of next token.  */
-+          endp = strchrnul (*optionp, ',');
-+
-+          /* The current suboption does not match any option.  */
-+          *valuep = *optionp;
-+
-+          if (*endp != '\0')
-+            *endp++ = '\0';
-+          *optionp = endp;
-+
-+          return -1;
-+}
-+
- static int parse_subopt(char **subs, const char * const *subopts, char **value)
- {
--	int opt = getsubopt(subs, (char * const *)subopts, value);
-+	int opt = my_getsubopt(subs, (char * const *)subopts, value);
- 
- 	if (opt == -1) {
- 		fprintf(stderr, "Invalid suboptions specified\n");
-@@ -1667,7 +1704,7 @@ static void parse_next_subopt(char **sub
- 	static char *const subopts[] = {
- 	    NULL
- 	};
--	int opt = getsubopt(subs, subopts, value);
-+	int opt = my_getsubopt(subs, subopts, value);
- 
- 	if (value == NULL) {
- 		fprintf(stderr, "No value given to suboption <%s>\n",
-@@ -3493,6 +3530,7 @@ int main(int argc, char **argv)
- 		static char buf[40960];
- 		int len;
- 
-+#ifndef __FreeBSD__
- 		if (doioctl(fd, VIDIOC_LOG_STATUS, NULL) == 0) {
- 			printf("\nStatus Log:\n\n");
- 			len = klogctl(3, buf, sizeof(buf) - 1);
-@@ -3514,6 +3552,7 @@ int main(int argc, char **argv)
- 				}
- 			}
- 		}
-+#endif
- 	}
- 
- 	/* List options */
diff --git a/multimedia/v4l-utils/files/patch-v4l2-dbg__v4l2-dbg.cpp b/multimedia/v4l-utils/files/patch-v4l2-dbg__v4l2-dbg.cpp
deleted file mode 100644
index 6652666a88c9..000000000000
--- a/multimedia/v4l-utils/files/patch-v4l2-dbg__v4l2-dbg.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- v4l2-dbg/v4l2-dbg.cpp.orig	2011-06-01 13:23:03.000000000 +0200
-+++ v4l2-dbg/v4l2-dbg.cpp	2011-06-04 10:04:30.000000000 +0200
-@@ -17,7 +17,6 @@
-  */
- 
- #include <unistd.h>
--#include <features.h>		/* Uses _GNU_SOURCE to define getsubopt in stdlib.h */
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -31,7 +30,6 @@
- #include <sys/ioctl.h>
- #include <sys/time.h>
- #include <math.h>
--#include <sys/klog.h>
- 
- #include <linux/videodev2.h>
- #include <media/v4l2-chip-ident.h>
-@@ -767,6 +765,7 @@
- 		static char buf[40960];
- 		int len;
- 
-+#ifndef __FreeBSD__
- 		if (doioctl(fd, VIDIOC_LOG_STATUS, NULL, "VIDIOC_LOG_STATUS") == 0) {
- 			printf("\nStatus Log:\n\n");
- 			len = klogctl(3, buf, sizeof(buf) - 1);
-@@ -788,6 +787,7 @@
- 				}
- 			}
- 		}
-+#endif
- 	}
- 
- 	if (options[OptListSymbols]) {