From 57d454e4f28f8a375da8f8f374fadec18221030e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 18 Jan 2009 22:33:17 +0000 Subject: [PATCH] make caca support unconditional --- xine-lib.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 7029552..04f68fc 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -19,12 +19,10 @@ %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 @@ -72,13 +70,11 @@ BuildRequires: libmng-devel %if %{with_aalib} BuildRequires: aalib-devel >= 1.4 %endif # aalib -%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 %endif # directfb @@ -125,7 +121,7 @@ It can play back various media. It also decodes multimedia files from local 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 @@ -177,9 +173,7 @@ This package contains extra plugins for xine-lib: %if %{with_aalib} - AA-lib %endif # aalib -%if %{with_caca} - Libcaca -%endif # caca %if 0%{!?_without_imagemagick:1} - Image decoding %endif # imagemagick @@ -226,6 +220,7 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %if 0%{?_with_freetype:1} %if 0%{?_with_antialiasing:1} --enable-antialiasing \ + --with-caca \ %endif # antialiasing --with-freetype \ --with-fontconfig \ @@ -411,9 +406,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with_aalib} %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so %endif # aalib -%if %{with_caca} %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so -%endif # caca %if 0%{!?_without_directfb:1} %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so @@ -437,6 +430,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sun Jan 18 2009 Rex Dieter - 1.1.16-2 - drop deepbind patch (#480504) +- caca support (EPEL) * Wed Jan 07 2009 Kevin Kofler - 1.1.16-1.1 - patch for old libcaca in F9-