--St7VIuEGZ6dlpu13
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

On Sat, Mar 24, 2007 at 08:46:10AM +0000, Stephen Borrill wrote:
> Bernd Ernesti wrote:
> >Hmmm,
> >
> >I also tracked it down to
> >
> >https://sourceforge.net/tracker/?func=detail&atid=108874&aid=1648398&group_id=8874
> >
> >which uses a different patch which was allready commited to the libgphoto2
> >source code.
> 
> Yes, I'd looked at using UCS-2LE and BE.
> 
> However, I'd spotted at byteorder is always set to LE (as shown in this 
> patch too):
> 
>  	camera->pl->params.byteorder = PTP_DL_LE;
> +    if (camera->pl->params.byteorder == PTP_DL_LE) {
> +        camloc = "UCS-2LE";
> +    } else {
> +        camloc = "UCS-2BE";
> +    }
> 
> byteorder isn't altered anywhere else that I can see.

It would be better to use the commited patch and not something which isn't
documented (in the patch file) and differes from there version.

This makes it not easier to update it.

> >It would be better to use rev 9964 (there were some further commits, but 
> >they
> >were backout out).
> >
> >See attached patch (which fixed two files in one patch). I didn't had the 
> >time
> >to commit this patch.
> 
> pkgsrc is frozen now for 2007Q1 anyway; I'd need to get permission to 
> commit this (plus I'd like to test it on a BE and LE machine first).

It wasn't frozen when you wrote that mail.

Right now it is broken because doxygen isn't disabled, despite the
DOXYGEN=no in the Makefile and therefor the PLIST isn't correct if
doxygen is installed.

See the attached patch which fixes this problem.

Bernd


--St7VIuEGZ6dlpu13
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="libgphoto2.patch"

--- Makefile	20 Mar 2007 10:22:31 -0000	1.36
+++ Makefile	31 Mar 2007 12:37:36 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.36 2007/03/20 10:22:31 abs Exp $
 
 DISTNAME=	libgphoto2-2.3.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,7 +16,7 @@
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-CONFIGURE_FLAGS+=	DOXYGEN=no
+CONFIGURE_ENV+=		ac_cv_path_DOXYGEN=false
 PKGCONFIG_OVERRIDE+=	libgphoto2/libgphoto2.pc.in
 
 .include "../../mk/bsd.prefs.mk"

--St7VIuEGZ6dlpu13--