CVS commit: pkgsrc/devel/libgphoto2

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jan 31 10:53:41 UTC 2018

Modified Files:
        pkgsrc/devel/libgphoto2: distinfo
Added Files:
        pkgsrc/devel/libgphoto2/patches: patch-camlibs_barbie_barbie.c
            patch-camlibs_kodak_dc120_dc120.c
            patch-camlibs_kodak_dc120_library.c
            patch-camlibs_panasonic_coolshot_library.c
            patch-camlibs_st2205_st2205.c
            patch-libgphoto2__port_gphoto2_gphoto2-port-portability.h
            patch-libgphoto2_gphoto2-file.c

Log Message:
libgphoto2: Set _{POSIX,XOPEN}*_SOURCE correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/libgphoto2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libgphoto2/patches/patch-camlibs_barbie_barbie.c \
    pkgsrc/devel/libgphoto2/patches/patch-camlibs_kodak_dc120_dc120.c \
    pkgsrc/devel/libgphoto2/patches/patch-camlibs_kodak_dc120_library.c \
    pkgsrc/devel/libgphoto2/patches/patch-camlibs_panasonic_coolshot_library.c \
    pkgsrc/devel/libgphoto2/patches/patch-camlibs_st2205_st2205.c \
    pkgsrc/devel/libgphoto2/patches/patch-libgphoto2__port_gphoto2_gphoto2-port-portability.h \
    pkgsrc/devel/libgphoto2/patches/patch-libgphoto2_gphoto2-file.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libgphoto2/distinfo
diff -u pkgsrc/devel/libgphoto2/distinfo:1.28 pkgsrc/devel/libgphoto2/distinfo:1.29
--- pkgsrc/devel/libgphoto2/distinfo:1.28       Thu Feb  4 11:58:00 2016
+++ pkgsrc/devel/libgphoto2/distinfo    Wed Jan 31 10:53:40 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2016/02/04 11:58:00 wiz Exp $
+$NetBSD: distinfo,v 1.29 2018/01/31 10:53:40 jperkin Exp $
 
 SHA1 (libgphoto2-2.5.8.tar.bz2) = 976feb07d51026e6ca647f9fa333c500c5e0c041
 RMD160 (libgphoto2-2.5.8.tar.bz2) = bbb57fdace9783f9829bafbd89818949f6d0fce3
@@ -9,5 +9,12 @@ SHA1 (patch-an) = 60d109d29834c01cdae29b
 SHA1 (patch-ao) = 01e7eea353ef12b97b54aeb34f00abfd1f50c3ff
 SHA1 (patch-camlibs_ax203_jpeg__memsrcdest.c) = 763f39f07023aa82de6e91014a3fbf19e9e79afa
 SHA1 (patch-camlibs_ax203_jpeg__memsrcdest.h) = a78c6fd04f1fb72863ce609ac3ad25ebe12dc51c
+SHA1 (patch-camlibs_barbie_barbie.c) = 0dc3d60155ce221b356d59c173d5842b9b2cc98d
 SHA1 (patch-camlibs_jl2005c_jpeg__memsrcdest.c) = 0b178dc031b0b051a230eff6cc6c322596d1a8ee
 SHA1 (patch-camlibs_jl2005c_jpeg__memsrcdest.h) = 49bff8c0523d9cf87be92856cef3dd9127b983a0
+SHA1 (patch-camlibs_kodak_dc120_dc120.c) = 5b009334d954fcfa7b852281fa0bcc73b7355bbc
+SHA1 (patch-camlibs_kodak_dc120_library.c) = da5842b447e5cf2627c52b2fed64ec9b12d427d5
+SHA1 (patch-camlibs_panasonic_coolshot_library.c) = bb476c660d8ef011f11da119a718357d9672aadf
+SHA1 (patch-camlibs_st2205_st2205.c) = 2269a9d6d143bd74c49e21fafb706c6ee528748e
+SHA1 (patch-libgphoto2__port_gphoto2_gphoto2-port-portability.h) = 9f62a7c4213f8be273b6da7b2cbbd1f68e697631
+SHA1 (patch-libgphoto2_gphoto2-file.c) = 2b63f2e3bb3b6ef73c8d860efdda5e342f093eb8

Added files:

