rpms/xine-lib/EL-5 xine-lib-1.1.16-old-caca.patch, NONE, 1.1 xine-lib.spec, 1.22, 1.23

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28067

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.16-old-caca.patch 
Log Message:
--with-caca, add awol patch


xine-lib-1.1.16-old-caca.patch:

--- NEW FILE xine-lib-1.1.16-old-caca.patch ---
--- src/video_out/video_out_caca.c	Tue Nov 18 21:13:55 2008 +0100
+++ src/video_out/video_out_caca.c	Mon Nov 10 16:33:51 2008 +0100
@@ -276,7 +276,6 @@ static int caca_redraw_needed (vo_driver
 
 static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) {
   caca_class_t         *class = (caca_class_t *) class_gen;
-  caca_display_t       *dp = (caca_display_t *)visual_gen;
   caca_driver_t        *this;
 
   this = calloc(1, sizeof (caca_driver_t));
@@ -301,13 +300,8 @@ static vo_driver_t *open_plugin (video_d
   this->yuv2rgb_factory = yuv2rgb_factory_init(MODE_32_RGB, 0, NULL);
   this->yuv2rgb_factory->set_csc_levels(this->yuv2rgb_factory, 0, 128, 128);
 
-  if (dp) {
-    this->cv = caca_get_canvas(dp);
-    this->dp = dp;
-  } else {
-    this->cv = cucul_create_canvas(0, 0);
-    this->dp = caca_create_display(this->cv);
-  }
+  this->cv = cucul_create_canvas(0, 0);
+  this->dp = caca_create_display(this->cv);
 
   caca_refresh_display(this->dp);
   return &this->vo_driver;



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xine-lib.spec	18 Jan 2009 22:26:20 -0000	1.22
+++ xine-lib.spec	18 Jan 2009 22:34:43 -0000	1.23
@@ -121,7 +121,7 @@
 disk drives, and displays multimedia streamed over the Internet. It
 interprets many of the most common multimedia formats available - and some
 of the most uncommon formats, too.  --with/--without rpmbuild options
-(some default values depend on target distribution): aalib, caca, directfb,
+(some default values depend on target distribution): aalib, directfb,
 imagemagick, freetype, antialiasing (with freetype), pulseaudio, xcb.
 
 %package        devel
@@ -220,6 +220,7 @@
 %if 0%{?_with_freetype:1}
 %if 0%{?_with_antialiasing:1}
     --enable-antialiasing \
+    --with-caca \
 %endif # antialiasing
     --with-freetype \
     --with-fontconfig \