diff options
author | jperkin <jperkin> | 2012-09-27 13:20:42 +0000 |
---|---|---|
committer | jperkin <jperkin> | 2012-09-27 13:20:42 +0000 |
commit | b7785b5d708140bff1df483827b1374561fc8e91 (patch) | |
tree | 32436ce290d9ac04a7c8c7027508fdffa069fe6f /graphics | |
parent | 00925aaf1d5d077201091b5606f768ad9a873bda (diff) | |
download | pkgsrc-b7785b5d708140bff1df483827b1374561fc8e91.tar.gz |
Ensure that MODULE_ARCH is syncronised between pkgsrc and configure script.
Fixes package on Solaris.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/evas/distinfo | 8 | ||||
-rw-r--r-- | graphics/evas/patches/patch-configure | 14 | ||||
-rw-r--r-- | graphics/evas/patches/patch-configure.ac | 14 | ||||
-rw-r--r-- | graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c | 2 |
4 files changed, 24 insertions, 14 deletions
diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo index 172d078ccea..591d4a3bca1 100644 --- a/graphics/evas/distinfo +++ b/graphics/evas/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.11 2012/01/12 15:34:24 hans Exp $ +$NetBSD: distinfo,v 1.12 2012/09/27 13:20:42 jperkin Exp $ SHA1 (evas-1.1.0.tar.bz2) = e09daebd5aa14ecdff94bca0ff30a4cf70b3b84b RMD160 (evas-1.1.0.tar.bz2) = ebad0e5b4f3987ee9a29b39f329afb650eafeb20 Size (evas-1.1.0.tar.bz2) = 9235732 bytes -SHA1 (patch-configure) = e8c7965ff313119dafed9e741439056a0b68bf13 -SHA1 (patch-configure.ac) = 7ab470d4c80e60859c3990eccc54633e84d54bda -SHA1 (patch-src_modules_loaders_psd_evas__image__load__psd.c) = 3c7ec26362e48e8458cb862000999c192965c095 +SHA1 (patch-configure) = 134e4585671677a7e06b36f8915ca7e1fe78e52b +SHA1 (patch-configure.ac) = 890c2e38922ed2c3d85de1660cad6634e6b2e742 +SHA1 (patch-src_modules_loaders_psd_evas__image__load__psd.c) = e65edd1214a926986a1a8206c955f5351308c306 diff --git a/graphics/evas/patches/patch-configure b/graphics/evas/patches/patch-configure index c7af6374926..473794eec13 100644 --- a/graphics/evas/patches/patch-configure +++ b/graphics/evas/patches/patch-configure @@ -1,17 +1,21 @@ -$NetBSD: patch-configure,v 1.4 2011/12/26 02:56:51 sbd Exp $ +$NetBSD: patch-configure,v 1.5 2012/09/27 13:20:42 jperkin Exp $ ---- configure.orig 2011-12-02 07:42:00.000000000 +0000 -+++ configure -@@ -12101,7 +12101,7 @@ case "$host_os" in +--- configure.orig Fri Dec 2 07:42:00 2011 ++++ configure Thu Sep 27 13:05:49 2012 +@@ -12100,8 +12100,11 @@ + mingw32ce*) MODULE_ARCH="$host_os-$host_cpu" ;; ++ solaris*) ++ MODULE_ARCH="solaris-$host_cpu-1.1.0" ++ ;; *) - MODULE_ARCH="$host_os-$host_cpu-1.1.0" + MODULE_ARCH="${host_os%-gnu}-$host_cpu-1.1.0" ;; esac -@@ -19846,6 +19846,7 @@ $as_echo_n "checking whether shm_open() +@@ -19846,6 +19849,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/graphics/evas/patches/patch-configure.ac b/graphics/evas/patches/patch-configure.ac index 01224fb307c..1225ef4dae1 100644 --- a/graphics/evas/patches/patch-configure.ac +++ b/graphics/evas/patches/patch-configure.ac @@ -1,17 +1,21 @@ -$NetBSD: patch-configure.ac,v 1.2 2011/12/26 02:56:51 sbd Exp $ +$NetBSD: patch-configure.ac,v 1.3 2012/09/27 13:20:42 jperkin Exp $ ---- configure.ac.orig 2011-11-17 03:25:24.000000000 +0000 -+++ configure.ac -@@ -81,7 +81,7 @@ case "$host_os" in +--- configure.ac.orig Thu Nov 17 03:25:24 2011 ++++ configure.ac Thu Sep 27 13:04:34 2012 +@@ -80,8 +80,11 @@ + mingw32ce*) MODULE_ARCH="$host_os-$host_cpu" ;; ++ solaris*) ++ MODULE_ARCH="solaris-$host_cpu-v_maj.v_min.v_mic" ++ ;; *) - MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic" + MODULE_ARCH="${host_os%-gnu}-$host_cpu-v_maj.v_min.v_mic" ;; esac AC_SUBST(MODULE_ARCH) -@@ -569,6 +569,7 @@ if test "x${want_evas_cserve}" = "xyes" +@@ -569,6 +572,7 @@ AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[ diff --git a/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c b/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c index 4b76538af5d..5e07b74d72c 100644 --- a/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c +++ b/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c @@ -1,3 +1,5 @@ +$NetBSD: patch-src_modules_loaders_psd_evas__image__load__psd.c,v 1.2 2012/09/27 13:20:42 jperkin Exp $ + --- src/modules/loaders/psd/evas_image_load_psd.c.orig 2011-08-11 07:46:01.000000000 +0200 +++ src/modules/loaders/psd/evas_image_load_psd.c 2011-12-27 15:15:11.097276116 +0100 @@ -1,4 +1,6 @@ |