svn commit: r331147 - in head/audio/acoustid-fingerprinter: . files

[William Grzybowski]

Author: wg
Date: Mon Oct 21 14:54:12 2013
New Revision: 331147
URL: http://svnweb.freebsd.org/changeset/ports/331147

Log:
  audio/acoustid-fingerprinter: link against ffmpeg-2
  
  - Link against ffmpeg-2
  - Remove ffmpeg prefix patch
  
  Approved by:	portmgr (bapt, implicit)

Added:
  head/audio/acoustid-fingerprinter/files/patch-decoder.h   (contents, props changed)
Deleted:
  head/audio/acoustid-fingerprinter/files/patch-cmake__modules__FindFFmpeg.cmake
Modified:
  head/audio/acoustid-fingerprinter/Makefile

Modified: head/audio/acoustid-fingerprinter/Makefile
==============================================================================
--- head/audio/acoustid-fingerprinter/Makefile	Mon Oct 21 14:45:53 2013	(r331146)
+++ head/audio/acoustid-fingerprinter/Makefile	Mon Oct 21 14:54:12 2013	(r331147)
@@ -2,7 +2,7 @@
 
 PORTNAME=	acoustid-fingerprinter
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://bitbucket.org/acoustid/${PORTNAME}/downloads/ \
 		http://cloud.github.com/downloads/lalinsky/${PORTNAME}/
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libchromaprint.so:${PORTSDIR}/audio/chromaprint \
 		libtag.so:${PORTSDIR}/audio/taglib \
-		libavcodec${FFMPEG_SUFFIX}.so:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX}
+		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 
 USES=		cmake
 USE_QT4=	gui network \
@@ -22,12 +22,12 @@ USE_QT4=	gui network \
 INSTALLS_ICONS=	yes
 
 FETCH_ARGS=	-Fpr
-CMAKE_ARGS=	-DFFMPEG_SUFFIX:STRING=${FFMPEG_SUFFIX}
-FFMPEG_SUFFIX?=	1
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		 ${WRKSRC}/cmake/modules/*.cmake
+	@${REINPLACE_CMD} -e 's,CodecID,AVCodecID,g' \
+		${WRKSRC}/ffmpeg/audioconvert.h
 
 post-install:
 .for i in 16 24 32 48 128 256

Added: head/audio/acoustid-fingerprinter/files/patch-decoder.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/acoustid-fingerprinter/files/patch-decoder.h	Mon Oct 21 14:54:12 2013	(r331147)
@@ -0,0 +1,13 @@
+--- decoder.h.orig	2013-10-21 12:47:16.077685162 -0200
++++ decoder.h	2013-10-21 12:47:47.588683149 -0200
+@@ -35,6 +35,10 @@
+ }
+ #include "fingerprintcalculator.h"
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
+ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 64, 0)
+ #define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16
+ #endif