diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index 7a85ccd345c9..529ea779fd27 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -1,74 +1,60 @@ PORTNAME= libgphoto2 -PORTVERSION= 2.5.26 -PORTREVISION= 3 +PORTVERSION= 2.5.31 CATEGORIES= graphics MASTER_SITES= SF/gphoto/libgphoto/${PORTVERSION} MAINTAINER= danfe@FreeBSD.org COMMENT= Universal digital camera control library WWW= http://www.gphoto.org/proj/libgphoto2/ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libltdl.so:devel/libltdl -USES= compiler:c11 gmake gnome iconv libtool localbase pathfix \ - pkgconfig tar:bzip2 -USE_CSTD= gnu99 +USES= gnome libtool pathfix pkgconfig tar:xz USE_GNOME= libxml2 - GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CONFIGURE_ENV= LTDLINCL="-I${LOCALBASE}/include" \ - LIBLTDL="-L${LOCALBASE}/lib -lltdl" \ - PATH="${PATH:C,${HOME}/bin,,}" \ - ac_cv_path_DOT=false \ - ac_cv_path_DOXYGEN=false \ - udevscriptdir=${WRKDIR} INSTALL_TARGET= install-strip USE_LDCONFIG= yes PATHFIX_MAKEFILEIN= Makefile.in \ configure \ libgphoto2_port/Makefile.in \ libgphoto2_port/configure -PLIST_SUB= VERSION="${PORTVERSION}" VERSION_PORT=0.12.0 +PLIST_SUB= VERSION=${PORTVERSION} VERSION_PORT=0.12.2 OPTIONS_DEFINE= CURL DOCS GD JPEG LIBEXIF NLS OPTIONS_DEFAULT= CURL GD JPEG LIBEXIF OPTIONS_SUB= yes CURL_DESC= Lumix WiFi support via cURL CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_OFF= --with-libcurl=no GD_DESC= libGD conversion support GD_LIB_DEPENDS= libgd.so:graphics/gd GD_CONFIGURE_OFF= --with-gdlib=no JPEG_DESC= JPEG image mangling support JPEG_USES= jpeg -JPEG_CONFIGURE_WITH= jpeg +JPEG_CONFIGURE_OFF= --without-jpeg LIBEXIF_LIB_DEPENDS= libexif.so:graphics/libexif LIBEXIF_CONFIGURE_OFF= --with-libexif=no NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls +NLS_CONFIGURE_OFF= --disable-nls post-patch: .for i in configure libgphoto2_port/configure @${REINPLACE_CMD} -e \ '/FLAGS/s|-g|| ; \ /grep -i linux/s|; fi ; then|; else false; fi ; then|' \ ${WRKSRC}/${i} .endfor @${REINPLACE_CMD} -e \ '/^doc_DATA/s|COPYING||' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e \ - '/^SUBDIRS/s|linux-hotplug||' \ - ${WRKSRC}/packaging/Makefile.in .include diff --git a/graphics/libgphoto2/distinfo b/graphics/libgphoto2/distinfo index db4b3349e98b..1569720f4dbc 100644 --- a/graphics/libgphoto2/distinfo +++ b/graphics/libgphoto2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611463219 -SHA256 (libgphoto2-2.5.26.tar.bz2) = 7740fea3cbb78489071cdfec06c07fab528e69e27ac82734eae6a73eaeeabcd4 -SIZE (libgphoto2-2.5.26.tar.bz2) = 7572381 +TIMESTAMP = 1693647231 +SHA256 (libgphoto2-2.5.31.tar.xz) = 8fc7bf40f979459509b87dd4ff1aae9b6c1c2b4724d37db576081eec15406ace +SIZE (libgphoto2-2.5.31.tar.xz) = 6322264 diff --git a/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h b/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h deleted file mode 100644 index f38bc4cd5012..000000000000 --- a/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h +++ /dev/null @@ -1,16 +0,0 @@ ---- camlibs/ax203/jpeg_memsrcdest.h.orig 2015-08-08 15:57:29 UTC -+++ camlibs/ax203/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-camlibs_jl2005c_jpeg__memsrcdest.h b/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h deleted file mode 100644 index a439119fbb33..000000000000 --- a/graphics/libgphoto2/files/patch-camlibs_jl2005c_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 @@ -1,151 +1,151 @@ bin/gphoto2-config bin/gphoto2-port-config include/gphoto2/gphoto2-abilities-list.h include/gphoto2/gphoto2-camera.h include/gphoto2/gphoto2-context.h include/gphoto2/gphoto2-file.h include/gphoto2/gphoto2-filesys.h include/gphoto2/gphoto2-library.h include/gphoto2/gphoto2-list.h include/gphoto2/gphoto2-port-info-list.h include/gphoto2/gphoto2-port-log.h include/gphoto2/gphoto2-port-portability.h include/gphoto2/gphoto2-port-result.h include/gphoto2/gphoto2-port-version.h include/gphoto2/gphoto2-port.h include/gphoto2/gphoto2-result.h include/gphoto2/gphoto2-setting.h include/gphoto2/gphoto2-version.h 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 lib/libgphoto2/%%VERSION%%/dimagev.so lib/libgphoto2/%%VERSION%%/directory.so %%GD%%lib/libgphoto2/%%VERSION%%/docupen.so lib/libgphoto2/%%VERSION%%/jl2005a.so lib/libgphoto2/%%VERSION%%/jl2005c.so lib/libgphoto2/%%VERSION%%/kodak_dc240.so %%CURL%%lib/libgphoto2/%%VERSION%%/lumix.so lib/libgphoto2/%%VERSION%%/mars.so lib/libgphoto2/%%VERSION%%/pentax.so lib/libgphoto2/%%VERSION%%/ptp2.so lib/libgphoto2/%%VERSION%%/ricoh_g3.so lib/libgphoto2/%%VERSION%%/sierra.so lib/libgphoto2/%%VERSION%%/sonix.so lib/libgphoto2/%%VERSION%%/sq905.so lib/libgphoto2/%%VERSION%%/st2205.so lib/libgphoto2/%%VERSION%%/topfield.so 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 libdata/pkgconfig/libgphoto2.pc libdata/pkgconfig/libgphoto2_port.pc %%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/NEWS %%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 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.905C %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913C %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913D %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.adc65 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.agfa-cl20 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.aox %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203-compression %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.canon %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.clicksmart310 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.enigma13 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.gsmart300 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.iclick %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jamcam %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005a %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005bcd-compression %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005c %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.konica %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.largan-lmini %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.lg_gsm %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mars %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.minolta-dimagev %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mustek %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-coolshot %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-l859 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam300 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam600 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pentax %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ptp2 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.smal %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonix %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonydscf1 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.soundvision %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.spca50x %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sq905 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205-compression %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.toshiba-pdrm11 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.tp6801 %%PORTDOCS%%%%DOCSDIR%%_port/AUTHORS %%PORTDOCS%%%%DOCSDIR%%_port/NEWS %%PORTDOCS%%%%DOCSDIR%%_port/README %%DATADIR%%/%%VERSION%%/konica/english %%DATADIR%%/%%VERSION%%/konica/french %%DATADIR%%/%%VERSION%%/konica/german %%DATADIR%%/%%VERSION%%/konica/japanese %%DATADIR%%/%%VERSION%%/konica/korean %%DATADIR%%/%%VERSION%%/konica/spanish %%DATADIR%%_port/%%VERSION_PORT%%/vcamera/README.txt %%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/fi/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-12.mo %%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 %%NLS%%share/locale/sr/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-6.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-12.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-12.mo share/man/man3/libgphoto2.3.gz share/man/man3/libgphoto2_port.3.gz