| @@ -1,7360 +0,0 @@
---- MPlayer-1.0rc1/configure
-+++ MPlayer-1.0rc1/configure
-@@ -5566,14 +5566,15 @@
- if test "$_liblzo" = auto ; then
- _liblzo=no
- cat > $TMPC << EOF
--#include <lzo1x.h>
-+#include <lzo/lzo1x.h>
-+#include <lzo/lzoutil.h>
- int main(void) { lzo_init();return 0; }
- EOF
-- cc_check -llzo && _liblzo=yes
-+ cc_check -llzo2 && _liblzo=yes
- fi
- if test "$_liblzo" = yes ; then
- _def_liblzo='#define USE_LIBLZO 1'
-- _ld_liblzo='-llzo'
-+ _ld_liblzo='-llzo2'
- _codecmodules="liblzo $_codecmodules"
- else
- _def_liblzo='#undef USE_LIBLZO'
---- MPlayer-1.0rc1/libmpcodecs/native/lzoconf.h
-+++ MPlayer-1.0rc1/libmpcodecs/native/lzoconf.h
-@@ -2,11 +2,17 @@
-
- This file is part of the LZO real-time data compression library.
-
-+ Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-+ Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-+ Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-+ Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-+ Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-+ All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
-@@ -24,27 +30,24 @@
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-- <markus.oberhumer@jk.uni-linz.ac.at>
-- http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
-+ <markus@oberhumer.com>
-+ http://www.oberhumer.com/opensource/lzo/
- */
-
-
--#ifndef __LZOCONF_H
--#define __LZOCONF_H
-+#ifndef __LZOCONF_H_INCLUDED
-+#define __LZOCONF_H_INCLUDED
-
--#define LZO_VERSION 0x1070
--#define LZO_VERSION_STRING "1.07"
--#define LZO_VERSION_DATE "Oct 18 2000"
-+#define LZO_VERSION 0x2010
-+#define LZO_VERSION_STRING "2.01"
-+#define LZO_VERSION_DATE "Jun 27 2005"
-
- /* internal Autoconf configuration file - only used when building LZO */
- #if defined(LZO_HAVE_CONFIG_H)
- # include <config.h>
- #endif
- #include <limits.h>
--
--#ifdef __cplusplus
--extern "C" {
--#endif
-+#include <stddef.h>
-
-
- /***********************************************************************
-@@ -61,71 +64,39 @@
- # error "your limits.h macros are broken"
- #endif
-
--/* workaround a cpp bug under hpux 10.20 */
--#define LZO_0xffffffffL 4294967295ul
-+/* get OS and architecture defines */
-+#ifndef __LZODEFS_H_INCLUDED
-+#include "lzodefs.h"
-+#endif
-
-
--/***********************************************************************
--// architecture defines
--************************************************************************/
--
--#if !defined(__LZO_WIN) && !defined(__LZO_DOS) && !defined(__LZO_OS2)
--# if defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
--# define __LZO_WIN
--# elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
--# define __LZO_WIN
--# elif defined(__NT__) || defined(__NT_DLL__) || defined(__WINDOWS_386__)
--# define __LZO_WIN
--# elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS)
--# define __LZO_DOS
--# elif defined(__OS2__) || defined(__OS2V2__) || defined(OS2)
--# define __LZO_OS2
--# elif defined(__palmos__)
--# define __LZO_PALMOS
--# elif defined(__TOS__) || defined(__atarist__)
--# define __LZO_TOS
--# endif
-+#ifdef __cplusplus
-+extern "C" {
- #endif
-
--#if (UINT_MAX < LZO_0xffffffffL)
--# if defined(__LZO_WIN)
--# define __LZO_WIN16
--# elif defined(__LZO_DOS)
--# define __LZO_DOS16
--# elif defined(__LZO_PALMOS)
--# define __LZO_PALMOS16
--# elif defined(__LZO_TOS)
--# define __LZO_TOS16
--# elif defined(__C166__)
--# else
--# error "16-bit target not supported - contact me for porting hints"
--# endif
--#endif
-
--#if !defined(__LZO_i386)
--# if defined(__LZO_DOS) || defined(__LZO_WIN16)
--# define __LZO_i386
--# elif defined(__i386__) || defined(__386__) || defined(_M_IX86)
--# define __LZO_i386
--# endif
--#endif
-+/***********************************************************************
-+//
-+************************************************************************/
-
--#if defined(__LZO_STRICT_16BIT)
-+#if !defined(LZO_UINT32_C)
- # if (UINT_MAX < LZO_0xffffffffL)
--# include <lzo16bit.h>
-+# define LZO_UINT32_C(c) c ## UL
-+# else
-+# define LZO_UINT32_C(c) ((c) + 0U)
- # endif
- #endif
-
- /* memory checkers */
- #if !defined(__LZO_CHECKER)
- # if defined(__BOUNDS_CHECKING_ON)
--# define __LZO_CHECKER
-+# define __LZO_CHECKER 1
- # elif defined(__CHECKER__)
--# define __LZO_CHECKER
-+# define __LZO_CHECKER 1
- # elif defined(__INSURE__)
--# define __LZO_CHECKER
-+# define __LZO_CHECKER 1
- # elif defined(__PURIFY__)
--# define __LZO_CHECKER
-+# define __LZO_CHECKER 1
- # endif
- #endif
-
-@@ -134,7 +105,37 @@
- // integral and pointer types
- ************************************************************************/
-
--/* Integral types with 32 bits or more */
-+/* lzo_uint should match size_t */
-+#if !defined(LZO_UINT_MAX)
-+# if defined(LZO_ABI_LLP64) /* WIN64 */
-+# if defined(LZO_OS_WIN64)
-+ typedef unsigned __int64 lzo_uint;
-+ typedef __int64 lzo_int;
-+# else
-+ typedef unsigned long long lzo_uint;
-+ typedef long long lzo_int;
-+# endif
-+# define LZO_UINT_MAX 0xffffffffffffffffull
-+# define LZO_INT_MAX 9223372036854775807LL
-+# define LZO_INT_MIN (-1LL - LZO_INT_MAX)
-+# elif defined(LZO_ABI_IP32L64) /* MIPS R5900 */
-+ typedef unsigned int lzo_uint;
-+ typedef int lzo_int;
-+# define LZO_UINT_MAX UINT_MAX
-+# define LZO_INT_MAX INT_MAX
-+# define LZO_INT_MIN INT_MIN
-+# elif (ULONG_MAX >= LZO_0xffffffffL)
-+ typedef unsigned long lzo_uint;
-+ typedef long lzo_int;
-+# define LZO_UINT_MAX ULONG_MAX
-+# define LZO_INT_MAX LONG_MAX
-+# define LZO_INT_MIN LONG_MIN
-+# else
-+# error "lzo_uint"
-+# endif
|
