[143827] trunk/dports/graphics/ipe
devans at macports.org
devans at macports.org
Tue Dec 22 20:48:08 PST 2015
Revision: 143827
https://trac.macports.org/changeset/143827
Author: devans at macports.org
Date: 2015-12-22 20:48:08 -0800 (Tue, 22 Dec 2015)
Log Message:
-----------
ipe: maintainer update to version 7.1.10 (#50116).
Modified Paths:
--------------
trunk/dports/graphics/ipe/Portfile
Added Paths:
-----------
trunk/dports/graphics/ipe/files/patch-common.mak.diff
trunk/dports/graphics/ipe/files/patch-ipelets-lua-Makefile.diff
trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap_unix.cpp.diff
Removed Paths:
-------------
trunk/dports/graphics/ipe/files/patch-ipecanvas-ipecanvas_qt.cpp.diff
Modified: trunk/dports/graphics/ipe/Portfile
===================================================================
--- trunk/dports/graphics/ipe/Portfile 2015-12-23 01:45:53 UTC (rev 143826)
+++ trunk/dports/graphics/ipe/Portfile 2015-12-23 04:48:08 UTC (rev 143827)
@@ -5,7 +5,7 @@
PortGroup qt4 1.0
name ipe
-version 7.1.9
+version 7.1.10
set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
maintainers gmail.com:m7.thon openmaintainer
@@ -19,12 +19,12 @@
license GPL-3+
homepage http://ipe.otfried.org
platforms darwin
-master_sites https://github.com/otfried/ipe/raw/master/releases/${branch}
+master_sites https://dl.bintray.com/otfried/generic/ipe/${branch}
distname ${name}-${version}-src
worksrcdir ${name}-${version}/src
-checksums sha1 ec213ad86393ab2e0de8581a50ce63a09b83186d \
- rmd160 03d4425b2b7cee4309d363ecc90bb3ddaab48542
+checksums sha1 1fec414df0ce63fe7da2694a56ab808224c37288 \
+ rmd160 6a2c3404a3673d901728f09f902601b9a3ba6947
depends_lib-append port:freetype \
path:lib/pkgconfig/cairo.pc:cairo \
@@ -33,7 +33,9 @@
port:libpng \
port:zlib
-patchfiles patch-ipecanvas-ipecanvas_qt.cpp.diff
+patchfiles patch-ipelib-ipebitmap_unix.cpp.diff \
+ patch-common.mak.diff \
+ patch-ipelets-lua-Makefile.diff
use_configure no
@@ -71,6 +73,7 @@
}
destroot.args-append IPEPREFIX=${prefix}
+
use_parallel_build no
platform macosx {
Added: trunk/dports/graphics/ipe/files/patch-common.mak.diff
===================================================================
--- trunk/dports/graphics/ipe/files/patch-common.mak.diff (rev 0)
+++ trunk/dports/graphics/ipe/files/patch-common.mak.diff 2015-12-23 04:48:08 UTC (rev 143827)
@@ -0,0 +1,14 @@
+--- common.mak.orig 2015-12-23 04:16:35.000000000 +0100
++++ common.mak 2015-12-23 04:20:02.000000000 +0100
+@@ -38,11 +38,7 @@
+ # Read configuration options (not used on Win32)
+
+ ifndef WIN32
+-ifdef MACOS
+- include $(IPESRCDIR)/macos.mak
+-else
+ include $(IPESRCDIR)/config.mak
+-endif
+ BUILDDIR = $(IPESRCDIR)/../build
+ ifdef IPECXX
+ CXX = $(IPECXX)
Deleted: trunk/dports/graphics/ipe/files/patch-ipecanvas-ipecanvas_qt.cpp.diff
===================================================================
--- trunk/dports/graphics/ipe/files/patch-ipecanvas-ipecanvas_qt.cpp.diff 2015-12-23 01:45:53 UTC (rev 143826)
+++ trunk/dports/graphics/ipe/files/patch-ipecanvas-ipecanvas_qt.cpp.diff 2015-12-23 04:48:08 UTC (rev 143827)
@@ -1,11 +0,0 @@
---- ipecanvas/ipecanvas_qt.cpp.orig 2015-10-24 20:31:16.000000000 +0200
-+++ ipecanvas/ipecanvas_qt.cpp 2015-10-24 20:31:53.000000000 +0200
-@@ -239,7 +239,7 @@
- void Canvas::tabletEvent(QTabletEvent *ev)
- {
- Vector globalPos(ev->hiResGlobalX(), ev->hiResGlobalY());
-- QPointF hiPos = ev->posF();
-+ QPointF hiPos = ev->hiResGlobalPos() - (ev->globalPos() - ev->pos());
- ev->accept();
-
- switch (ev->type()) {
Added: trunk/dports/graphics/ipe/files/patch-ipelets-lua-Makefile.diff
===================================================================
--- trunk/dports/graphics/ipe/files/patch-ipelets-lua-Makefile.diff (rev 0)
+++ trunk/dports/graphics/ipe/files/patch-ipelets-lua-Makefile.diff 2015-12-23 04:48:08 UTC (rev 143827)
@@ -0,0 +1,17 @@
+--- ipelets/lua/Makefile.orig 2015-12-23 04:46:41.000000000 +0100
++++ ipelets/lua/Makefile 2015-12-23 04:46:52.000000000 +0100
+@@ -14,14 +14,5 @@
+ $(INSTALL_DIR) $(INSTALL_ROOT)$(IPELETDIR)
+ $(INSTALL_FILES) $(LUASCRIPTS) $(INSTALL_ROOT)$(IPELETDIR)
+
+-ifdef MACOS
+-
+-IPELETDIR = $(BUILDDIR)/Ipe.app/Contents/Resources/ipelets
+-
+-app:
+- $(INSTALL_DIR) $(IPELETDIR)
+- $(INSTALL_FILES) $(LUASCRIPTS) $(IPELETDIR)
+-
+-endif
+
+ # --------------------------------------------------------------------
Added: trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap_unix.cpp.diff
===================================================================
--- trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap_unix.cpp.diff (rev 0)
+++ trunk/dports/graphics/ipe/files/patch-ipelib-ipebitmap_unix.cpp.diff 2015-12-23 04:48:08 UTC (rev 143827)
@@ -0,0 +1,75 @@
+--- ipelib/ipebitmap_unix.cpp.orig 2015-12-23 04:02:26.000000000 +0100
++++ ipelib/ipebitmap_unix.cpp 2015-12-23 04:03:35.000000000 +0100
+@@ -32,64 +32,13 @@
+
+ #include <png.h>
+
+-#ifdef __APPLE__
+-#include <CoreGraphics.h>
+-#else
+ #include <csetjmp>
+ #include <jpeglib.h>
+-#endif
+
+ using namespace ipe;
+
+ // --------------------------------------------------------------------
+
+-#ifdef __APPLE__
+-
+-bool dctDecode(Buffer dctData, Buffer pixelData, int components)
+-{
+- CGDataProviderRef source =
+- CGDataProviderCreateWithData(NULL, dctData.data(),
+- dctData.size(), NULL);
+- CGImageRef bitmap =
+- CGImageCreateWithJPEGDataProvider(source, NULL, false,
+- kCGRenderingIntentDefault);
+-
+- if (CGImageGetBitsPerComponent(bitmap) != 8)
+- return false;
+-
+- int w = CGImageGetWidth(bitmap);
+- int h = CGImageGetHeight(bitmap);
+- int bytes = CGImageGetBitsPerPixel(bitmap) / 8;
+- int stride = CGImageGetBytesPerRow(bitmap);
+-
+- CGBitmapInfo info = CGImageGetBitmapInfo(bitmap);
+- // TODO: check for alpha channel, float pixel values, and byte order?
+- ipeDebug("dctDecode: %d x %d x %d, stride %d, info %x",
+- w, h, bytes, stride, info);
+-
+- // TODO: Is it necessary to copy the data?
+- CFDataRef pixels = CGDataProviderCopyData(CGImageGetDataProvider(bitmap));
+- const uchar *inRow = CFDataGetBytePtr(pixels);
+-
+- uchar *q = (uchar *) pixelData.data();
+- for (int y = 0; y < h; ++y) {
+- const uchar *p = inRow;
+- for (int x = 0; x < w; ++x) {
+- *q++ = p[0];
+- *q++ = p[1];
+- *q++ = p[2];
+- p += bytes;
+- }
+- inRow += stride;
+- }
+- CFRelease(pixels);
+- CGImageRelease(bitmap);
+- CGDataProviderRelease(source);
+- return true;
+-}
+-
+-#else
+-
+ // Decode jpeg image using libjpeg API with error handling
+ // Code contributed by Michael Thon, 2015.
+
+@@ -139,7 +88,6 @@
+ jpeg_destroy_decompress(&cinfo);
+ return true;
+ }
+-#endif
+
+ // --------------------------------------------------------------------
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151222/6455bb74/attachment.html>
More information about the macports-changes
mailing list