pkgsrc-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[PATCH] update vlc to 0.8.6d
Attached is the patch that updates VLC to the newest available version.
Some things had to be commented out due to an old version of ffmpeg, but at
least on my system, it seems to work. It would be nice if someone else tested
this prior to commiting it just to be sure.
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/vlc/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- Makefile 31 Oct 2007 15:35:30 -0000 1.46
+++ Makefile 5 Jan 2008 20:29:38 -0000
@@ -2,7 +2,6 @@
#
DISTNAME= vlc-${VLC_VER}
-PKGREVISION= 7
CATEGORIES= multimedia
MASTER_SITES=
http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
EXTRACT_SUFX= .tar.bz2
@@ -18,7 +17,7 @@
PTHREAD_OPTS+= require
USE_LANGUAGES= c c++
-VLC_VER= 0.8.5
+VLC_VER= 0.8.6d
.include "../../mk/bsd.prefs.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/vlc/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo 22 Jun 2007 14:32:24 -0000 1.12
+++ distinfo 5 Jan 2008 20:29:38 -0000
@@ -1,16 +1,11 @@
-$NetBSD: distinfo,v 1.12 2007/06/22 14:32:24 lkundrak Exp $
+$NetBSD$
-SHA1 (vlc-0.8.5.tar.bz2) = 2f0a26a336a5211f32c7bcc653dfd0b27f1fb26b
-RMD160 (vlc-0.8.5.tar.bz2) = d24140a5b4bf771754028090e103bb5c171e4fd8
-Size (vlc-0.8.5.tar.bz2) = 8562996 bytes
-SHA1 (patch-aa) = a12d95fc0d6266969431a3c42d438b3cc11acc79
-SHA1 (patch-ab) = 3a0754638228d664570c7c437b5188195b23c734
-SHA1 (patch-ad) = 374f8deb5179c72b4055cdbd37d318a44b3c9e7e
-SHA1 (patch-ag) = 44061c0018d97c45d4edfdb2a16192f3c99024f8
-SHA1 (patch-ah) = 5a355a70b7b39c0a33db7cc37e3944f903686d3f
-SHA1 (patch-ai) = 655df187ab529eb30753531dafbf4b68f7a85785
+SHA1 (vlc-0.8.6d.tar.bz2) = 63afd15cc782795c8d8f3de5edc614389465c577
+RMD160 (vlc-0.8.6d.tar.bz2) = 16c1998dbc30ad96bebdd8792d135b5f7899166e
+Size (vlc-0.8.6d.tar.bz2) = 11170003 bytes
+SHA1 (patch-aa) = 74d15267aafc9df14d896e4754ca88ad3dc096b3
+SHA1 (patch-ab) = 8433e193cc923fce8da0bb2a3cc2125377a4b1b5
+SHA1 (patch-ac) = b731b69907caa910ac9518326f7287c5dddadd5f
+SHA1 (patch-ae) = 88092655659ce7c2151b16e3c7790893cf8093fe
+SHA1 (patch-ai) = e8ad474bee5bd0dd8f56e68a78ffdab332e8b1fc
SHA1 (patch-aj) = ff16b192696f7a8517b2bf343697cb81c6041015
-SHA1 (patch-ak) = e9d9a6073134861033cb10820ec2307d3ca42e3d
-SHA1 (patch-al) = d363baa7a1d4150b2b12376652650295e546f0fe
-SHA1 (patch-am) = 7d212c47879c718a7685fe94660c9fa71a02f4c3
-SHA1 (patch-an) = 6388e50ad6b7c4cc6860759d514ca691b996ee45
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/vlc/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patches/patch-aa 26 Sep 2006 07:27:19 -0000 1.4
+++ patches/patch-aa 5 Jan 2008 20:29:38 -0000
@@ -1,13 +1,13 @@
$NetBSD: patch-aa,v 1.4 2006/09/26 07:27:19 martti Exp $
---- include/vlc_common.h.orig 2006-05-19 19:46:18.000000000 +0000
-+++ include/vlc_common.h
-@@ -873,7 +873,7 @@ static inline void _SetQWBE( uint8_t *p,
- # define vlc_strtoll NULL
- #endif
+--- include/vlc_common.h.orig 2007-11-26 14:08:12 +0100
++++ include/vlc_common.h 2008-01-05 19:28:29 +0100
+@@ -882,6 +882,7 @@
--#if defined(SYS_BEOS)
-+#if defined(SYS_BEOS) || defined(__DragonFly__)
+ #if defined(SYS_BEOS) \
+- || (defined (__FreeBSD__) && (__FreeBSD__ < 5))
++ || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) \
++ || defined(__DragonFly__)
typedef struct {
long long quot; /* Quotient. */
long long rem; /* Remainder. */
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/vlc/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- patches/patch-ab 26 Sep 2006 07:27:19 -0000 1.2
+++ patches/patch-ab 5 Jan 2008 20:29:38 -0000
@@ -1,13 +1,13 @@
$NetBSD: patch-ab,v 1.2 2006/09/26 07:27:19 martti Exp $
---- src/extras/libc.c.orig 2006-05-19 20:06:19.000000000 +0000
-+++ src/extras/libc.c
-@@ -346,7 +346,7 @@ int64_t vlc_atoll( const char *nptr )
- /*****************************************************************************
- * lldiv: returns quotient and remainder
+--- src/extras/libc.c.orig 2007-11-26 14:07:58 +0100
++++ src/extras/libc.c 2008-01-05 19:29:39 +0100
+@@ -350,6 +350,7 @@
*****************************************************************************/
--#if defined(SYS_BEOS)
-+#if defined(SYS_BEOS) || defined(__DragonFly__)
+ #if defined(SYS_BEOS) \
+- || (defined (__FreeBSD__) && (__FreeBSD__ < 5))
++ || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) \
++ || defined(__DragonFly__)
lldiv_t vlc_lldiv( long long numer, long long denom )
{
lldiv_t d;
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ac 5 Jan 2008 20:29:38 -0000
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Our ffmpeg is too old and it's header file does not contain these constants.
+
+--- modules/codec/ffmpeg/ffmpeg.c.orig 2008-01-05 20:59:35 +0100
++++ modules/codec/ffmpeg/ffmpeg.c 2008-01-05 21:00:23 +0100
+@@ -1129,7 +1129,7 @@
+ AUDIO_ES, "PCM U16 LE" },
+ { VLC_FOURCC('u','1','6','b'), CODEC_ID_PCM_U16BE,
+ AUDIO_ES, "PCM U16 BE" },
+- { VLC_FOURCC('s','2','4','l'), CODEC_ID_PCM_S24LE,
++/* { VLC_FOURCC('s','2','4','l'), CODEC_ID_PCM_S24LE,
+ AUDIO_ES, "PCM S24 LE" },
+ { VLC_FOURCC('s','2','4','b'), CODEC_ID_PCM_S24BE,
+ AUDIO_ES, "PCM S24 BE" },
+@@ -1144,7 +1144,7 @@
+ { VLC_FOURCC('u','3','2','l'), CODEC_ID_PCM_U32LE,
+ AUDIO_ES, "PCM U32 LE" },
+ { VLC_FOURCC('u','3','2','b'), CODEC_ID_PCM_U32BE,
+- AUDIO_ES, "PCM U32 BE" },
++ AUDIO_ES, "PCM U32 BE" }, */
+ { VLC_FOURCC('a','l','a','w'), CODEC_ID_PCM_ALAW,
+ AUDIO_ES, "PCM ALAW" },
+ { VLC_FOURCC('u','l','a','w'), CODEC_ID_PCM_MULAW,
Index: patches/patch-ad
===================================================================
RCS file: patches/patch-ad
diff -N patches/patch-ad
--- patches/patch-ad 13 Jan 2007 07:32:36 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,165 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/01/13 07:32:36 wiz Exp $
-
---- modules/codec/flac.c.orig 2006-05-06 15:52:19.000000000 +0000
-+++ modules/codec/flac.c
-@@ -33,6 +33,12 @@
- # include <FLAC/stream_decoder.h>
- # include <FLAC/stream_encoder.h>
- # define USE_LIBFLAC
-+ /* by LEGACY_FLAC we mean before FLAC 1.1.3 when the decoder/encoder APIs
were simplified */
-+# if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+# define LEGACY_FLAC
-+# else
-+# undef LEGACY_FLAC
-+# endif
- #endif
-
- #include "vlc_block_helper.h"
-@@ -133,7 +139,12 @@ static int SyncInfo( decoder_t *, uint8_
- #ifdef USE_LIBFLAC
- static FLAC__StreamDecoderReadStatus
- DecoderReadCallback( const FLAC__StreamDecoder *decoder,
-- FLAC__byte buffer[], unsigned *bytes, void *client_data
);
-+#ifdef LEGACY_FLAC
-+ FLAC__byte buffer[], unsigned *bytes,
-+#else
-+ FLAC__byte buffer[], size_t *bytes,
-+#endif
-+ void *client_data );
-
- static FLAC__StreamDecoderWriteStatus
- DecoderWriteCallback( const FLAC__StreamDecoder *decoder,
-@@ -223,6 +234,7 @@ static int OpenDecoder( vlc_object_t *p_
- return VLC_EGENERIC;
- }
-
-+#ifdef LEGACY_FLAC
- FLAC__stream_decoder_set_read_callback( p_sys->p_flac,
- DecoderReadCallback );
- FLAC__stream_decoder_set_write_callback( p_sys->p_flac,
-@@ -233,7 +245,12 @@ static int OpenDecoder( vlc_object_t *p_
- DecoderErrorCallback );
- FLAC__stream_decoder_set_client_data( p_sys->p_flac, p_dec );
-
-+ /* really should check the return value here */
- FLAC__stream_decoder_init( p_sys->p_flac );
-+#else
-+ /* really should check the return value here */
-+ FLAC__stream_decoder_init_stream( p_sys->p_flac, DecoderReadCallback,
NULL, NULL, NULL, NULL, DecoderWriteCallback, DecoderMetadataCallback,
DecoderErrorCallback, p_dec );
-+#endif
- #endif
-
- /* Set output properties */
-@@ -535,7 +552,12 @@ static aout_buffer_t *DecodeBlock( decod
-
*****************************************************************************/
- static FLAC__StreamDecoderReadStatus
- DecoderReadCallback( const FLAC__StreamDecoder *decoder, FLAC__byte buffer[],
-- unsigned *bytes, void *client_data )
-+#ifdef LEGACY_FLAC
-+ unsigned *bytes,
-+#else
-+ size_t *bytes,
-+#endif
-+ void *client_data )
- {
- decoder_t *p_dec = (decoder_t *)client_data;
- decoder_sys_t *p_sys = p_dec->p_sys;
-@@ -660,6 +682,11 @@ static void DecoderErrorCallback( const
- msg_Err( p_dec, "frame's data did not match the CRC in the "
- "footer." );
- break;
-+#ifndef LEGACY_FLAC
-+ case FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM:
-+ msg_Err( p_dec, "the decoder encountered reserved fields in use in
the stream." );
-+ break;
-+#endif
- default:
- msg_Err( p_dec, "got decoder error: %d", status );
- }
-@@ -722,16 +749,11 @@ static void decoder_state_error( decoder
- case FLAC__STREAM_DECODER_END_OF_STREAM:
- msg_Dbg( p_dec, "the decoder has reached the end of the stream." );
- break;
-- case FLAC__STREAM_DECODER_ABORTED:
-- msg_Warn( p_dec, "the decoder was aborted by the read callback." );
-- break;
-+#ifdef LEGACY_FLAC
- case FLAC__STREAM_DECODER_UNPARSEABLE_STREAM:
- msg_Warn( p_dec, "the decoder encountered reserved fields in use "
- "in the stream." );
- break;
-- case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
-- msg_Err( p_dec, "error when allocating memory." );
-- break;
- case FLAC__STREAM_DECODER_ALREADY_INITIALIZED:
- msg_Err( p_dec, "FLAC__stream_decoder_init() was called when the "
- "decoder was already initialized, usually because "
-@@ -741,6 +763,20 @@ static void decoder_state_error( decoder
- msg_Err( p_dec, "FLAC__stream_decoder_init() was called without "
- "all callbacks being set." );
- break;
-+#else
-+ case FLAC__STREAM_DECODER_OGG_ERROR:
-+ msg_Warn( p_dec, "an error occurred in the underlying Ogg layer." );
-+ break;
-+ case FLAC__STREAM_DECODER_SEEK_ERROR:
-+ msg_Warn( p_dec, "an error occurred while seeking." );
-+ break;
-+#endif
-+ case FLAC__STREAM_DECODER_ABORTED:
-+ msg_Warn( p_dec, "the decoder was aborted by the read callback." );
-+ break;
-+ case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
-+ msg_Err( p_dec, "error when allocating memory." );
-+ break;
- case FLAC__STREAM_DECODER_UNINITIALIZED:
- msg_Err( p_dec, "decoder in uninitialized state." );
- break;
-@@ -1138,7 +1174,11 @@ static block_t *Encode( encoder_t *, aou
- static FLAC__StreamEncoderWriteStatus
- EncoderWriteCallback( const FLAC__StreamEncoder *encoder,
- const FLAC__byte buffer[],
-+#ifdef LEGACY_FLAC
- unsigned bytes, unsigned samples,
-+#else
-+ size_t bytes, unsigned samples,
-+#endif
- unsigned current_frame, void *client_data );
-
- static void EncoderMetadataCallback( const FLAC__StreamEncoder *encoder,
-@@ -1185,15 +1225,23 @@ static int OpenEncoder( vlc_object_t *p_
- FLAC__stream_encoder_set_bits_per_sample( p_sys->p_flac, 16 );
- p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE;
-
-+#ifdef LEGACY_FLAC
- FLAC__stream_encoder_set_write_callback( p_sys->p_flac,
- EncoderWriteCallback );
- FLAC__stream_encoder_set_metadata_callback( p_sys->p_flac,
- EncoderMetadataCallback );
- FLAC__stream_encoder_set_client_data( p_sys->p_flac, p_enc );
-+#endif
-
- /* Get and store the STREAMINFO metadata block as a p_extra */
- p_sys->p_chain = 0;
-+#ifdef LEGACY_FLAC
-+ /* really should check the return value here */
- FLAC__stream_encoder_init( p_sys->p_flac );
-+#else
-+ /* really should check the return value here */
-+ FLAC__stream_encoder_init_stream( p_sys->p_flac, EncoderWriteCallback,
NULL, NULL, EncoderMetadataCallback, p_enc );
-+#endif
-
- return VLC_SUCCESS;
- }
-@@ -1270,7 +1318,11 @@ static void EncoderMetadataCallback( con
- static FLAC__StreamEncoderWriteStatus
- EncoderWriteCallback( const FLAC__StreamEncoder *encoder,
- const FLAC__byte buffer[],
-+#ifdef LEGACY_FLAC
- unsigned bytes, unsigned samples,
-+#else
-+ size_t bytes, unsigned samples,
-+#endif
- unsigned current_frame, void *client_data )
- {
- encoder_t *p_enc = (encoder_t *)client_data;
Index: patches/patch-ae
===================================================================
RCS file: patches/patch-ae
diff -N patches/patch-ae
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ae 5 Jan 2008 20:29:38 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Our ffmpeg is too old and it's header file does not contain 'level'.
+--- modules/codec/ffmpeg/encoder.c.orig 2008-01-05 21:12:15 +0100
++++ modules/codec/ffmpeg/encoder.c 2008-01-05 21:12:34 +0100
+@@ -383,9 +383,9 @@
+
+ p_context->width = p_enc->fmt_in.video.i_width;
+ p_context->height = p_enc->fmt_in.video.i_height;
+- if( p_enc->fmt_out.i_codec == VLC_FOURCC('m', 'p', '2', 'v')
++ /* if( p_enc->fmt_out.i_codec == VLC_FOURCC('m', 'p', '2', 'v')
+ && (p_context->width > 720 || p_context->height > 576) )
+- p_context->level = 4; /* High level */
++ p_context->level = 4; */ /* High level */
+
+ #if LIBAVCODEC_BUILD >= 4754
+ p_context->time_base.num = p_enc->fmt_in.video.i_frame_rate_base;
Index: patches/patch-ag
===================================================================
RCS file: patches/patch-ag
diff -N patches/patch-ag
--- patches/patch-ag 13 Jan 2007 07:32:36 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2007/01/13 07:32:36 wiz Exp $
-
---- modules/gui/wxwidgets/menus.cpp.orig 2006-05-04 14:22:54.000000000
+0200
-+++ modules/gui/wxwidgets/menus.cpp
-@@ -1013,7 +1013,6 @@ void MenuEvtHandler::OnMenuEvent( wxComm
- p_menuitemext->i_object_id );
- if( p_object == NULL ) return;
-
-- wxMutexGuiLeave(); // We don't want deadlocks
- var_Set( p_object, p_menuitemext->psz_var, p_menuitemext->val );
- //wxMutexGuiEnter();
-
Index: patches/patch-ah
===================================================================
RCS file: patches/patch-ah
diff -N patches/patch-ah
--- patches/patch-ah 26 Sep 2006 07:27:19 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/09/26 07:27:19 martti Exp $
-
---- src/misc/charset.c.orig 2006-05-06 17:52:13.000000000 +0200
-+++ src/misc/charset.c
-@@ -37,10 +37,9 @@
- #if !defined WIN32
- # if HAVE_LANGINFO_CODESET
- # include <langinfo.h>
--# else
--# if HAVE_SETLOCALE
--# include <locale.h>
--# endif
-+# endif
-+# if HAVE_SETLOCALE
-+# include <locale.h>
- # endif
- #elif defined WIN32
- # include <windows.h>
Index: patches/patch-ai
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/vlc/patches/patch-ai,v
retrieving revision 1.1
diff -u -r1.1 patch-ai
--- patches/patch-ai 26 Sep 2006 07:27:19 -0000 1.1
+++ patches/patch-ai 5 Jan 2008 20:29:38 -0000
@@ -2,14 +2,14 @@
--- configure.orig 2006-05-06 15:54:17.000000000 +0000
+++ configure
-@@ -30035,13 +30035,13 @@ fi
+@@ -30467,13 +30467,13 @@ fi
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
THREAD_LIB=error
if test "${THREAD_LIB}" = "error"; then
-- echo "$as_me:$LINENO: checking for main in -lpthread" >&5
--echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for main in ${PTHREAD_LDFLAGS}
${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}...
$ECHO_C" >&6
+- { echo "$as_me:$LINENO: checking for main in -lpthread" >&5
+-echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for main in ${PTHREAD_LDFLAGS}
${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}...
$ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19,25 +19,16 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30093,7 +30093,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
+@@ -30523,7 +30523,7 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6; }
if test $ac_cv_lib_pthread_main = yes; then
- THREAD_LIB="-lpthread"
+ THREAD_LIB="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
fi
fi
-@@ -36628,7 +36628,7 @@ fi;
- test "${enable_debug}" != "yes" && enable_debug="no"
-
-
--if test "x${enable_debug}" == "xno"; then
-+if test "x${enable_debug}" = "xno"; then
- cat >>confdefs.h <<\_ACEOF
- #define NDEBUG 1
- _ACEOF
-@@ -37311,7 +37311,7 @@ echo "${ECHO_T}yes" >&6
+@@ -38020,7 +38020,7 @@ echo "${ECHO_T}yes" >&6
for element in access_dv; do
@@ -46,8 +37,8 @@
am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
done
-@@ -37563,7 +37563,7 @@ echo $ECHO_N "checking for avc1394 heade
- echo "${ECHO_T}yes" >&6
+@@ -38263,7 +38263,7 @@ echo $ECHO_N "checking for avc1394 heade
+ echo "${ECHO_T}yes" >&6; }
for element in access_dv; do
- eval "LDFLAGS_${element}="'"'"-L${with_dv_avc1394}/lib -lavc1394
-lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
@@ -64,8 +55,8 @@
am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
done
-@@ -37766,7 +37766,7 @@ echo "$as_me: error: cannot cd to ${real
- echo "${ECHO_T}${real_dv_avc1394_tree}/src/.libs/libavc1394.a" >&6
+@@ -38457,7 +38457,7 @@ echo "$as_me: error: cannot cd to ${real
+ echo "${ECHO_T}${real_dv_avc1394_tree}/src/.libs/libavc1394.a" >&6; }
for element in access_dv; do
- eval "LDFLAGS_${element}="'"'"-L${real_dv_avc1394_tree}/src/.libs
-lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
@@ -79,8 +70,8 @@
fi
- if ! test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
+ if ! test -f "${real_ffmpeg_tree}/libavcodec.a"; then
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: cannot find
${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec
in ${with_ffmpeg_tree}" >&5
-echo "$as_me: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a,
make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot find
${real_ffmpeg_tree}/libavcodec.a, make sure you compiled libavcodec in
${with_ffmpeg_tree}" >&5
@@ -92,24 +83,6 @@
if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a";
then
for element in ffmpeg; do
-@@ -43144,13 +43144,13 @@ echo "$as_me: error: cannot find ${real_
- else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-- { { echo "$as_me:$LINENO: error:
${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with
postprocessing support, make sure you configured ffmpeg with --enable-pp" >&5
--echo "$as_me: error: ${real_ffmpeg_tree}/libavcodec/libavcodec.a was not
compiled with postprocessing support, make sure you configured ffmpeg with
--enable-pp" >&2;}
-+ { { echo "$as_me:$LINENO: error: ${real_ffmpeg_tree}/libavcodec.a was
not compiled with postprocessing support, make sure you configured ffmpeg with
--enable-pp" >&5
-+echo "$as_me: error: ${real_ffmpeg_tree}/libavcodec.a was not compiled with
postprocessing support, make sure you configured ffmpeg with --enable-pp" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-- echo "$as_me:$LINENO: result:
${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&5
--echo "${ECHO_T}${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&6
-+ echo "$as_me:$LINENO: result: ${real_ffmpeg_tree}/libavcodec.a" >&5
-+echo "${ECHO_T}${real_ffmpeg_tree}/libavcodec.a" >&6
-
- if fgrep -s "CONFIG_ZLIB=yes" "${real_ffmpeg_tree}/config.mak"; then
- if test "${with_ffmpeg_zlib}" != "yes"; then
@@ -43318,7 +43318,7 @@ fi
@@ -146,17 +119,8 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -58120,7 +58120,7 @@ rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- done
- LIBS="${LIBS_save}"
-- if test "${LIBS_cclink}" == "no"; then
-+ if test "${LIBS_cclink}" = "no"; then
- { { echo "$as_me:$LINENO: error: cannot find XML parser for CyberLink
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot find XML parser for CyberLink
@@ -58132,7 +58132,7 @@ fi
- echo "${ECHO_T}${LIBS_cclink}" >&6
+ echo "${ECHO_T}${LIBS_cclink}" >&6; }
for element in upnp_cc; do
- eval "LDFLAGS_${element}="'"'"${real_cyberlink_tree}/lib/unix/libclink.a
-lpthread ${LIBS_cclink} "'$'"{LDFLAGS_${element}} "'"'
@@ -173,30 +137,3 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -58244,7 +58244,7 @@ else
- has_upnp="no"
- fi
-
-- if test "x${enable_upnp}" != "x" && test "${has_upnp}" == "no"; then
-+ if test "x${enable_upnp}" != "x" && test "${has_upnp}" = "no"; then
- Â
- { { echo "$as_me:$LINENO: error: cannot find Intel UPnP SDK (libupnp)" >&5
- echo "$as_me: error: cannot find Intel UPnP SDK (libupnp)" >&2;}
-@@ -58252,7 +58252,7 @@ echo "$as_me: error: cannot find Intel U
-
- fi
-
-- if test "${has_upnp}" == "yes"; then
-+ if test "${has_upnp}" = "yes"; then
-
-
- for element in upnp_intel; do
-@@ -58271,7 +58271,7 @@ else
- fi
-
-
--if test "${has_upnp}" == "yes"; then
-+if test "${has_upnp}" = "yes"; then
-
-
- PLUGINS="${PLUGINS} upnp_intel"
Index: patches/patch-ak
===================================================================
RCS file: patches/patch-ak
diff -N patches/patch-ak
--- patches/patch-ak 22 Jun 2007 14:32:24 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2007/06/22 14:32:24 lkundrak Exp $
-
-Fix for CVE-2007-3316 format-string vulnerability in CDDA module described
-by VideoLAN-SA-0702 advisory. Backported from 0.8.6c.
-
---- modules/access/cdda.c.orig 2006-05-06 17:52:18.000000000 +0200
-+++ modules/access/cdda.c
-@@ -630,7 +630,7 @@ static int GetTracks( access_t *p_access
- {
- vlc_input_item_AddInfo( &p_item->input,
- _(VLC_META_INFO_CAT),
-- _(VLC_META_TITLE),
-+ _(VLC_META_TITLE), "%s",
- cddb_track_get_title( t ) );
- if( p_item->input.psz_name )
- free( p_item->input.psz_name );
-@@ -641,7 +641,7 @@ static int GetTracks( access_t *p_access
- if( psz_result )
- {
- vlc_input_item_AddInfo( &p_item->input,
-- _(VLC_META_INFO_CAT),
-+ _(VLC_META_INFO_CAT), "%s",
- _(VLC_META_ARTIST), psz_result );
- }
- }
Index: patches/patch-al
===================================================================
RCS file: patches/patch-al
diff -N patches/patch-al
--- patches/patch-al 22 Jun 2007 14:13:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.1 2007/06/22 14:13:16 lkundrak Exp $
-
-Fix for CVE-2007-3316 format-string vulnerability in Vorbis module described
-by VideoLAN-SA-0702 advisory. Backported from 0.8.6c.
-
---- modules/codec/vorbis.c.orig 2007-06-22 16:03:12.000000000 +0200
-+++ modules/codec/vorbis.c
-@@ -614,7 +614,7 @@ static void ParseVorbisComments( decoder
- *psz_value = '\0';
- psz_value++;
- input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"),
-- psz_name, psz_value );
-+ psz_name, "%s", psz_value );
- if( strcasestr( psz_name, "artist" ) )
- {
- vlc_input_item_AddInfo( p_input->input.p_item,
Index: patches/patch-am
===================================================================
RCS file: patches/patch-am
diff -N patches/patch-am
--- patches/patch-am 22 Jun 2007 14:13:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.1 2007/06/22 14:13:16 lkundrak Exp $
-
-Fix for CVE-2007-3316 format-string vulnerability in Theora module described
-by VideoLAN-SA-0702 advisory. Backported from 0.8.6c.
-
---- modules/codec/theora.c.orig 2007-06-22 16:04:59.000000000 +0200
-+++ modules/codec/theora.c
-@@ -510,7 +510,7 @@ static void ParseTheoraComments( decoder
- *psz_value = '\0';
- psz_value++;
- input_Control( p_input, INPUT_ADD_INFO, _("Theora comment"),
-- psz_name, psz_value );
-+ psz_name, "%s", psz_value );
- }
- free( psz_comment );
- i++;
Index: patches/patch-an
===================================================================
RCS file: patches/patch-an
diff -N patches/patch-an
--- patches/patch-an 22 Jun 2007 14:13:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1 2007/06/22 14:13:17 lkundrak Exp $
-
-Fix for CVE-2007-3316 format-string vulnerability in SAP module described
-by VideoLAN-SA-0702 advisory. Backported from 0.8.6c.
-
---- modules/services_discovery/sap.c.orig 2007-06-22 16:06:09.000000000
+0200
-+++ modules/services_discovery/sap.c
-@@ -818,12 +818,12 @@ sap_announce_t *CreateAnnounce( services
- if( psz_value != NULL )
- {
- vlc_input_item_AddInfo( &p_item->input, _("Session"),
-- _("Tool"), psz_value );
-+ _("Tool"), "%s", psz_value );
- }
- if( strcmp( p_sdp->psz_username, "-" ) )
- {
- vlc_input_item_AddInfo( &p_item->input, _("Session"),
-- _("User"), p_sdp->psz_username );
-+ _("User"), "%s", p_sdp->psz_username );
- }
-
- psz_value = GetAttribute( p_sap->p_sdp, "x-plgroup" );
Home |
Main Index |
Thread Index |
Old Index