Index: pkgsrc/devel/libgphoto2/patches/patch-camlibs_barbie_barbie.c
diff -u /dev/null pkgsrc/devel/libgphoto2/patches/patch-camlibs_barbie_barbie.c:1.1
--- /dev/null   Wed Jan 31 10:53:41 2018
+++ pkgsrc/devel/libgphoto2/patches/patch-camlibs_barbie_barbie.c       Wed Jan 31 10:53:40 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-camlibs_barbie_barbie.c,v 1.1 2018/01/31 10:53:40 jperkin Exp $
+
+Set _POSIX_C_SOURCE correctly.
+
+--- camlibs/barbie/barbie.c.orig       2014-06-04 18:19:35.000000000 +0000
++++ camlibs/barbie/barbie.c
+@@ -21,7 +21,9 @@
+  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  * Boston, MA  02110-1301  USA
+  */
++#if !defined(__sun) || (__STDC_VERSION__-0 < 199901L)
+ #define _POSIX_C_SOURCE 199309L
++#endif
+ 
+ #include "config.h"
+ 
Index: pkgsrc/devel/libgphoto2/patches/patch-camlibs_kodak_dc120_dc120.c
diff -u /dev/null pkgsrc/devel/libgphoto2/patches/patch-camlibs_kodak_dc120_dc120.c:1.1
--- /dev/null   Wed Jan 31 10:53:41 2018
+++ pkgsrc/devel/libgphoto2/patches/patch-camlibs_kodak_dc120_dc120.c   Wed Jan 31 10:53:40 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-camlibs_kodak_dc120_dc120.c,v 1.1 2018/01/31 10:53:40 jperkin Exp $
+
+Set _POSIX_C_SOURCE correctly.
+
+--- camlibs/kodak/dc120/dc120.c.orig   2015-02-22 08:30:09.000000000 +0000
++++ camlibs/kodak/dc120/dc120.c
+@@ -19,7 +19,9 @@
+  */
+ 
+ #define _BSD_SOURCE
++#if !defined(__sun) || (__STDC_VERSION__-0 < 199901L)
+ #define _POSIX_C_SOURCE 199309L
++#endif
+ 
+ #include "config.h"
+ 
Index: pkgsrc/devel/libgphoto2/patches/patch-camlibs_kodak_dc120_library.c
diff -u /dev/null pkgsrc/devel/libgphoto2/patches/patch-camlibs_kodak_dc120_library.c:1.1
--- /dev/null   Wed Jan 31 10:53:41 2018
+++ pkgsrc/devel/libgphoto2/patches/patch-camlibs_kodak_dc120_library.c Wed Jan 31 10:53:40 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-camlibs_kodak_dc120_library.c,v 1.1 2018/01/31 10:53:40 jperkin Exp $
+
+Set _POSIX_C_SOURCE correctly.
+
+--- camlibs/kodak/dc120/library.c.orig 2015-02-22 08:30:12.000000000 +0000
++++ camlibs/kodak/dc120/library.c
+@@ -19,7 +19,9 @@
+  */
+ 
+ #define _BSD_SOURCE
++#if !defined(__sun) || (__STDC_VERSION__-0 < 199901L)
+ #define _POSIX_C_SOURCE 199309L
++#endif
+ #include "config.h"
+ 
+ #include <stdio.h>
Index: pkgsrc/devel/libgphoto2/patches/patch-camlibs_panasonic_coolshot_library.c
diff -u /dev/null pkgsrc/devel/libgphoto2/patches/patch-camlibs_panasonic_coolshot_library.c:1.1
--- /dev/null   Wed Jan 31 10:53:41 2018
+++ pkgsrc/devel/libgphoto2/patches/patch-camlibs_panasonic_coolshot_library.c  Wed Jan 31 10:53:40 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-camlibs_panasonic_coolshot_library.c,v 1.1 2018/01/31 10:53:40 jperkin Exp $
+
+Set _POSIX_C_SOURCE correctly.
+
+--- camlibs/panasonic/coolshot/library.c.orig  2014-06-27 05:31:22.000000000 +0000
++++ camlibs/panasonic/coolshot/library.c
+@@ -24,7 +24,9 @@
+ /* Boston, MA  02110-1301  USA                                        */
+ /****************************************************************/
+ 
++#if !defined(__sun) || (__STDC_VERSION__-0 < 199901L)
+ #define _POSIX_C_SOURCE 199309L
++#endif
+ #define _BSD_SOURCE
+ 
+ #include "config.h"
Index: pkgsrc/devel/libgphoto2/patches/patch-camlibs_st2205_st2205.c
diff -u /dev/null pkgsrc/devel/libgphoto2/patches/patch-camlibs_st2205_st2205.c:1.1
--- /dev/null   Wed Jan 31 10:53:41 2018
+++ pkgsrc/devel/libgphoto2/patches/patch-camlibs_st2205_st2205.c       Wed Jan 31 10:53:40 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-camlibs_st2205_st2205.c,v 1.1 2018/01/31 10:53:40 jperkin Exp $
+
+Set _POSIX_C_SOURCE correctly.
+
+--- camlibs/st2205/st2205.c.orig       2014-07-22 21:59:09.000000000 +0000
++++ camlibs/st2205/st2205.c
+@@ -18,7 +18,9 @@
+  * Boston, MA  02110-1301  USA
+  */
+ #define _BSD_SOURCE
++#if !defined(__sun) || (__STDC_VERSION__-0 < 199901L)
+ #define _POSIX_C_SOURCE 1
++#endif
+ #include "config.h"
+ 
+ #include <stdio.h>
Index: pkgsrc/devel/libgphoto2/patches/patch-libgphoto2__port_gphoto2_gphoto2-port-portability.h
diff -u /dev/null pkgsrc/devel/libgphoto2/patches/patch-libgphoto2__port_gphoto2_gphoto2-port-portability.h:1.1
--- /dev/null   Wed Jan 31 10:53:41 2018
+++ pkgsrc/devel/libgphoto2/patches/patch-libgphoto2__port_gphoto2_gphoto2-port-portability.h   Wed Jan 31 10:53:40 2018
@@ -0,0 +1,26 @@
+$NetBSD: patch-libgphoto2__port_gphoto2_gphoto2-port-portability.h,v 1.1 2018/01/31 10:53:40 jperkin Exp $
+
+Set _XOPEN_SOURCE / _POSIX_C_SOURCE correctly.
+
+--- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig    2014-06-27 05:26:01.000000000 +0000
++++ libgphoto2_port/gphoto2/gphoto2-port-portability.h
+@@ -176,7 +176,9 @@ typedef struct {
+ 
+ /* XOPEN needed for usleep */
+ #ifndef _XOPEN_SOURCE
++# if !defined(__sun) || (__STDC_VERSION__-0 < 199901L)
+ # define _XOPEN_SOURCE 500
++# endif
+ #else
+ # if ((_XOPEN_SOURCE - 0) < 500)
+ #  undef _XOPEN_SOURCE
+@@ -186,7 +188,9 @@ typedef struct {
+ 
+ /* for nanosleep */
+ # ifndef _POSIX_C_SOURCE
++#  if !defined(__sun) || (__STDC_VERSION__-0 < 199901L)
+ #  define _POSIX_C_SOURCE 199309
++#  endif
+ # endif
+ # include <time.h>
+ 
Index: pkgsrc/devel/libgphoto2/patches/patch-libgphoto2_gphoto2-file.c
diff -u /dev/null pkgsrc/devel/libgphoto2/patches/patch-libgphoto2_gphoto2-file.c:1.1
--- /dev/null   Wed Jan 31 10:53:41 2018
+++ pkgsrc/devel/libgphoto2/patches/patch-libgphoto2_gphoto2-file.c     Wed Jan 31 10:53:40 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-libgphoto2_gphoto2-file.c,v 1.1 2018/01/31 10:53:40 jperkin Exp $
+
+Set _POSIX_SOURCE correctly.
+
+--- libgphoto2/gphoto2-file.c.orig     2014-11-05 20:37:59.000000000 +0000
++++ libgphoto2/gphoto2-file.c
+@@ -24,7 +24,9 @@
+  * This file contains internal functions. Use of these functions from
+  * external software modules is considered <strong>deprecated</strong>.
+  */
++#if !defined(__sun) || (__STDC_VERSION__-0 < 199901L)
+ #define _POSIX_SOURCE
++#endif
+ #define _BSD_SOURCE
+ 
+ #include "config.h"