- rel bump

[packages/DirectFB.git] / DirectFB.spec

diff --git a/DirectFB.spec b/DirectFB.spec
index 80c0ab8a977d42af716d7c2afdff1e3968a95d89..8e05c953d6397324930491a4813cdf2d11de42d2 100644 (file)
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -19,18 +19,18 @@
 %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.4
-Release:       1
+Version:       1.7.6
+Release:       3.2
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://www.directfb.org/downloads/Core/DirectFB-1.7/%{name}-%{version}.tar.gz
-# Source0-md5: f5bdacde77fc653279819796ae11341e
+# Source0-md5: 8a7bb06b3f58599b230b4cf314004512
 Source1:       http://www.directfb.org/downloads/Extras/DFBTutorials-0.5.0.tar.gz
 # Source1-md5: 13e443a64bddd68835b574045d9025e9
 Patch0:                %{name}-am.patch
@@ -45,6 +45,7 @@ Patch8:               %{name}-missing.patch
 Patch9:                %{name}-ffmpeg.patch
 Patch10:       %{name}-libmpeg3.patch
 Patch11:       %{name}-format.patch
+Patch12:       x32-asm.patch
 URL:           http://www.directfb.org/
 BuildRequires: Mesa-libEGL-devel
 BuildRequires: Mesa-libGLES-devel
@@ -111,7 +112,7 @@ Obsoletes:  DirectFB-input-ucb1x00
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                dfbdir  %{_libdir}/directfb-1.7-4
+%define                dfbdir  %{_libdir}/directfb-1.7-6
 
 %define                specflags       -fno-strict-aliasing
 
@@ -597,7 +598,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 +614,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 +938,7 @@ Statyczna biblioteka sawman.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 # video drivers
 %{__sed} -i -e 's/checkfor_\(cle266\|cyber5k\|radeon\|savage\|unichrome\|vmware\)=no/checkfor_\1=yes/' configure.in
@@ -982,7 +984,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
@@ -1043,19 +1045,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/voodooplay_client
 %attr(755,root,root) %{_bindir}/voodooplay_server
 %attr(755,root,root) %{_libdir}/libdirect-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdirect-1.7.so.4
+%attr(755,root,root) %ghost %{_libdir}/libdirect-1.7.so.6
 %attr(755,root,root) %{_libdir}/libdirectfb-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdirectfb-1.7.so.4
+%attr(755,root,root) %ghost %{_libdir}/libdirectfb-1.7.so.6
 %attr(755,root,root) %{_libdir}/libfusion-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfusion-1.7.so.4
+%attr(755,root,root) %ghost %{_libdir}/libfusion-1.7.so.6
 %if %{with one}
 %attr(755,root,root) %{_libdir}/libone-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libone-1.7.so.4
+%attr(755,root,root) %ghost %{_libdir}/libone-1.7.so.6
 %endif
 %attr(755,root,root) %{_libdir}/libuniquewm-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libuniquewm-1.7.so.4
+%attr(755,root,root) %ghost %{_libdir}/libuniquewm-1.7.so.6
 %attr(755,root,root) %{_libdir}/libvoodoo-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvoodoo-1.7.so.4
+%attr(755,root,root) %ghost %{_libdir}/libvoodoo-1.7.so.6
 %dir %{dfbdir}
 %dir %{dfbdir}/gfxdrivers
 %attr(755,root,root) %{dfbdir}/gfxdrivers/libdirectfb_ati128.so
@@ -1363,7 +1365,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dfbswitch
 # library itself
 %attr(755,root,root) %{_libdir}/lib++dfb-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib++dfb-1.7.so.4
+%attr(755,root,root) %ghost %{_libdir}/lib++dfb-1.7.so.6
 
 %files c++-devel
 %defattr(644,root,root,755)
@@ -1380,7 +1382,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/spooky
 %attr(755,root,root) %{_libdir}/libdivine-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdivine-1.7.so.4
+%attr(755,root,root) %ghost %{_libdir}/libdivine-1.7.so.6
 %attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_divine.so
 %dir %{dfbdir}/interfaces/IDiVine
 %attr(755,root,root) %{dfbdir}/interfaces/IDiVine/libidivine_dispatcher.so
@@ -1402,7 +1404,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/fddump
 %attr(755,root,root) %{_bindir}/fdmaster
 %attr(755,root,root) %{_libdir}/libfusiondale-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfusiondale-1.7.so.4
+%attr(755,root,root) %ghost %{_libdir}/libfusiondale-1.7.so.6
 %dir %{dfbdir}/interfaces/IComa
 %attr(755,root,root) %{dfbdir}/interfaces/IComa/libicoma_*.so
 %dir %{dfbdir}/interfaces/IComaComponent
@@ -1431,7 +1433,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/fsproxy
 %attr(755,root,root) %{_bindir}/fsvolume
 %attr(755,root,root) %{_libdir}/libfusionsound-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfusionsound-1.7.so.4
+%attr(755,root,root) %ghost %{_libdir}/libfusionsound-1.7.so.6
 %dir %{dfbdir}/interfaces/IFusionSound
 %attr(755,root,root) %{dfbdir}/interfaces/IFusionSound/libifusionsound.so
 %attr(755,root,root) %{dfbdir}/interfaces/IFusionSound/libifusionsound_dispatcher.so
@@ -1495,7 +1497,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/swmdump
 %attr(755,root,root) %{_libdir}/libsawman-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsawman-1.7.so.4
+%attr(755,root,root) %ghost %{_libdir}/libsawman-1.7.so.6
 %attr(755,root,root) %{dfbdir}/wm/libdirectfbwm_sawman.so
 
 %files -n SaWMan-devel