[122559] trunk/dports/x11

jeremyhu at macports.org jeremyhu at macports.org
Wed Jul 23 18:59:49 PDT 2014


Revision: 122559
          https://trac.macports.org/changeset/122559
Author:   jeremyhu at macports.org
Date:     2014-07-23 18:59:49 -0700 (Wed, 23 Jul 2014)
Log Message:
-----------
xorg-xcb-util-cursor: New port

Added Paths:
-----------
    trunk/dports/x11/xorg-xcb-util-cursor/
    trunk/dports/x11/xorg-xcb-util-cursor/Portfile
    trunk/dports/x11/xorg-xcb-util-cursor/files/
    trunk/dports/x11/xorg-xcb-util-cursor/files/0001-Use-CFSwapInt32LittleToHost-from-CoreFoundation.h-on.patch
    trunk/dports/x11/xorg-xcb-util-cursor/files/0002-Check-submodules-before-running-autoconf.patch
    trunk/dports/x11/xorg-xcb-util-cursor/files/0003-darwin-Use-OSByteOrder.h-rather-than-CF.patch

Added: trunk/dports/x11/xorg-xcb-util-cursor/Portfile
===================================================================
--- trunk/dports/x11/xorg-xcb-util-cursor/Portfile	                        (rev 0)
+++ trunk/dports/x11/xorg-xcb-util-cursor/Portfile	2014-07-24 01:59:49 UTC (rev 122559)
@@ -0,0 +1,41 @@
+# $Id$
+
+PortSystem 1.0
+
+name		xorg-xcb-util-cursor
+version		0.1.1
+categories	x11 devel
+license		X11
+maintainers	jeremyhu openmaintainer
+description	X.org xcb-util-cursor
+homepage	http://xcb.freedesktop.org/
+platforms	darwin macosx
+long_description Utility libraries for XCB
+master_sites	 ${homepage}/dist/
+
+distname	xcb-util-cursor-${version}
+checksums           sha1    75ea5d4dc5f185151f171e525023cb76f3b72128 \
+                    rmd160  3dafa5d3ba7d284c2cdd4c8f57d648dfb595fb46 \
+                    sha256  517a1febcede3bc994e356c4c066e297a12ca219063b7d39047e29c7a8860652
+use_bzip2	yes
+use_parallel_build yes
+
+depends_build   port:pkgconfig \
+                port:xorg-util-macros
+depends_lib	port:xorg-xcb-util \
+                port:xorg-xcb-util-image \
+                port:xorg-xproto
+
+patchfiles \
+    0001-Use-CFSwapInt32LittleToHost-from-CoreFoundation.h-on.patch \
+    0002-Check-submodules-before-running-autoconf.patch \
+    0003-darwin-Use-OSByteOrder.h-rather-than-CF.patch
+
+patch.pre_args -p1
+
+use_autoreconf  yes
+autoreconf.args -fvi
+
+livecheck.type  regex
+livecheck.url   ${master_sites}?C=M&O=D
+livecheck.regex xcb-util-image-(\\d+(?:\\.\\d+)*)


Property changes on: trunk/dports/x11/xorg-xcb-util-cursor/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/x11/xorg-xcb-util-cursor/files/0001-Use-CFSwapInt32LittleToHost-from-CoreFoundation.h-on.patch
===================================================================
--- trunk/dports/x11/xorg-xcb-util-cursor/files/0001-Use-CFSwapInt32LittleToHost-from-CoreFoundation.h-on.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-xcb-util-cursor/files/0001-Use-CFSwapInt32LittleToHost-from-CoreFoundation.h-on.patch	2014-07-24 01:59:49 UTC (rev 122559)
@@ -0,0 +1,41 @@
+From d25806902ee6050ec3d52480d0bc8f4889942350 Mon Sep 17 00:00:00 2001
+From: Marcus Crestani <crestani at informatik.uni-tuebingen.de>
+Date: Mon, 23 Dec 2013 23:30:04 +0100
+Subject: [PATCH 1/3] Use CFSwapInt32LittleToHost from CoreFoundation.h on Mac
+ OS X to implement le32toh.
+
+---
+ configure.ac               | 2 +-
+ cursor/parse_cursor_file.c | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4baa90a..7b45299 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,7 @@ XCB_UTIL_COMMON([1.4], [1.6])
+ 
+ AM_MISSING_PROG([GPERF], [gperf])
+ 
+-AC_CHECK_HEADERS([endian.h sys/endian.h sys/byteorder.h], [break])
++AC_CHECK_HEADERS([endian.h sys/endian.h sys/byteorder.h CoreFoundation/CoreFoundation.h], [break])
+ AC_CHECK_FUNCS([le32toh])
+ 
+ PKG_CHECK_MODULES(XCB_RENDER, xcb-render)
+diff --git a/cursor/parse_cursor_file.c b/cursor/parse_cursor_file.c
+index 30c6a58..0226b01 100644
+--- a/cursor/parse_cursor_file.c
++++ b/cursor/parse_cursor_file.c
+@@ -48,6 +48,9 @@
+ # ifndef HAVE_LE32TOH
+ #  define le32toh(x) LE_32(x)
+ # endif
++#elif defined(HAVE_COREFOUNDATION_COREFOUNDATION_H)
++#include <CoreFoundation/CoreFoundation.h>
++#define le32toh(x) CFSwapInt32LittleToHost(x)
+ #endif
+ 
+ #include <xcb/xcb.h>
+-- 
+1.9.1
+

