Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
670d5486
Commit
670d5486
authored
Jul 26, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contrib: Patches updates for Win32 compile of FFmpeg and libass.
parent
4b1c0509
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
38 deletions
+12
-38
extras/contrib/src/Patches/ffmpeg-svn-win32.patch
extras/contrib/src/Patches/ffmpeg-svn-win32.patch
+5
-18
extras/contrib/src/Patches/libass-cross.patch
extras/contrib/src/Patches/libass-cross.patch
+7
-20
No files found.
extras/contrib/src/Patches/ffmpeg-svn-win32.patch
View file @
670d5486
Index: configure
--- configure.orig 2009-07-26 00:06:36.000000000 +0200
===================================================================
+++ configure 2009-07-26 00:08:21.000000000 +0200
--- configure.orig 2009-03-23 18:20:30.339627360 +0000
@@ -1674,7 +1674,7 @@
+++ configure 2009-03-23 18:25:12.457447960 +0000
@@ -1438,7 +1438,7 @@
die "C compiler test failed."
fi
fi
add_cppflags -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112
-check_cflags -std=c99
-check_cflags -std=c99
+#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_c
pp
flags -D_FILE_OFFSET_BITS=64
#include <stdlib.h>
#include <stdlib.h>
EOF
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."; }
extras/contrib/src/Patches/libass-cross.patch
View file @
670d5486
--- libass/configure.ac 2008-05-22 21:04:13.000000000 +0200
--- libass/Makefile.am.orig 2009-07-26 00:32:35.000000000 +0200
+++ libass.new/configure.ac 2008-08-03 09:10:02.000000000 +0200
+++ libass/Makefile.am 2009-07-26 00:34:32.000000000 +0200
@@ -42,9 +42,9 @@
@@ -9,5 +9,5 @@
AC_TYPE_UINT8_T
test = test
endif
# Checks for library functions.
-SUBDIRS = libass $(test)
-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
+SUBDIRS = libass
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment