Update to 0.8.6h

Submitted by:		Rafaël Carré <funman@videolan.org>
Security:		http://www.videolan.org/security/

7 files changed, 5 insertions, 161 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index e4f4d3c2e76..28372b96d30 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -9,8 +9,8 @@
 #
 
 PORTNAME=	vlc
-DISTVERSION=	0.8.6f
-PORTREVISION=	4
+DISTVERSION=	0.8.6h
+PORTREVISION=	0
 PORTEPOCH=	2
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index b5c91a7fa0b..c5a91c729a1 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlc-0.8.6f.tar.bz2) = c3aded2583fcdb9f4c71d3fc3601b73b
-SHA256 (vlc-0.8.6f.tar.bz2) = 23efbf3777f1f719034f2f0a5ab67d69acd9d5a49f0014afea7b0a8b74effe14
-SIZE (vlc-0.8.6f.tar.bz2) = 11433698
+MD5 (vlc-0.8.6h.tar.bz2) = 4a6eece2f56d4ad5dfa786e934d2b4a8
+SHA256 (vlc-0.8.6h.tar.bz2) = 50ed87c869228274043b7fa468f908fe6ee571196510177593c701d99b357221
+SIZE (vlc-0.8.6h.tar.bz2) = 11762435
diff --git a/multimedia/vlc/files/patch-configure b/multimedia/vlc/files/patch-configure
deleted file mode 100644
index 808fff207d4..00000000000
--- a/multimedia/vlc/files/patch-configure
+++ /dev/null
@@ -1,59 +0,0 @@
---- configure.orig	Tue Apr 17 17:46:17 2007
-+++ configure	Tue May  1 08:56:07 2007
-@@ -2444,8 +2444,7 @@
- done
- if test -z "$ac_aux_dir"; then
-   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&5
--echo "$as_me: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&2;}
--   { (exit 1); exit 1; }; }
-+echo "$as_me: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&2;} }
- fi
- 
- # These three variables are undocumented and unsupported,
-@@ -37905,8 +37904,7 @@
-         if test -n "${enable_dv}"
-         then
-           { { echo "$as_me:$LINENO: error: cannot find libraw1394 headers" >&5
--echo "$as_me: error: cannot find libraw1394 headers" >&2;}
--   { (exit 1); exit 1; }; }
-+echo "$as_me: error: cannot find libraw1394 headers" >&2;} ;}
-         fi
- 
- fi
-@@ -37925,8 +37923,7 @@
-             { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-       { { echo "$as_me:$LINENO: error: cannot cd to ${real_dv_raw1394_tree}" >&5
--echo "$as_me: error: cannot cd to ${real_dv_raw1394_tree}" >&2;}
--   { (exit 1); exit 1; }; }
-+echo "$as_me: error: cannot cd to ${real_dv_raw1394_tree}" >&2;} ;}
-     fi
-     if test -f "${real_dv_raw1394_tree}/src/.libs/libraw1394.a"
-     then
-@@ -38145,8 +38142,7 @@
-         if test -n "${enable_dv}"
-         then
-           { { echo "$as_me:$LINENO: error: cannot find libavc1394 headers" >&5
--echo "$as_me: error: cannot find libavc1394 headers" >&2;}
--   { (exit 1); exit 1; }; }
-+echo "$as_me: error: cannot find libavc1394 headers" >&2;} ; }
-         fi
- 
- fi
-@@ -43314,15 +43310,11 @@
- echo "${ECHO_T}$ac_cv_lib_dts_pic_dts_free" >&6; }
- if test $ac_cv_lib_dts_pic_dts_free = yes; then
- 
--  for element in ffmpeg; do
--    eval "LDFLAGS_${element}="'"'"-ldts_pic "'$'"{LDFLAGS_${element}} "'"'
--    am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
--  done
- 
- else
- 
-   for element in ffmpeg; do
--    eval "LDFLAGS_${element}="'"'"-ldts "'$'"{LDFLAGS_${element}} "'"'
-+    eval "LDFLAGS_${element}="'"'"-ldca "'$'"{LDFLAGS_${element}} "'"'
-     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-   done
- 
diff --git a/multimedia/vlc/files/patch-libcdio b/multimedia/vlc/files/patch-libcdio
deleted file mode 100644
index 2b09da24e67..00000000000
--- a/multimedia/vlc/files/patch-libcdio
+++ /dev/null
@@ -1,55 +0,0 @@
---- modules/access/cdda/cdda.h.orig	2008-04-09 08:08:07.801650907 -0400
-+++ modules/access/cdda/cdda.h	2008-04-09 08:09:00.648021466 -0400
-@@ -71,12 +71,13 @@
- #define CdIo_t CdIo
- #endif    
- 
-+#if LIBCDIO_VERSION_NUM < 78
- typedef enum {
-   paranoia_none    = 0, /* Note: We make use of 0 as being the same as false */
-   paranoia_overlap = 1, 
-   paranoia_full    = 2
- } paranoia_mode_t;
--
-+#endif
-   
- /*****************************************************************************
-  * cdda_data_t: CD audio information
---- modules/access/cdda/access.c.orig	2008-04-09 08:05:14.289716290 -0400
-+++ modules/access/cdda/access.c	2008-04-09 08:07:57.944769027 -0400
-@@ -737,14 +737,14 @@
-    
-       char *psz_paranoia = config_GetPsz( p_access, 
- 					  MODULE_STRING "-paranoia" );
--      p_cdda->e_paranoia = paranoia_none;
-+      p_cdda->e_paranoia = PARANOIA_MODE_DISABLE;
-       if( psz_paranoia && *psz_paranoia )
-       {
- 
- 	if( !strncmp( psz_paranoia, "full", strlen("full") )  )
--	  p_cdda->e_paranoia = paranoia_full;
-+	  p_cdda->e_paranoia = PARANOIA_MODE_FULL;
- 	else if( !strncmp( psz_paranoia, "overlap", strlen("overlap") )  )
--	  p_cdda->e_paranoia = paranoia_overlap;
-+	  p_cdda->e_paranoia = PARANOIA_MODE_OVERLAP;
- 	
- 	/* Use CD Paranoia? */
- 	if ( p_cdda->e_paranoia ) {
-@@ -755,7 +755,7 @@
- 	  if ( 0 != cdio_cddap_open(p_cdda->paranoia_cd) ) {
- 	    msg_Warn( p_cdda_input, "unable to get paranoia support - "
- 		      "continuing without it." );
--	    p_cdda->e_paranoia = paranoia_none;
-+	    p_cdda->e_paranoia = PARANOIA_MODE_DISABLE;
- 	  } else {
- 	    p_cdda->paranoia = cdio_paranoia_init(p_cdda->paranoia_cd);
- 	    cdio_paranoia_seek(p_cdda->paranoia, p_cdda->i_lsn, SEEK_SET);
-@@ -763,7 +763,7 @@
- 	    /* Set reading mode for full or overlap paranoia, 
- 	       but allow skipping sectors. */
- 	    cdio_paranoia_modeset(p_cdda->paranoia,
--				  paranoia_full == p_cdda->e_paranoia ?
-+				  PARANOIA_MODE_FULL == p_cdda->e_paranoia ?
- 				  PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP :
- 				  PARANOIA_MODE_OVERLAP^PARANOIA_MODE_NEVERSKIP
- 				  );
diff --git a/multimedia/vlc/files/patch-modules_video_filter_swscale_common.h b/multimedia/vlc/files/patch-modules_video_filter_swscale_common.h
deleted file mode 100644
index 4219d8b5377..00000000000
--- a/multimedia/vlc/files/patch-modules_video_filter_swscale_common.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- modules/video_filter/swscale/common.h.orig	Fri May 13 03:23:24 2005
-+++ modules/video_filter/swscale/common.h	Fri May 13 03:37:24 2005
-@@ -36,7 +36,17 @@
- #define MANGLE(a) #a
- #endif
- 
--#ifdef ARCH_X86
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
-+#if (defined(__FreeBSD__) && __FreeBSD_version >= 500000)
-+#include <sys/endian.h>
-+#define bswap_16(x) bswap16(x)
-+#elif (defined(__FreeBSD__) && __FreeBSD_version <= 500000)
-+#include <sys/endian.h>
-+#define bswap_16(x) be16toh(x)
-+#elif ARCH_X86
- static inline unsigned short ByteSwap16(unsigned short x)
- {
-   __asm("xchgb %b0,%h0" :
diff --git a/multimedia/vlc/files/patch-modules_visualization_galaktos_PCM.c b/multimedia/vlc/files/patch-modules_visualization_galaktos_PCM.c
deleted file mode 100644
index 78799ac46b5..00000000000
--- a/multimedia/vlc/files/patch-modules_visualization_galaktos_PCM.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/visualization/galaktos/PCM.c.orig	Fri Nov 26 08:21:47 2004
-+++ modules/visualization/galaktos/PCM.c	Fri Nov 26 08:22:06 2004
-@@ -79,7 +79,7 @@
- //Takes in a 2x512 array of PCM samples
- //and stores them
- 
--void addPCM(int16_t PCMdata[2][512])
-+void addPCM(short PCMdata[2][512])
- {
-   int i,j;
-   int samples=512;
diff --git a/multimedia/vlc/files/patch-wxgtk28 b/multimedia/vlc/files/patch-wxgtk28
deleted file mode 100644
index adcb742a757..00000000000
--- a/multimedia/vlc/files/patch-wxgtk28
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/gui/wxwidgets/dialogs.cpp
-+++ modules/gui/wxwidgets/dialogs.cpp
-@@ -380,7 +380,7 @@
-     {
-         p_file_generic_dialog->SetMessage( wxU(p_arg->psz_title) );
-         p_file_generic_dialog->SetWildcard( wxU(p_arg->psz_extensions) );
--        p_file_generic_dialog->SetStyle( (p_arg->b_save ? wxSAVE : wxOPEN) |
-+        p_file_generic_dialog->SetWindowStyle( (p_arg->b_save ? wxSAVE : wxOPEN) |
-                                          (p_arg->b_multiple ? wxMULTIPLE:0) );
-     }