Added: trunk/dports/x11/xorg-xcb-util-cursor/files/0002-Check-submodules-before-running-autoconf.patch
===================================================================
--- trunk/dports/x11/xorg-xcb-util-cursor/files/0002-Check-submodules-before-running-autoconf.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-xcb-util-cursor/files/0002-Check-submodules-before-running-autoconf.patch	2014-07-24 01:59:49 UTC (rev 122559)
@@ -0,0 +1,45 @@
+From a08bbf0e20995d29cbf890957c898059d4a9ece2 Mon Sep 17 00:00:00 2001
+From: Niclas Zeising <zeising at daemonic.se>
+Date: Mon, 12 Aug 2013 13:53:10 +0200
+Subject: [PATCH 2/3] Check submodules before running autoconf.
+
+Exit early with an informative message if the submodules are missing,
+since they are needed.  Without this autoconf throws a bunch of
+uninformative errors which does not point to the actual problem.
+This was taken from util-keysyms.
+
+Signed-off-by: Niclas Zeising <zeising at daemonic.se>
+Reviewed-By: Arnaud Fontaine <arnau at debian.org>
+---
+ autogen.sh | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/autogen.sh b/autogen.sh
+index 904cd67..afe5299 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -6,6 +6,21 @@ test -z "$srcdir" && srcdir=.
+ ORIGDIR=`pwd`
+ cd $srcdir
+ 
++# If this is a git checkout, verify that the submodules are initialized,
++# otherwise autotools will just fail with an unhelpful error message.
++if [ -d ".git" ] && [ -r ".gitmodules" ]
++then
++	# If git is not in PATH, this will not return 0, thus not keeping us
++	# from building. Since the message is worthless when git is not
++	# installed, this is what we want.
++	if git submodule status 2>/dev/null | grep -q '^-'
++	then
++		echo "You have uninitialized git submodules." >&2
++		echo "Please run: git submodule update --init" >&2
++		exit 1
++	fi
++fi
++
+ autoreconf -v --install || exit 1
+ cd $ORIGDIR || exit $?
+ 
+-- 
+1.9.1
+

Added: trunk/dports/x11/xorg-xcb-util-cursor/files/0003-darwin-Use-OSByteOrder.h-rather-than-CF.patch
===================================================================
--- trunk/dports/x11/xorg-xcb-util-cursor/files/0003-darwin-Use-OSByteOrder.h-rather-than-CF.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-xcb-util-cursor/files/0003-darwin-Use-OSByteOrder.h-rather-than-CF.patch	2014-07-24 01:59:49 UTC (rev 122559)
@@ -0,0 +1,44 @@
+From f03cc278c6cce0cf721adf9c3764d3c5fba63392 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 5 Apr 2014 15:50:28 -0700
+Subject: [PATCH 3/3] darwin: Use OSByteOrder.h rather than CF.
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ configure.ac               | 2 +-
+ cursor/parse_cursor_file.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7b45299..94798d8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,7 @@ XCB_UTIL_COMMON([1.4], [1.6])
+ 
+ AM_MISSING_PROG([GPERF], [gperf])
+ 
+-AC_CHECK_HEADERS([endian.h sys/endian.h sys/byteorder.h CoreFoundation/CoreFoundation.h], [break])
++AC_CHECK_HEADERS([endian.h sys/endian.h sys/byteorder.h libkern/OSByteOrder.h], [break])
+ AC_CHECK_FUNCS([le32toh])
+ 
+ PKG_CHECK_MODULES(XCB_RENDER, xcb-render)
+diff --git a/cursor/parse_cursor_file.c b/cursor/parse_cursor_file.c
+index 0226b01..21f72bf 100644
+--- a/cursor/parse_cursor_file.c
++++ b/cursor/parse_cursor_file.c
+@@ -48,9 +48,9 @@
+ # ifndef HAVE_LE32TOH
+ #  define le32toh(x) LE_32(x)
+ # endif
+-#elif defined(HAVE_COREFOUNDATION_COREFOUNDATION_H)
+-#include <CoreFoundation/CoreFoundation.h>
+-#define le32toh(x) CFSwapInt32LittleToHost(x)
++#elif defined(HAVE_LIBKERN_OSBYTEORDER_H)
++#include <libkern/OSByteOrder.h>
++#define le32toh(x) OSSwapLittleToHostInt32(x)
+ #endif
+ 
+ #include <xcb/xcb.h>
+-- 
+1.9.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140723/3884730e/attachment.html>


More information about the macports-changes mailing list