[vlc-devel] commit: Contrib: Patches updates for Win32 compile of FFmpeg and libass. ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul 26 00:10:45 2009 +0200| [670d5486d1dd100f45be7fd738b439a3388d7b5f] | committer: Jean-Baptiste Kempf 

Contrib: Patches updates for Win32 compile of FFmpeg and libass.

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

 extras/contrib/src/Patches/ffmpeg-svn-win32.patch |   23 ++++--------------
 extras/contrib/src/Patches/libass-cross.patch     |   27 +++++---------------
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/extras/contrib/src/Patches/ffmpeg-svn-win32.patch b/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
index fcde292..d06af7a 100644
--- a/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
+++ b/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
@@ -1,24 +1,11 @@
-Index: configure
-===================================================================
---- configure.orig	2009-03-23 18:20:30.339627360 +0000
-+++ configure	2009-03-23 18:25:12.457447960 +0000
-@@ -1438,7 +1438,7 @@
-     die "C compiler test failed."
+--- configure.orig	2009-07-26 00:06:36.000000000 +0200
++++ configure	2009-07-26 00:08:21.000000000 +0200
+@@ -1674,7 +1674,7 @@
  fi
  
+ add_cppflags -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112
 -check_cflags -std=c99
 +#check_cflags -std=c99
- check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cflags -D_FILE_OFFSET_BITS=64
+ check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64
  #include <stdlib.h>
  EOF
-@@ -1611,8 +1611,8 @@
-         objformat="win32"
-         enable dos_paths
-         if ! enabled x86_64; then
--            check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
--                die "ERROR: MinGW runtime version must be >= 3.15."
-+            check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 13)" ||
-+                die "ERROR: MinGW runtime version must be >= 3.13."
-             enabled_any avisynth vfwcap_demuxer &&
-                 { check_cpp_condition w32api.h "(__W32API_MAJOR_VERSION > 3) || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION >= 13)" ||
-                   die "ERROR: avisynth and vfwcap_demuxer require w32api version 3.13 or later."; }
diff --git a/extras/contrib/src/Patches/libass-cross.patch b/extras/contrib/src/Patches/libass-cross.patch
index 07ed336..a4d231e 100644
--- a/extras/contrib/src/Patches/libass-cross.patch
+++ b/extras/contrib/src/Patches/libass-cross.patch
@@ -1,22 +1,9 @@
---- libass/configure.ac	2008-05-22 21:04:13.000000000 +0200
-+++ libass.new/configure.ac	2008-08-03 09:10:02.000000000 +0200
-@@ -42,9 +42,9 @@
- AC_TYPE_UINT8_T
+--- libass/Makefile.am.orig	2009-07-26 00:32:35.000000000 +0200
++++ libass/Makefile.am	2009-07-26 00:34:32.000000000 +0200
+@@ -9,5 +9,5 @@
+     test = test
+ endif
  
- # Checks for library functions.
--AC_FUNC_MALLOC
-+#AC_FUNC_MALLOC
- AC_FUNC_MEMCMP
--AC_FUNC_REALLOC
-+#AC_FUNC_REALLOC
- AC_FUNC_STAT
- AC_FUNC_STRTOD
- AC_FUNC_VPRINTF
---- libass/Makefile.am.old	2008-08-12 08:55:47.000000000 +0200
-+++ libass/Makefile.am	2008-08-12 08:56:05.000000000 +0200
-@@ -4,4 +4,4 @@
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libass.pc
- 
--SUBDIRS = libass test
+-SUBDIRS = libass $(test)
 +SUBDIRS = libass
+