Greetings,
Thanks for the update: your patch builds cleanly and works fine on
i386-current here as well. You can drop the include_Makefile_in patch, and I
wouldn't mind the maintainer e-mail being changed, but I would accept this
patch.
The only problem I can see is the lack of documentation. I see up-stream has
helpfully decided to drop the docs from the tarball, so should we have (at
least) a sub-package containing the docs?
I have attached a diff against the current CVS version which contains your
patch, and adds a -docs subpackage. This would mean adding a build-time
dependency on Doxygen, so that we can recreate the missing docs.
Thanks,
David.
diff -ruN libmpcdec/Makefile libmpcdec/Makefile
--- libmpcdec/Makefile Sat Oct 28 11:30:41 2006
+++ libmpcdec/Makefile Mon Dec 11 23:39:35 2006
@@ -1,14 +1,21 @@
# $OpenBSD: Makefile,v 1.3 2006/10/28 10:30:41 espie Exp $
-COMMENT= "musepack, high quality audio compression format"
-DISTNAME= libmpcdec-1.2.2
-PKGNAME= ${DISTNAME}p0
+COMMENT-main= "musepack decoder library"
+COMMENT-docs= "musepack library API documentation"
+VERSION= 1.2.4
+DISTNAME= libmpcdec-${VERSION}
+PKGNAME-main= libmpcdec-${VERSION}
+PKGNAME-docs= libmpcdec-docs-${VERSION}
+
+SHARED_LIBS += mpcdec 2.0 # .5.1
CATEGORIES= audio
+MULTI_PACKAGES= -docs -main
+
HOMEPAGE= http://www.musepack.net/
-MAINTAINER= David Love <[EMAIL PROTECTED]>
+MAINTAINER= David Love <[EMAIL PROTECTED]>
MASTER_SITES= http://files2.musepack.net/source/
EXTRACT_SUFX= .tar.bz2
@@ -21,19 +28,31 @@
DOCDIR=${PREFIX}/share/doc/libmpcdec
+BUILD_DEPENDS=
:automake-${AUTOMAKE_VERSION}*:devel/automake/${AUTOMAKE_VERSION}
\
+
:autoconf-${AUTOCONF_VERSION}*:devel/autoconf/${AUTOCONF_VERSION}
+
+.if ${MULTI_PACKAGES:M-docs}
+BUILD_DEPENDS+= ::devel/doxygen
+.endif
+
pre-configure:
+ cd ${WRKSRC} && ${SETENV} AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
@perl -pi -e 's|-O3\ -fomit-frame-pointer||g' ${WRKSRC}/configure
post-install:
${INSTALL} ${WRKBUILD}/src/.libs/sample ${PREFIX}/bin/mpc2wav
+.if ${MULTI_PACKAGES:M-docs}
+ cd ${WRKDIST}; doxygen docs/Doxyfile
${INSTALL_DATA_DIR} ${DOCDIR}
- cp -r ${WRKDIST}/docs/* ${DOCDIR}
+ cp -r ${WRKDIST}/docs/html/* ${DOCDIR}
+.endif
-SHARED_LIBS += mpcdec 1.0 # .4.1
-
USE_LIBTOOL= Yes
WANTLIB= c m stdc++
CONFIGURE_STYLE=gnu
+AUTOCONF_VERSION=2.59
+AUTOMAKE_VERSION=1.9
.include <bsd.port.mk>
diff -ruN libmpcdec/distinfo libmpcdec/distinfo
--- libmpcdec/distinfo Fri Mar 10 09:43:37 2006
+++ libmpcdec/distinfo Mon Dec 11 14:13:11 2006
@@ -1,4 +1,4 @@
-MD5 (libmpcdec-1.2.2.tar.bz2) = f14e07285b9b102a806649074c1d779b
-RMD160 (libmpcdec-1.2.2.tar.bz2) = c49faf5ba183e1c66b33c5b729168b13ff3c7447
-SHA1 (libmpcdec-1.2.2.tar.bz2) = aab2a7329486e712ea5fd6e3b0819f918c428e8a
-SIZE (libmpcdec-1.2.2.tar.bz2) = 318620
+MD5 (libmpcdec-1.2.4.tar.bz2) = 7c904f519020df99484dc6cea6f4c869
+RMD160 (libmpcdec-1.2.4.tar.bz2) = ddd8e4c5ada41e7111df386a2f5aff2aa2213a51
+SHA1 (libmpcdec-1.2.4.tar.bz2) = 0dca205be8b6149d617a4f4b129dc4dbf591037c
+SIZE (libmpcdec-1.2.4.tar.bz2) = 43735
diff -ruN libmpcdec/patches/patch-configure_ac
libmpcdec/patches/patch-configure_ac
--- libmpcdec/patches/patch-configure_ac Thu Jan 1 01:00:00 1970
+++ libmpcdec/patches/patch-configure_ac Mon Dec 11 14:13:11 2006
@@ -0,0 +1,43 @@
+$OpenBSD$
+--- configure.ac.orig Mon Dec 11 11:48:33 2006
++++ configure.ac Mon Dec 11 11:50:22 2006
+@@ -26,6 +26,7 @@ AC_CHECK_FUNCS([memmove memset sqrt])
+ AC_MSG_CHECKING(for int16_t)
+ AC_CACHE_VAL(has_int16_t,
+ [AC_TRY_RUN([
++#include <stdint.h>
+ int16_t foo;
+ int main() {return 0;}
+ ],
+@@ -38,6 +39,7 @@ AC_MSG_RESULT($has_int16_t)
+ AC_MSG_CHECKING(for int32_t)
+ AC_CACHE_VAL(has_int32_t,
+ [AC_TRY_RUN([
++#include <stdint.h>
+ int32_t foo;
+ int main() {return 0;}
+ ],
+@@ -50,6 +52,7 @@ AC_MSG_RESULT($has_int32_t)
+ AC_MSG_CHECKING(for uint32_t)
+ AC_CACHE_VAL(has_uint32_t,
+ [AC_TRY_RUN([
++#include <stdint.h>
+ uint32_t foo;
+ int main() {return 0;}
+ ],
+@@ -62,6 +65,7 @@ AC_MSG_RESULT($has_uint32_t)
+ AC_MSG_CHECKING(for uint16_t)
+ AC_CACHE_VAL(has_uint16_t,
+ [AC_TRY_RUN([
++#include <stdint.h>
+ uint16_t foo;
+ int main() {return 0;}
+ ],
+@@ -98,6 +102,7 @@ AC_MSG_RESULT($has_u_int16_t)
+ AC_MSG_CHECKING(for int64_t)
+ AC_CACHE_VAL(has_int64_t,
+ [AC_TRY_RUN([
++#include <stdint.h>
+ int64_t foo;
+ int main() {return 0;}
+ ],
diff -ruN libmpcdec/patches/patch-include_Makefile_in
libmpcdec/patches/patch-include_Makefile_in
--- libmpcdec/patches/patch-include_Makefile_in Fri Mar 10 09:43:37 2006
+++ libmpcdec/patches/patch-include_Makefile_in Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-include_Makefile_in,v 1.1.1.1 2006/03/10 09:43:37 espie Exp $
---- include/Makefile.in.orig Fri Mar 10 10:39:30 2006
-+++ include/Makefile.in Fri Mar 10 10:39:38 2006
-@@ -218,7 +218,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_bu
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status include/config.h
- $(srcdir)/config.h.in: $(am__configure_deps)
-- cd $(top_srcdir) && $(AUTOHEADER)
-+# cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-
diff -ruN libmpcdec/patches/patch-include_mpcdec_config_types_h_in
libmpcdec/patches/patch-include_mpcdec_config_types_h_in
--- libmpcdec/patches/patch-include_mpcdec_config_types_h_in Thu Jan 1
01:00:00 1970
+++ libmpcdec/patches/patch-include_mpcdec_config_types_h_in Mon Dec 11
14:13:11 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- include/mpcdec/config_types.h.in.orig Mon Dec 11 11:50:54 2006
++++ include/mpcdec/config_types.h.in Mon Dec 11 11:51:37 2006
+@@ -35,6 +35,8 @@
+ #ifndef __MUSEPACK_CONFIG_TYPES_H__
+ #define __MUSEPACK_CONFIG_TYPES_H__
+
++#include <stdint.h>
++
+ typedef unsigned char mpc_bool_t;
+ #define TRUE 1
+ #define FALSE 0
diff -ruN libmpcdec/patches/patch-src_sample_cpp
libmpcdec/patches/patch-src_sample_cpp
--- libmpcdec/patches/patch-src_sample_cpp Thu Jan 1 01:00:00 1970
+++ libmpcdec/patches/patch-src_sample_cpp Mon Dec 11 14:13:11 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/sample.cpp.orig Mon Dec 11 10:21:39 2006
++++ src/sample.cpp Mon Dec 11 10:22:05 2006
+@@ -270,7 +270,7 @@ main(int argc, char **argv)
+ /* instantiate a decoder with our file reader */
+ mpc_decoder_setup(&decoder, &reader);
+ if (!mpc_decoder_initialize(&decoder, &info)) {
+- printf("Error initializing decoder.\n", argv[1]);
++ printf("Error initializing decoder.\n");
+ return 1;
+ }
+
diff -ruN libmpcdec/pkg/DESCR libmpcdec/pkg/DESCR
--- libmpcdec/pkg/DESCR Fri Mar 10 09:43:37 2006
+++ libmpcdec/pkg/DESCR Thu Jan 1 01:00:00 1970
@@ -1,8 +0,0 @@
-Musepack is an audio compression format with a strong emphasis on high
-quality. It's not lossless, but it is designed for transparency, so that
-you won't be able to hear differences between the original wave file and
-the much smaller MPC file.
-
-It is based on the MPEG-1 Layer-2 / MP2 algorithms, but since 1997 it
-has rapidly developed and vastly improved and is now at an advanced
-stage in which it contains heavily optimized and patentless code.
diff -ruN libmpcdec/pkg/DESCR-docs libmpcdec/pkg/DESCR-docs
--- libmpcdec/pkg/DESCR-docs Thu Jan 1 01:00:00 1970
+++ libmpcdec/pkg/DESCR-docs Mon Dec 11 23:36:52 2006
@@ -0,0 +1,8 @@
+Musepack is an audio compression format with a strong emphasis on high
+quality. It's not lossless, but it is designed for transparency, so that
+you won't be able to hear differences between the original wave file and
+the much smaller MPC file.
+
+This package contains the API documentation, needed to develop
+applications using the the libmpcdec library. It is generated from the
+library code, and should be unessesary for most users.
diff -ruN libmpcdec/pkg/DESCR-main libmpcdec/pkg/DESCR-main
--- libmpcdec/pkg/DESCR-main Thu Jan 1 01:00:00 1970
+++ libmpcdec/pkg/DESCR-main Fri Mar 10 09:43:37 2006
@@ -0,0 +1,8 @@
+Musepack is an audio compression format with a strong emphasis on high
+quality. It's not lossless, but it is designed for transparency, so that
+you won't be able to hear differences between the original wave file and
+the much smaller MPC file.
+
+It is based on the MPEG-1 Layer-2 / MP2 algorithms, but since 1997 it
+has rapidly developed and vastly improved and is now at an advanced
+stage in which it contains heavily optimized and patentless code.
diff -ruN libmpcdec/pkg/PFRAG.shared libmpcdec/pkg/PFRAG.shared
--- libmpcdec/pkg/PFRAG.shared Fri Mar 10 09:43:37 2006
+++ libmpcdec/pkg/PFRAG.shared Thu Jan 1 01:00:00 1970
@@ -1,2 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/03/10 09:43:37 espie
Exp $
[EMAIL PROTECTED] lib/libmpcdec.so.${LIBmpcdec_VERSION}
diff -ruN libmpcdec/pkg/PFRAG.shared-main libmpcdec/pkg/PFRAG.shared-main
--- libmpcdec/pkg/PFRAG.shared-main Thu Jan 1 01:00:00 1970
+++ libmpcdec/pkg/PFRAG.shared-main Mon Dec 11 22:45:04 2006
@@ -0,0 +1,2 @@
[EMAIL PROTECTED] $OpenBSD$
[EMAIL PROTECTED] lib/libmpcdec.so.${LIBmpcdec_VERSION}
diff -ruN libmpcdec/pkg/PLIST libmpcdec/pkg/PLIST
--- libmpcdec/pkg/PLIST Fri Mar 10 15:53:53 2006
+++ libmpcdec/pkg/PLIST Thu Jan 1 01:00:00 1970
@@ -1,90 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.2 2006/03/10 15:53:53 jolan Exp $
-%%SHARED%%
-bin/mpc2wav
-include/mpcdec/
-include/mpcdec/config_types.h
-include/mpcdec/decoder.h
-include/mpcdec/huffman.h
-include/mpcdec/math.h
-include/mpcdec/mpcdec.h
-include/mpcdec/reader.h
-include/mpcdec/requant.h
-include/mpcdec/streaminfo.h
-lib/libmpcdec.a
-lib/libmpcdec.la
-share/doc/libmpcdec/
-share/doc/libmpcdec/Doxyfile
-share/doc/libmpcdec/custom.css
-share/doc/libmpcdec/html/
-share/doc/libmpcdec/html/annotated.html
-share/doc/libmpcdec/html/classWavWriter-members.html
-share/doc/libmpcdec/html/classWavWriter.html
-share/doc/libmpcdec/html/config__win32_8h-source.html
-share/doc/libmpcdec/html/custom.css
-share/doc/libmpcdec/html/decoder_8h-source.html
-share/doc/libmpcdec/html/decoder_8h.html
-share/doc/libmpcdec/html/dir_000000.html
-share/doc/libmpcdec/html/dir_000001.html
-share/doc/libmpcdec/html/dir_000002.html
-share/doc/libmpcdec/html/dirs.html
-share/doc/libmpcdec/html/doxygen.png
-share/doc/libmpcdec/html/files.html
-share/doc/libmpcdec/html/functions.html
-share/doc/libmpcdec/html/functions_func.html
-share/doc/libmpcdec/html/functions_rela.html
-share/doc/libmpcdec/html/functions_vars.html
-share/doc/libmpcdec/html/globals.html
-share/doc/libmpcdec/html/globals_defs.html
-share/doc/libmpcdec/html/globals_eval.html
-share/doc/libmpcdec/html/globals_func.html
-share/doc/libmpcdec/html/globals_type.html
-share/doc/libmpcdec/html/globals_vars.html
-share/doc/libmpcdec/html/huffman_8h-source.html
-share/doc/libmpcdec/html/huffman_8h.html
-share/doc/libmpcdec/html/huffsv46_8c-source.html
-share/doc/libmpcdec/html/huffsv46_8c.html
-share/doc/libmpcdec/html/huffsv7_8c-source.html
-share/doc/libmpcdec/html/huffsv7_8c.html
-share/doc/libmpcdec/html/idtag_8c-source.html
-share/doc/libmpcdec/html/idtag_8c.html
-share/doc/libmpcdec/html/index.html
-share/doc/libmpcdec/html/internal_8h-source.html
-share/doc/libmpcdec/html/internal_8h.html
-share/doc/libmpcdec/html/mainpage_8h-source.html
-share/doc/libmpcdec/html/math_8h-source.html
-share/doc/libmpcdec/html/math_8h.html
-share/doc/libmpcdec/html/mpc__decoder_8c-source.html
-share/doc/libmpcdec/html/mpc__decoder_8c.html
-share/doc/libmpcdec/html/mpc__reader_8c-source.html
-share/doc/libmpcdec/html/mpc__reader_8c.html
-share/doc/libmpcdec/html/mpcdec_8h-source.html
-share/doc/libmpcdec/html/mpcdec_8h.html
-share/doc/libmpcdec/html/pages.html
-share/doc/libmpcdec/html/reader_8h-source.html
-share/doc/libmpcdec/html/reader_8h.html
-share/doc/libmpcdec/html/requant_8c-source.html
-share/doc/libmpcdec/html/requant_8c.html
-share/doc/libmpcdec/html/requant_8h-source.html
-share/doc/libmpcdec/html/requant_8h.html
-share/doc/libmpcdec/html/sample_8cpp-source.html
-share/doc/libmpcdec/html/streaminfo_8c-source.html
-share/doc/libmpcdec/html/streaminfo_8c.html
-share/doc/libmpcdec/html/streaminfo_8h-source.html
-share/doc/libmpcdec/html/streaminfo_8h.html
-share/doc/libmpcdec/html/structQuantTyp-members.html
-share/doc/libmpcdec/html/structQuantTyp.html
-share/doc/libmpcdec/html/structhuffman__type__t-members.html
-share/doc/libmpcdec/html/structhuffman__type__t.html
-share/doc/libmpcdec/html/structmpc__decoder__t-members.html
-share/doc/libmpcdec/html/structmpc__decoder__t.html
-share/doc/libmpcdec/html/structmpc__reader__file__t-members.html
-share/doc/libmpcdec/html/structmpc__reader__file__t.html
-share/doc/libmpcdec/html/structmpc__reader__t-members.html
-share/doc/libmpcdec/html/structmpc__reader__t.html
-share/doc/libmpcdec/html/structmpc__streaminfo-members.html
-share/doc/libmpcdec/html/structmpc__streaminfo.html
-share/doc/libmpcdec/html/structreader__data__t-members.html
-share/doc/libmpcdec/html/structreader__data__t.html
-share/doc/libmpcdec/html/synth__filter_8c-source.html
-share/doc/libmpcdec/html/synth__filter_8c.html
-share/doc/libmpcdec/html/todo.html
diff -ruN libmpcdec/pkg/PLIST-docs libmpcdec/pkg/PLIST-docs
--- libmpcdec/pkg/PLIST-docs Thu Jan 1 01:00:00 1970
+++ libmpcdec/pkg/PLIST-docs Mon Dec 11 23:29:17 2006
@@ -0,0 +1,77 @@
+share/doc/libmpcdec/
+share/doc/libmpcdec/annotated.html
+share/doc/libmpcdec/classWavWriter-members.html
+share/doc/libmpcdec/classWavWriter.html
+share/doc/libmpcdec/config__types_8h-source.html
+share/doc/libmpcdec/config__win32_8h-source.html
+share/doc/libmpcdec/custom.css
+share/doc/libmpcdec/decoder_8h-source.html
+share/doc/libmpcdec/decoder_8h.html
+share/doc/libmpcdec/dir_2647b1bfcf80f373554495ba9eae0b78.html
+share/doc/libmpcdec/dir_2e98e833f4722e9e4d7536a1a4af78be.html
+share/doc/libmpcdec/dir_b5e059489dc5343f1e1b499a0abdb747.html
+share/doc/libmpcdec/dirs.html
+share/doc/libmpcdec/doxygen.png
+share/doc/libmpcdec/files.html
+share/doc/libmpcdec/functions.html
+share/doc/libmpcdec/functions_func.html
+share/doc/libmpcdec/functions_vars.html
+share/doc/libmpcdec/globals.html
+share/doc/libmpcdec/globals_defs.html
+share/doc/libmpcdec/globals_eval.html
+share/doc/libmpcdec/globals_func.html
+share/doc/libmpcdec/globals_type.html
+share/doc/libmpcdec/globals_vars.html
+share/doc/libmpcdec/huffman_8h-source.html
+share/doc/libmpcdec/huffman_8h.html
+share/doc/libmpcdec/huffsv46_8c-source.html
+share/doc/libmpcdec/huffsv46_8c.html
+share/doc/libmpcdec/huffsv7_8c-source.html
+share/doc/libmpcdec/huffsv7_8c.html
+share/doc/libmpcdec/idtag_8c-source.html
+share/doc/libmpcdec/idtag_8c.html
+share/doc/libmpcdec/index.html
+share/doc/libmpcdec/internal_8h-source.html
+share/doc/libmpcdec/internal_8h.html
+share/doc/libmpcdec/mainpage_8h-source.html
+share/doc/libmpcdec/math_8h-source.html
+share/doc/libmpcdec/math_8h.html
+share/doc/libmpcdec/mpc__decoder_8c-source.html
+share/doc/libmpcdec/mpc__decoder_8c.html
+share/doc/libmpcdec/mpc__reader_8c-source.html
+share/doc/libmpcdec/mpc__reader_8c.html
+share/doc/libmpcdec/mpcdec_8h-source.html
+share/doc/libmpcdec/mpcdec_8h.html
+share/doc/libmpcdec/pages.html
+share/doc/libmpcdec/reader_8h-source.html
+share/doc/libmpcdec/reader_8h.html
+share/doc/libmpcdec/requant_8c-source.html
+share/doc/libmpcdec/requant_8c.html
+share/doc/libmpcdec/requant_8h-source.html
+share/doc/libmpcdec/requant_8h.html
+share/doc/libmpcdec/sample_8cpp-source.html
+share/doc/libmpcdec/streaminfo_8c-source.html
+share/doc/libmpcdec/streaminfo_8c.html
+share/doc/libmpcdec/streaminfo_8h-source.html
+share/doc/libmpcdec/streaminfo_8h.html
+share/doc/libmpcdec/structQuantTyp-members.html
+share/doc/libmpcdec/structQuantTyp.html
+share/doc/libmpcdec/structhuffman__type__t-members.html
+share/doc/libmpcdec/structhuffman__type__t.html
+share/doc/libmpcdec/structmpc__decoder__t-members.html
+share/doc/libmpcdec/structmpc__decoder__t.html
+share/doc/libmpcdec/structmpc__reader__file__t-members.html
+share/doc/libmpcdec/structmpc__reader__file__t.html
+share/doc/libmpcdec/structmpc__reader__t-members.html
+share/doc/libmpcdec/structmpc__reader__t.html
+share/doc/libmpcdec/structmpc__streaminfo-members.html
+share/doc/libmpcdec/structmpc__streaminfo.html
+share/doc/libmpcdec/structreader__data__t-members.html
+share/doc/libmpcdec/structreader__data__t.html
+share/doc/libmpcdec/synth__filter_8c-source.html
+share/doc/libmpcdec/synth__filter_8c.html
+share/doc/libmpcdec/tab_b.gif
+share/doc/libmpcdec/tab_l.gif
+share/doc/libmpcdec/tab_r.gif
+share/doc/libmpcdec/tabs.css
+share/doc/libmpcdec/todo.html
diff -ruN libmpcdec/pkg/PLIST-main libmpcdec/pkg/PLIST-main
--- libmpcdec/pkg/PLIST-main Thu Jan 1 01:00:00 1970
+++ libmpcdec/pkg/PLIST-main Mon Dec 11 22:45:04 2006
@@ -0,0 +1,14 @@
[EMAIL PROTECTED] $OpenBSD$
+%%SHARED%%
+bin/mpc2wav
+include/mpcdec/
+include/mpcdec/config_types.h
+include/mpcdec/decoder.h
+include/mpcdec/huffman.h
+include/mpcdec/math.h
+include/mpcdec/mpcdec.h
+include/mpcdec/reader.h
+include/mpcdec/requant.h
+include/mpcdec/streaminfo.h
+lib/libmpcdec.a
+lib/libmpcdec.la
