diff options
author | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2012-06-26 12:45:06 +0000 |
---|---|---|
committer | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2012-06-26 12:45:06 +0000 |
commit | 753f10b9f983e112532a0bd343233d489dcda58e (patch) | |
tree | 35e4b28755c87e9b46cb488abaad28244efce283 /multimedia/py-kaa-metadata | |
parent | c86214e70f93b4e862813e3ab1c3e00434327203 (diff) | |
download | ports-753f10b9f983e112532a0bd343233d489dcda58e.tar.gz ports-753f10b9f983e112532a0bd343233d489dcda58e.zip |
- 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)
Notes
Notes:
svn path=/head/; revision=300007
Diffstat (limited to 'multimedia/py-kaa-metadata')
-rw-r--r-- | multimedia/py-kaa-metadata/Makefile | 11 | ||||
-rw-r--r-- | multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp | 12 | ||||
-rw-r--r-- | multimedia/py-kaa-metadata/pkg-descr | 2 | ||||
-rw-r--r-- | multimedia/py-kaa-metadata/pkg-plist | 9 |
4 files changed, 24 insertions, 10 deletions
diff --git a/multimedia/py-kaa-metadata/Makefile b/multimedia/py-kaa-metadata/Makefile index a3a644c78e39..19a027e18e37 100644 --- a/multimedia/py-kaa-metadata/Makefile +++ b/multimedia/py-kaa-metadata/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: py-kaa-metadata -# Date created: 2009 January 10 -# Whom: J.R. Oldroyd <fbsd@opal.com> +# Date created: 2009 January 10 +# Whom: J.R. Oldroyd <fbsd@opal.com> # # $FreeBSD$ # PORTNAME= kaa-metadata PORTVERSION= 0.7.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia python MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,10 +16,11 @@ MAINTAINER= fbsd@opal.com 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_PKGNAMEPREFIX}kaa-base>0:${PORTSDIR}/multimedia/py-kaa-base \ + ${PYTHON_PKGNAMEPREFIX}exiv2>0:${PORTSDIR}/graphics/py-exiv2 RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_PYTHON= yes +USE_PYTHON= -2.7 USE_PYDISTUTILS= yes CFLAGS+= -I${PREFIX}/include diff --git a/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp b/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp new file mode 100644 index 000000000000..24d7f2ea1344 --- /dev/null +++ b/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp @@ -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);
\ No newline at end of file diff --git a/multimedia/py-kaa-metadata/pkg-descr b/multimedia/py-kaa-metadata/pkg-descr index 050ba111a406..39bc2dc77c34 100644 --- a/multimedia/py-kaa-metadata/pkg-descr +++ b/multimedia/py-kaa-metadata/pkg-descr @@ -19,4 +19,4 @@ that deal with video and audio. Kaa is named after the python character in the Jungle Book by Rudyard Kipling. -WWW: http://doc.freevo.org/2.0/Kaa +WWW: http://doc.freevo.org/api/kaa/ diff --git a/multimedia/py-kaa-metadata/pkg-plist b/multimedia/py-kaa-metadata/pkg-plist index 90938c42ad0c..7aa8cb4b6a2e 100644 --- a/multimedia/py-kaa-metadata/pkg-plist +++ b/multimedia/py-kaa-metadata/pkg-plist @@ -115,6 +115,7 @@ bin/mminfo %%PYTHON_SITELIBDIR%%/kaa/metadata/image/core.py %%PYTHON_SITELIBDIR%%/kaa/metadata/image/core.pyc %%PYTHON_SITELIBDIR%%/kaa/metadata/image/core.pyo +%%PYTHON_SITELIBDIR%%/kaa/metadata/image/exiv2.so %%PYTHON_SITELIBDIR%%/kaa/metadata/image/generic.py %%PYTHON_SITELIBDIR%%/kaa/metadata/image/generic.pyc %%PYTHON_SITELIBDIR%%/kaa/metadata/image/generic.pyo @@ -178,11 +179,11 @@ bin/mminfo %%PYTHON_SITELIBDIR%%/kaa/metadata/video/vcd.py %%PYTHON_SITELIBDIR%%/kaa/metadata/video/vcd.pyc %%PYTHON_SITELIBDIR%%/kaa/metadata/video/vcd.pyo -@dirrm %%PYTHON_SITELIBDIR%%/kaa/metadata/misc @dirrm %%PYTHON_SITELIBDIR%%/kaa/metadata/video -@dirrm %%PYTHON_SITELIBDIR%%/kaa/metadata/audio/eyeD3 -@dirrm %%PYTHON_SITELIBDIR%%/kaa/metadata/audio +@dirrm %%PYTHON_SITELIBDIR%%/kaa/metadata/misc @dirrm %%PYTHON_SITELIBDIR%%/kaa/metadata/image -@dirrm %%PYTHON_SITELIBDIR%%/kaa/metadata/disc @dirrm %%PYTHON_SITELIBDIR%%/kaa/metadata/games +@dirrm %%PYTHON_SITELIBDIR%%/kaa/metadata/disc +@dirrm %%PYTHON_SITELIBDIR%%/kaa/metadata/audio/eyeD3 +@dirrm %%PYTHON_SITELIBDIR%%/kaa/metadata/audio @dirrm %%PYTHON_SITELIBDIR%%/kaa/metadata |