Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
de0420fb
Commit
de0420fb
authored
Oct 13, 2006
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update the x264 patch
Don't use dl_open on win32 Both patches by Tim Schuerewege. thanks.
parent
2169e1cd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
24 deletions
+29
-24
THANKS
THANKS
+1
-0
extras/contrib/src/Patches/x264-svn-win32.patch
extras/contrib/src/Patches/x264-svn-win32.patch
+8
-24
extras/contrib/src/Patches/xml2-win32.patch
extras/contrib/src/Patches/xml2-win32.patch
+20
-0
No files found.
THANKS
View file @
de0420fb
...
@@ -145,6 +145,7 @@ Steven M. Schultz <sms at TO.GD-ES.COM> - BSD/OS port
...
@@ -145,6 +145,7 @@ Steven M. Schultz <sms at TO.GD-ES.COM> - BSD/OS port
Steven Sheehy - wxWidgets interface fix
Steven Sheehy - wxWidgets interface fix
Tadashi Jokagi <elf2000 at users.sourceforge dot net> - Japanese translation
Tadashi Jokagi <elf2000 at users.sourceforge dot net> - Japanese translation
Tim 'O Callaghan <tim.ocallaghan at limestudios dot com> - pvr input cleaning patch
Tim 'O Callaghan <tim.ocallaghan at limestudios dot com> - pvr input cleaning patch
Tim Schuerewegen <ma054331 at skynet dot be> - contrib fixes
Thomas Graf <tgraf at europe.com> - gettext support, German translation
Thomas Graf <tgraf at europe.com> - gettext support, German translation
Thomas L. Wood <twood at lucent.com> - fixed a bug in QuantMatrixExtension
Thomas L. Wood <twood at lucent.com> - fixed a bug in QuantMatrixExtension
Thomas Parmelan <tom+vlc at ankh.fr.EU.org> - mosaic user-defined offsets for substreams
Thomas Parmelan <tom+vlc at ankh.fr.EU.org> - mosaic user-defined offsets for substreams
...
...
extras/contrib/src/Patches/x264-svn-win32.patch
View file @
de0420fb
Index: configure
Index: configure
===================================================================
===================================================================
--- configure (revision 5
6
0)
--- configure (revision 5
9
0)
+++ configure (working copy)
+++ configure (working copy)
@@ -6
6,8 +66,109
@@
@@ -6
4,8 +64,101
@@
EXE=""
EXE=""
...
@@ -56,11 +56,9 @@ Index: configure
...
@@ -56,11 +56,9 @@ Index: configure
+ ;;
+ ;;
+ --extra-cflags=*)
+ --extra-cflags=*)
+ CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
+ CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
+ VFW_CFLAGS="${opt#--extra-cflags=}"
+ ;;
+ ;;
+ --extra-ldflags=*)
+ --extra-ldflags=*)
+ LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
+ LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
+ VFW_LDFLAGS="${opt#--extra-ldflags=}"
+ ;;
+ ;;
+ --enable-pthread)
+ --enable-pthread)
+ pthread="yes"
+ pthread="yes"
...
@@ -79,12 +77,6 @@ Index: configure
...
@@ -79,12 +77,6 @@ Index: configure
+ --enable-pic)
+ --enable-pic)
+ pic="yes"
+ pic="yes"
+ ;;
+ ;;
+ --enable-vfw)
+ vfw="yes"
+ ;;
+ --disable-vfw)
+ vfw="no"
+ ;;
+ --enable-gtk)
+ --enable-gtk)
+ gtk="yes"
+ gtk="yes"
+ ;;
+ ;;
...
@@ -112,7 +104,7 @@ Index: configure
...
@@ -112,7 +104,7 @@ Index: configure
case "${MACHINE#*-*-}" in
case "${MACHINE#*-*-}" in
beos*)
beos*)
SYS="BEOS"
SYS="BEOS"
@@ -1
80,96 +28
1,6 @@
@@ -1
78,88 +27
1,6 @@
esac
esac
CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
...
@@ -154,11 +146,9 @@ Index: configure
...
@@ -154,11 +146,9 @@ Index: configure
- ;;
- ;;
- --extra-cflags=*)
- --extra-cflags=*)
- CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
- CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
- VFW_CFLAGS="${opt#--extra-cflags=}"
- ;;
- ;;
- --extra-ldflags=*)
- --extra-ldflags=*)
- LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
- LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
- VFW_LDFLAGS="${opt#--extra-ldflags=}"
- ;;
- ;;
- --enable-pthread)
- --enable-pthread)
- pthread="yes"
- pthread="yes"
...
@@ -177,12 +167,6 @@ Index: configure
...
@@ -177,12 +167,6 @@ Index: configure
- --enable-pic)
- --enable-pic)
- pic="yes"
- pic="yes"
- ;;
- ;;
- --enable-vfw)
- vfw="yes"
- ;;
- --disable-vfw)
- vfw="no"
- ;;
- --enable-gtk)
- --enable-gtk)
- gtk="yes"
- gtk="yes"
- ;;
- ;;
...
@@ -209,8 +193,8 @@ Index: configure
...
@@ -209,8 +193,8 @@ Index: configure
# autodetect options that weren't forced nor disabled
# autodetect options that weren't forced nor disabled
if test "$pthread" = "auto" ; then
if test "$pthread" = "auto" ; then
@@ -3
61,6 +372
,9 @@
@@ -3
49,6 +360
,9 @@
VFW=$vfw
ASFLAGS=$ASFLAGS
GTK=$gtk
GTK=$gtk
EXE=$EXE
EXE=$EXE
+AR=$AR
+AR=$AR
...
@@ -221,9 +205,9 @@ Index: configure
...
@@ -221,9 +205,9 @@ Index: configure
DEVNULL=$DEVNULL
DEVNULL=$DEVNULL
Index: Makefile
Index: Makefile
===================================================================
===================================================================
--- Makefile (revision 5
6
0)
--- Makefile (revision 5
9
0)
+++ Makefile (working copy)
+++ Makefile (working copy)
@@ -6
4,8 +64
,8 @@
@@ -6
6,8 +66
,8 @@
default: $(DEP) x264$(EXE)
default: $(DEP) x264$(EXE)
libx264.a: .depend $(OBJS) $(OBJASM)
libx264.a: .depend $(OBJS) $(OBJASM)
...
@@ -235,7 +219,7 @@ Index: Makefile
...
@@ -235,7 +219,7 @@ Index: Makefile
$(SONAME): .depend $(OBJS) $(OBJASM)
$(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
@@ -138,14 +138,14 @@
@@ -138,14 +138,14 @@
rm -f config.mak config.h
vfw/build/cygwin/config.mak
x264.pc
rm -f config.mak config.h x264.pc
$(MAKE) -C gtk distclean
$(MAKE) -C gtk distclean
-install: x264 $(SONAME)
-install: x264 $(SONAME)
...
...
extras/contrib/src/Patches/xml2-win32.patch
View file @
de0420fb
...
@@ -191,3 +191,23 @@
...
@@ -191,3 +191,23 @@
noinst_LTLIBRARIES = testdso.la
noinst_LTLIBRARIES = testdso.la
testdso_la_SOURCES = testdso.c
testdso_la_SOURCES = testdso.c
testdso_la_LDFLAGS = -module -rpath $(libdir)
testdso_la_LDFLAGS = -module -rpath $(libdir)
--- xml/xmlmodule.c 2005-10-28 16:24:34.000000000 +0200
+++ xml-new/xmlmodule.c 2006-10-11 13:56:13.748125000 +0200
@@ -190,6 +190,8 @@
return (0);
}
+#ifndef _WIN32
+
#ifdef HAVE_DLOPEN
#ifdef HAVE_DLFCN_H
#include <dlfcn.h>
@@ -288,7 +290,7 @@
#endif /* HAVE_SHLLOAD */
#endif /* ! HAVE_DLOPEN */
-#ifdef _WIN32
+#else /* _WIN32 */
#include <windows.h>
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