From jr@opal.com  Sun Jul 17 07:19:06 2011
Return-Path: <jr@opal.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BB251106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 17 Jul 2011 07:19:06 +0000 (UTC)
	(envelope-from jr@opal.com)
Received: from mho-02-ewr.mailhop.org (mho-04-ewr.mailhop.org [204.13.248.74])
	by mx1.freebsd.org (Postfix) with ESMTP id 774488FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 17 Jul 2011 07:19:06 +0000 (UTC)
Received: from pool-141-154-233-28.bos.east.verizon.net ([141.154.233.28] helo=homobox.opal.com)
	by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256)
	(Exim 4.72)
	(envelope-from <jr@opal.com>)
	id 1QiLKS-0009NP-9Y
	for FreeBSD-gnats-submit@freebsd.org; Sun, 17 Jul 2011 06:59:52 +0000
Received: from opal.com (localhost [IPv6:::1])
	by homobox.opal.com (8.14.4/8.14.4) with ESMTP id p6H6xpEu093079
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 17 Jul 2011 02:59:51 -0400 (EDT)
	(envelope-from jr@opal.com)
Received: from homobox.opal.com ([127.0.0.1] helo=homobox.opal.com) with
	IPv4:25 by opal.com; 17 Jul 2011 02:59:51 -0400
Received: (from jr@localhost)
	by homobox.opal.com (8.14.4/8.14.4/Submit) id p6H6xpqj093078;
	Sun, 17 Jul 2011 02:59:51 -0400 (EDT)
	(envelope-from jr)
Message-Id: <201107170659.p6H6xpqj093078@homobox.opal.com>
Date: Sun, 17 Jul 2011 02:59:51 -0400 (EDT)
From: "J.R. Oldroyd" <fbsd@opal.com>
Reply-To: "J.R. Oldroyd" <fbsd@opal.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: multimedia/py-kaa-multimedia: fix build error for graphics/py-exiv2 module
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         158987
>Category:       ports
>Synopsis:       multimedia/py-kaa-multimedia: fix build error for graphics/py-exiv2 module
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-multimedia
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 17 07:20:09 UTC 2011
>Closed-Date:    Tue Jun 26 12:45:38 UTC 2012
>Last-Modified:  Tue Jun 26 12:50:10 UTC 2012
>Originator:     J.R. Oldroyd
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD xx.opal.com 8.2-RELEASE FreeBSD 8.2-RELEASE #6: Tue Feb 22 16:00:09 EST 2011 xx@xx.opal.com:/usr/obj/usr/src/sys/XX i386
>Description:
Port does not currently build if graphics/py-exiv2 module happens to be
installed.  This patch fixes error and makes the exiv2 module a prerequisite.
>How-To-Repeat:
n/a
>Fix:
diff -ruN /usr/ports/multimedia/py-kaa-metadata/Makefile multimedia/py-kaa-metadata/Makefile
--- /usr/ports/multimedia/py-kaa-metadata/Makefile	2010-09-14 14:58:50.000000000 -0400
+++ multimedia/py-kaa-metadata/Makefile	2011-07-15 11:51:22.000000000 -0400
@@ -7,7 +7,7 @@
 
 PORTNAME=	kaa-metadata
 PORTVERSION=	0.7.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia python
 MASTER_SITES=	SF/freevo/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,8 @@
 COMMENT=	Kaa Media Repository - media file metadata parser
 
 LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/kaa/__init__.py:${PORTSDIR}/multimedia/py-kaa-base
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/kaa/__init__.py:${PORTSDIR}/multimedia/py-kaa-base \
+		${PYTHON_SITELIBDIR}/pyexiv2/__init__.py:${PORTSDIR}/graphics/py-exiv2
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	yes
diff -ruN /usr/ports/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp
--- /usr/ports/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp	1969-12-31 19:00:00.000000000 -0500
+++ multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp	2011-07-15 11:50:22.000000000 -0400
@@ -0,0 +1,12 @@
+--- src/image/exiv2.cpp.orig	2009-01-30 22:18:25.000000000 +0100
++++ src/image/exiv2.cpp	2011-07-15 15:48:34.000000000 +0200
+@@ -47,7 +47,8 @@
+ 		Py_DECREF(entry);
+ 	    }
+ 
+-	    Exiv2::DataBuf databuf = exifData.copyThumbnail();
++	    Exiv2::ExifThumbC ExifThumb(exifData);
++	    Exiv2::DataBuf databuf = ExifThumb.copy();
+ 	    if (databuf.pData_) {
+ 		entry = PyBuffer_New(databuf.size_);
+ 		PyObject_AsWriteBuffer(entry, (void **)&data, &len);
>Release-Note:
>Audit-Trail:
Class-Changed-From-To: maintainer-update->change-request 
Class-Changed-By: edwin 
Class-Changed-When: Sun Jul 17 07:20:19 UTC 2011 
Class-Changed-Why:  
Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158987 
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-multimedia 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jul 17 07:20:23 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158987 
State-Changed-From-To: open->closed 
State-Changed-By: rm 
State-Changed-When: Tue Jun 26 12:45:37 UTC 2012 
State-Changed-Why:  
Committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158987 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/158987: commit references a PR
Date: Tue, 26 Jun 2012 12:45:21 +0000 (UTC)

 rm          2012-06-26 12:45:06 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/py-kaa-metadata Makefile pkg-descr pkg-plist 
   Added files:
     multimedia/py-kaa-metadata/files patch-src-image-exiv2.cpp 
   Log:
   - add patch to fix build when graphics/py-exiv2 is installed
   - add dependency on py-exiv2 explicitly
   - bump PORTREVISION because of dependency change
   
   While here:
   - use PYTHON_PKGNAMEPREFIX instead of PYTHON_SITELIBDIR
   - strict python version to 2.x
   - update pkg-descr:WWW
   - correct pkg-plist
   
   PR:             158987
   Submitted by:   "J.R. Oldroyd" <fbsd at opal dot com> (maintainer)
   
   Revision  Changes    Path
   1.14      +6 -5      ports/multimedia/py-kaa-metadata/Makefile
   1.1       +12 -0     ports/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp (new)
   1.2       +1 -1      ports/multimedia/py-kaa-metadata/pkg-descr
   1.3       +5 -4      ports/multimedia/py-kaa-metadata/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
