to build with ffmpeg, just needed to wrap ffmpeg headers wit
extern "C" {}. build picked up libsamplerate on it's own.
with this, akodeplay can now play AAC files, among other things.
OK?
--
[EMAIL PROTECTED]
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: Makefile
===================================================================
RCS file: /home/cvs/OpenBSD/ports/audio/akode/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 18 Sep 2007 18:24:09 -0000 1.6
+++ Makefile 1 Oct 2007 00:06:39 -0000
@@ -2,7 +2,7 @@
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 @@
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
@@ -36,6 +38,6 @@
CONFIGURE= /bin/sh ${WRKDIST}/admin/cvs.sh configure
CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \
--with-extra-libs=${LOCALBASE}/lib \
- --without-ffmpeg
+ --with-ffmpeg
.include <bsd.port.mk>
Index: patches/patch-akode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp
===================================================================
RCS file: patches/patch-akode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp
diff -N patches/patch-akode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-akode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp 1 Oct
2007 00:06:39 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- 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>
Index: pkg/PFRAG.shared
===================================================================
RCS file: /home/cvs/OpenBSD/ports/audio/akode/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PFRAG.shared
--- pkg/PFRAG.shared 10 Mar 2006 10:40:16 -0000 1.1.1.1
+++ pkg/PFRAG.shared 1 Oct 2007 00:06:39 -0000
@@ -1,7 +1,9 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/03/10 10:40:16 espie 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
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/OpenBSD/ports/audio/akode/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 8 May 2007 15:16:37 -0000 1.2
+++ pkg/PLIST 1 Oct 2007 00:06:39 -0000
@@ -30,12 +30,16 @@
include/akode/wav_decoder.h
lib/libakode.a
lib/libakode.la
[EMAIL PROTECTED] lib/libakode_ffmpeg_decoder.a
[EMAIL PROTECTED] 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
[EMAIL PROTECTED] lib/libakode_src_resampler.a
[EMAIL PROTECTED] lib/libakode_src_resampler.la
@comment lib/libakode_sun_sink.a
@comment lib/libakode_sun_sink.la
@comment lib/libakode_xiph_decoder.a
