- not needed

Changed files:
    vlc-disablehal.patch -> 1.2
    vlc-po.patch -> 1.5
    vlc-speex.patch -> 1.3
    vlc-wxgtk2.patch -> 1.4

diff --git a/vlc-disablehal.patch b/vlc-disablehal.patch
deleted file mode 100644 (file)
index 80c1f59..0000000
--- a/vlc-disablehal.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- vlc-0.8.1/configure.ac.orig        2005-05-04 20:37:33.000000000 +0200
-+++ vlc-0.8.1/configure.ac     2005-05-04 21:41:54.000000000 +0200
-@@ -676,11 +676,11 @@
- fi
- 
- dnl Check for hal
--PKG_CHECK_MODULES(HAL, hal >= 0.2.97,
--  [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library])
--   VLC_ADD_LDFLAGS([vlc],[$HAL_LIBS])
--   VLC_ADD_CFLAGS([vlc],[$HAL_CFLAGS])],
--  [AC_MSG_WARN(HAL library not found)])
-+dnl PKG_CHECK_MODULES(HAL, hal >= 0.2.97,
-+dnl   [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library])
-+dnl   VLC_ADD_LDFLAGS([vlc],[$HAL_LIBS])
-+dnl   VLC_ADD_CFLAGS([vlc],[$HAL_CFLAGS])],
-+dnl  [AC_MSG_WARN(HAL library not found)])
- 
- dnl Build the gtk_main plugins?
- NEED_GTK_MAIN=no

diff --git a/vlc-po.patch b/vlc-po.patch
deleted file mode 100644 (file)
index 3ada023..0000000
--- a/vlc-po.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vlc-0.8.1/configure.ac.orig        2005-03-30 03:06:33.000000000 +0200
-+++ vlc-0.8.1/configure.ac     2005-03-30 03:07:15.000000000 +0200
-@@ -192,7 +192,7 @@
- dnl
- dnl Gettext stuff
- dnl
--ALL_LINGUAS="da de en_GB es fr hu it ja nl no pl pt_BR ru sv"
-+ALL_LINGUAS="da de en_GB es fr hu it ja nl nb pl pt_BR ru sv"
- AM_GNU_GETTEXT_VERSION(0.11.5)
- AM_GNU_GETTEXT
- if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then

diff --git a/vlc-speex.patch b/vlc-speex.patch
deleted file mode 100644 (file)
index a04a7c5..0000000
--- a/vlc-speex.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- vlc-0.8.1/configure.ac.orig        2005-04-09 13:41:21.000000000 +0200
-+++ vlc-0.8.1/configure.ac     2005-04-09 14:24:25.000000000 +0200
-@@ -2444,7 +2444,7 @@
-     AC_CHECK_HEADERS(speex.h, [
-     AC_MSG_CHECKING(for libspeex version > 1.1.0)
-     AC_EGREP_CPP(yes,
--      [#include <speex.h>
-+      [#include <speex/speex.h>
-        #ifdef SPEEX_SET_SUBMODE_ENCODING
-        yes
-        #endif],
---- vlc-0.8.1/modules/codec/speex.c.orig       2005-04-09 14:25:30.000000000 +0200
-+++ vlc-0.8.1/modules/codec/speex.c    2005-04-09 14:25:10.000000000 +0200
-@@ -29,7 +29,7 @@
- #include <vlc/input.h>
- 
- #include <ogg/ogg.h>
--#include <speex.h>
-+#include <speex/speex.h>
- #include "speex_header.h"
- #include "speex_stereo.h"
- #include "speex_callbacks.h"
---- vlc-0.8.1/configure.ac.orig        2005-04-09 14:43:26.000000000 +0200
-+++ vlc-0.8.1/configure.ac     2005-04-09 14:43:49.000000000 +0200
-@@ -2441,7 +2441,7 @@
-   [  --enable-speex          Speex decoder support (default enabled)])
- if test "${enable_speex}" != "no"
- then
--  AC_CHECK_HEADERS(speex.h, [
-+  AC_CHECK_HEADERS(speex/speex.h, [
-     AC_MSG_CHECKING(for libspeex version > 1.1.0)
-     AC_EGREP_CPP(yes,
-       [#include <speex/speex.h>
---- vlc-0.8.1/modules/codec/speex.c.orig       2005-04-09 15:08:01.000000000 +0200
-+++ vlc-0.8.1/modules/codec/speex.c    2005-04-09 15:13:18.000000000 +0200
-@@ -30,9 +30,9 @@
- 
- #include <ogg/ogg.h>
- #include <speex/speex.h>
--#include "speex_header.h"
--#include "speex_stereo.h"
--#include "speex_callbacks.h"
-+#include <speex/speex_header.h>
-+#include <speex/speex_stereo.h>
-+#include <speex/speex_callbacks.h>
- 
- /*****************************************************************************
-  * decoder_sys_t : speex decoder descriptor

diff --git a/vlc-wxgtk2.patch b/vlc-wxgtk2.patch
deleted file mode 100644 (file)
index b132780..0000000
--- a/vlc-wxgtk2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur o-vlc-0.8.1/configure.ac vlc-0.8.1/configure.ac
---- o-vlc-0.8.1/configure.ac   2004-11-14 09:10:56.000000000 -0700
-+++ vlc-0.8.1/configure.ac     2005-02-06 08:13:36.434615764 -0700
-@@ -3468,18 +3468,15 @@
-   WXWINDOWS_PATH="${PATH}"
-   AC_ARG_WITH(wx-config-path,
-     [    --with-wx-config-path=PATH wx-config path (default search in \$PATH)],
-+  # look for wx-config
-     [ if test "${with_wx_config_path}" != "no"
-       then
--        WXWINDOWS_PATH="${with_wx_config_path}:${PATH}"
--      fi ])
--  # look for wx-config
-+  AC_PATH_PROG(WX_CONFIG, ${with_wx_config_path}, no)
-+              else
-   AC_PATH_PROG(WX_CONFIG, wx-config, no, ${WXWINDOWS_PATH})
-+      fi ])
-   if test "${WX_CONFIG}" != "no"
-   then
--    if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null
--    then
--      AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwindows.])
--    fi
-     AC_LANG_PUSH(C++)
-     VLC_ADD_CXXFLAGS([wxwindows],[`${WX_CONFIG} --cxxflags`])
-     VLC_ADD_LDFLAGS([wxwindows],[`${WX_CONFIG} --libs`])