diff options
| author | nox <nox@FreeBSD.org> | 2012-09-24 00:40:17 +0800 |
|---|---|---|
| committer | nox <nox@FreeBSD.org> | 2012-09-24 00:40:17 +0800 |
| commit | ef5146bfe8de3efd0e17936cb64766cf8bae2dce (patch) | |
| tree | 6c84549a8c5b8eee7df9df8d7ca1020d6b2a3098 /multimedia | |
| parent | 6b97409e5f30beb609ec375326ae98973bb30071 (diff) | |
| download | freebsd-ports-gnome-ef5146bfe8de3efd0e17936cb64766cf8bae2dce.tar.gz freebsd-ports-gnome-ef5146bfe8de3efd0e17936cb64766cf8bae2dce.tar.zst freebsd-ports-gnome-ef5146bfe8de3efd0e17936cb64766cf8bae2dce.zip | |
- Fix build with clang. [1]
- Remove duplicate patch.
PR: ports/171891 [1]
Submitted by: rakuco, hselasky (maintainer, clang fix) [1]
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/webcamd/files/patch-clang | 10 | ||||
| -rw-r--r-- | multimedia/webcamd/files/patch-media_tree-include-linux-dvb-ca.h | 20 |
2 files changed, 10 insertions, 20 deletions
diff --git a/multimedia/webcamd/files/patch-clang b/multimedia/webcamd/files/patch-clang new file mode 100644 index 000000000000..3f045c1336b8 --- /dev/null +++ b/multimedia/webcamd/files/patch-clang @@ -0,0 +1,10 @@ +--- kernel/linux_defs.h.orig 2012-09-23 16:06:07.000000000 +0200 ++++ kernel/linux_defs.h 2012-09-23 16:06:24.000000000 +0200 +@@ -98,6 +98,7 @@ + #define symbol_put(x) __nop + #define EXPORT_SYMBOL(...) + #define EXPORT_SYMBOL_GPL(...) ++#define MODULE_INFO(...) + #define MODULE_AUTHOR(...) + #define MODULE_DESCRIPTION(...) + #define MODULE_LICENSE(...) diff --git a/multimedia/webcamd/files/patch-media_tree-include-linux-dvb-ca.h b/multimedia/webcamd/files/patch-media_tree-include-linux-dvb-ca.h deleted file mode 100644 index 8841d967f0c4..000000000000 --- a/multimedia/webcamd/files/patch-media_tree-include-linux-dvb-ca.h +++ /dev/null @@ -1,20 +0,0 @@ ---- media_tree/include/linux/dvb/ca.h.orig -+++ media_tree/include/linux/dvb/ca.h -@@ -80,9 +80,17 @@ typedef struct ca_pid { - - #define CA_RESET _IO('o', 128) - #define CA_GET_CAP _IOR('o', 129, ca_caps_t) -+ -+/* At least CA_GET_SLOT_INFO and CA_GET_MSG need to be _IOWR not _IOR. -+ * This is wrong on Linux too but there the driver doesn't care. -+ * - #define CA_GET_SLOT_INFO _IOR('o', 130, ca_slot_info_t) - #define CA_GET_DESCR_INFO _IOR('o', 131, ca_descr_info_t) - #define CA_GET_MSG _IOR('o', 132, ca_msg_t) -+ */ -+#define CA_GET_SLOT_INFO _IOWR('o', 130, ca_slot_info_t) -+#define CA_GET_DESCR_INFO _IOR('o', 131, ca_descr_info_t) -+#define CA_GET_MSG _IOWR('o', 132, ca_msg_t) - #define CA_SEND_MSG _IOW('o', 133, ca_msg_t) - #define CA_SET_DESCR _IOW('o', 134, ca_descr_t) - #define CA_SET_PID _IOW('o', 135, ca_pid_t) |