Index: head/graphics/gegl/Makefile =================================================================== --- head/graphics/gegl/Makefile (revision 427510) +++ head/graphics/gegl/Makefile (revision 427511) @@ -1,256 +1,256 @@ # Created by: Pietro Cerutti # $FreeBSD$ PORTNAME= gegl PORTVERSION= 0.2.0 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics MASTER_SITES= GIMP MAINTAINER= gnome@FreeBSD.org COMMENT= Graph based image processing framework LICENSE= GPLv3+ LGPL20+ LGPL3+ LICENSE_COMB= multi LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL3+ = ${WRKSRC}/COPYING.LESSER LIB_DEPENDS= libbabl-0.1.so:x11/babl # ignore new versions until we can replace this version with gegl 3.x PORTSCOUT= ignore:1 OPTIONS_DEFINE= CAIRO ENSCRIPT EXIV2 FFMPEG PIXBUF GRAPHVIZ JASPER JPEG \ LUA OPENEXR OPENRAW SIMD PANGO PNG LIBRSVG2 SDL SPIRO V4L \ DOCS EXAMPLES OPTIONS_DEFAULT=CAIRO ENSCRIPT EXIV2 PIXBUF GRAPHVIZ JASPER JPEG LUA \ OPENEXR OPENRAW PANGO PNG LIBRSVG2 SDL SPIRO V4L ENSCRIPT_DESC= Enscript support SPIRO_DESC= Spiro support #UMFPACK_DESC= UMFpack support USES= cpe gettext gmake libtool pathfix pkgconfig shebangfix tar:bzip2 USE_GNOME= glib20 intltool USE_LDCONFIG= ${PREFIX}/lib/gegl-0.2 GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_execinfo_h=no CONFIGURE_ARGS= --without-vala --disable-docs INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl GEGL_MINOR= 199 GEGL_VER= 0.2 PLIST_SUB+= GEGL_MINOR="${GEGL_MINOR}" GEGL_VER=${GEGL_VER} EXAMPLES= 2geglbuffer csugar float-lookup \ gegl-convert gegl-slicer geglbuffer-add-image \ geglbuffer-clock hello-world-video hello-world SHEBANG_FILES= tools/xml_insert.sh .include .if ${PORT_OPTIONS:MPIXBUF} USE_GNOME+= gdkpixbuf2 PLIST_SUB+= GDK="" .else CONFIGURE_ARGS+=--without-gdk-pixbuf PLIST_SUB+= GDK="@comment " .endif .if ${PORT_OPTIONS:MCAIRO} LIB_DEPENDS+= libcairo.so:graphics/cairo PLIST_SUB+= CAIRO="" .else CONFIGURE_ARGS+=--without-cairo PLIST_SUB+= CAIRO="@comment " .endif .if ${PORT_OPTIONS:MPANGO} USE_GNOME+= pango PLIST_SUB+= PANGO="" .else CONFIGURE_ARGS+=--without-pango PLIST_SUB+= PANGO="@comment " .endif .if ${PORT_OPTIONS:MPANGO} && ${PORT_OPTIONS:MCAIRO} PLIST_SUB+= PANGOCAIRO="" .else CONFIGURE_ARGS+=--without-pangocairo PLIST_SUB+= PANGOCAIRO="@comment " .endif .if ${PORT_OPTIONS:MENSCRIPT} BUILD_DEPENDS+= enscript:print/enscript-a4 .endif .if ${PORT_OPTIONS:MFFMPEG} LIB_DEPENDS+= libavformat.so:multimedia/ffmpeg PLIST_SUB+= FFMPEG="" .else CONFIGURE_ARGS+=--without-libavformat PLIST_SUB+= FFMPEG="@comment " .endif .if ${PORT_OPTIONS:MGRAPHVIZ} LIB_DEPENDS+= libcgraph.so:graphics/graphviz .else CONFIGURE_ARGS+=--without-graphviz .endif .if ${PORT_OPTIONS:MJASPER} LIB_DEPENDS+= libjasper.so:graphics/jasper PLIST_SUB+= JP2="" .else CONFIGURE_ARGS+=--without-jasper PLIST_SUB+= JP2="@comment " .endif .if ${PORT_OPTIONS:MJPEG} USES+= jpeg PLIST_SUB+= JPEG="" .else CONFIGURE_ARGS+=--without-libjpeg PLIST_SUB+= JPEG="@comment " .endif .if ${PORT_OPTIONS:MLUA} USES+= lua .else CONFIGURE_ARGS+=--without-lua .endif .if ${PORT_OPTIONS:MOPENEXR} LIB_DEPENDS+= libIlmImf.so:graphics/OpenEXR PLIST_SUB+= OPENEXR="" .else CONFIGURE_ARGS+=--without-openexr PLIST_SUB+= OPENEXR="@comment " .endif .if ${PORT_OPTIONS:MOPENRAW} LIB_DEPENDS+= libopenraw.so:graphics/libopenraw PLIST_SUB+= OPENRAW="" .else CONFIGURE_ARGS+=--without-libopenraw PLIST_SUB+= OPENRAW="@comment " .endif .if ! ${PORT_OPTIONS:MSIMD} CONFIGURE_ARGS+=--disable-mmx \ --disable-sse .endif .if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= libpng.so:graphics/png PLIST_SUB+= PNG="" .else CONFIGURE_ARGS+=--without-libpng PLIST_SUB+= PNG="@comment " .endif .if ${PORT_OPTIONS:MLIBRSVG2} LIB_DEPENDS+= librsvg-2.so:graphics/librsvg2 PLIST_SUB+= RSVG="" .else CONFIGURE_ARGS+=--without-librsvg PLIST_SUB+= RSVG="@comment " .endif .if ${PORT_OPTIONS:MSDL} USE_SDL= sdl PLIST_SUB+= SDL="" .else CONFIGURE_ARGS+=--without-sdl PLIST_SUB+= SDL="@comment " .endif .if ${PORT_OPTIONS:MSPIRO} LIB_DEPENDS+= libspiro.so:graphics/libspiro .else CONFIGURE_ARGS+=--without-libspiro .endif .if ${PORT_OPTIONS:MV4L} BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat PLIST_SUB+= V4L="" .else CONFIGURE_ARGS+=--without-libv4l PLIST_SUB+= V4L="@comment " .endif # umfpack library is broken #.if ${PORT_OPTIONS:MUMFPACK} #LIB_DEPENDS+= umfpack:math/suitesparse #PLIST_SUB+= UMFPACK="" #.else CONFIGURE_ARGS+=--without-umfpack PLIST_SUB+= UMFPACK="@comment " #.endif .if ${PORT_OPTIONS:MEXIV2} LIB_DEPENDS+= libexiv2.so:graphics/exiv2 PLIST_SUB+= EXIV2="" .else CONFIGURE_ARGS+=--without-exiv2 PLIST_SUB+= EXIV2="@comment " .endif .if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= a2x:textproc/asciidoc \ ${LOCALBASE}/bin/bash:shells/bash \ vimdot:graphics/graphviz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes .else CONFIGURE_ARGS+=--disable-docs .endif post-patch: ${REINPLACE_CMD} "s/lua >/lua-${LUA_VER} >/g" ${WRKSRC}/configure .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e 's|tools examples|tools|g' \ ${WRKSRC}/Makefile.in .endif - ${REINPLACE_CMD} -e 's|\(lua\)\(5\.1\)|\1-\2|g ; s|x86_64|amd64|g' \ + ${REINPLACE_CMD} -e 's|\(lua\)\(5\.1\)|\1-\2|g ; s|x86_64|amd64|g ; s|libopenraw-1.0|libopenraw-0.1|g' \ ${WRKSRC}/configure .if ${PORT_OPTIONS:MDOCS} pre-configure: # .if !exists() evaluates too early before graphviz has a chance to be installed @if ! hash vimdot 2>/dev/null; then \ ${ECHO_MSG} "${PKGNAME}: Needs graphics/graphviz with PANGOCAIRO support enabled."; \ ${FALSE}; \ fi .endif post-build: .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/docs && ${MAKE_CMD} index.html cd ${WRKSRC}/docs/gallery && ${MAKE_CMD} index.html .endif post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR}/gallery (cd ${WRKSRC}/docs && \ ${COPYTREE_SHARE} \*.html ${STAGEDIR}${DOCSDIR} && \ ${INSTALL_DATA} ChangeLog gegl.css gegl.devhelp devhelp.css ${STAGEDIR}${DOCSDIR} && \ ${INSTALL_DATA} gallery/OpenRaster* ${STAGEDIR}${DOCSDIR}/gallery && \ ${INSTALL_DATA} gallery/clones* ${STAGEDIR}${DOCSDIR}/gallery && \ ${INSTALL_DATA} gallery/index.html ${STAGEDIR}${DOCSDIR}/gallery ) .endif .if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/data ${INSTALL_DATA} ${WRKSRC}/examples/data/surfer.png ${STAGEDIR}${EXAMPLESDIR}/data .for ex in ${EXAMPLES} ${INSTALL_DATA} ${WRKSRC}/examples/${ex}.c ${STAGEDIR}${EXAMPLESDIR} .endfor .endif @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gegl-0.2/*.so .include Index: head/graphics/gegl/files/patch-operations_external_openraw.c =================================================================== --- head/graphics/gegl/files/patch-operations_external_openraw.c (nonexistent) +++ head/graphics/gegl/files/patch-operations_external_openraw.c (revision 427511) @@ -0,0 +1,13 @@ +OR_DATA_TYPE_CFA was replaced by OR_DATA_TYPE_RAW in libopenraw-0.1.0 + +--- operations/external/openraw.c.orig 2016-12-01 05:57:23 UTC ++++ operations/external/openraw.c +@@ -116,7 +116,7 @@ load_buffer (GeglOperation *operation) + goto clean_file; + } + +- if(or_rawdata_format (rawdata) != OR_DATA_TYPE_CFA) ++ if(or_rawdata_format (rawdata) != OR_DATA_TYPE_RAW) + { + goto clean_file; + } Property changes on: head/graphics/gegl/files/patch-operations_external_openraw.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/libopenraw/Makefile =================================================================== --- head/graphics/libopenraw/Makefile (revision 427510) +++ head/graphics/libopenraw/Makefile (revision 427511) @@ -1,43 +1,40 @@ # Created by: Pav Lucistnik # $FreeBSD$ PORTNAME= libopenraw -PORTVERSION= 0.0.9 -PORTREVISION= 4 +PORTVERSION= 0.1.0 CATEGORIES= graphics MASTER_SITES= http://libopenraw.freedesktop.org/download/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Library for camera RAW files decoding LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -LIB_DEPENDS= libboost_thread.so:devel/boost-libs +BUILD_DEPENDS= ${LOCALBASE}/include/boost/variant.hpp:devel/boost-libs -USES= compiler:c++11-lang jpeg libtool localbase pkgconfig tar:bzip2 +USES= compiler:c++11-lib jpeg libtool localbase pkgconfig tar:bz2 USE_GNOME= libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include -MAKE_ENV= V=1 +CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include \ + --disable-silent-rules +INSTALL_TARGET= install-strip -OPTIONS_DEFINE= GNOME +# Unhide SEEK_SET to fix build with GCC 4.9 (ports/193528). +CXXFLAGS+= -D_GLIBCXX_USE_C99 + +OPTIONS_DEFINE= GNOME OPTIONS_DEFAULT= GNOME +OPTIONS_SUB= yes -OPTIONS_SUB= yes GNOME_CONFIGURE_ENABLE= gnome -GNOME_USE= GNOME=glib20,gdkpixbuf2 +GNOME_USES= gettext-runtime +GNOME_USE= GNOME=glib20,gdkpixbuf2 post-patch: @${REINPLACE_CMD} -e 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|testsuite ||' ${WRKSRC}/Makefile.in - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenraw.so - -post-install-GNOME-on: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenrawgnome.so - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gdk-pixbuf-2.0/${GTK2_VERSION}/loaders/libopenraw_pixbuf.so .include Index: head/graphics/libopenraw/distinfo =================================================================== --- head/graphics/libopenraw/distinfo (revision 427510) +++ head/graphics/libopenraw/distinfo (revision 427511) @@ -1,2 +1,3 @@ -SHA256 (libopenraw-0.0.9.tar.bz2) = 49fd1adf0a0228c7a17a79bf98d8d03664195feae1e50f4ddd1b20162626e18f -SIZE (libopenraw-0.0.9.tar.bz2) = 478687 +TIMESTAMP = 1480563957 +SHA256 (libopenraw-0.1.0.tar.bz2) = 4dede1db9b85c9c22a1ddaf37839f2713746a00b81a6d4623d66556000cb76cf +SIZE (libopenraw-0.1.0.tar.bz2) = 525449 Index: head/graphics/libopenraw/files/patch-gnomeincludes =================================================================== --- head/graphics/libopenraw/files/patch-gnomeincludes (revision 427510) +++ head/graphics/libopenraw/files/patch-gnomeincludes (nonexistent) @@ -1,12 +0,0 @@ ---- gnome/include/libopenraw-gnome/Makefile.in.orig Tue Jan 9 00:28:06 2007 -+++ gnome/include/libopenraw-gnome/Makefile.in Wed Mar 21 14:51:32 2007 -@@ -371,7 +371,8 @@ - - info-am: - --install-data-am: install-libopenrawgnomeHEADERS -+@BUILD_GNOME_SUPPORT_TRUE@install-data-am: install-libopenrawgnomeHEADERS -+@BUILD_GNOME_SUPPORT_FALSE@install-data-am: - - install-exec-am: - Property changes on: head/graphics/libopenraw/files/patch-gnomeincludes ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/libopenraw/files/patch-demo_ppmload.c =================================================================== --- head/graphics/libopenraw/files/patch-demo_ppmload.c (nonexistent) +++ head/graphics/libopenraw/files/patch-demo_ppmload.c (revision 427511) @@ -0,0 +1,11 @@ +--- demo/ppmload.c.orig 2016-01-24 18:35:23 UTC ++++ demo/ppmload.c +@@ -30,6 +30,8 @@ + # include + # include + # define htobe16(x) OSSwapHostToBigInt16(x) ++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) ++# include + #else + # include + #endif Property changes on: head/graphics/libopenraw/files/patch-demo_ppmload.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/libopenraw/files/patch-gnome_include_libopenraw-gnome_Makefile.in =================================================================== --- head/graphics/libopenraw/files/patch-gnome_include_libopenraw-gnome_Makefile.in (nonexistent) +++ head/graphics/libopenraw/files/patch-gnome_include_libopenraw-gnome_Makefile.in (revision 427511) @@ -0,0 +1,12 @@ +--- gnome/include/libopenraw-gnome/Makefile.in.orig 2016-11-27 01:53:40 UTC ++++ gnome/include/libopenraw-gnome/Makefile.in +@@ -529,7 +529,8 @@ info: info-am + + info-am: + +-install-data-am: install-libopenrawgnomeHEADERS ++@BUILD_GNOME_SUPPORT_TRUE@install-data-am: install-libopenrawgnomeHEADERS ++@BUILD_GNOME_SUPPORT_FALSE@install-data-am: + + install-dvi: install-dvi-am + Property changes on: head/graphics/libopenraw/files/patch-gnome_include_libopenraw-gnome_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/libopenraw/pkg-descr =================================================================== --- head/graphics/libopenraw/pkg-descr (revision 427510) +++ head/graphics/libopenraw/pkg-descr (revision 427511) @@ -1,6 +1,6 @@ libopenraw is an ongoing project to provide a free software implementation for -camera RAW files decoding. One of the main reason is that dcraw is not suited +camera RAW files decoding. One of the main reasons is that dcraw is not suited for easy integration into applications, and there is a need for an easy to use -API to build free software digital image processing application. +API to build free software digital image processing applications. WWW: http://libopenraw.freedesktop.org/ Index: head/graphics/libopenraw/pkg-plist =================================================================== --- head/graphics/libopenraw/pkg-plist (revision 427510) +++ head/graphics/libopenraw/pkg-plist (revision 427511) @@ -1,25 +1,28 @@ -include/libopenraw-1.0/libopenraw/bitmapdata.h -include/libopenraw-1.0/libopenraw/consts.h -include/libopenraw-1.0/libopenraw/debug.h -include/libopenraw-1.0/libopenraw/demosaic.h -include/libopenraw-1.0/libopenraw/exif.h -include/libopenraw-1.0/libopenraw/io.h -include/libopenraw-1.0/libopenraw/libopenraw.h -include/libopenraw-1.0/libopenraw/metadata.h -include/libopenraw-1.0/libopenraw/rawdata.h -include/libopenraw-1.0/libopenraw/rawfile.h -include/libopenraw-1.0/libopenraw/thumbnails.h -include/libopenraw-1.0/libopenraw/types.h -%%GNOME%%include/libopenraw-1.0/libopenraw-gnome/gdkpixbuf.h +%%GNOME%%include/libopenraw-0.1/libopenraw-gnome/gdkpixbuf.h +include/libopenraw-0.1/libopenraw/bitmapdata.h +include/libopenraw-0.1/libopenraw/cameraids.h +include/libopenraw-0.1/libopenraw/cfapattern.h +include/libopenraw-0.1/libopenraw/consts.h +include/libopenraw-0.1/libopenraw/debug.h +include/libopenraw-0.1/libopenraw/demosaic.h +include/libopenraw-0.1/libopenraw/exif.h +include/libopenraw-0.1/libopenraw/io.h +include/libopenraw-0.1/libopenraw/libopenraw.h +include/libopenraw-0.1/libopenraw/metadata.h +include/libopenraw-0.1/libopenraw/prefix.h +include/libopenraw-0.1/libopenraw/rawdata.h +include/libopenraw-0.1/libopenraw/rawfile.h +include/libopenraw-0.1/libopenraw/thumbnails.h +include/libopenraw-0.1/libopenraw/types.h %%GNOME%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libopenraw_pixbuf.a %%GNOME%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libopenraw_pixbuf.so lib/libopenraw.a lib/libopenraw.so -lib/libopenraw.so.1 -lib/libopenraw.so.1.6.0 +lib/libopenraw.so.7 +lib/libopenraw.so.7.0.0 %%GNOME%%lib/libopenrawgnome.a %%GNOME%%lib/libopenrawgnome.so -%%GNOME%%lib/libopenrawgnome.so.1 -%%GNOME%%lib/libopenrawgnome.so.1.6.0 -libdata/pkgconfig/libopenraw-1.0.pc -%%GNOME%%libdata/pkgconfig/libopenraw-gnome-1.0.pc +%%GNOME%%lib/libopenrawgnome.so.7 +%%GNOME%%lib/libopenrawgnome.so.7.0.0 +libdata/pkgconfig/libopenraw-0.1.pc +%%GNOME%%libdata/pkgconfig/libopenraw-gnome-0.1.pc