Commit de0420fb authored by Christophe Mutricy's avatar Christophe Mutricy

Update the x264 patch

Don't use dl_open on win32
Both patches by Tim Schuerewege. thanks.
parent 2169e1cd
......@@ -145,6 +145,7 @@ Steven M. Schultz <sms at TO.GD-ES.COM> - BSD/OS port
Steven Sheehy - wxWidgets interface fix
Tadashi Jokagi <elf2000 at users.sourceforge dot net> - Japanese translation
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 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
......
Index: configure
===================================================================
--- configure (revision 560)
--- configure (revision 590)
+++ configure (working copy)
@@ -66,8 +66,109 @@
@@ -64,8 +64,101 @@
EXE=""
......@@ -56,11 +56,9 @@ Index: configure
+ ;;
+ --extra-cflags=*)
+ CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
+ VFW_CFLAGS="${opt#--extra-cflags=}"
+ ;;
+ --extra-ldflags=*)
+ LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
+ VFW_LDFLAGS="${opt#--extra-ldflags=}"
+ ;;
+ --enable-pthread)
+ pthread="yes"
......@@ -79,12 +77,6 @@ Index: configure
+ --enable-pic)
+ pic="yes"
+ ;;
+ --enable-vfw)
+ vfw="yes"
+ ;;
+ --disable-vfw)
+ vfw="no"
+ ;;
+ --enable-gtk)
+ gtk="yes"
+ ;;
......@@ -112,7 +104,7 @@ Index: configure
case "${MACHINE#*-*-}" in
beos*)
SYS="BEOS"
@@ -180,96 +281,6 @@
@@ -178,88 +271,6 @@
esac
CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
......@@ -154,11 +146,9 @@ Index: configure
- ;;
- --extra-cflags=*)
- CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
- VFW_CFLAGS="${opt#--extra-cflags=}"
- ;;
- --extra-ldflags=*)
- LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
- VFW_LDFLAGS="${opt#--extra-ldflags=}"
- ;;
- --enable-pthread)
- pthread="yes"
......@@ -177,12 +167,6 @@ Index: configure
- --enable-pic)
- pic="yes"
- ;;
- --enable-vfw)
- vfw="yes"
- ;;
- --disable-vfw)
- vfw="no"
- ;;
- --enable-gtk)
- gtk="yes"
- ;;
......@@ -209,8 +193,8 @@ Index: configure
# autodetect options that weren't forced nor disabled
if test "$pthread" = "auto" ; then
@@ -361,6 +372,9 @@
VFW=$vfw
@@ -349,6 +360,9 @@
ASFLAGS=$ASFLAGS
GTK=$gtk
EXE=$EXE
+AR=$AR
......@@ -221,9 +205,9 @@ Index: configure
DEVNULL=$DEVNULL
Index: Makefile
===================================================================
--- Makefile (revision 560)
--- Makefile (revision 590)
+++ Makefile (working copy)
@@ -64,8 +64,8 @@
@@ -66,8 +66,8 @@
default: $(DEP) x264$(EXE)
libx264.a: .depend $(OBJS) $(OBJASM)
......@@ -235,7 +219,7 @@ Index: Makefile
$(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
@@ -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
-install: x264 $(SONAME)
......
......@@ -191,3 +191,23 @@
noinst_LTLIBRARIES = testdso.la
testdso_la_SOURCES = testdso.c
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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment