_jpeg__memsrcdest.h +++ /dev/null @@ -1,16 +0,0 @@ ---- camlibs/jl2005c/jpeg_memsrcdest.h.orig 2015-08-08 15:57:29 UTC -+++ camlibs/jl2005c/jpeg_memsrcdest.h -@@ -1,5 +1,7 @@ - #include - -+#if JPEG_LIB_VERSION < 80 -+ - void - jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - unsigned long bufsize); -@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, un - void - jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, - unsigned long * outsize); -+ -+#endif diff --git a/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h b/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h deleted file mode 100644 index 87eae53991ac..000000000000 --- a/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h +++ /dev/null @@ -1,23 +0,0 @@ ---- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig 2014-06-27 05:26:01 UTC -+++ libgphoto2_port/gphoto2/gphoto2-port-portability.h -@@ -174,20 +174,6 @@ typedef struct { - - /* yummy. :) */ - --/* XOPEN needed for usleep */ --#ifndef _XOPEN_SOURCE --# define _XOPEN_SOURCE 500 --#else --# if ((_XOPEN_SOURCE - 0) < 500) --# undef _XOPEN_SOURCE --# define _XOPEN_SOURCE 500 --# endif --#endif -- --/* for nanosleep */ --# ifndef _POSIX_C_SOURCE --# define _POSIX_C_SOURCE 199309 --# endif - # include - - # include diff --git a/graphics/libgphoto2/pkg-plist b/graphics/libgphoto2/pkg-plist index c27b3fdc9d00..1be9c0ffe44f 100644 --- a/graphics/libgphoto2/pkg-plist +++ b/graphics/libgphoto2/pkg-plist @@ -20,7 +20,7 @@ include/gphoto2/gphoto2-widget.h include/gphoto2/gphoto2.h lib/libgphoto2.so lib/libgphoto2.so.6 -lib/libgphoto2.so.6.1.0 +lib/libgphoto2.so.6.3.0 lib/libgphoto2/%%VERSION%%/ax203.so lib/libgphoto2/%%VERSION%%/canon.so lib/libgphoto2/%%VERSION%%/digigr8.so @@ -44,7 +44,7 @@ lib/libgphoto2/%%VERSION%%/tp6801.so lib/libgphoto2/print-camera-list lib/libgphoto2_port.so lib/libgphoto2_port.so.12 -lib/libgphoto2_port.so.12.0.0 +lib/libgphoto2_port.so.12.2.0 lib/libgphoto2_port/%%VERSION_PORT%%/disk.so lib/libgphoto2_port/%%VERSION_PORT%%/ptpip.so lib/libgphoto2_port/%%VERSION_PORT%%/usb1.so @@ -57,7 +57,6 @@ libdata/pkgconfig/libgphoto2_port.pc %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/README.packaging %%PORTDOCS%%%%DOCSDIR%%/RELEASE-HOWTO.md -%%PORTDOCS%%%%DOCSDIR%%/camlibs/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9050 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9051 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9052 @@ -134,6 +133,7 @@ libdata/pkgconfig/libgphoto2_port.pc %%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-12.mo +%%NLS%%share/locale/ro/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/sk/LC_MESSAGES/libgphoto2_port-12.mo