Date: 13 Nov 2009 08:15:54 -0200 From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kde@FreeBSD.org Subject: ports/140527: [PATCH] audio/akode-plugins-ffmpeg: Fix build against ffmpeg 0.5 Message-ID: <20091113101554.41554.qmail@exxodus.fedaykin.here> Resent-Message-ID: <200911131020.nADAK32K029743@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140527 >Category: ports >Synopsis: [PATCH] audio/akode-plugins-ffmpeg: Fix build against ffmpeg 0.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 13 10:20:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Mario Sergio Fujikawa Ferreira >Release: FreeBSD 8.0-RC2 i386 >Organization: >Environment: System: FreeBSD exxodus.fedaykin.here 8.0-RC2 FreeBSD 8.0-RC2 #1: Wed Nov 4 20:02:03 BRST >Description: - Remove BROKEN: fix build against ffmpeg 0.5 - Pet portlint Obtained from: NetBSD pkgsrc [1] [1] http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/audio/akode/patches/patch-ad?rev=1.2&content-type=text/x-cvsweb-markup Added file(s): - files/patch-akode__plugins__ffmpeg_decoder__ffmpeg_decoder.cpp Port maintainer (kde@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- akode-plugins-ffmpeg-2.0.2,1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/audio/akode-plugins-ffmpeg/Makefile,v retrieving revision 1.5 diff -d -u -u -r1.5 Makefile --- Makefile 12 Aug 2009 08:55:45 -0000 1.5 +++ Makefile 13 Nov 2009 10:14:30 -0000 @@ -5,29 +5,28 @@ # $FreeBSD: ports/audio/akode-plugins-ffmpeg/Makefile,v 1.5 2009/08/12 08:55:45 mm Exp $ # -PORTNAME= akode-plugins-${PORTNAMESUFX} -PORTVERSION= 2.0.2 -PORTEPOCH= 1 -CATEGORIES= audio kde -MASTER_SITES= ${MASTER_SITE_GENTOO} +PORTNAME= akode +PORTVERSION= 2.0.2 +PORTEPOCH= 1 +CATEGORIES= audio kde +MASTER_SITES= ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR=distfiles -DISTNAME= 30375-akode-${PORTVERSION}.tar.bz2 -EXTRACT_SUFX= # none +PKGNAMESUFFIX= -plugins-${PORTNAMESUFX} +DISTNAME= 30375-akode-${PORTVERSION}.tar.bz2 +EXTRACT_SUFX= # none MAINTAINER= kde@FreeBSD.org COMMENT= FFMPEG decoder plugin for akode LIB_DEPENDS= avcodec:${PORTSDIR}/multimedia/ffmpeg -BROKEN= does not compile with ffmpeg 0.5 and later - CONFLICTS= kdemultimedia-3.[1-3]* PLUGIN= ffmpeg_decoder PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//} USE_AUTOTOOLS= libltdl -USE_AUTOTOOLS= libtool:22 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} Index: files/patch-akode__plugins__ffmpeg_decoder__ffmpeg_decoder.cpp =================================================================== RCS file: files/patch-akode__plugins__ffmpeg_decoder__ffmpeg_decoder.cpp diff -N files/patch-akode__plugins__ffmpeg_decoder__ffmpeg_decoder.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-akode__plugins__ffmpeg_decoder__ffmpeg_decoder.cpp 13 Nov 2009 10:14:30 -0000 @@ -0,0 +1,28 @@ +--- ./akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.orig 2009-11-13 07:52:52.000000000 -0200 ++++ ./akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp 2009-11-13 08:04:20.000000000 -0200 +@@ -26,6 +26,7 @@ + #include "decoder.h" + + #include <assert.h> ++ + #include <ffmpeg/avcodec.h> + #include <ffmpeg/avformat.h> + #include <ffmpeg/avio.h> +@@ -45,7 +46,7 @@ + aKode::File *file = (aKode::File*)opaque; + return file->write((char*)buf, size); + } +- static offset_t akode_seek(void* opaque, offset_t pos, int whence) ++ static int64_t akode_seek(void* opaque, int64_t pos, int whence) + { + aKode::File *file = (aKode::File*)opaque; + return file->seek(pos, whence); +@@ -314,7 +315,7 @@ + assert(d->packet.stream_index == d->audioStream); + + retry: +- int len = avcodec_decode_audio( d->ic->streams[d->audioStream]->codec, ++ int len = avcodec_decode_audio2( d->ic->streams[d->audioStream]->codec, + (short*)d->buffer, &d->buffer_size, + d->packetData, d->packetSize ); + --- akode-plugins-ffmpeg-2.0.2,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091113101554.41554.qmail>