Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Oct 2018 19:02:47 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r481475 - in head: . graphics graphics/gegl graphics/gegl/files graphics/gegl3
Message-ID:  <201810071902.w97J2lMH068680@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Sun Oct  7 19:02:47 2018
New Revision: 481475
URL: https://svnweb.freebsd.org/changeset/ports/481475

Log:
  Move graphics/gegl3 to graphics/gegl and update to 0.4.8.

Added:
  head/graphics/gegl/
     - copied from r481474, head/graphics/gegl3/
  head/graphics/gegl/files/patch-operations_external_exr-save.cc   (contents, props changed)
Deleted:
  head/graphics/gegl/files/patch-operations_external_ff-save.c
  head/graphics/gegl3/
Modified:
  head/MOVED
  head/graphics/Makefile
  head/graphics/gegl/Makefile
  head/graphics/gegl/distinfo
  head/graphics/gegl/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Oct  7 19:00:17 2018	(r481474)
+++ head/MOVED	Sun Oct  7 19:02:47 2018	(r481475)
@@ -10568,3 +10568,4 @@ net-p2p/libtorrent-rasterbar-python|net-p2p/py-libtorr
 biology/tinker|science/tinker|2018-10-06|Move to proper category
 net-im/telepathy-qt4|net-im/telepathy-qt@qt4|2018-10-07|Moved to flavored version
 net-im/telepathy-qt5|net-im/telepathy-qt@qt5|2018-10-07|Moved to flavored version
+graphics/gegl3|graphics/gegl|2018-10-07|Replaced old gegl version with the newer version

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Sun Oct  7 19:00:17 2018	(r481474)
+++ head/graphics/Makefile	Sun Oct  7 19:02:47 2018	(r481475)
@@ -239,7 +239,6 @@
     SUBDIR += gdtclft
     SUBDIR += geeqie
     SUBDIR += gegl
-    SUBDIR += gegl3
     SUBDIR += generic_image_decoder
     SUBDIR += geoapi
     SUBDIR += geomorph

Modified: head/graphics/gegl/Makefile
==============================================================================
--- head/graphics/gegl3/Makefile	Sun Oct  7 19:00:17 2018	(r481474)
+++ head/graphics/gegl/Makefile	Sun Oct  7 19:02:47 2018	(r481475)
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gegl
-PORTVERSION=	0.3.34
-PORTREVISION=	2
+PORTVERSION=	0.4.8
 CATEGORIES=	graphics
 MASTER_SITES=	GIMP
-PKGNAMESUFFIX=	3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Graph based image processing framework
@@ -18,9 +16,10 @@ LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LESSER
 
 LIB_DEPENDS=	libbabl-0.1.so:x11/babl \
 		libjson-glib-1.0.so:devel/json-glib \
+		libfribidi.so:converters/fribidi \
 		libpng.so:graphics/png
 
-USES=		compiler:c11 cpe gettext gmake jpeg libtool localbase \
+USES=		compiler:c11 cpe gettext gmake gnome jpeg libtool localbase \
 		pathfix pkgconfig shebangfix uniquefiles tar:bzip2
 USE_GNOME=	glib20 intltool introspection:build
 USE_LDCONFIG=	yes
@@ -30,8 +29,8 @@ CONFIGURE_ARGS=	--without-vala --disable-docs
 CONFIGURE_ARGS+=--without-mrg --without-lensfun
 INSTALL_TARGET=	install-strip
 
-GEGL_MINOR=	334
-GEGL_VER=	0.3
+GEGL_MINOR=	408
+GEGL_VER=	0.4
 PLIST_SUB+=	GEGL_MINOR="${GEGL_MINOR}" GEGL_VER=${GEGL_VER}
 
 EXAMPLES=	2geglbuffer \
@@ -42,7 +41,7 @@ SHEBANG_FILES=	tools/xml_insert.sh
 
 # Fix conflicts with graphics/gegl and sysutils/coreutils
 EXAMPLESDIR=	${PREFIX}/share/examples/gegl${PKGNAMESUFFIX}
