[patch] files/mplayer-1.0_pre7-lzo2.patch

mplayer-1.0_pre7-lzo2.patch (text/plain), 3.98 KB, created by Daniel Black (RETIRED) on 2005-11-12 23:43:22 UTC

--- configure.orig	2005-11-13 17:43:29.000000000 +1100
+++ configure	2005-11-13 18:06:27.000000000 +1100
@@ -5096,15 +5096,17 @@
 echocheck "external liblzo support"
 if test "$_liblzo" = auto ; then
   _liblzo=no
+  _liblzo_include="-I/usr/include/lzo"
   cat > $TMPC << EOF
 #include <lzo1x.h>
 int main(void) { lzo_init();return 0; }
 EOF
-  cc_check -llzo && _liblzo=yes
+  cc_check $_liblzo_include -llzo2 && _liblzo=yes
 fi
 if test "$_liblzo" = yes ; then
   _def_liblzo='#define USE_LIBLZO 1'
-  _ld_liblzo='-llzo'
+  _ld_liblzo='-llzo2'
+  _liblzo_include="-I/usr/include/lzo"
   _codecmodules="liblzo $_codecmodules"
 else
   _def_liblzo='#undef USE_LIBLZO'
@@ -6830,6 +6832,7 @@
 FRIBIDI_INC = $_inc_fribidi
 FRIBIDI_LIB = $_ld_fribidi
 LIBLZO_LIB= $_ld_liblzo
+LIBLZO_INC=$_liblzo_include
 MAD_LIB = $_ld_mad
 VORBIS_LIB = $_ld_vorbis $_ld_libdv
 THEORA_LIB = $_ld_theora
--- Makefile.orig	2005-11-13 18:02:05.000000000 +1100
+++ Makefile	2005-11-13 18:03:52.000000000 +1100
@@ -35,7 +35,7 @@
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(X264_LIB)
 COMMON_LIBS = libmpcodecs/libmpcodecs.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB)
 
-CFLAGS = $(OPTFLAGS) -I. $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall
+CFLAGS = $(OPTFLAGS) -I. $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(LIBLZO_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall
 ifeq ($(TOOLAME),yes)
 CFLAGS += $(TOOLAME_EXTRAFLAGS) 
 CODEC_LIBS += $(TOOLAME_LIB)
--- libmpcodecs/Makefile.orig	2005-11-13 18:13:27.000000000 +1100
+++ libmpcodecs/Makefile	2005-11-13 18:14:07.000000000 +1100
@@ -50,7 +50,7 @@
 SRCS2=$(ENCODER_SRCS)
 OBJS2=$(SRCS2:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
+CFLAGS  = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) $(LIBLZO_INC) -D_GNU_SOURCE
 
 .SUFFIXES: .c .o
 
--- libmpdemux/Makefile.orig	2005-11-13 18:14:25.000000000 +1100
+++ libmpdemux/Makefile	2005-11-13 18:14:49.000000000 +1100
@@ -37,7 +37,7 @@
 OBJS	= $(SRCS:.c=.o)
 OBJS   += $(CPLUSPLUSSRCS:.cpp=.o)
 INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
-CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
+CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) $(LIBLZO_INC)
 CPLUSPLUSFLAGS  = $(CFLAGS) $(CPLUSPLUSINCLUDE)
 CPLUSPLUS = $(CC)
 
--- ./libmpcodecs/vd_lzo.c.orig	2005-11-13 18:24:14.000000000 +1100
+++ ./libmpcodecs/vd_lzo.c	2005-11-13 18:25:34.000000000 +1100
@@ -10,8 +10,6 @@
 #include <lzo1x.h>
 #else
 #include "native/minilzo.h"
-#define lzo_malloc malloc
-#define lzo_free free
 #endif
 
 #define MOD_NAME "DecLZO"
@@ -66,7 +64,7 @@
     priv->codec = -1;
     sh->context = priv;
 
-    priv->wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS);
+    priv->wrkmem = (lzo_bytep) malloc(LZO1X_1_MEM_COMPRESS);
 
     if (priv->wrkmem == NULL) {
 	mp_msg (MSGT_DECVIDEO, MSGL_ERR, "[%s] Cannot alloc work memory\n", MOD_NAME);
@@ -84,7 +82,7 @@
     if (priv)
     {
 	if (priv->wrkmem)
-	    lzo_free(priv->wrkmem);
+	    free(priv->wrkmem);
 	free(priv);
     }
 
@@ -112,7 +110,7 @@
 	
 	// decompress one frame to see if its
 	// either YV12 or RGB24
-	if (!tmp) tmp = lzo_malloc(sh->bih->biSizeImage);
+	if (!tmp) tmp = malloc(sh->bih->biSizeImage);
 
 	mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] 2 depth %d, format %d data %p len (%d) (%d)\n",
 	    MOD_NAME, sh->bih->biBitCount, sh->format, data, len, sh->bih->biSizeImage