On Thu, Dec 29, 2011 at 11:47:41AM +0000, Stuart Henderson wrote: > This is going to need @conflict markers with audio/libmpcdec, quirks > entry and check for any needed WANTLIB syncs on ports which depend on it. > I wonder if it might be simpler to just handle it as an update to > audio/libmpcdec instead though. >
musepack is decoder(StreamVersion7 and StreamVersion8), encoder(StreamVersion8) and misc tools. I'm not sure what to use the old name is a good idea. Add diff - switch ports on musepack. > > On 2011-12-26, Alexandr Shadchin <[email protected]> wrote: > > > > --vtzGhvizbBRQ85DL > > Content-Type: text/plain; charset=us-ascii > > Content-Disposition: inline > > > > Hi, > > > > DESC: > > 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 has rapidly > > developed and vastly improved and is now at an advanced stage in which > > it contains heavily optimized and patentless code. > > > > This port can be considered as a replacement for audio/libmpcdec and > > audio/mppenc. Tested on amd64. > > > > Comments ? OK ? > > > -- Alexandr Shadchin Index: audio/aqualung/Makefile =================================================================== RCS file: /cvs/ports/audio/aqualung/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- audio/aqualung/Makefile 12 Oct 2011 12:54:30 -0000 1.27 +++ audio/aqualung/Makefile 2 Jan 2012 16:24:23 -0000 @@ -3,7 +3,7 @@ COMMENT= advanced music player DISTNAME= aqualung-0.9beta11 -REVISION= 6 +REVISION= 7 EPOCH= 0 CATEGORIES= audio @@ -38,8 +38,8 @@ LIB_DEPENDS= audio/flac \ audio/libcddb \ audio/libmad \ audio/libmodplug \ - audio/libmpcdec \ audio/mac \ + audio/musepack \ audio/speex \ audio/wavpack \ graphics/ffmpeg \ Index: audio/libmpcdec/Makefile =================================================================== RCS file: /cvs/ports/audio/libmpcdec/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- audio/libmpcdec/Makefile 24 Aug 2009 15:27:49 -0000 1.7 +++ audio/libmpcdec/Makefile 2 Jan 2012 16:24:23 -0000 @@ -2,6 +2,7 @@ COMMENT= musepack decoder library DISTNAME= libmpcdec-1.2.6 +REVISION= 0 SHARED_LIBS += mpcdec 3.0 # .5.2 CATEGORIES= audio Index: audio/libmpcdec/pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/libmpcdec/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- audio/libmpcdec/pkg/PLIST 24 Dec 2006 22:45:35 -0000 1.3 +++ audio/libmpcdec/pkg/PLIST 2 Jan 2012 16:24:23 -0000 @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.3 2006/12/24 22:45:35 steven Exp $ +@conflict musepack-* %%SHARED%% bin/mpc2wav include/mpcdec/ Index: audio/mpd/Makefile =================================================================== RCS file: /cvs/ports/audio/mpd/Makefile,v retrieving revision 1.42 diff -u -p -r1.42 Makefile --- audio/mpd/Makefile 30 Oct 2011 11:46:18 -0000 1.42 +++ audio/mpd/Makefile 2 Jan 2012 16:24:23 -0000 @@ -2,6 +2,7 @@ COMMENT = Music Player Daemon DISTNAME = mpd-0.16.5 +REVISION = 0 CATEGORIES = audio HOMEPAGE = http://www.musicpd.org/ MAINTAINER = Tobias Ulmer <[email protected]> @@ -82,7 +83,7 @@ LIB_DEPENDS += audio/libvorbis \ audio/lame \ net/libshout \ audio/faad>=2.6.1p0 \ - audio/libmpcdec + audio/musepack CONFIGURE_ARGS += --enable-aac \ --enable-shout \ --enable-vorbis-encoder Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.59 diff -u -p -r1.59 Makefile --- devel/quirks/Makefile 16 Dec 2011 08:15:49 -0000 1.59 +++ devel/quirks/Makefile 2 Jan 2012 16:24:30 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-1.57 +PKGNAME = quirks-1.58 PKG_ARCH = * MAINTAINER = Marc Espie <[email protected]> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.64 diff -u -p -r1.64 Quirks.pm --- devel/quirks/files/Quirks.pm 16 Dec 2011 08:15:49 -0000 1.64 +++ devel/quirks/files/Quirks.pm 2 Jan 2012 16:24:30 -0000 @@ -255,6 +255,8 @@ my $stem_extensions = { 'libusb' => 'libusb-compat', 'pecl-pcntl' => 'php-pcntl', 'distribute' => 'py3-distribute' + 'libmpcdec' => 'musepack' + 'mppenc' => 'musepack' }; # ->is_base_system($handle, $state): Index: multimedia/gstreamer-0.10/plugins-bad/Makefile =================================================================== RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-bad/Makefile,v retrieving revision 1.62 diff -u -p -r1.62 Makefile --- multimedia/gstreamer-0.10/plugins-bad/Makefile 16 Sep 2011 10:31:23 -0000 1.62 +++ multimedia/gstreamer-0.10/plugins-bad/Makefile 2 Jan 2012 16:24:37 -0000 @@ -11,7 +11,7 @@ PKGNAME-main = gstreamer-plugins-bad-${ PKGNAME-neon = gstreamer-neon-${V} PKGNAME-mjpeg = gstreamer-mjpeg-${V} -REVISION-main = 5 +REVISION-main = 6 REVISION-neon = 1 REVISION-mjpeg = 1 @@ -54,8 +54,8 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \ audio/gsm \ audio/libcdaudio \ audio/libdca \ - audio/libmpcdec \ audio/libsndfile \ + audio/musepack \ audio/soundtouch \ devel/sdl \ graphics/jasper \ Index: multimedia/k3b/Makefile =================================================================== RCS file: /cvs/ports/multimedia/k3b/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- multimedia/k3b/Makefile 3 Dec 2011 18:35:11 -0000 1.14 +++ multimedia/k3b/Makefile 2 Jan 2012 16:24:37 -0000 @@ -4,7 +4,7 @@ SHARED_ONLY = Yes COMMENT = CD/DVD creator DISTNAME = k3b-1.0.4 -REVISION= 9 +REVISION= 10 SHARED_LIBS = k3b 0.0 # 3.0 SHARED_LIBS += k3bdevice 0.0 # 5.0 @@ -44,10 +44,10 @@ RUN_DEPENDS = sysutils/cdrtools \ LIB_DEPENDS = audio/flac \ audio/lame \ audio/libmad \ - audio/libmpcdec \ audio/libsamplerate \ audio/libsndfile \ audio/libvorbis \ + audio/musepack \ audio/taglib \ devel/libdvdread \ graphics/ffmpeg>=20100512 \ @@ -69,5 +69,8 @@ CONFIGURE_ARGS += --with-qt-dir=${MODQT_ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ PTHREAD_LIBS="-pthread" + +# For QSettings to write its setup +PORTHOME= ${WRKDIST} .include <bsd.port.mk> Index: multimedia/k3b/patches/patch-configure =================================================================== RCS file: /cvs/ports/multimedia/k3b/patches/patch-configure,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure --- multimedia/k3b/patches/patch-configure 9 Jul 2008 02:13:01 -0000 1.2 +++ multimedia/k3b/patches/patch-configure 2 Jan 2012 16:24:37 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-configure,v 1.2 2008/07/09 02:13:01 jakemsr Exp $ ---- configure.orig Fri Nov 2 03:02:31 2007 -+++ configure Sun Jun 22 00:56:53 2008 +--- configure.orig Fri Nov 2 15:02:31 2007 ++++ configure Mon Jan 2 17:53:12 2012 @@ -29531,7 +29531,10 @@ rm -f core conftest.err conftest.$ac_objext conftest_i fi @@ -48,3 +48,21 @@ $OpenBSD: patch-configure,v 1.2 2008/07/ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF +@@ -37326,7 +37329,7 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${a + + + +-for ac_header in mpcdec/mpcdec.h ++for ac_header in mpc/mpcdec.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +@@ -37528,7 +37531,7 @@ if test $ac_cv_lib_mpcdec_mpc_decoder_setup = yes; the + MPC_LIBS="-lmpcdec" + + cat >>confdefs.h <<\_ACEOF +-#define MPC_HEADER_FILE <mpcdec/mpcdec.h> ++#define MPC_HEADER_FILE <mpc/mpcdec.h> + _ACEOF + + Index: multimedia/k3b/patches/patch-plugins_decoder_musepack_k3bmpcwrapper_cpp =================================================================== RCS file: multimedia/k3b/patches/patch-plugins_decoder_musepack_k3bmpcwrapper_cpp diff -N multimedia/k3b/patches/patch-plugins_decoder_musepack_k3bmpcwrapper_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ multimedia/k3b/patches/patch-plugins_decoder_musepack_k3bmpcwrapper_cpp 2 Jan 2012 16:24:37 -0000 @@ -0,0 +1,129 @@ +$OpenBSD$ +--- plugins/decoder/musepack/k3bmpcwrapper.cpp.orig Fri Nov 2 14:55:03 2007 ++++ plugins/decoder/musepack/k3bmpcwrapper.cpp Mon Jan 2 21:54:47 2012 +@@ -19,32 +19,32 @@ + #include <qfile.h> + + +-mpc_int32_t read_impl( void* data, void* ptr, mpc_int32_t size ) ++mpc_int32_t read_impl( mpc_reader *p_reader, void* ptr, mpc_int32_t size ) + { +- QFile* input = static_cast<QFile*>( data ); ++ QFile* input = static_cast<QFile*>( p_reader->data ); + return input->readBlock( (char*)ptr, size ); + } + + +-mpc_bool_t seek_impl( void* data, mpc_int32_t offset ) ++mpc_bool_t seek_impl( mpc_reader *p_reader, mpc_int32_t offset ) + { +- QFile* input = static_cast<QFile*>( data ); ++ QFile* input = static_cast<QFile*>( p_reader->data ); + return input->at( offset ); + } + +-mpc_int32_t tell_impl( void* data ) ++mpc_int32_t tell_impl( mpc_reader *p_reader ) + { +- QFile* input = static_cast<QFile*>( data ); ++ QFile* input = static_cast<QFile*>( p_reader->data ); + return input->at(); + } + +-mpc_int32_t get_size_impl( void* data ) ++mpc_int32_t get_size_impl( mpc_reader *p_reader ) + { +- QFile* input = static_cast<QFile*>( data ); ++ QFile* input = static_cast<QFile*>( p_reader->data ); + return input->size(); + } + +-mpc_bool_t canseek_impl( void* ) ++mpc_bool_t canseek_impl( mpc_reader * ) + { + return true; + } +@@ -74,8 +74,6 @@ K3bMpcWrapper::K3bMpcWrapper() + m_reader->canseek = canseek_impl; + m_reader->data = m_input; + +- m_decoder = new mpc_decoder; +- + m_info = new mpc_streaminfo; + } + +@@ -85,7 +83,8 @@ K3bMpcWrapper::~K3bMpcWrapper() + close(); + + delete m_reader; +- delete m_decoder; ++ if (m_demux) ++ mpc_demux_exit(m_demux); + delete m_info; + delete m_input; + } +@@ -98,24 +97,15 @@ bool K3bMpcWrapper::open( const QString& filename ) + m_input->setName( filename ); + + if( m_input->open( IO_ReadOnly ) ) { +- mpc_streaminfo_init( m_info ); +- if( mpc_streaminfo_read( m_info, m_reader ) != ERROR_CODE_OK ) { +- kdDebug() << "(K3bMpcWrapper) Not a valid musepack file: \"" << filename << "\"" << endl; ++ m_demux = mpc_demux_init(m_reader); ++ if (!m_demux) + return false; +- } +- else { +- mpc_decoder_setup( m_decoder, m_reader ); +- if( !mpc_decoder_initialize( m_decoder, m_info ) ) { +- kdDebug() << "(K3bMpcWrapper) failed to initialize the Musepack decoder." << endl; +- close(); +- return false; +- } +- else { +- kdDebug() << "(K3bMpcWrapper) valid musepack file. " +- << channels() << " Channels and Samplerate: " << samplerate() << endl; +- return true; +- } +- } ++ ++ mpc_demux_get_info(m_demux, m_info); ++ ++ kdDebug() << "(K3bMpcWrapper) valid musepack file. " ++ << channels() << " Channels and Samplerate: " << samplerate() << endl; ++ return true; + } + else + return false; +@@ -130,11 +120,21 @@ void K3bMpcWrapper::close() + + int K3bMpcWrapper::decode( char* data, int max ) + { ++ mpc_frame_info frame; ++ mpc_status status; ++ + // FIXME: make this a member variable + MPC_SAMPLE_FORMAT sample_buffer[MPC_DECODER_BUFFER_LENGTH]; + +- unsigned int samples = mpc_decoder_decode( m_decoder, sample_buffer, 0, 0 ); ++ frame.buffer = sample_buffer; ++ status = mpc_demux_decode(m_demux, &frame); ++ if (status != MPC_STATUS_OK) { ++ kdDebug() << "(K3bMpcWrapper) failed to decode sample." << endl; ++ return -1; ++ } + ++ unsigned int samples = frame.samples; ++ + if( samples*channels()*2 > (unsigned int)max ) { + kdDebug() << "(K3bMpcWrapper) buffer not big enough." << endl; + return -1; +@@ -170,7 +170,7 @@ int K3bMpcWrapper::decode( char* data, int max ) + + bool K3bMpcWrapper::seek( const K3b::Msf& msf ) + { +- return mpc_decoder_seek_seconds( m_decoder, (double)msf.totalFrames()/75.0 ); ++ return mpc_demux_seek_second(m_demux, (double)msf.totalFrames()/75.0) == MPC_STATUS_OK; + } + + Index: multimedia/k3b/patches/patch-plugins_decoder_musepack_k3bmpcwrapper_h =================================================================== RCS file: multimedia/k3b/patches/patch-plugins_decoder_musepack_k3bmpcwrapper_h diff -N multimedia/k3b/patches/patch-plugins_decoder_musepack_k3bmpcwrapper_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ multimedia/k3b/patches/patch-plugins_decoder_musepack_k3bmpcwrapper_h 2 Jan 2012 16:24:37 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- plugins/decoder/musepack/k3bmpcwrapper.h.orig Mon Jan 2 19:23:45 2012 ++++ plugins/decoder/musepack/k3bmpcwrapper.h Mon Jan 2 19:58:08 2012 +@@ -51,7 +51,7 @@ class K3bMpcWrapper + private: + QFile* m_input; + mpc_reader* m_reader; +- mpc_decoder* m_decoder; ++ mpc_demux* m_demux; + mpc_streaminfo* m_info; + }; + Index: multimedia/xine-lib/Makefile =================================================================== RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v retrieving revision 1.84 diff -u -p -r1.84 Makefile --- multimedia/xine-lib/Makefile 16 Nov 2011 00:43:17 -0000 1.84 +++ multimedia/xine-lib/Makefile 2 Jan 2012 16:24:38 -0000 @@ -5,6 +5,7 @@ SHARED_ONLY= Yes COMMENT= multimedia decoding library DISTNAME= xine-lib-1.1.20 +REVISION= 0 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} EXTRACT_SUFX= .tar.xz @@ -40,9 +41,9 @@ LIB_DEPENDS= audio/faad \ audio/libdca \ audio/libmad \ audio/libmodplug \ - audio/libmpcdec \ audio/libogg \ audio/libvorbis \ + audio/musepack \ audio/speex \ audio/wavpack \ devel/sdl \ Index: multimedia/xine-lib/patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-configure_ac,v retrieving revision 1.9 diff -u -p -r1.9 patch-configure_ac --- multimedia/xine-lib/patches/patch-configure_ac 16 Nov 2011 00:43:17 -0000 1.9 +++ multimedia/xine-lib/patches/patch-configure_ac 2 Jan 2012 16:24:38 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-configure_ac,v 1.9 2011/11/16 00:43:17 sthen Exp $ ---- configure.ac.orig Sun Jul 25 10:37:30 2010 -+++ configure.ac Wed Sep 28 03:18:47 2011 +--- configure.ac.orig Sun Nov 13 07:36:20 2011 ++++ configure.ac Mon Jan 2 17:30:29 2012 @@ -565,9 +565,9 @@ t q b :q @@ -22,6 +22,15 @@ $OpenBSD: patch-configure_ac,v 1.9 2011/ [ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> +@@ -1376,7 +1376,7 @@ if test "x$enable_musepack" = "xno"; then + AC_MSG_RESULT([musepack support disabled]) + elif test "x$with_external_libmpcdec" = "xyes"; then + AC_CHECK_LIB([mpcdec], [mpc_demux_decode], [have_mpcdec=yes], +- [AC_CHECK_LIB([mpcdec], [mpc_decoder_decode], [have_mpcdec=yes])]) ++ [AC_CHECK_LIB([mpcdec], [mpc_decoder_decode], [have_mpcdec=yes])], [-lm]) + AC_CHECK_HEADERS([mpc/mpcdec.h], [], + [AC_CHECK_HEADERS([mpcdec/mpcdec.h], [], [have_mpcdec=no])]) + if test "x$have_mpcdec" != "xyes"; then @@ -1402,9 +1402,10 @@ if test "x$with_mng" = "xyes"; then AC_CHECK_LIB(mng, mng_initialize, [ AC_CHECK_HEADER(libmng.h,
