pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
uTox-git: Correct patches
Module Name: pkgsrc-wip
Committed By: Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By: f8l
Date: Wed Jan 25 18:06:46 2017 +0100
Changeset: 6c8f7953ff7b93b92bb3a31a75042b1d9d469dcf
Modified Files:
uTox-git/distinfo
uTox-git/patches/patch-src_xlib_main.c
uTox-git/patches/patch-src_xlib_v4l.c
Log Message:
uTox-git: Correct patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6c8f7953ff7b93b92bb3a31a75042b1d9d469dcf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
uTox-git/distinfo | 4 ++--
uTox-git/patches/patch-src_xlib_main.c | 4 ++--
uTox-git/patches/patch-src_xlib_v4l.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diffs:
diff --git a/uTox-git/distinfo b/uTox-git/distinfo
index 2dee5ca..9cadb913 100644
--- a/uTox-git/distinfo
+++ b/uTox-git/distinfo
@@ -3,6 +3,6 @@ $NetBSD$
SHA1 (patch-src_main.h) = 1def46cb26e474b20a5e34ae5a471a7c9fbb004c
SHA1 (patch-src_updater.c) = c02cec879f954d6c2abb3e1ea6b0e0a01b4e0b50
SHA1 (patch-src_xlib_CMakeLists.txt) = efb01107005a759509b81e8887f75c7a65c58f5f
-SHA1 (patch-src_xlib_main.c) = b50f9a43b49724d29382d9497048f49e2b101282
-SHA1 (patch-src_xlib_v4l.c) = 159ac6e676c0361262daeb3f5324e4916b09b16a
+SHA1 (patch-src_xlib_main.c) = f474254680c6da875e5e3454afcb07455f858bbf
+SHA1 (patch-src_xlib_v4l.c) = 8f8de28684886ea9a135820b21f3bb3a91ba87b9
SHA1 (patch-src_xlib_video.c) = e8a036070322af80736fb7789de3a2dbdeb86d45
diff --git a/uTox-git/patches/patch-src_xlib_main.c b/uTox-git/patches/patch-src_xlib_main.c
index 8c48ca6..62b3bc4 100644
--- a/uTox-git/patches/patch-src_xlib_main.c
+++ b/uTox-git/patches/patch-src_xlib_main.c
@@ -8,7 +8,7 @@ Avoid using Linux-specific headers when not compiling for Linux.
XFlush(display);
}
-+#ifdef __LINUX__
++#ifdef __linux__
#include <linux/input.h>
+#endif
FILE *ptt_keyboard_handle;
@@ -18,7 +18,7 @@ Avoid using Linux-specific headers when not compiling for Linux.
int ptt_key;
/* First, we try for direct access to the keyboard. */
-+#ifdef __LINUX__
++#ifdef __linux__
ptt_key = KEY_LEFTCTRL; // TODO allow user to change this...
if (ptt_keyboard_handle) {
/* Nice! we have direct access to the keyboard! */
diff --git a/uTox-git/patches/patch-src_xlib_v4l.c b/uTox-git/patches/patch-src_xlib_v4l.c
index 5b4f17c..2f61833 100644
--- a/uTox-git/patches/patch-src_xlib_v4l.c
+++ b/uTox-git/patches/patch-src_xlib_v4l.c
@@ -11,7 +11,7 @@ Use Linux headers when on Linux, not when not on OpenBSD.
-#ifdef __OpenBSD__
-#include <sys/videoio.h>
-#else
-+#ifdef __Linux__
++#ifdef __linux__
#include <linux/videodev2.h>
+#else
+#include <sys/videoio.h>
Home |
Main Index |
Thread Index |
Old Index