pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/libv4l Fix patch to look for <sys/videoio.h> ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/10f2f1771548
branches:  trunk
changeset: 644821:10f2f1771548
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Jan 18 05:57:25 2015 +0000

description:
Fix patch to look for <sys/videoio.h> on FreeBSD as well as NetBSD,
OpenBSD, Dragonfly, and Solaris. Also, for platforms there isn't a
case for, #error instead of including nothing, as there's no chance
of the package compiling anyway and this makes it easier to work out
what happened. PR 49541.

diffstat:

 graphics/libv4l/distinfo         |   4 ++--
 graphics/libv4l/patches/patch-aa |  14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r 33a6fe2c820d -r 10f2f1771548 graphics/libv4l/distinfo
--- a/graphics/libv4l/distinfo  Sun Jan 18 00:50:38 2015 +0000
+++ b/graphics/libv4l/distinfo  Sun Jan 18 05:57:25 2015 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2013/06/24 15:57:21 jperkin Exp $
+$NetBSD: distinfo,v 1.12 2015/01/18 05:57:25 dholland Exp $
 
 SHA1 (libv4l-0.4.3.tar.gz) = 2539aa6b04650b97c9fc7ba95721f1e362a73031
 RMD160 (libv4l-0.4.3.tar.gz) = 4f0435d955f15602ac093385607417fab71deb17
 Size (libv4l-0.4.3.tar.gz) = 83022 bytes
-SHA1 (patch-aa) = ab28c6400bbf8cf4e4e5ae6b258841574ec95ee3
+SHA1 (patch-aa) = 2e6e4d525be190a890c03ca3d00ba77f7e06d124
 SHA1 (patch-ab) = 5ade487d6d64d280f3fdae8afad99fbd0b6e5eda
 SHA1 (patch-ac) = 5457af836909f1c9f759c6a780daeb13968ec91f
 SHA1 (patch-ad) = 1d2568e49182efcbde47c14911b6a04e088b2578
diff -r 33a6fe2c820d -r 10f2f1771548 graphics/libv4l/patches/patch-aa
--- a/graphics/libv4l/patches/patch-aa  Sun Jan 18 00:50:38 2015 +0000
+++ b/graphics/libv4l/patches/patch-aa  Sun Jan 18 05:57:25 2015 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2012/04/18 17:47:22 hans Exp $
+$NetBSD: patch-aa,v 1.5 2015/01/18 05:57:25 dholland Exp $
+
+- support platforms other than linux
 
---- include/libv4lconvert.h.orig       2008-09-08 14:33:17.000000000 -0400
-+++ include/libv4lconvert.h    2008-09-08 14:34:03.000000000 -0400
-@@ -22,10 +22,20 @@
+--- include/libv4lconvert.h.orig       2008-08-26 12:32:39.000000000 +0000
++++ include/libv4lconvert.h
+@@ -22,10 +22,22 @@
  /* These headers are not needed by us, but by linux/videodev2.h,
     which is broken on some systems and doesn't include them itself :( */
  #include <sys/time.h>
@@ -11,7 +13,7 @@
  #include <linux/ioctl.h>
  /* end broken header workaround includes */
  #include <linux/videodev2.h>
-+#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun)
++#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__sun)
 +#include <sys/types.h>
 +#include <sys/ioctl.h>
 +#if defined(__sun)
@@ -19,6 +21,8 @@
 +#else
 +#include <sys/videoio.h>
 +#endif
++#else
++#error "I don't know how to find the v4l headers on this platform"
 +#endif
  
  #ifdef __cplusplus



Home | Main Index | Thread Index | Old Index