[vlc-devel] commit: Revert "Patch no longer applies cleanly. This needs fixing not for committing in vlc-git." (Jean-Paul Saman )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Tue Oct 14 17:07:23 2008 +0200| [53af46b704e24ba36d808f86acfc97424755eb90] | committer: Jean-Paul Saman 

Revert "Patch no longer applies cleanly. This needs fixing not for committing in vlc-git."

As the comments says I didn't intend to push it.

This reverts commit f7f50087d9371a70755a5cd9b0c46f3ccf14c596.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=53af46b704e24ba36d808f86acfc97424755eb90
---

 extras/contrib/src/Patches/gnutls-win32.patch |   41 +++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Patches/gnutls-win32.patch b/extras/contrib/src/Patches/gnutls-win32.patch
index aa49071..18af991 100644
--- a/extras/contrib/src/Patches/gnutls-win32.patch
+++ b/extras/contrib/src/Patches/gnutls-win32.patch
@@ -17,6 +17,47 @@
  #ifdef _LIBC
  libc_hidden_def (gai_strerror)
  #endif
+--- gnutls-2.2.5/configure.in	2008-05-19 21:45:47.000000000 +0200
++++ gnutls/configure.in	2008-05-22 08:19:02.000000000 +0200
+@@ -200,8 +200,6 @@
+ 	fi
+ fi
+ 
+-# Needs to be called outside of 'if' clause.
+-AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, test "$output_def" = "yes")
+ AM_CONDITIONAL([HAVE_GCC_GNU89_INLINE_OPTION],
+                [test "$_gcc_gnu89_inline" = "yes"])
+ 
+@@ -715,6 +713,10 @@
+ AC_SUBST(LIBGNUTLS_LIBS)
+ AC_SUBST(LIBGNUTLS_CFLAGS)
+ 
++
++# Needs to be called outside of 'if' clause.
++AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, test "$output_def" = "yes")
++
+ LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LTLIBOPENCDK $LZO_LIBS $LIBGNUTLS_LIBS"
+ LIBGNUTLS_EXTRA_CFLAGS="$INCOPENCDK -I${includedir}"
+ AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
+--- gnutls-2.2.5/lib/Makefile.in	2008-05-19 21:48:35.000000000 +0200
++++ gnutls/lib/Makefile.in	2008-05-22 08:30:01.000000000 +0200
+@@ -643,7 +643,6 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = x509 $(am__append_1)
+@@ -712,7 +711,7 @@
+ libgnutls_la_LIBADD = ../lgl/liblgnu.la x509/libgnutls_x509.la \
+ 	@LTLIBZ@ $(LIBGCRYPT_LIBS) @LTLIBINTL@ $(am__append_6)
+ @HAVE_LD_OUTPUT_DEF_TRUE at defexecdir = $(bindir)
+- at HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA = libgnutls-$(SOVERSION).def
++ at HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA =
+ 
+ # C++ library
+ @ENABLE_CXX_TRUE at CPP_OBJECTS = gnutlsxx.cpp
 --- gnutls-2.2.5/lib/Makefile.am	2008-05-19 21:45:13.000000000 +0200
 +++ gnutls/lib/Makefile.am	2008-05-22 08:44:16.000000000 +0200
 @@ -123,7 +123,7 @@