Commit fbfa084e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Useless patches.

parent 1699620e
This diff is collapsed.
Index: dvdread/bswap.h
===================================================================
RCS file: /cvsroot/ogle/libdvdread/dvdread/bswap.h,v
retrieving revision 1.10
diff -u -r1.10 bswap.h
--- dvdread/bswap.h 18 Jun 2003 13:35:03 -0000 1.10
+++ dvdread/bswap.h 2 Sep 2004 13:43:25 -0000
@@ -85,14 +85,14 @@
(((x) & 0x0000ff00) << 8) | \
(((x) & 0x000000ff) << 24))
#define B2N_64(x) \
- x = ((((x) & 0xff00000000000000) >> 56) | \
- (((x) & 0x00ff000000000000) >> 40) | \
- (((x) & 0x0000ff0000000000) >> 24) | \
- (((x) & 0x000000ff00000000) >> 8) | \
- (((x) & 0x00000000ff000000) << 8) | \
- (((x) & 0x0000000000ff0000) << 24) | \
- (((x) & 0x000000000000ff00) << 40) | \
- (((x) & 0x00000000000000ff) << 56))
+ x = ((((x) & 0xff00000000000000LL) >> 56) | \
+ (((x) & 0x00ff000000000000LL) >> 40) | \
+ (((x) & 0x0000ff0000000000LL) >> 24) | \
+ (((x) & 0x000000ff00000000LL) >> 8) | \
+ (((x) & 0x00000000ff000000LL) << 8) | \
+ (((x) & 0x0000000000ff0000LL) << 24) | \
+ (((x) & 0x000000000000ff00LL) << 40) | \
+ (((x) & 0x00000000000000ffLL) << 56))
#else
Index: dvdread/dvd_input.c
===================================================================
RCS file: /cvsroot/ogle/libdvdread/dvdread/dvd_input.c,v
retrieving revision 1.8
diff -u -r1.8 dvd_input.c
--- dvdread/dvd_input.c 4 Apr 2004 20:02:27 -0000 1.8
+++ dvdread/dvd_input.c 2 Sep 2004 13:43:25 -0000
@@ -21,11 +21,23 @@
#include <stdio.h>
#include <stdlib.h>
+
+#if defined(HAVE_INTTYPES_H)
+#include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+#include <stdint.h>
+#endif
+
#include <fcntl.h>
#include <unistd.h>
#include "dvd_reader.h"
#include "dvd_input.h"
+
+#ifdef WIN32
+# define lseek _lseeki64
+# define off_t int64_t
+#endif
/* The function pointers that is the exported interface of this file. */
dvd_input_t (*dvdinput_open) (const char *);
Index: include/ogg/os_types.h
===================================================================
RCS file: /usr/local/cvsroot/ogg/include/ogg/os_types.h,v
retrieving revision 1.12
diff -u -r1.12 os_types.h
--- libogg/include/ogg/os_types.h 18 Sep 2002 04:42:09 -0000 1.12
+++ libogg/include/ogg/os_types.h 18 Apr 2003 13:48:18 -0000
@@ -27,7 +27,7 @@
#define _ogg_realloc realloc
#define _ogg_free free
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
# ifndef __GNUC__
/* MSVC/Borland */
diff -Naur vorbis.old/Makefile vorbis/Makefile
--- vorbis.old/Makefile Sun Nov 2 15:05:33 2003
+++ vorbis/Makefile Sun Nov 2 16:50:28 2003
@@ -104,7 +104,7 @@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = lib include doc examples win32 debian vq
+SUBDIRS = lib include doc
m4datadir = $(datadir)/aclocal
m4data_DATA = vorbis.m4
diff -Naur vorbis.old/Makefile.am vorbis/Makefile.am
--- vorbis.old/Makefile.am Thu Sep 11 22:42:26 2003
+++ vorbis/Makefile.am Sun Nov 2 16:50:56 2003
@@ -2,7 +2,8 @@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = lib include doc examples win32 debian vq
+#SUBDIRS = lib include doc examples win32 debian vq
+SUBDIRS = lib include doc
m4datadir = $(datadir)/aclocal
m4data_DATA = vorbis.m4
diff -Naur vorbis.old/Makefile.in vorbis/Makefile.in
--- vorbis.old/Makefile.in Sun Nov 2 02:33:58 2003
+++ vorbis/Makefile.in Sun Nov 2 16:51:07 2003
@@ -104,7 +104,8 @@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = lib include doc examples win32 debian vq
+#SUBDIRS = lib include doc examples win32 debian vq
+SUBDIRS = lib include doc
m4datadir = $(datadir)/aclocal
m4data_DATA = vorbis.m4
diff -Naur vorbis.old/lib/Makefile vorbis/lib/Makefile
--- vorbis.old/lib/Makefile Sun Nov 2 15:05:33 2003
+++ vorbis/lib/Makefile Sun Nov 2 16:48:57 2003
@@ -123,12 +123,12 @@
libvorbis_la_LDFLAGS = -no-undefined -version-info 3:0:3
libvorbisfile_la_SOURCES = vorbisfile.c
-libvorbisfile_la_LDFLAGS = -no-undefined -version-info 4:0:1
-libvorbisfile_la_LIBADD = libvorbis.la
+libvorbisfile_la_LDFLAGS = -version-info 4:0:1
+libvorbisfile_la_LIBADD = -lvorbis
libvorbisenc_la_SOURCES = vorbisenc.c
-libvorbisenc_la_LDFLAGS = -no-undefined -version-info 2:0:0
-libvorbisenc_la_LIBADD = libvorbis.la
+libvorbisenc_la_LDFLAGS = -version-info 2:0:0
+libvorbisenc_la_LIBADD = -lvorbis
EXTRA_PROGRAMS = barkmel tone psytune
CLEANFILES = $(EXTRA_PROGRAMS)
@@ -151,10 +151,10 @@
floor1.lo floor0.lo res0.lo mapping0.lo registry.lo codebook.lo \
sharedbook.lo lookup.lo bitrate.lo
libvorbis_la_OBJECTS = $(am_libvorbis_la_OBJECTS)
-libvorbisenc_la_DEPENDENCIES = libvorbis.la
+libvorbisenc_la_DEPENDENCIES =
am_libvorbisenc_la_OBJECTS = vorbisenc.lo
libvorbisenc_la_OBJECTS = $(am_libvorbisenc_la_OBJECTS)
-libvorbisfile_la_DEPENDENCIES = libvorbis.la
+libvorbisfile_la_DEPENDENCIES =
am_libvorbisfile_la_OBJECTS = vorbisfile.lo
libvorbisfile_la_OBJECTS = $(am_libvorbisfile_la_OBJECTS)
EXTRA_PROGRAMS = barkmel$(EXEEXT) tone$(EXEEXT) psytune$(EXEEXT)
diff -Naur vorbis.old/lib/Makefile.am vorbis/lib/Makefile.am
--- vorbis.old/lib/Makefile.am Sat Jan 18 22:02:20 2003
+++ vorbis/lib/Makefile.am Sun Nov 2 16:38:53 2003
@@ -20,12 +20,12 @@
libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
libvorbisfile_la_SOURCES = vorbisfile.c
-libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
-libvorbisfile_la_LIBADD = libvorbis.la
+libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+libvorbisfile_la_LIBADD = -lvorbis
libvorbisenc_la_SOURCES = vorbisenc.c
-libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
-libvorbisenc_la_LIBADD = libvorbis.la
+libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
+libvorbisenc_la_LIBADD = -lvorbis
EXTRA_PROGRAMS = barkmel tone psytune
CLEANFILES = $(EXTRA_PROGRAMS)
diff -Naur vorbis.old/lib/Makefile.in vorbis/lib/Makefile.in
--- vorbis.old/lib/Makefile.in Sun Nov 2 02:34:00 2003
+++ vorbis/lib/Makefile.in Sun Nov 2 16:51:10 2003
@@ -123,12 +123,12 @@
libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
libvorbisfile_la_SOURCES = vorbisfile.c
-libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
-libvorbisfile_la_LIBADD = libvorbis.la
+libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+libvorbisfile_la_LIBADD = -lvorbis
libvorbisenc_la_SOURCES = vorbisenc.c
-libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
-libvorbisenc_la_LIBADD = libvorbis.la
+libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
+libvorbisenc_la_LIBADD = -lvorbis
EXTRA_PROGRAMS = barkmel tone psytune
CLEANFILES = $(EXTRA_PROGRAMS)
@@ -151,10 +151,10 @@
floor1.lo floor0.lo res0.lo mapping0.lo registry.lo codebook.lo \
sharedbook.lo lookup.lo bitrate.lo
libvorbis_la_OBJECTS = $(am_libvorbis_la_OBJECTS)
-libvorbisenc_la_DEPENDENCIES = libvorbis.la
+libvorbisenc_la_DEPENDENCIES =
am_libvorbisenc_la_OBJECTS = vorbisenc.lo
libvorbisenc_la_OBJECTS = $(am_libvorbisenc_la_OBJECTS)
-libvorbisfile_la_DEPENDENCIES = libvorbis.la
+libvorbisfile_la_DEPENDENCIES =
am_libvorbisfile_la_OBJECTS = vorbisfile.lo
libvorbisfile_la_OBJECTS = $(am_libvorbisfile_la_OBJECTS)
EXTRA_PROGRAMS = barkmel$(EXEEXT) tone$(EXEEXT) psytune$(EXEEXT)
diff -u -r1.49 init.cpp
--- src/common/init.cpp 2004/10/19 13:38:15 1.49
+++ src/common/init.cpp 2005/02/09 12:46:59
@@ -332,7 +332,7 @@
{
wxModule::CleanUpModules();
- wxClassInfo::CleanUp();
+ //wxClassInfo::CleanUp();
// we can't do this in wxApp itself because it doesn't know if argv had
// been allocated
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