On Thu, Jan 05, 2012 at 10:57:52PM +0600, Alexandr Shadchin wrote: > On Mon, Jan 02, 2012 at 10:58:42PM +0600, Alexandr Shadchin wrote: > > 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. > > > > Change > * fix missing ',' in devel/quirks > * merge with new multimedia/xine-lib >
Merge with -current ports. OK ?
--
Alexandr Shadchin
Index: audio/aqualung/Makefile
===================================================================
RCS file: /cvs/ports/audio/aqualung/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- audio/aqualung/Makefile 15 May 2012 18:04:13 -0000 1.30
+++ audio/aqualung/Makefile 22 May 2012 19:07:56 -0000
@@ -3,7 +3,7 @@
COMMENT= advanced music player
DISTNAME= aqualung-0.9beta11
-REVISION= 8
+REVISION= 9
EPOCH= 0
CATEGORIES= audio
@@ -39,8 +39,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/mpd/Makefile
===================================================================
RCS file: /cvs/ports/audio/mpd/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- audio/mpd/Makefile 16 Apr 2012 09:50:17 -0000 1.45
+++ audio/mpd/Makefile 22 May 2012 19:07:58 -0000
@@ -2,7 +2,7 @@
COMMENT = Music Player Daemon
DISTNAME = mpd-0.16.8
-REVISION = 0
+REVISION = 1
CATEGORIES = audio
HOMEPAGE = http://www.musicpd.org/
MAINTAINER = David Coppa <[email protected]>
@@ -83,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.72
diff -u -p -r1.72 Makefile
--- devel/quirks/Makefile 21 May 2012 13:54:25 -0000 1.72
+++ devel/quirks/Makefile 22 May 2012 19:08:24 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-1.70
+PKGNAME = quirks-1.71
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.77
diff -u -p -r1.77 Quirks.pm
--- devel/quirks/files/Quirks.pm 21 May 2012 13:54:25 -0000 1.77
+++ devel/quirks/files/Quirks.pm 22 May 2012 19:08:25 -0000
@@ -296,7 +296,9 @@ my $stem_extensions = {
'apr-util-mt' => 'apr-util',
'xfce-utils' => 'xfce4-session',
'p5-Email-MIME-Creator' => 'p5-Email-MIME',
- 'p5-Email-MIME-Modifier' => 'p5-Email-MIME'
+ 'p5-Email-MIME-Modifier' => 'p5-Email-MIME',
+ '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.65
diff -u -p -r1.65 Makefile
--- multimedia/gstreamer-0.10/plugins-bad/Makefile 3 May 2012 06:51:24
-0000 1.65
+++ multimedia/gstreamer-0.10/plugins-bad/Makefile 22 May 2012 19:08:54
-0000
@@ -11,7 +11,7 @@ PKGNAME-main = gstreamer-plugins-bad-${
PKGNAME-neon = gstreamer-neon-${V}
PKGNAME-mjpeg = gstreamer-mjpeg-${V}
-REVISION-main = 0
+REVISION-main = 1
MULTI_PACKAGES = -main -neon -mjpeg
@@ -55,8 +55,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.15
diff -u -p -r1.15 Makefile
--- multimedia/k3b/Makefile 5 May 2012 07:49:28 -0000 1.15
+++ multimedia/k3b/Makefile 22 May 2012 19:08:54 -0000
@@ -4,7 +4,7 @@ SHARED_ONLY = Yes
COMMENT = CD/DVD creator
DISTNAME = k3b-1.0.4
-REVISION= 10
+REVISION= 11
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 22 May 2012 19:08:54 -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
22 May 2012 19:08:54 -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
22 May 2012 19:08:54 -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.93
diff -u -p -r1.93 Makefile
--- multimedia/xine-lib/Makefile 14 May 2012 13:48:49 -0000 1.93
+++ multimedia/xine-lib/Makefile 22 May 2012 19:08:57 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY= Yes
COMMENT= multimedia decoding library
DISTNAME= xine-lib-1.1.20.1
-REVISION= 6
+REVISION= 7
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.xz
@@ -45,9 +45,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.11
diff -u -p -r1.11 patch-configure_ac
--- multimedia/xine-lib/patches/patch-configure_ac 8 Apr 2012 07:37:25
-0000 1.11
+++ multimedia/xine-lib/patches/patch-configure_ac 22 May 2012 19:08:57
-0000
@@ -13,6 +13,15 @@ $OpenBSD: patch-configure_ac,v 1.11 2012
AC_DEFINE_UNQUOTED([LIBXV_SO], "${x_lib_location:-libXv.so}", [The soname
of libXv, needed for dlopen()])
+@@ -1369,7 +1369,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
@@ -1395,9 +1395,10 @@ if test "x$with_mng" = "xyes"; then
AC_CHECK_LIB(mng, mng_initialize,
[ AC_CHECK_HEADER(libmng.h,
musepack.tgz
Description: application/tar-gz
