From 859bee2b3370fc3c05a76e0adb84d4162ada4cf7 Mon Sep 17 00:00:00 2001
From: jakemsr <jakemsr@openbsd.org>
Date: Mon, 1 Oct 2007 17:39:50 +0000
Subject: [PATCH] build with ffmpeg and libsamplerate.

ok brad@
---
 audio/akode/Makefile                              | 11 ++++++-----
 ...kode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp | 15 +++++++++++++++
 audio/akode/pkg/PFRAG.shared                      |  4 +++-
 audio/akode/pkg/PLIST                             |  6 +++++-
 4 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 audio/akode/patches/patch-akode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp

diff --git a/audio/akode/Makefile b/audio/akode/Makefile
index 67c1e43b7b5..21f9ed0f928 100644
--- a/audio/akode/Makefile
+++ b/audio/akode/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2007/09/18 18:24:09 mgrimm Exp $
+# $OpenBSD: Makefile,v 1.7 2007/10/01 17:39:50 jakemsr Exp $
 COMMENT=	Decoding Library for KDE Multimedia
 
 DISTNAME=	akode-2.0.2
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 SHARED_LIBS +=	akode                2.1      # .2.0
 
 CATEGORIES=	audio multimedia x11/kde
@@ -23,7 +23,9 @@ LIB_DEPENDS=	FLAC.>=8::audio/flac \
 		mad::audio/libmad \
 		speex::audio/speex \
 		vorbis,vorbisfile::audio/libvorbis \
-		ltdl::devel/libtool,-ltdl
+		ltdl::devel/libtool,-ltdl \
+		avcodec.>=10,avformat.>=10::graphics/ffmpeg \
+		samplerate.>=1::audio/libsamplerate
 
 WANTLIB=	c stdc++ pthread m ossaudio ogg
 
@@ -35,7 +37,6 @@ CONFIGURE_STYLE=	autoconf
 AUTOCONF_VERSION=	2.60
 CONFIGURE=		/bin/sh ${WRKDIST}/admin/cvs.sh configure
 CONFIGURE_ARGS+=	--with-extra-includes=${LOCALBASE}/include \
-			--with-extra-libs=${LOCALBASE}/lib \
-			--without-ffmpeg
+			--with-extra-libs=${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/audio/akode/patches/patch-akode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp b/audio/akode/patches/patch-akode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp
new file mode 100644
index 00000000000..da90b47b2e4
--- /dev/null
+++ b/audio/akode/patches/patch-akode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp
@@ -0,0 +1,15 @@
+$OpenBSD: patch-akode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp,v 1.1 2007/10/01 17:39:50 jakemsr Exp $
+--- akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.orig	Sun Sep 30 16:42:06 2007
++++ akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp	Sun Sep 30 16:42:46 2007
+@@ -26,9 +26,11 @@
+ #include "decoder.h"
+ 
+ #include <assert.h>
++extern "C" {
+ #include <ffmpeg/avcodec.h>
+ #include <ffmpeg/avformat.h>
+ #include <ffmpeg/avio.h>
++}
+ 
+ #include "ffmpeg_decoder.h"
+ #include <iostream>
diff --git a/audio/akode/pkg/PFRAG.shared b/audio/akode/pkg/PFRAG.shared
index f84c79fea68..d2970f6db3f 100644
--- a/audio/akode/pkg/PFRAG.shared
+++ b/audio/akode/pkg/PFRAG.shared
@@ -1,7 +1,9 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/03/10 10:40:16 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2007/10/01 17:39:50 jakemsr Exp $
 @lib lib/libakode.so.${LIBakode_VERSION}
+lib/libakode_ffmpeg_decoder.so
 lib/libakode_mpc_decoder.so
 lib/libakode_mpeg_decoder.so
 lib/libakode_oss_sink.so
+lib/libakode_src_resampler.so
 lib/libakode_sun_sink.so
 lib/libakode_xiph_decoder.so
diff --git a/audio/akode/pkg/PLIST b/audio/akode/pkg/PLIST
index e20764a5b69..043f874c0ff 100644
--- a/audio/akode/pkg/PLIST
+++ b/audio/akode/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2007/05/08 15:16:37 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.3 2007/10/01 17:39:50 jakemsr Exp $
 %%SHARED%%
 bin/akode-config
 bin/akodeplay
@@ -30,12 +30,16 @@ include/akode/volumefilter.h
 include/akode/wav_decoder.h
 lib/libakode.a
 lib/libakode.la
+@comment lib/libakode_ffmpeg_decoder.a
+@comment lib/libakode_ffmpeg_decoder.la
 @comment lib/libakode_mpc_decoder.a
 @comment lib/libakode_mpc_decoder.la
 @comment lib/libakode_mpeg_decoder.a
 @comment lib/libakode_mpeg_decoder.la
 @comment lib/libakode_oss_sink.a
 @comment lib/libakode_oss_sink.la
+@comment lib/libakode_src_resampler.a
+@comment lib/libakode_src_resampler.la
 @comment lib/libakode_sun_sink.a
 @comment lib/libakode_sun_sink.la
 @comment lib/libakode_xiph_decoder.a