Преглед изворни кода

unbreak building by porting to latest LZO 2.0 and upgrade Live extension

Ralf S. Engelschall пре 20 година
родитељ
комит
b627d682ff
2 измењених фајлова са 59 додато и 3 уклоњено
  1. 56 0
      mplayer/mplayer.patch
  2. 3 3
      mplayer/mplayer.spec

+ 56 - 0
mplayer/mplayer.patch

@@ -9,3 +9,59 @@
  #CFLAGS=-I. -I.. -O $(WARN_FLAGS) -g #-fno-omit-frame-pointer
  
  all: libloader.a
+Index: libmpcodecs/Makefile
+--- libmpcodecs/Makefile.orig	2004-12-29 20:51:56 +0100
++++ libmpcodecs/Makefile	2005-07-09 09:05:17 +0200
+@@ -21,7 +21,7 @@
+ 
+ ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_raw.c ve_libdv.c ve_xvid.c ve_xvid4.c ve_qtvideo.c ve_nuv.c ve_x264.c
+ 
+-NATIVE_SRCS=native/RTjpegN.c native/minilzo.c native/nuppelvideo.c native/xa_gsm.c native/decode144.c native/decode288.c
++NATIVE_SRCS=native/RTjpegN.c native/nuppelvideo.c native/xa_gsm.c native/decode144.c native/decode288.c
+ 
+ ifeq ($(FAME),yes)
+ VFILTER_SRCS += vf_fame.c
+Index: libmpcodecs/vd_lzo.c
+--- libmpcodecs/vd_lzo.c.orig	2002-11-07 00:54:24 +0100
++++ libmpcodecs/vd_lzo.c	2005-07-19 09:33:33 +0200
+@@ -10,9 +10,9 @@
+ #include <lzo1x.h>
+ #else
+ #include "native/minilzo.h"
++#endif
+ #define lzo_malloc malloc
+ #define lzo_free free
+-#endif
+ 
+ #define MOD_NAME "DecLZO"
+ 
+Index: libmpcodecs/native/nuppelvideo.c
+--- libmpcodecs/native/nuppelvideo.c.orig	2005-03-03 11:19:56 +0100
++++ libmpcodecs/native/nuppelvideo.c	2005-07-19 09:45:17 +0200
+@@ -19,7 +19,11 @@
+ 
+ #include "libmpdemux/nuppelvideo.h" 
+ #include "RTjpegN.h"
++#ifdef USE_LIBLZO
++#include <lzo1x.h>
++#else
+ #include "minilzo.h"
++#endif
+ 
+ #define KEEP_BUFFER
+ 
+Index: libmpcodecs/ve_nuv.c
+--- libmpcodecs/ve_nuv.c.orig	2005-03-03 11:19:56 +0100
++++ libmpcodecs/ve_nuv.c	2005-07-19 09:51:16 +0200
+@@ -19,7 +19,11 @@
+ #include "vf.h"
+ 
+ #include "libmpdemux/nuppelvideo.h"
++#ifdef USE_LIBLZO
++#include <lzo1x.h>
++#else
+ #include "native/minilzo.h"
++#endif
+ #include "native/RTjpegN.h"
+ 
+ #define LZO_AL(size) (((size) + (sizeof(long) - 1)) / sizeof(long))

+ 3 - 3
mplayer/mplayer.spec

@@ -25,7 +25,7 @@
 #   package versions
 %define       V_mplayer     1.0pre7
 %define       V_blue        1.4
-%define       V_live        2005.05.26
+%define       V_live        2005.07.15
 
 #   package information
 Name:         mplayer
@@ -38,7 +38,7 @@ Class:        EVAL
 Group:        Video
 License:      GPL and others
 Version:      %{V_mplayer}
-Release:      20050526
+Release:      20050719
 
 #   build options
 %option       with_gui    yes
@@ -137,7 +137,7 @@ AutoReqProv:  no
     CXX="%{l_cxx}" \
     CFLAGS="%{l_cflags -O}" \
     CXXFLAGS="%{l_cxxflags -O} -Wno-deprecated" \
-    CPPFLAGS="%{l_cppflags}" \
+    CPPFLAGS="%{l_cppflags lzo .}" \
     LDFLAGS="%{l_ldflags}" \
     _ld_aa=`%{l_prefix}/bin/aalib-config --libs` \
     ./configure \