cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make it work with newer ffmpeg, update wantlib/lib_depends

Browse Source
This commit is contained in:
jakemsr 2010-05-26 22:33:36 +00:00
parent b666a5d2b5
commit d0822f515d
2 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
multimedia/k3b/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2009/12/22 15:46:59 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.6 2010/05/26 22:33:36 jakemsr Exp $
SHARED_ONLY = Yes SHARED_ONLY = Yes
COMMENT = CD/DVD creator COMMENT = CD/DVD creator
DISTNAME = k3b-1.0.4 DISTNAME = k3b-1.0.4
PKGNAME = ${DISTNAME}p3 PKGNAME = ${DISTNAME}p4
SHARED_LIBS = k3b 0.0 # 3.0 SHARED_LIBS = k3b 0.0 # 3.0
SHARED_LIBS += k3bdevice 0.0 # 5.0 SHARED_LIBS += k3bdevice 0.0 # 5.0
@ -21,7 +21,7 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = ICE SM X11 Xau Xdmcp Xext Xrender \ WANTLIB = ICE SM X11 Xau Xdmcp Xext Xrender \
art_lgpl_2 c fam idn m ogg png pthread \ art_lgpl_2 c fam idn m ogg png pthread \
pthread-stubs rpcsvc stdc++ util xcb z pthread-stubs stdc++ util xcb z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=k3b/} MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=k3b/}
EXTRACT_SUFX = .tar.bz2 EXTRACT_SUFX = .tar.bz2
@ -44,7 +44,7 @@ LIB_DEPENDS = jpeg::graphics/jpeg \
mpcdec::audio/libmpcdec \ mpcdec::audio/libmpcdec \
vorbis,vorbisenc,vorbisfile::audio/libvorbis \ vorbis,vorbisenc,vorbisfile::audio/libvorbis \
mp3lame::audio/lame \ mp3lame::audio/lame \
avcodec,avformat::graphics/ffmpeg \ avcodec.>=14,avformat.>=13:ffmpeg->=20100512:graphics/ffmpeg \
sndfile::audio/libsndfile \ sndfile::audio/libsndfile \
FLAC,FLAC++::audio/flac \ FLAC,FLAC++::audio/flac \
tag::audio/taglib \ tag::audio/taglib \

45
multimedia/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-plugins_decoder_ffmpeg_k3bffmpegwrapper_cpp,v 1.1 2008/07/09 02:13:01 jakemsr Exp $ $OpenBSD: patch-plugins_decoder_ffmpeg_k3bffmpegwrapper_cpp,v 1.2 2010/05/26 22:33:36 jakemsr Exp $
--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig Sun Jun 22 01:24:57 2008 --- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig Fri Nov 2 02:55:03 2007
+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp Sun Jun 22 01:25:20 2008 +++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp Wed May 19 05:59:07 2010
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
#include "k3bffmpegwrapper.h" #include "k3bffmpegwrapper.h"
@ -12,3 +12,42 @@ $OpenBSD: patch-plugins_decoder_ffmpeg_k3bffmpegwrapper_cpp,v 1.1 2008/07/09 02:
} }
#include <string.h> #include <string.h>
@@ -44,8 +44,8 @@ class K3bFFMpegFile::Private (public)
K3b::Msf length;
// for decoding
- char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE];
- char* outputBufferPos;
+ DECLARE_ALIGNED(16,uint8_t,outputBuffer)[(AVCODEC_MAX_AUDIO_FRAME_SIZE*3)/2];
+ uint8_t* outputBufferPos;
int outputBufferSize;
AVPacket packet;
Q_UINT8* packetData;
@@ -194,7 +194,7 @@ QString K3bFFMpegFile::typeComment() const
return i18n("Windows Media v1");
case CODEC_ID_WMAV2:
return i18n("Windows Media v2");
- case CODEC_ID_MP3LAME:
+ case CODEC_ID_MP3:
return i18n("MPEG 1 Layer III");
case CODEC_ID_AAC:
return i18n("Advanced Audio Coding (AAC)");
@@ -287,13 +287,11 @@ int K3bFFMpegFile::fillOutputBuffer()
d->outputBufferPos = d->outputBuffer;
-#ifdef FFMPEG_BUILD_PRE_4629
- int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec,
-#else
- int len = avcodec_decode_audio( d->formatContext->streams[0]->codec,
-#endif
- (short*)d->outputBuffer, &d->outputBufferSize,
- d->packetData, d->packetSize );
+ d->outputBufferSize = sizeof(d->outputBuffer);
+
+ int len = avcodec_decode_audio3( d->formatContext->streams[0]->codec,
+ (int16_t*)d->outputBuffer, &d->outputBufferSize,
+ &d->packet );
d->packetSize -= len;
d->packetData += len;