rpms/xine-lib/devel xine-lib-1.1.16-old-caca.patch, NONE, 1.1 xine-lib.spec, 1.57, 1.58
Kevin Kofler
kkofler at fedoraproject.org
Wed Jan 7 23:14:59 UTC 2009
- Previous message (by thread): rpms/xine-lib/F-9 xine-lib-1.1.16-old-caca.patch, NONE, 1.1 xine-lib.spec, 1.47, 1.48
- Next message (by thread): rpms/centerim/devel centerim-4.22.6-url-escape-fedora.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 centerim.spec, 1.18, 1.19 sources, 1.10, 1.11 centerim-4.22.3-url-escape-fedora.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5736/devel
Modified Files:
xine-lib.spec
Added Files:
xine-lib-1.1.16-old-caca.patch
Log Message:
* Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
- patch for old libcaca in F9-
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/devel/xine-lib.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- xine-lib.spec 7 Jan 2009 21:28:55 -0000 1.57
+++ xine-lib.spec 7 Jan 2009 23:14:29 -0000 1.58
@@ -13,16 +13,18 @@
%define have_vidix 0
%endif # ix86
-%if 0%{?fedora} > 9
-%define _with_caca --with-caca
+%if 0%{?fedora} <= 9
+ %define old_caca 1
%endif
%if 0%{?fedora}
%define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1}
+ %define with_caca %{?_without_caca:0}%{!?_without_caca:1}
%define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
%define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1}
%else
%define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0}
+ %define with_caca %{?_with_caca:1}%{!?_with_caca:0}
%define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
%define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0}
%endif # Fedora
@@ -34,7 +36,7 @@
Summary: Xine library
Name: xine-lib
Version: 1.1.16
-Release: 1%{?dist}
+Release: 1%{?dist}.1
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -50,6 +52,7 @@
Patch1: %{name}-1.1.4-optflags.patch
Patch6: %{name}-1.1.1-deepbind-939.patch
+Patch7: %{name}-1.1.16-old-caca.patch
## upstream patches
Provides: xine-lib(plugin-abi) = %{abiver}
@@ -69,8 +72,12 @@
%if %{with_aalib}
BuildRequires: aalib-devel >= 1.4
%endif # aalib
-%if 0%{?_with_caca:1}
-BuildRequires: libcaca-devel >= 0.99-0.5.beta16
+%if %{with_caca}
+%if 0%{?old_caca}
+BuildRequires: libcaca-devel >= 0.99
+%else
+BuildRequires: libcaca-devel >= 0.99-0.5.beta16
+%endif
%endif # caca
%if 0%{!?_without_directfb:1}
BuildRequires: directfb-devel
@@ -170,7 +177,7 @@
%if %{with_aalib}
- AA-lib
%endif # aalib
-%if 0%{?_with_caca:1}
+%if %{with_caca}
- Libcaca
%endif # caca
%if 0%{!?_without_imagemagick:1}
@@ -190,6 +197,9 @@
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
# Patch6 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
+%if 0%{?old_caca}
+%patch7 -p0 -b .old-caca
+%endif
# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -227,7 +237,6 @@
%if 0%{?_without_imagemagick:1}
--without-imagemagick \
%endif # imagemagick
- %{?_with_caca} %{!?_with_caca:--without-caca} \
%{!?_without_arts:--with-arts} %{?_without_arts} \
--with-wavpack \
--with-real-codecs-path=%{codecdir} \
@@ -401,7 +410,7 @@
%if %{with_aalib}
%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
%endif # aalib
-%if 0%{?_with_caca:1}
+%if %{with_caca}
%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
%endif # caca
%if 0%{!?_without_directfb:1}
@@ -425,6 +434,9 @@
%changelog
+* Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
+- patch for old libcaca in F9-
+
* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16, plugin ABI 1.25
- --with-external-libdvdnav, include mpeg demuxers (#213597)
- Previous message (by thread): rpms/xine-lib/F-9 xine-lib-1.1.16-old-caca.patch, NONE, 1.1 xine-lib.spec, 1.47, 1.48
- Next message (by thread): rpms/centerim/devel centerim-4.22.6-url-escape-fedora.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 centerim.spec, 1.18, 1.19 sources, 1.10, 1.11 centerim-4.22.3-url-escape-fedora.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list