[SCM] VLC media player packaging branch, sid, updated. debian/0.9.9a-1-22-gd6698b9
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Sat Jun 6 15:00:29 UTC 2009
The following commit has been merged in the sid branch:
commit c7bb179b4b8bfc4d87be4fe800e0ab8ca734ebba
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Thu Jun 4 16:34:31 2009 +0200
Patch to support libmpc new API
Thanks: Yavor Doganov
Closes: #476375
diff --git a/debian/patches/406-libmpc6-api.diff b/debian/patches/406-libmpc6-api.diff
new file mode 100644
index 0000000..37c2ce5
--- /dev/null
+++ b/debian/patches/406-libmpc6-api.diff
@@ -0,0 +1,274 @@
+diff --git a/configure.ac b/configure.ac
+index 7e09201..aa5883d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2881,9 +2881,12 @@ AC_ARG_ENABLE(mpc,
+ [ --enable-mpc Mpc demux support (default enabled)])
+ if test "${enable_mpc}" != "no"
+ then
+- AC_CHECK_HEADERS(mpcdec/mpcdec.h, [
++ AC_CHECK_HEADERS([mpc/mpcdec.h], [
+ VLC_ADD_PLUGIN([mpc])
+- VLC_ADD_LIBS([mpc],[-lmpcdec])])
++ VLC_ADD_LIBS([mpc],[-lmpcdec])],
++ [AC_CHECK_HEADERS([mpcdec/mpcdec.h], [
++ VLC_ADD_PLUGIN([mpc])
++ VLC_ADD_LIBS([mpc],[-lmpcdec])])])
+ fi
+
+ dnl
+diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c
+index 60fe5c5..5b36cb0 100644
+--- a/modules/demux/mpc.c
++++ b/modules/demux/mpc.c
+@@ -35,7 +35,11 @@
+ #include <vlc_codec.h>
+ #include <math.h>
+
++#ifdef HAVE_MPC_MPCDEC_H
++#include <mpc/mpcdec.h>
++#else
+ #include <mpcdec/mpcdec.h>
++#endif
+
+ /* TODO:
+ * - test stream version 4..6
+@@ -74,7 +78,11 @@ struct demux_sys_t
+ es_out_id_t *p_es;
+
+ /* */
++#ifndef HAVE_MPC_MPCDEC_H
+ mpc_decoder decoder;
++#else
++ mpc_demux *decoder;
++#endif
+ mpc_reader reader;
+ mpc_streaminfo info;
+
+@@ -82,11 +90,19 @@ struct demux_sys_t
+ int64_t i_position;
+ };
+
++#ifndef HAVE_MPC_MPCDEC_H
+ mpc_int32_t ReaderRead( void *p_private, void *dst, mpc_int32_t i_size );
+ mpc_bool_t ReaderSeek( void *p_private, mpc_int32_t i_offset );
+ mpc_int32_t ReaderTell( void *p_private);
+ mpc_int32_t ReaderGetSize( void *p_private );
+ mpc_bool_t ReaderCanSeek( void *p_private );
++#else
++mpc_int32_t ReaderRead( mpc_reader *p_private, void *dst, mpc_int32_t i_size );
++mpc_bool_t ReaderSeek( mpc_reader *p_private, mpc_int32_t i_offset );
++mpc_int32_t ReaderTell( mpc_reader *p_private);
++mpc_int32_t ReaderGetSize( mpc_reader *p_private );
++mpc_bool_t ReaderCanSeek( mpc_reader *p_private );
++#endif
+
+ /*****************************************************************************
+ * Open: initializes ES structures
+@@ -101,7 +117,12 @@ static int Open( vlc_object_t * p_this )
+ if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
+ return VLC_EGENERIC;
+
+- if( memcmp( p_peek, "MP+", 3 ) )
++ if( memcmp( p_peek, "MP+", 3 )
++#ifdef HAVE_MPC_MPCDEC_H
++ /* SV8 format */
++ && memcmp( p_peek, "MPCK", 4 )
++#endif
++ )
+ {
+ /* for v4..6 we check extension file */
+ const int i_version = (GetDWLE( p_peek ) >> 11)&0x3ff;
+@@ -132,6 +153,7 @@ static int Open( vlc_object_t * p_this )
+ p_sys->reader.canseek = ReaderCanSeek;
+ p_sys->reader.data = p_demux;
+
++#ifndef HAVE_MPC_MPCDEC_H
+ /* Load info */
+ mpc_streaminfo_init( &p_sys->info );
+ if( mpc_streaminfo_read( &p_sys->info, &p_sys->reader ) != ERROR_CODE_OK )
+@@ -149,6 +171,16 @@ static int Open( vlc_object_t * p_this )
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
++#else
++ p_sys->decoder = mpc_demux_init( &p_sys->reader );
++ if( !p_sys->decoder )
++ {
++ free( p_sys );
++ return VLC_EGENERIC;
++ }
++
++ mpc_demux_get_info( p_sys->decoder, &p_sys->info );
++#endif
+
+ /* Fill p_demux fields */
+ p_demux->pf_demux = Demux;
+@@ -199,6 +231,10 @@ static void Close( vlc_object_t * p_this )
+ demux_t *p_demux = (demux_t*)p_this;
+ demux_sys_t *p_sys = p_demux->p_sys;
+
++#ifdef HAVE_MPC_MPCDEC_H
++ if( p_sys->decoder )
++ mpc_demux_exit( p_sys->decoder );
++#endif
+ free( p_sys );
+ }
+
+@@ -212,9 +248,14 @@ static int Demux( demux_t *p_demux )
+ demux_sys_t *p_sys = p_demux->p_sys;
+ block_t *p_data;
+ int i_ret;
++#ifdef HAVE_MPC_MPCDEC_H
++ mpc_frame_info frame;
++ mpc_status err;
++#endif
+
+ p_data = block_New( p_demux,
+ MPC_DECODER_BUFFER_LENGTH*sizeof(MPC_SAMPLE_FORMAT) );
++#ifndef HAVE_MPC_MPCDEC_H
+ i_ret = mpc_decoder_decode( &p_sys->decoder,
+ (MPC_SAMPLE_FORMAT*)p_data->p_buffer,
+ NULL, NULL );
+@@ -223,6 +264,22 @@ static int Demux( demux_t *p_demux )
+ block_Release( p_data );
+ return i_ret < 0 ? -1 : 0;
+ }
++#else
++ frame.buffer = (MPC_SAMPLE_FORMAT*)p_data->p_buffer;
++ err = mpc_demux_decode( p_sys->decoder, &frame );
++ if( err != MPC_STATUS_OK )
++ {
++ block_Release( p_data );
++ return -1;
++ }
++ else if( frame.bits == -1 )
++ {
++ block_Release( p_data );
++ return 0;
++ }
++
++ i_ret = frame.samples;
++#endif
+
+ /* */
+ p_data->i_buffer = i_ret * sizeof(MPC_SAMPLE_FORMAT) * p_sys->info.channels;
+@@ -258,15 +315,27 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
+
+ case DEMUX_GET_LENGTH:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
++#ifndef HAVE_MPC_MPCDEC_H
+ *pi64 = INT64_C(1000000) * p_sys->info.pcm_samples /
+ p_sys->info.sample_freq;
++#else
++ *pi64 = INT64_C(1000000) * (p_sys->info.samples -
++ p_sys->info.beg_silence) /
++ p_sys->info.sample_freq;
++#endif
+ return VLC_SUCCESS;
+
+ case DEMUX_GET_POSITION:
+ pf = (double*)va_arg( args, double * );
++#ifndef HAVE_MPC_MPCDEC_H
+ if( p_sys->info.pcm_samples > 0 )
+ *pf = (double) p_sys->i_position /
+ (double)p_sys->info.pcm_samples;
++#else
++ if( p_sys->info.samples - p_sys->info.beg_silence > 0)
++ *pf = (double) p_sys->i_position /
++ (double)(p_sys->info.samples - p_sys->info.beg_silence);
++#endif
+ else
+ *pf = 0.0;
+ return VLC_SUCCESS;
+@@ -279,8 +348,14 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
+
+ case DEMUX_SET_POSITION:
+ f = (double)va_arg( args, double );
++#ifndef HAVE_MPC_MPCDEC_H
+ i64 = (int64_t)(f * p_sys->info.pcm_samples);
+ if( mpc_decoder_seek_sample( &p_sys->decoder, i64 ) )
++#else
++ i64 = (int64_t)(f * (p_sys->info.samples -
++ p_sys->info.beg_silence));
++ if( mpc_demux_seek_sample( p_sys->decoder, i64 ) == MPC_STATUS_OK )
++#endif
+ {
+ p_sys->i_position = i64;
+ return VLC_SUCCESS;
+@@ -289,7 +364,11 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
+
+ case DEMUX_SET_TIME:
+ i64 = (int64_t)va_arg( args, int64_t );
++#ifndef HAVE_MPC_MPCDEC_H
+ if( mpc_decoder_seek_sample( &p_sys->decoder, i64 ) )
++#else
++ if( mpc_demux_seek_sample( p_sys->decoder, i64 ) == MPC_STATUS_OK )
++#endif
+ {
+ p_sys->i_position = i64;
+ return VLC_SUCCESS;
+@@ -301,33 +380,63 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
+ }
+ }
+
++#ifndef HAVE_MPC_MPCDEC_H
+ mpc_int32_t ReaderRead( void *p_private, void *dst, mpc_int32_t i_size )
+ {
+ demux_t *p_demux = (demux_t*)p_private;
++#else
++mpc_int32_t ReaderRead( mpc_reader *p_private, void *dst, mpc_int32_t i_size )
++{
++ demux_t *p_demux = (demux_t*)p_private->data;
++#endif
+ return stream_Read( p_demux->s, dst, i_size );
+ }
+
++#ifndef HAVE_MPC_MPCDEC_H
+ mpc_bool_t ReaderSeek( void *p_private, mpc_int32_t i_offset )
+ {
+ demux_t *p_demux = (demux_t*)p_private;
++#else
++mpc_bool_t ReaderSeek( mpc_reader *p_private, mpc_int32_t i_offset )
++{
++ demux_t *p_demux = (demux_t*)p_private->data;
++#endif
+ return !stream_Seek( p_demux->s, i_offset );
+ }
+
++#ifndef HAVE_MPC_MPCDEC_H
+ mpc_int32_t ReaderTell( void *p_private)
+ {
+ demux_t *p_demux = (demux_t*)p_private;
++#else
++mpc_int32_t ReaderTell( mpc_reader *p_private)
++{
++ demux_t *p_demux = (demux_t*)p_private->data;
++#endif
+ return stream_Tell( p_demux->s );
+ }
+
++#ifndef HAVE_MPC_MPCDEC_H
+ mpc_int32_t ReaderGetSize( void *p_private )
+ {
+ demux_t *p_demux = (demux_t*)p_private;
++#else
++mpc_int32_t ReaderGetSize( mpc_reader *p_private )
++{
++ demux_t *p_demux = (demux_t*)p_private->data;
++#endif
+ return stream_Size( p_demux->s );
+ }
+
++#ifndef HAVE_MPC_MPCDEC_H
+ mpc_bool_t ReaderCanSeek( void *p_private )
+ {
+ demux_t *p_demux = (demux_t*)p_private;
++#else
++mpc_bool_t ReaderCanSeek( mpc_reader *p_private )
++{
++ demux_t *p_demux = (demux_t*)p_private->data;
++#endif
+ bool b_canseek;
+
+ stream_Control( p_demux->s, STREAM_CAN_SEEK, &b_canseek );
diff --git a/debian/patches/406b-rebootstrap.diff b/debian/patches/406b-rebootstrap.diff
new file mode 100644
index 0000000..e0cfa93
--- /dev/null
+++ b/debian/patches/406b-rebootstrap.diff
@@ -0,0 +1,190 @@
+diff --git a/config.h.in b/config.h.in
+index e1a2534..f922f00 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -517,6 +517,9 @@
+ /* Define to 1 if you have the <mpcdec/mpcdec.h> header file. */
+ #undef HAVE_MPCDEC_MPCDEC_H
+
++/* Define to 1 if you have the <mpc/mpcdec.h> header file. */
++#undef HAVE_MPC_MPCDEC_H
++
+ /* Define if nanosleep is available. */
+ #undef HAVE_NANOSLEEP
+
+diff --git a/configure b/configure
+index 819328c..2a529d1 100755
+--- a/configure
++++ b/configure
+@@ -45739,6 +45743,160 @@ fi
+ if test "${enable_mpc}" != "no"
+ then
+
++for ac_header in mpc/mpcdec.h
++do
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ $as_echo_n "(cached) " >&6
++fi
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'`
++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++else
++ # Is the header compilable?
++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
++$as_echo_n "checking $ac_header usability... " >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_header_compiler=yes
++else
++ $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_compiler=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
++
++# Is the header present?
++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
++$as_echo_n "checking $ac_header presence... " >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <$ac_header>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ ac_header_preproc=yes
++else
++ $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_preproc=no
++fi
++
++rm -f conftest.err conftest.$ac_ext
++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
++
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++
++ ;;
++esac
++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ $as_echo_n "(cached) " >&6
++else
++ eval "$as_ac_Header=\$ac_header_preproc"
++fi
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'`
++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++
++fi
++as_val=`eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'`
++ if test "x$as_val" = x""yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++
++ PLUGINS="${PLUGINS} mpc"
++ LTLIBmpc="libmpc_plugin.la"
++
++
++
++ for element in mpc; do
++ eval "LIBS_${element}="'"'"-lmpcdec "'$'"{LIBS_${element}} "'"'
++ am_modules_with_libs="${am_modules_with_libs} ${element}"
++ done
++
++else
++
+ for ac_header in mpcdec/mpcdec.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+@@ -45897,6 +46055,10 @@ done
+
+ fi
+
++done
++
++fi
++
+ # Check whether --enable-gme was given.
+ if test "${enable_gme+set}" = set; then
+ enableval=$enable_gme;
diff --git a/debian/patches/series b/debian/patches/series
index 66cc365..63f0f48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,5 @@
403_http_hosts.diff
404_duplicate_extended.diff
405_javascript_log.diff
+406-libmpc6-api.diff
+406b-rebootstrap.diff
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list