- update to 0.6.2

- add patches to not expect postprocessing in ffmpeg, our ffmpeg don't
  have postprocessing built in
- use gtk2 variant of wxWindows

PR:		58969
Submitted by:	Pav Lucistnik

5 files changed, 26 insertions, 34 deletions

diff --git a/multimedia/vlc-devel/files/patch-configure b/multimedia/vlc-devel/files/patch-configure
index 2751c0139c98..5dfeef829dc6 100644
--- a/multimedia/vlc-devel/files/patch-configure
+++ b/multimedia/vlc-devel/files/patch-configure
@@ -8,12 +8,3 @@
      ;;
    darwin*)
      SYS=darwin
-@@ -14017,7 +14016,7 @@
- fi
- 
- 
--#BUILTINS="${BUILTINS} mpeg_video_old idct idctclassic motion"
-+BUILTINS="${BUILTINS} mpeg_video_old idct idctclassic motion"
- PLUGINS="${PLUGINS} dummy rc logger gestures memcpy"
- PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv"
- PLUGINS="${PLUGINS} spudec mpeg_audio lpcm a52 dts cinepak"
diff --git a/multimedia/vlc-devel/files/patch-modules-codec-ffmpeg-ffmpeg.c b/multimedia/vlc-devel/files/patch-modules-codec-ffmpeg-ffmpeg.c
new file mode 100644
index 000000000000..23363319effa
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-modules-codec-ffmpeg-ffmpeg.c
@@ -0,0 +1,12 @@
+--- modules/codec/ffmpeg/ffmpeg.c.orig	Fri Aug  8 19:08:32 2003
++++ modules/codec/ffmpeg/ffmpeg.c	Wed Nov  5 15:07:26 2003
+@@ -296,8 +296,7 @@
+         avcodec_register_all();
+         b_ffmpeginit = 1;
+ 
+-        msg_Dbg( p_decoder->p_fifo, "libavcodec initialized (interface "
+-                                    LIBAVCODEC_BUILD_STR ")" );
++        msg_Dbg( p_decoder->p_fifo, "libavcodec initialized" );
+     }
+     else
+     {
diff --git a/multimedia/vlc-devel/files/patch-modules-codec-ffmpeg-ffmpeg.h b/multimedia/vlc-devel/files/patch-modules-codec-ffmpeg-ffmpeg.h
new file mode 100644
index 000000000000..b474a55d5747
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-modules-codec-ffmpeg-ffmpeg.h
@@ -0,0 +1,14 @@
+--- modules/codec/ffmpeg/ffmpeg.h.orig	Fri Aug  8 19:08:32 2003
++++ modules/codec/ffmpeg/ffmpeg.h	Wed Nov  5 15:10:17 2003
+@@ -49,11 +49,7 @@
+ 
+ } generic_thread_t;
+ 
+-#if LIBAVCODEC_BUILD >= 4663
+-#   define LIBAVCODEC_PP
+-#else
+ #   undef  LIBAVCODEC_PP
+-#endif
+ 
+ #define GetWLE( p ) \
+     ( *(u8*)(p) + ( *((u8*)(p)+1) << 8 ) )
diff --git a/multimedia/vlc-devel/files/patch-modules::codec::mpeg_video::parser.c b/multimedia/vlc-devel/files/patch-modules::codec::mpeg_video::parser.c
index 359baa7bf977..e69de29bb2d1 100644
--- a/multimedia/vlc-devel/files/patch-modules::codec::mpeg_video::parser.c
+++ b/multimedia/vlc-devel/files/patch-modules::codec::mpeg_video::parser.c
@@ -1,11 +0,0 @@
---- modules/codec/mpeg_video/parser.c.orig	Mon Jun 30 18:15:14 2003
-+++ modules/codec/mpeg_video/parser.c	Mon Jun 30 18:16:37 2003
-@@ -143,7 +143,7 @@
-     {
-         free( p_vpar );
-         return( -1 );
--    )
-+    }
- 
-     /*
-      * Main loop - it is not executed if an error occured during
diff --git a/multimedia/vlc-devel/files/patch-modules::gui::wxwindows::menus.cpp b/multimedia/vlc-devel/files/patch-modules::gui::wxwindows::menus.cpp
index 4f9da4eca5a5..e69de29bb2d1 100644
--- a/multimedia/vlc-devel/files/patch-modules::gui::wxwindows::menus.cpp
+++ b/multimedia/vlc-devel/files/patch-modules::gui::wxwindows::menus.cpp
@@ -1,14 +0,0 @@
---- modules/gui/wxwindows/menus.cpp.orig	Mon Jun 30 15:22:03 2003
-+++ modules/gui/wxwindows/menus.cpp	Mon Jun 30 15:24:40 2003
-@@ -516,9 +516,8 @@
-           menuitem =
-               new wxMenuItemExt( menu, ++i_item_id,
-                                  text_list.p_list->p_values[i].psz_string ?
--                                 wxU(text_list.p_list->p_values[i].psz_string):
--                                 wxString::Format(wxT("%d"),
--                                 val_list.p_list->p_values[i].i_int),
-+                                 (wxString)wxU(text_list.p_list->p_values[i].psz_string):
-+                                 (wxString)wxString::Format(wxT("%d"), val_list.p_list->p_values[i].i_int),
-                                  wxT(""), wxITEM_RADIO, strdup(psz_var),
-                                  p_object->i_object_id,
-                                  val_list.p_list->p_values[i], i_type );