[rpms/xine-lib] epel9-next: sync from F-9/ branch

[rpms/xine-lib] epel9-next: sync from F-9/ branch

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/xine-lib
Branch : epel9-next
Commit : 9440df6141ecab325a0fe69840ae7b585e6c6366
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2009-04-17T16:56:23+00:00
Stats  : +4/-45 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/xine-lib/c/9440df6141ecab325a0fe69840ae7b585e6c6366?branch=epel9-next

Log:
sync from F-9/ branch

---
diff --git a/xine-lib-1.1.16-old-caca.patch b/xine-lib-1.1.16-old-caca.patch
deleted file mode 100644
index 5a149a9..0000000
--- a/xine-lib-1.1.16-old-caca.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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;
-

diff --git a/xine-lib.spec b/xine-lib.spec
index 253bd5f..5986bbc 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -13,10 +13,6 @@
     %define     have_vidix  0
 %endif # ix86
 
-%if 0%{?fedora} <= 9
-    %define     old_caca    1
-%endif
-
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
@@ -34,7 +30,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.16.3
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,7 +46,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
-Patch7:         %{name}-1.1.16-old-caca.patch
 # http://bugzilla.redhat.com/470568
 Patch8:         xine-lib-1.1.15-avsync_hack.patch
 # http://bugzilla.redhat.com/477226
@@ -79,11 +74,7 @@ BuildRequires:  libmng-devel
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if 0%{?old_caca}
-BuildRequires:  libcaca-devel >= 0.99
-%else
 BuildRequires:  libcaca-devel >= 0.99-0.5.beta14
-%endif
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
 %endif # directfb
@@ -190,9 +181,6 @@ This package contains extra plugins for %{name}:
 
 %prep
 %setup -q
-%if 0%{?old_caca}
-sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure.ac
-%endif
 %patch0 -p1 -b .autotools
 touch -r configure.ac aclocal.m4
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
@@ -202,11 +190,6 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 # see also http://bugzilla.redhat.com/480504 for side-effects
 #patch6 -p1 -b .deepbind
 
-%if 0%{?old_caca}
-sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure
-%patch7 -p0 -b .old-caca
-%endif
-
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
 %patch50 -p1 -b .mod_mimetypes_typo
@@ -442,6 +425,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 17 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.3-2.1
+- drop old_caca hacks/patches (F-9)
+
 * Fri Apr 10 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.3-2
 - fix modtracker mimetypes