From owner-svn-ports-head@FreeBSD.ORG Mon Oct 21 14:54:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 85993D88; Mon, 21 Oct 2013 14:54:13 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 577C92D28; Mon, 21 Oct 2013 14:54:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LEsDWH052358; Mon, 21 Oct 2013 14:54:13 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LEsCFU052352; Mon, 21 Oct 2013 14:54:12 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310211454.r9LEsCFU052352@svn.freebsd.org> From: William Grzybowski Date: Mon, 21 Oct 2013 14:54:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331147 - in head/audio/acoustid-fingerprinter: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 14:54:13 -0000 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