-UNIQUE_SUFFIX_FILES=	bin/gcut bin/gegl
+UNIQUE_SUFFIX_FILES=	bin/gcut
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	CAIRO ENSCRIPT EXIV2 FFMPEG PIXBUF GRAPHVIZ JASPER \

Modified: head/graphics/gegl/distinfo
==============================================================================
--- head/graphics/gegl3/distinfo	Sun Oct  7 19:00:17 2018	(r481474)
+++ head/graphics/gegl/distinfo	Sun Oct  7 19:02:47 2018	(r481475)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526313999
-SHA256 (gegl-0.3.34.tar.bz2) = 5ca2227655ebf1ab2e252cee3eede219c758336394288ef301b93264b9411304
-SIZE (gegl-0.3.34.tar.bz2) = 6707964
+TIMESTAMP = 1537606982
+SHA256 (gegl-0.4.8.tar.bz2) = 719468eec56ac5b191626a0cb6238f3abe9117e80594890c246acdc89183ae49
+SIZE (gegl-0.4.8.tar.bz2) = 7017022

Added: head/graphics/gegl/files/patch-operations_external_exr-save.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/gegl/files/patch-operations_external_exr-save.cc	Sun Oct  7 19:02:47 2018	(r481475)
@@ -0,0 +1,36 @@
+Upstream: https://gitlab.gnome.org/GNOME/gegl/commit/c1c3541caab485384087bbbcf1c83ef2d5bd4d43
+
+diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc
+index b2032046ccf69f645e52e908bf4fe58ab2b85c6e..018e5d9af0469cc082d12a27af9377ec9b553322 100644
+--- operations/external/exr-save.cc
++++ operations/external/exr-save.cc
+@@ -145,10 +145,10 @@ write_tiled_exr (const float       *pixels,
+                           &blue[0], &blue[1],
+                           NULL, NULL, NULL);
+     {
+-    Imf::Chromaticities c1 (Imath_2_2::V2f(red[0],red[1]),
+-                            Imath_2_2::V2f(green[0],green[1]),
+-                            Imath_2_2::V2f(blue[0],blue[1]),
+-                            Imath_2_2::V2f(wp[0],wp[1]));
++    Imf::Chromaticities c1 (Imath::V2f(red[0],red[1]),
++                            Imath::V2f(green[0],green[1]),
++                            Imath::V2f(blue[0],blue[1]),
++                            Imath::V2f(wp[0],wp[1]));
+     Imf::addChromaticities (header, c1);
+     }
+   }
+@@ -184,10 +184,10 @@ write_scanline_exr (const float       *pixels,
+                            &green[0], &green[1],
+                            &blue[0], &blue[1],
+                            NULL, NULL, NULL);
+-    Imf::Chromaticities c1 (Imath_2_2::V2f(red[0],red[1]),
+-                            Imath_2_2::V2f(green[0],green[1]),
+-                            Imath_2_2::V2f(blue[0],blue[1]),
+-                            Imath_2_2::V2f(wp[0],wp[1]));
++    Imf::Chromaticities c1 (Imath::V2f(red[0],red[1]),
++                            Imath::V2f(green[0],green[1]),
++                            Imath::V2f(blue[0],blue[1]),
++                            Imath::V2f(wp[0],wp[1]));
+     Imf::addChromaticities (header, c1);
+   }
+ 

Modified: head/graphics/gegl/pkg-plist
==============================================================================
--- head/graphics/gegl3/pkg-plist	Sun Oct  7 19:00:17 2018	(r481474)
+++ head/graphics/gegl/pkg-plist	Sun Oct  7 19:02:47 2018	(r481475)
@@ -145,6 +145,7 @@ share/locale/is/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/it/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/ko/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/lv/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
+share/locale/mr/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/nb/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/oc/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/pl/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
@@ -156,4 +157,5 @@ share/locale/sl/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/sr/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/sv/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/tr/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
+share/locale/uk/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/zh_CN/LC_MESSAGES/gegl-%%GEGL_VER%%.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810071902.w97J2lMH068680>