- release 11 (by relup.sh)

[packages/DirectFB.git] / DirectFB.spec

diff --git a/DirectFB.spec b/DirectFB.spec
index 17c49546023858b775653bdc4a5eab3a54f9effe..9362ec6502e96516aba414b91aca78bfb75a9143 100644 (file)
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_with    multi           # build Multi-application core (requires working /dev/fusion*)
-%bcond_without one             # Linux One IPC library
+%bcond_with    one             # Linux One IPC library
 %bcond_without static_libs     # don't build static libraries
 %bcond_with    sh772x          # SH7722/SH7723 (SH-Mobile) graphics driver
 %bcond_with    avifile         # AviFile video provider [not updated for DirectFB 1.7.0]
@@ -19,13 +19,13 @@
 %define                with_sh772x     1
 %endif
 %if %{without xine}
-%undefine      xine_vdpau
+%undefine      with_xine_vdpau
 %endif
 Summary:       DirectFB - Hardware graphics acceleration
 Summary(pl.UTF-8):     DirectFB - Wspomaganie grafiki
 Name:          DirectFB
 Version:       1.7.6
-Release:       1
+Release:       11
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
@@ -45,6 +45,8 @@ Patch8:               %{name}-missing.patch
 Patch9:                %{name}-ffmpeg.patch
 Patch10:       %{name}-libmpeg3.patch
 Patch11:       %{name}-format.patch
+Patch12:       x32-asm.patch
+Patch13:       ffmpeg3.patch
 URL:           http://www.directfb.org/
 BuildRequires: Mesa-libEGL-devel
 BuildRequires: Mesa-libGLES-devel
@@ -597,7 +599,7 @@ Summary:    XINE video provider for DirectFB
 Summary(pl.UTF-8):     DirectFB - wtyczka dostarczająca obraz XINE
 Group:         Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-%requires_eq   xine-lib
+%{?with_xine:%requires_eq      xine-lib}
 
 %description video-xine
 This package contains video provider for DirectFB which uses XINE
@@ -613,7 +615,7 @@ Summary:    DirectFB video output plugin for XINE
 Summary(pl.UTF-8):     Wtyczka wyjścia obrazu DirectFB dla XINE
 Group:         Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-%requires_eq   xine-lib
+%{?with_xine:%requires_eq      xine-lib}
 
 %description -n xine-output-video-dfb
 DirectFB video output plugin for XINE.
@@ -937,6 +939,8 @@ Statyczna biblioteka sawman.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 # video drivers
 %{__sed} -i -e 's/checkfor_\(cle266\|cyber5k\|radeon\|savage\|unichrome\|vmware\)=no/checkfor_\1=yes/' configure.in
@@ -982,7 +986,7 @@ Statyczna biblioteka sawman.
        %{?with_xine_vdpau:--enable-xine-vdpau} \
        --enable-x11 \
        --enable-zlib \
-%ifarch %{ix86} %{x8664}
+%ifarch %{ix86} %{x8664} x32
 %ifnarch i386 i486
        --enable-mmx \
 %endif
@@ -1161,7 +1165,7 @@ rm -rf $RPM_BUILD_ROOT
 %{?with_one:%{_libdir}/libone.la}
 %{_libdir}/libuniquewm.la
 %{_libdir}/libvoodoo.la
-%{_includedir}/One
+%{?with_one:%{_includedir}/One}
 %{_includedir}/directfb
 %{_includedir}/directfb-internal
 %{_pkgconfigdir}/direct.pc
@@ -1409,8 +1413,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dfbdir}/interfaces/IComaComponent/libicomacomponent_*.so
 %dir %{dfbdir}/interfaces/IFusionDale
 %attr(755,root,root) %{dfbdir}/interfaces/IFusionDale/libifusiondale_*.so
+%if %{with one}
 %dir %{dfbdir}/interfaces/IFusionDaleMessenger
 %attr(755,root,root) %{dfbdir}/interfaces/IFusionDaleMessenger/libifusiondalemessenger_one.so
+%endif
 
 %files -n FusionDale-devel
 %defattr(644,root,root,755)