diff options
| author | sborrill <sborrill@pkgsrc.org> | 2007-03-19 08:42:04 +0000 |
|---|---|---|
| committer | sborrill <sborrill@pkgsrc.org> | 2007-03-19 08:42:04 +0000 |
| commit | 32c15ee12643772589aa74ade83975d8a6bbc398 (patch) | |
| tree | f70d896cc1e3591b7d4b0d352d68e2bd2e2b9392 /devel | |
| parent | 954b989b9c2aae3ec054796aeaba476fc0b19b21 (diff) | |
| download | pkgsrc-32c15ee12643772589aa74ade83975d8a6bbc398.tar.gz | |
Patch ptp code to work with (hopefully) all implementations of iconv,
including NetBSD in-tree, pkgsrc and glibc.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libgphoto2/Makefile | 3 | ||||
| -rw-r--r-- | devel/libgphoto2/distinfo | 3 | ||||
| -rw-r--r-- | devel/libgphoto2/patches/patch-aa | 36 |
3 files changed, 40 insertions, 2 deletions
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile index c49673e81da..61e441a5b34 100644 --- a/devel/libgphoto2/Makefile +++ b/devel/libgphoto2/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.34 2007/01/08 16:17:47 joerg Exp $ +# $NetBSD: Makefile,v 1.35 2007/03/19 08:42:04 sborrill Exp $ DISTNAME= libgphoto2-2.3.1 +PKGREVISION= 1 CATEGORIES= devel graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/libgphoto2/distinfo b/devel/libgphoto2/distinfo index 24589737c96..f0aaaab904f 100644 --- a/devel/libgphoto2/distinfo +++ b/devel/libgphoto2/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.10 2007/02/05 20:03:19 markd Exp $ +$NetBSD: distinfo,v 1.11 2007/03/19 08:42:04 sborrill Exp $ SHA1 (libgphoto2-2.3.1.tar.bz2) = 13cc3f05ee298b33cd03ba4b772ef05a3aa49b97 RMD160 (libgphoto2-2.3.1.tar.bz2) = ab678a5006a89ef1fe9f052dac1f9738961cc3a8 Size (libgphoto2-2.3.1.tar.bz2) = 3230934 bytes +SHA1 (patch-aa) = 44dc81c577c5fa6c0d3fcc84087825a39540901a SHA1 (patch-ab) = 921eea83471110dd85197a7171278c7d0556536b SHA1 (patch-ac) = f5d3e72163f6de85c4e5a9b5f4b32d8d628e7b30 SHA1 (patch-ad) = 270c6f9a655631bc8d43a8d66851e902ea5ea8a5 diff --git a/devel/libgphoto2/patches/patch-aa b/devel/libgphoto2/patches/patch-aa new file mode 100644 index 00000000000..74c76d5e4f1 --- /dev/null +++ b/devel/libgphoto2/patches/patch-aa @@ -0,0 +1,36 @@ +$NetBSD: patch-aa,v 1.5 2007/03/19 08:42:04 sborrill Exp $ + +--- camlibs/ptp2/library.c.orig 2007-03-16 13:18:01.000000000 +0000 ++++ camlibs/ptp2/library.c 2007-03-16 13:18:01.000000000 +0000 +@@ -58,6 +58,7 @@ + * is always bigendian though, we would need to work around that + * too... + */ ++/* + #ifndef __GLIBC__ + #define UCS_2_INTERNAL "UCS-2-INTERNAL" + #else +@@ -66,7 +67,7 @@ + #endif + #define UCS_2_INTERNAL "UCS-2" + #endif +- ++*/ + #include "ptp.h" + #include "ptp-bugs.h" + #include "ptp-private.h" +@@ -3696,8 +3697,12 @@ + + curloc = nl_langinfo (CODESET); + if (!curloc) curloc="UTF-8"; +- camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, UCS_2_INTERNAL); +- camera->pl->params.cd_locale_to_ucs2 = iconv_open(UCS_2_INTERNAL, curloc); ++ camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, "UCS-2-INTERNAL"); ++ if(camera->pl->params.cd_ucs2_to_locale == (iconv_t) -1)) ++ camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, "UCS-2"); ++ camera->pl->params.cd_locale_to_ucs2 = iconv_open("UCS-2-INTERNAL", curloc); ++ if(camera->pl->params.cd_locale_to_ucs2 == (iconv_t) -1)) ++ camera->pl->params.cd_locale_to_ucs2 = iconv_open("UCS-2", curloc); + if ((camera->pl->params.cd_ucs2_to_locale == (iconv_t) -1) || + (camera->pl->params.cd_locale_to_ucs2 == (iconv_t) -1)) { + gp_log (GP_LOG_ERROR, "iconv", "Failed to create iconv converter.\n"); |