Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Jul 2010 12:32:02 +0200
From:      Horvath Andras <han@log69.com>
To:        Philippe =?UTF-8?B?QXVkw6lvdWQ=?= <jadawin@FreeBSD.org>
Cc:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/148773: [PATCH] graphics/aaphoto: update to 0.38
Message-ID:  <20100720123202.5db1c268@dell.andras>
In-Reply-To: <20100720083801.GC11445@tuxaco.net>
References:  <201007200653.o6K6rMaM079521@freefall.freebsd.org> <20100720091710.36452d59@dell.andras> <20100720073407.GA11445@tuxaco.net> <20100720095756.11d1c74b@dell.andras> <20100720083801.GC11445@tuxaco.net>

next in thread | previous in thread | raw e-mail | index | archive | help
--MP_/=Y9MghpjbsNN8OAdGIr.Gxc
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Thanks for the test.

I think the patch should be good then. Will you commit it if noone else
has problem with it?

Andras


On Tue, 20 Jul 2010 10:38:01 +0200
Philippe Aud=C3=A9oud <jadawin@FreeBSD.org> wrote:

> On Tue, 20 Jul 2010, Horvath Andras wrote:
>=20
> > Hi,
> >=20
> > As i see, you tested it on amd64, which i also tested it on.
> >=20
> > I'd like to ask for help to test it on a sparc or ppc system to
> > compile. It is supposed to compile without the OpenMP option
> > switches.
> >=20
> > AFAIK the sparc platform has only GCC v3, and therefore it doesn't
> > have support for OpenMP. Just like with OS under 7.0 before GCC 4.2.
> >=20
> > I agree with you, it may be better that way to test if it's not
> > i386 or amd64 platform, then it should compile without openmp. The
> > only case it should compile with openmp if OS is above 7.0 and the
> > arch is whether amd64 or i386.
> >=20
> [...]
>=20
> Please, have a look here:
> http://paste.openbsd-france.org/?show=3Dmbd94c80
>=20
>=20
> > I attached another patch. Important part is:
> >=20
> > -.if ${ARCH} !=3D "amd64" && ${ARCH} !=3D "i386"
> > -BROKEN=3D                Does not compile on !amd64 and !i386
> > -.endif
> > -
> > -.if ${OSVERSION} >=3D 700000
> > +.if ${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386" && ${OSVERSION} >=
=3D
> > 700000 CFLAGS+=3D       -fopenmp -D__OPENMP__
> >  .endif
> >=20
> >=20
> > If somebody could be kind to test it on a sparc, ia64 or pcc system.
> >=20
> > Thanks.
> >=20
> >=20
> > On Tue, 20 Jul 2010 09:34:07 +0200
> > Philippe Aud=C3=A9oud <jadawin@FreeBSD.org> wrote:
> >=20
> > > On Tue, 20 Jul 2010, Horvath Andras wrote:
> > >=20
> > > > Could anybody help me test the port with the patch to compile
> > > > on a tier-2 hardware and confirm that it works?
> > > >=20
> > > >=20
> > > > On Tue, 20 Jul 2010 06:53:22 GMT
> > > > jadawin@FreeBSD.org wrote:
> > > >=20
> > > > > Synopsis: [PATCH] graphics/aaphoto: update to 0.38
> > > > >=20
> > > > > Responsible-Changed-From-To: freebsd-ports-bugs->jadawin
> > > > > Responsible-Changed-By: jadawin
> > > > > Responsible-Changed-When: Tue Jul 20 06:53:22 UTC 2010
> > > > > Responsible-Changed-Why:=20
> > > > > I'll take it.
> > > > >=20
> > > > > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D148773
> > > > _______________________________________________
> > > > freebsd-ports-bugs@freebsd.org mailing list
> > > > http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
> > > > To unsubscribe, send any mail to
> > > > "freebsd-ports-bugs-unsubscribe@freebsd.org"
> > >=20
> > >=20
> > > Hello,
> > >=20
> > > I tested it on my tinderbox:
> > >=20
> > > [...]
> > > cd .
> > > && /bin/sh /work/a/ports/graphics/aaphoto/work/aaphoto-0.38/missing
> > > --run autoheader autoheader: not found
> > > WARNING: `autoheader' is missing on your system.  You should only
> > > need it if
> > >          you modified `acconfig.h' or `configure.ac'.  You might
> > > want to install the `Autoconf' and `GNU m4' packages.  Grab them
> > >          from any GNU archive site.
> > > [...]
> > >=20
> > > from http://a.tchoum.info/tb/logs/7.1-FreeBSD/aaphoto-0.38.log
> > >=20
> > > btw i don't really understand why=20
> > >=20
> > > -.if ${ARCH} !=3D "amd64" && ${ARCH} !=3D "i386"
> > > -BROKEN=3D         Does not compile on !amd64 and !i386
> > > -.endif
> > > -
> > > -.if ${OSVERSION} >=3D 700000
> > > +.if ${OSVERSION} >=3D 700000 && \
> > > +        ${ARCH} !=3D "ia64" && \
> > > +        ${ARCH} !=3D "powerpc" && \
> > > +        ${ARCH} !=3D "powerpc64" && \
> > > +        ${ARCH} !=3D "sparc64"
> > >=20
> > > is better. if ${ARCH} !=3D "amd64" && ${ARCH} !=3D "i386" is enough to
> > > test arch.
> > >=20
> > > Regards,
> > >=20
> > _______________________________________________
> > freebsd-ports-bugs@freebsd.org mailing list
> > http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
> > To unsubscribe, send any mail to
> > "freebsd-ports-bugs-unsubscribe@freebsd.org"
>=20

--MP_/=Y9MghpjbsNN8OAdGIr.Gxc
Content-Type: text/plain; name=patch.txt
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=patch.txt

diff -ru aaphoto.old/Makefile aaphoto/Makefile
--- aaphoto.old/Makefile	2010-06-03 09:56:16.000000000 +0200
+++ aaphoto/Makefile	2010-07-19 09:25:46.000000000 +0200
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	aaphoto
-PORTVERSION=	0.37
-PORTREVISION=	1
+PORTVERSION=	0.38
 CATEGORIES=	graphics
 MASTER_SITES=	http://log69.com/downloads/
 DISTNAME=	${PORTNAME}_sources_v${PORTVERSION}
@@ -15,6 +14,8 @@
 MAINTAINER=	han@log69.com
 COMMENT=	Auto Adjust Photo, automatic color correction of photos
 
+LICENSE=	GPLv3
+
 LIB_DEPENDS=	jasper:${PORTSDIR}/graphics/jasper \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		png:${PORTSDIR}/graphics/png
@@ -31,11 +32,11 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "amd64" && ${ARCH} != "i386"
-BROKEN=		Does not compile on !amd64 and !i386
-.endif
-
-.if ${OSVERSION} >= 700000
+.if ${ARCH} == "amd64" || ${ARCH} == "i386" && ${OSVERSION} >= 700000
 CFLAGS+=	-fopenmp -D__OPENMP__
 .endif
 
diff -ru aaphoto.old/distinfo aaphoto/distinfo
--- aaphoto.old/distinfo	2010-05-10 15:16:39.000000000 +0200
+++ aaphoto/distinfo	2010-07-19 09:16:07.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (aaphoto_sources_v0.37.tar.gz) = f9cfaf7112713cb937f7b3ac1236d077
-SHA256 (aaphoto_sources_v0.37.tar.gz) = 2efe35c406ea5bd0b8a05a6eab02437c6b3eefbff38d4d74c0f200023c4f7ae4
-SIZE (aaphoto_sources_v0.37.tar.gz) = 134442
+MD5 (aaphoto_sources_v0.38.tar.gz) = 99c07a650eda444e753cb611dd0c9d36
+SHA256 (aaphoto_sources_v0.38.tar.gz) = e2a4de457d957bb80925beb18c79b4128982941dec24f506dfa2d495830ce63e
+SIZE (aaphoto_sources_v0.38.tar.gz) = 134661
diff -ru aaphoto.old/files/patch-Makefile.in aaphoto/files/patch-Makefile.in
--- aaphoto.old/files/patch-Makefile.in	2010-05-23 15:21:24.000000000 +0200
+++ aaphoto/files/patch-Makefile.in	2010-07-19 09:14:44.000000000 +0200
@@ -5,7 +5,7 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -AM_CFLAGS = -Wall -O2 -D__OPENMP__ -fopenmp
-+AM_CFLAGS = -Wall -O2 -Wno-unknown-pragmas
++AM_CFLAGS = -Wall -O2
  AM_LDFLAGS = -ljasper -ljpeg -lpng -lm
  aaphoto_SOURCES = aaphoto.c
  INCLUDES = 

--MP_/=Y9MghpjbsNN8OAdGIr.Gxc--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100720123202.5db1c268>