From 695c4f1c66907a95b5d273ac02fcc92f5de3ae88 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 7 Jan 2009 21:17:13 +0000 Subject: [PATCH] enable caca for f10+ only --- xine-lib.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index a44c7c5..757046b 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -13,14 +13,16 @@ %define have_vidix 0 %endif # ix86 +%if 0%{?fedora} > 9 +%define _with_caca --with-caca +%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 @@ -67,7 +69,7 @@ BuildRequires: libmng-devel %if %{with_aalib} BuildRequires: aalib-devel >= 1.4 %endif # aalib -%if %{with_caca} +%if 0%{?_with_caca:1} BuildRequires: libcaca-devel >= 0.99-0.5.beta16 %endif # caca %if 0%{!?_without_directfb:1} @@ -168,7 +170,7 @@ This package contains extra plugins for xine-lib: %if %{with_aalib} - AA-lib %endif # aalib -%if %{with_caca} +%if 0%{?with_caca:1} - Libcaca %endif # caca %if 0%{!?_without_imagemagick:1} @@ -225,6 +227,7 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %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} \ @@ -398,7 +401,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with_aalib} %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so %endif # aalib -%if %{with_caca} +%if 0%{?_with_caca} %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so %endif # caca %if 0%{!?_without_directfb:1}