update to 0.8.6b, from brad

This commit is contained in:
jolan 2007-06-05 01:53:04 +00:00
parent 2ed52b48eb
commit 0d35aa3d25
12 changed files with 38 additions and 105 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.50 2007/05/25 16:24:49 jakemsr Exp $
# $OpenBSD: Makefile,v 1.51 2007/06/05 01:53:04 jolan Exp $
SHARED_ONLY= Yes
COMMENT= "videolan client; multimedia player"
V= 0.8.6
V= 0.8.6b
DISTNAME= vlc-${V}
PKGNAME= vlc-${V}p7
CATEGORIES= x11
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/

View File

@ -1,5 +1,5 @@
MD5 (vlc-0.8.6.tar.gz) = 1Sd+Gx2YU9Ln6E4FAIByGA==
RMD160 (vlc-0.8.6.tar.gz) = osXLYLoCFVFiULrqT9STexuFRf4=
SHA1 (vlc-0.8.6.tar.gz) = FLUUsvWbJd6ONHNkow6o/ojTeq8=
SHA256 (vlc-0.8.6.tar.gz) = OxscuDfSB3iRYgEioK6hrSEQh/Xir8eMsm0xvpAf3ro=
SIZE (vlc-0.8.6.tar.gz) = 15427589
MD5 (vlc-0.8.6b.tar.gz) = xECKZW8y9rQ7bfpUNNMqVA==
RMD160 (vlc-0.8.6b.tar.gz) = d5TrbowuFe0+cJrHyL+Iw6B3dJo=
SHA1 (vlc-0.8.6b.tar.gz) = ZIXyKgz6Z2IP2W4qtKLOfisa0qQ=
SHA256 (vlc-0.8.6b.tar.gz) = Mp0hPCwjkvolstoE5AAIUVIX7+VFKyAdFG5e32OrkSI=
SIZE (vlc-0.8.6b.tar.gz) = 15381783

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-aclocal_m4,v 1.5 2006/12/23 13:31:31 jolan Exp $
--- aclocal.m4.orig Fri Dec 8 19:33:37 2006
+++ aclocal.m4 Sat Dec 23 06:31:31 2006
$OpenBSD: patch-aclocal_m4,v 1.6 2007/06/05 01:53:04 jolan Exp $
--- aclocal.m4.orig Tue Apr 17 17:46:03 2007
+++ aclocal.m4 Fri May 11 23:51:38 2007
@@ -1041,7 +1041,7 @@ AC_DEFUN([VLC_LIBRARY_SUFFIX], [
darwin*)
LIBEXT=".dylib"
@ -19,7 +19,7 @@ $OpenBSD: patch-aclocal_m4,v 1.5 2006/12/23 13:31:31 jolan Exp $
SYMPREF="_"
;;
esac
@@ -8754,9 +8754,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
@@ -8755,9 +8755,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
found_so=
found_a=
if test $use_additional = yes; then
@ -31,7 +31,7 @@ $OpenBSD: patch-aclocal_m4,v 1.5 2006/12/23 13:31:31 jolan Exp $
if test -f "$additional_libdir/lib$name.la"; then
found_la="$additional_libdir/lib$name.la"
fi
@@ -8776,9 +8776,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
@@ -8777,9 +8777,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
case "$x" in
-L*)
dir=`echo "X$x" | sed -e 's/^X-L//'`

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.7 2007/04/08 17:34:20 ajacoutot Exp $
--- configure.ac.orig Sat Dec 9 02:32:53 2006
+++ configure.ac Sun Apr 8 10:45:42 2007
$OpenBSD: patch-configure_ac,v 1.8 2007/06/05 01:53:04 jolan Exp $
--- configure.ac.orig Tue Apr 17 17:45:31 2007
+++ configure.ac Fri May 11 23:51:38 2007
@@ -210,7 +210,7 @@ case "${target_os}" in
VLC_ADD_CFLAGS([libvlc],[-x objective-c])
VLC_ADD_CFLAGS([vlc],[-x objective-c])
@ -38,7 +38,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2007/04/08 17:34:20 ajacoutot Exp $
[
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(ffmpeg/avformat.h)
@@ -3332,13 +3335,13 @@ AC_ARG_ENABLE(png,
@@ -3337,13 +3340,13 @@ AC_ARG_ENABLE(png,
[ --enable-png PNG support (default enabled)])
if test "${enable_png}" != "no"; then
AC_CHECK_HEADERS(png.h, [

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-modules_access_cdda_access_c,v 1.2 2007/04/08 17:34:20 ajacoutot Exp $
--- modules/access/cdda/access.c.orig Sat Dec 9 02:12:16 2006
+++ modules/access/cdda/access.c Sun Apr 8 10:45:29 2007
@@ -89,17 +89,17 @@ cdio_log_handler (cdio_log_level_t level, const char m
case CDIO_LOG_DEBUG:
case CDIO_LOG_INFO:
if (p_cdda->i_debug & INPUT_DBG_CDIO)
- msg_Dbg( p_cdda_input, message);
+ msg_Dbg( p_cdda_input, "%s", message);
break;
case CDIO_LOG_WARN:
- msg_Warn( p_cdda_input, message);
+ msg_Warn( p_cdda_input, "%s", message);
break;
case CDIO_LOG_ERROR:
case CDIO_LOG_ASSERT:
- msg_Err( p_cdda_input, message);
+ msg_Err( p_cdda_input, "%s", message);
break;
default:
- msg_Warn( p_cdda_input, message,
+ msg_Warn( p_cdda_input, "%s\n%s %d", message,
"the above message had unknown cdio log level",
level);
}

View File

@ -1,43 +0,0 @@
$OpenBSD: patch-modules_access_vcdx_access_c,v 1.2 2007/04/08 17:34:20 ajacoutot Exp $
--- modules/access/vcdx/access.c.orig Sat Dec 9 02:12:16 2006
+++ modules/access/vcdx/access.c Sun Apr 8 10:45:29 2007
@@ -92,17 +92,17 @@ cdio_log_handler (cdio_log_level_t level, const char m
case CDIO_LOG_DEBUG:
case CDIO_LOG_INFO:
if (p_vcdplayer->i_debug & INPUT_DBG_CDIO)
- msg_Dbg( p_vcd_access, message);
+ msg_Dbg( p_vcd_access, "%s", message);
break;
case CDIO_LOG_WARN:
- msg_Warn( p_vcd_access, message);
+ msg_Warn( p_vcd_access, "%s", message);
break;
case CDIO_LOG_ERROR:
case CDIO_LOG_ASSERT:
- msg_Err( p_vcd_access, message);
+ msg_Err( p_vcd_access, "%s", message);
break;
default:
- msg_Warn( p_vcd_access, message,
+ msg_Warn( p_vcd_access, "%s\n%s %d", message,
_("The above message had unknown log level"),
level);
}
@@ -118,14 +118,14 @@ vcd_log_handler (vcd_log_level_t level, const char mes
case VCD_LOG_DEBUG:
case VCD_LOG_INFO:
if (p_vcdplayer->i_debug & INPUT_DBG_VCDINFO)
- msg_Dbg( p_vcd_access, message);
+ msg_Dbg( p_vcd_access, "%s", message);
break;
case VCD_LOG_WARN:
- msg_Warn( p_vcd_access, message);
+ msg_Warn( p_vcd_access, "%s", message);
break;
case VCD_LOG_ERROR:
case VCD_LOG_ASSERT:
- msg_Err( p_vcd_access, message);
+ msg_Err( p_vcd_access, "%s", message);
break;
default:
msg_Warn( p_vcd_access, "%s\n%s %d", message,

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-modules_codec_faad_c,v 1.2 2007/04/08 17:34:20 ajacoutot Exp $
--- modules/codec/faad.c.orig Sat Dec 9 02:12:20 2006
+++ modules/codec/faad.c Sun Apr 8 10:45:29 2007
$OpenBSD: patch-modules_codec_faad_c,v 1.3 2007/06/05 01:53:04 jolan Exp $
--- modules/codec/faad.c.orig Tue Apr 17 17:45:11 2007
+++ modules/codec/faad.c Fri May 11 23:50:40 2007
@@ -315,6 +315,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, b
p_dec->fmt_out.audio.i_rate = frame.samplerate;
p_dec->fmt_out.audio.i_channels = frame.channels;
@ -18,4 +18,4 @@ $OpenBSD: patch-modules_codec_faad_c,v 1.2 2007/04/08 17:34:20 ajacoutot Exp $
+#endif
/* Convert frame.channel_position to our own channel values */
for( i = 0; i < frame.channels; i++ )
p_dec->fmt_out.audio.i_physical_channels = 0;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_demux_Makefile_in,v 1.2 2007/04/08 17:34:20 ajacoutot Exp $
--- modules/demux/Makefile.in.orig Sat Dec 9 02:34:22 2006
+++ modules/demux/Makefile.in Sun Apr 8 10:45:42 2007
@@ -1769,7 +1769,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS
$OpenBSD: patch-modules_demux_Makefile_in,v 1.3 2007/06/05 01:53:04 jolan Exp $
--- modules/demux/Makefile.in.orig Tue Apr 17 17:46:43 2007
+++ modules/demux/Makefile.in Fri May 11 23:51:39 2007
@@ -1777,7 +1777,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS
$(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_gui_wxwidgets_Makefile_in,v 1.2 2007/04/08 17:34:20 ajacoutot Exp $
--- modules/gui/wxwidgets/Makefile.in.orig Sat Dec 9 02:34:35 2006
+++ modules/gui/wxwidgets/Makefile.in Sun Apr 8 10:45:42 2007
@@ -710,7 +710,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS
$OpenBSD: patch-modules_gui_wxwidgets_Makefile_in,v 1.3 2007/06/05 01:53:04 jolan Exp $
--- modules/gui/wxwidgets/Makefile.in.orig Tue Apr 17 17:46:57 2007
+++ modules/gui/wxwidgets/Makefile.in Fri May 11 23:51:38 2007
@@ -718,7 +718,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS
$(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-share_Makefile_in,v 1.2 2007/04/08 17:34:20 ajacoutot Exp $
--- share/Makefile.in.orig Sat Dec 9 02:34:54 2006
+++ share/Makefile.in Sun Apr 8 10:45:42 2007
@@ -805,7 +805,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
$OpenBSD: patch-share_Makefile_in,v 1.3 2007/06/05 01:53:04 jolan Exp $
--- share/Makefile.in.orig Tue Apr 17 17:47:19 2007
+++ share/Makefile.in Fri May 11 23:51:38 2007
@@ -813,7 +813,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
skins2/default.vlt:
mkdir -p skins2

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PFRAG.no-no_web,v 1.1 2006/12/24 01:57:16 jolan Exp $
@comment $OpenBSD: PFRAG.no-no_web,v 1.2 2007/06/05 01:53:04 jolan Exp $
@comment lib/mozilla/
@comment lib/mozilla/plugins/
@comment lib/mozilla/plugins/libvlcplugin.so
lib/mozilla-plugins/
lib/mozilla-plugins/libvlcplugin.so
@comment lib/mozilla/plugins/
@comment lib/mozilla/plugins/libvlcplugin.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.26 2007/04/20 07:21:10 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.27 2007/06/05 01:53:04 jolan Exp $
%%altivec%%
%%win32%%
%%x86opt%%
@ -97,6 +97,7 @@ lib/vlc/codec/libsdl_image_plugin.so
lib/vlc/codec/libspudec_plugin.so
lib/vlc/codec/libsubsdec_plugin.so
lib/vlc/codec/libsvcdsub_plugin.so
lib/vlc/codec/libtelx_plugin.so
lib/vlc/codec/libvorbis_plugin.so
lib/vlc/codec/libx264_plugin.so
lib/vlc/control/
@ -278,6 +279,7 @@ share/locale/th/LC_MESSAGES/vlc.mo
share/locale/tr/LC_MESSAGES/vlc.mo
share/locale/zh_CN/LC_MESSAGES/vlc.mo
share/locale/zh_TW/LC_MESSAGES/vlc.mo
share/nls/pl_PL.ISO_8859-2/
share/vlc/
share/vlc/http/
share/vlc/http/.hosts