* Update audio/akode to 2.0.2
* Fix speex detection so it will work with speex 1.0/1.1/1.2.
* Drop maintainer; email address is invalid.
This looks harmless enough, but since I don't use akode (and KDE)
at all, somebody who does should probably test.
(My interest in this update is that it adds support for FLAC 1.1.3+,
which we'll need eventually, and fixing speex support so we can
move to speex 1.2.)
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/akode/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 28 Oct 2006 10:30:41 -0000 1.2
+++ Makefile 5 May 2007 15:48:06 -0000
@@ -1,18 +1,16 @@
# $OpenBSD: Makefile,v 1.2 2006/10/28 10:30:41 espie Exp $
COMMENT= "Decoding Library for KDE Multimedia"
-DISTNAME= akode-2.0
+DISTNAME= akode-2.0.2
PKGNAME= ${DISTNAME}
-SHARED_LIBS += akode 2.0 # .2.0
+SHARED_LIBS += akode 2.1 # .2.0
CATEGORIES= audio multimedia x11/kde
HOMEPAGE= http://www.kde-apps.org/content/show.php?content=30375
-MAINTAINER= David Love <[EMAIL PROTECTED]>
-
-MASTER_SITES= http://www.kde-apps.org/content/files/
-EXTRACT_SUFX= .tar.gz
+MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/
+EXTRACT_SUFX= .tar.bz2
DISTFILES= 30375-${DISTNAME}${EXTRACT_SUFX}
# LGPL
@@ -34,23 +32,9 @@
USE_LIBTOOL= Yes
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.59
+AUTOCONF_VERSION= 2.60
CONFIGURE= /bin/sh ${WRKDIST}/admin/cvs.sh configure
-
-
CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \
--with-extra-libs=${LOCALBASE}/lib
-
-
-# Force the plugins to link as modules
-PLUGINS= libakode_mpc_decoder \
- libakode_mpeg_decoder \
- lib/libakode_oss_sink \
- lib/libakode_sun_sink \
- lib/libakode_xiph_decoder
-
-.for _n in ${PLUGINS}
- MAKE_FLAGS+= lib${_n}_la_LDFLAGS='-module -avoid-version'
-.endfor
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/akode/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 5 Apr 2007 15:37:41 -0000 1.2
+++ distinfo 5 May 2007 15:48:06 -0000
@@ -1,5 +1,5 @@
-MD5 (30375-akode-2.0.tar.gz) = BPec2mXI6ZZvpGLqqqKC3A==
-RMD160 (30375-akode-2.0.tar.gz) = LNe3IDK1aRLGDCxpPsp+VvlI4rY=
-SHA1 (30375-akode-2.0.tar.gz) = y/ZdLyyqmesLxu4swWnq8tihOjE=
-SHA256 (30375-akode-2.0.tar.gz) = vJmFMp7CpH1fhcmjAojd8vadTKXceJe0U2vZlKagsZ8=
-SIZE (30375-akode-2.0.tar.gz) = 650094
+MD5 (30375-akode-2.0.2.tar.bz2) = ZZztDJxzXLPlW5E4/wI0LA==
+RMD160 (30375-akode-2.0.2.tar.bz2) = +gMiNn2OJOVBAH0/nlCMPDE3DZY=
+SHA1 (30375-akode-2.0.2.tar.bz2) = EK0eM1vFPCqQ0TO0k1aDJFFMcpw=
+SHA256 (30375-akode-2.0.2.tar.bz2) =
rWifezUxzDxC/aB8JkhzNgvA9KlLkMGkyRySoiMzp6Y=
+SIZE (30375-akode-2.0.2.tar.bz2) = 472605
Index: patches/patch-akode_plugins_mpc_decoder_mppdec_mpc_dec_cpp
===================================================================
RCS file:
/cvs/ports/audio/akode/patches/patch-akode_plugins_mpc_decoder_mppdec_mpc_dec_cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-akode_plugins_mpc_decoder_mppdec_mpc_dec_cpp
--- patches/patch-akode_plugins_mpc_decoder_mppdec_mpc_dec_cpp 10 Mar 2006
10:40:16 -0000 1.1.1.1
+++ patches/patch-akode_plugins_mpc_decoder_mppdec_mpc_dec_cpp 5 May 2007
15:48:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-akode_plugins_mpc_decoder_mppdec_mpc_dec_cpp,v 1.1.1.1
2006/03/10 10:40:16 espie Exp $
---- akode/plugins/mpc_decoder/mppdec/mpc_dec.cpp.orig Fri Mar 10 11:33:14 2006
-+++ akode/plugins/mpc_decoder/mppdec/mpc_dec.cpp Fri Mar 10 11:33:21 2006
-@@ -1056,6 +1056,7 @@ void MPC_decoder::UpdateBuffer ( unsigne
+--- akode/plugins/mpc_decoder/mppdec/mpc_dec.cpp.orig Mon Apr 4 15:38:05 2005
++++ akode/plugins/mpc_decoder/mppdec/mpc_dec.cpp Wed May 2 23:06:53 2007
+@@ -1056,6 +1056,7 @@ void MPC_decoder::UpdateBuffer ( unsigned int RING )
f_read_dword ( Speicher + (RING & MEMSIZE2), MEMSIZE2 ); //
update buffer
}
Index: patches/patch-akode_plugins_mpc_decoder_mppdec_streaminfo_cpp
===================================================================
RCS file:
/cvs/ports/audio/akode/patches/patch-akode_plugins_mpc_decoder_mppdec_streaminfo_cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-akode_plugins_mpc_decoder_mppdec_streaminfo_cpp
--- patches/patch-akode_plugins_mpc_decoder_mppdec_streaminfo_cpp 10 Mar
2006 10:40:16 -0000 1.1.1.1
+++ patches/patch-akode_plugins_mpc_decoder_mppdec_streaminfo_cpp 5 May
2007 15:48:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-akode_plugins_mpc_decoder_mppdec_streaminfo_cpp,v 1.1.1.1
2006/03/10 10:40:16 espie Exp $
---- akode/plugins/mpc_decoder/mppdec/streaminfo.cpp.orig Fri Mar 10
11:33:38 2006
-+++ akode/plugins/mpc_decoder/mppdec/streaminfo.cpp Fri Mar 10 11:33:50 2006
-@@ -143,6 +143,7 @@ int StreamInfo::ReadHeaderSV6 ( unsigned
+--- akode/plugins/mpc_decoder/mppdec/streaminfo.cpp.orig Mon Apr 4
15:38:05 2005
++++ akode/plugins/mpc_decoder/mppdec/streaminfo.cpp Wed May 2 23:06:53 2007
+@@ -143,6 +143,7 @@ int StreamInfo::ReadHeaderSV6 ( unsigned int HeaderDat
return ERROR_CODE_OK;
}
Index: patches/patch-akode_plugins_sun_sink_sun_sink_cpp
===================================================================
RCS file:
/cvs/ports/audio/akode/patches/patch-akode_plugins_sun_sink_sun_sink_cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-akode_plugins_sun_sink_sun_sink_cpp
--- patches/patch-akode_plugins_sun_sink_sun_sink_cpp 10 Mar 2006 10:40:16
-0000 1.1.1.1
+++ patches/patch-akode_plugins_sun_sink_sun_sink_cpp 5 May 2007 15:48:06
-0000
@@ -1,24 +1,24 @@
$OpenBSD: patch-akode_plugins_sun_sink_sun_sink_cpp,v 1.1.1.1 2006/03/10
10:40:16 espie Exp $
---- akode/plugins/sun_sink/sun_sink.cpp.orig Wed Feb 22 12:52:14 2006
-+++ akode/plugins/sun_sink/sun_sink.cpp Wed Feb 22 14:21:18 2006
-@@ -20,13 +20,15 @@
+--- akode/plugins/sun_sink/sun_sink.cpp.orig Fri Oct 28 10:57:18 2005
++++ akode/plugins/sun_sink/sun_sink.cpp Wed May 2 23:07:55 2007
+@@ -20,13 +20,14 @@
#include <config.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
-+#include <string.h>
#include <sys/audioio.h>
- #include <sys/ioctl.h>
+-#include <sys/ioctl.h>
#include <errno.h>
#include <fcntl.h>
++#include <string.h>
#include <unistd.h>
-#include <alloca.h>
#include <audioframe.h>
#include "sun_sink.h"
-@@ -97,7 +99,7 @@ int SunSink::setAudioConfiguration(const
+@@ -97,7 +98,7 @@ int SunSink::setAudioConfiguration(const AudioConfigur
{
d->config = *config;
Index: patches/patch-akode_plugins_xiph_decoder_speex_decoder_cpp
===================================================================
RCS file: patches/patch-akode_plugins_xiph_decoder_speex_decoder_cpp
diff -N patches/patch-akode_plugins_xiph_decoder_speex_decoder_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-akode_plugins_xiph_decoder_speex_decoder_cpp 5 May 2007
15:48:06 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- akode/plugins/xiph_decoder/speex_decoder.cpp.orig Sat May 5 17:14:13 2007
++++ akode/plugins/xiph_decoder/speex_decoder.cpp Sat May 5 17:15:06 2007
+@@ -25,10 +25,10 @@
+ extern "C" {
+ #include <string.h>
+ #include <stdlib.h>
+-#include <speex.h>
+-#include <speex_header.h>
+-#include <speex_callbacks.h>
+-#include <speex_stereo.h>
++#include <speex/speex.h>
++#include <speex/speex_header.h>
++#include <speex/speex_callbacks.h>
++#include <speex/speex_stereo.h>
+ #include <ogg/ogg.h>
+ }
+
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/audio/akode/patches/patch-configure_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure_in
--- patches/patch-configure_in 10 Mar 2006 10:40:16 -0000 1.1.1.1
+++ patches/patch-configure_in 5 May 2007 15:48:06 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2006/03/10 10:40:16 espie Exp $
---- configure.in.orig Wed Dec 14 21:09:22 2005
-+++ configure.in Wed Feb 22 12:08:06 2006
+--- configure.in.orig Fri Apr 6 15:23:11 2007
++++ configure.in Sat May 5 17:10:46 2007
@@ -120,7 +120,7 @@ AC_DEFUN([AC_CHECK_LIBFLAC],
])
@@ -8,18 +8,37 @@
- LIBFLAC="-lFLAC"
+ LIBFLAC="-lFLAC -lm"
AC_DEFINE(HAVE_LIBFLAC, 1,
- [Define if you have libFLAC (required for loading FLAC files)])
+ [Define if you have libFLAC 1.1.1 or 1.1.2])
fi
-@@ -136,7 +136,7 @@ AC_DEFUN([AC_CHECK_LIBOGGFLAC],
+@@ -136,11 +136,11 @@ AC_DEFUN([AC_CHECK_LIBFLAC113],
+ KDE_CHECK_HEADER(FLAC/metadata.h,
+ [
+ KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_seek_absolute,
+- have_libFLAC=yes,,[-lFLAC -logg])
++ have_libFLAC=yes,,[-lFLAC -logg -lm])
+
+ ])
+ if test "x$have_libFLAC" = "xyes"; then
+- LIBFLAC="-lFLAC -logg"
++ LIBFLAC="-lFLAC -logg -lm"
+ AC_DEFINE(HAVE_LIBFLAC113, 1,
+ [Define if you have libFLAC 1.1.3])
+ fi
+@@ -156,11 +156,11 @@ AC_DEFUN([AC_CHECK_LIBOGGFLAC],
KDE_CHECK_HEADER(OggFLAC/seekable_stream_decoder.h,
[
KDE_CHECK_LIB(OggFLAC,OggFLAC__seekable_stream_decoder_process_single,
- have_libOggFLAC=yes,,[-lm -lOggFLAC -lFLAC])
-+ have_libOggFLAC=yes,,[-lm -logg -lOggFLAC -lFLAC])
++ have_libOggFLAC=yes,,[-lOggFLAC -lFLAC -logg -lm])
])
if test "x$have_libOggFLAC" = "xyes"; then
-@@ -159,13 +159,13 @@ AC_DEFUN([KDE_CHECK_OGGVORBIS],
+- LIBOGGFLAC="-lOggFLAC"
++ LIBOGGFLAC="-lOggFLAC -lFLAC -logg -lm"
+ AC_DEFINE(HAVE_LIBOGGFLAC, 1,
+ [Define if you have libOggFLAC (required for loading OggFLAC files)])
+ fi
+@@ -179,13 +179,13 @@ AC_DEFUN([KDE_CHECK_OGGVORBIS],
[:], [have_oggvorbis=no])
KDE_CHECK_LIB(vorbis, vorbis_info_init,
@@ -36,3 +55,53 @@
VORBISFILE_LIBS="-lvorbisfile"
# for akode/plugins/xiph_decoder/
+@@ -257,8 +257,8 @@ kde_save_akode_libs="$LIBS"
+ LIBS="$all_libraries $USER_LDFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ AC_TRY_COMPILE([
+- #include <speex.h>
+- #include <speex_callbacks.h>
++ #include <speex/speex.h>
++ #include <speex/speex_callbacks.h>
+ #include <ogg/ogg.h>
+ ],[
+ ],[
+@@ -267,7 +267,7 @@ AC_TRY_COMPILE([
+ AC_MSG_RESULT($have_libspeex)
+ if test x$have_libspeex = xyes; then
+ KDE_CHECK_LIB(speex,speex_decoder_ctl,,
+- have_libspeex=no,[-lspeex -logg])
++ have_libspeex=no,[-lspeex -logg -lm])
+ fi
+ CFLAGS="$kde_save_akode_cflags"
+ LIBS="$kde_save_akode_libs"
+@@ -278,10 +278,10 @@ kde_save_akode_libs="$LIBS"
+ LIBS="$all_libraries $USER_LDFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ AC_TRY_COMPILE([
+- #include <speex.h>
+- #include <speex_callbacks.h>
+- #include <speex_echo.h>
+- #include <speex_preprocess.h>
++ #include <speex/speex.h>
++ #include <speex/speex_callbacks.h>
++ #include <speex/speex_echo.h>
++ #include <speex/speex_preprocess.h>
+ #include <ogg/ogg.h>
+ ],[
+ ],[
+@@ -290,12 +290,12 @@ AC_TRY_COMPILE([
+ AC_MSG_RESULT($have_libspeex11)
+ if test x$have_libspeex11 = xyes; then
+ KDE_CHECK_LIB(speex,speex_decode_int,,
+- broken_libspeex11=yes,[-lspeex -logg])
++ broken_libspeex11=yes,[-lspeex -logg -lm])
+ fi
+
+ if test x$have_libspeex = xyes; then
+ AC_DEFINE(HAVE_SPEEX,1,[Define if you have speex installed])
+- SPEEXLIBS="-lspeex -logg"
++ SPEEXLIBS="-lspeex -logg -lm"
+ fi
+ CFLAGS="$kde_save_akode_cflags"
+ LIBS="$kde_save_akode_libs"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/akode/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 10 Mar 2006 10:40:16 -0000 1.1.1.1
+++ pkg/PLIST 5 May 2007 15:48:06 -0000
@@ -30,13 +30,13 @@
include/akode/wav_decoder.h
lib/libakode.a
lib/libakode.la
-lib/libakode_mpc_decoder.a
-lib/libakode_mpc_decoder.la
-lib/libakode_mpeg_decoder.a
-lib/libakode_mpeg_decoder.la
-lib/libakode_oss_sink.a
-lib/libakode_oss_sink.la
-lib/libakode_sun_sink.a
-lib/libakode_sun_sink.la
-lib/libakode_xiph_decoder.a
-lib/libakode_xiph_decoder.la
[EMAIL PROTECTED] lib/libakode_mpc_decoder.a
[EMAIL PROTECTED] lib/libakode_mpc_decoder.la
[EMAIL PROTECTED] lib/libakode_mpeg_decoder.a
[EMAIL PROTECTED] lib/libakode_mpeg_decoder.la
[EMAIL PROTECTED] lib/libakode_oss_sink.a
[EMAIL PROTECTED] lib/libakode_oss_sink.la
[EMAIL PROTECTED] lib/libakode_sun_sink.a
[EMAIL PROTECTED] lib/libakode_sun_sink.la
[EMAIL PROTECTED] lib/libakode_xiph_decoder.a
[EMAIL PROTECTED] lib/libakode_xiph_decoder.la
--
Christian "naddy" Weisgerber [EMAIL PROTECTED]
