# TODO: --enable-pvr2d when ready [requires PowerVR SDK?]
-# - enable xine_vdpau (needs <xine/video_out_vdpau.h>)
#
# 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]
-%bcond_without ffmpeg # FFmpeg music and video providers
+%bcond_without ffmpeg # FFmpeg image, music and video providers
%bcond_with flash # FLASH video provider [not updated for DirectFB 1.7.0]
%bcond_without gstreamer # GStreamer video provider
%bcond_without mpg # libmpeg3 MPEG video provider
%bcond_without quicktime # QuickTime (openquicktime) video provider
%bcond_with swfdec # swfdec FLASH video provider [not ready for swfdec >= 0.6]
%bcond_without xine # Xine video provider
-%bcond_with xine_vdpau # Xine/VDPAU video provider
+%bcond_without xine_vdpau # Xine/VDPAU video provider
#
%ifarch sh4
%define with_sh772x 1
%endif
+%if %{without xine}
+%undefine with_xine_vdpau
+%endif
Summary: DirectFB - Hardware graphics acceleration
Summary(pl.UTF-8): DirectFB - Wspomaganie grafiki
Name: DirectFB
-Version: 1.7.0
-Release: 2
+Version: 1.7.6
+Release: 11
Epoch: 1
License: LGPL v2+
Group: Libraries
Source0: http://www.directfb.org/downloads/Core/DirectFB-1.7/%{name}-%{version}.tar.gz
-# Source0-md5: 258d3a5fda5d9af16c5cbdca671638e5
+# Source0-md5: 8a7bb06b3f58599b230b4cf314004512
Source1: http://www.directfb.org/downloads/Extras/DFBTutorials-0.5.0.tar.gz
# Source1-md5: 13e443a64bddd68835b574045d9025e9
Patch0: %{name}-am.patch
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
%{?with_swfdec:BuildRequires: swfdec-devel >= 0.5.0}
%{?with_swfdec:BuildRequires: swfdec-devel < 0.6.0}
BuildRequires: sysfsutils-devel >= 1.3.0-3
+BuildRequires: tar >= 1:1.22
BuildRequires: tslib-devel >= 1.0
-%{?with_xine:BuildRequires: xine-lib-devel >= 2:1.2.0}
+%{?with_xine:BuildRequires: xine-lib-devel >= 2:1.2.3}
%{?with_xine_vdpau:BuildRequires: /usr/include/xine/video_out_vdpau.h}
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-proto-xproto-devel
+BuildRequires: xz
BuildRequires: zlib-devel >= 1.1.3
#BuildRequires: pkgconfig(linotype) -- font provider???
%if %{with sh772x}
%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define dfbdir %{_libdir}/directfb-1.7-0
+%define dfbdir %{_libdir}/directfb-1.7-6
%define specflags -fno-strict-aliasing
%description input-wm97xx -l pl.UTF-8
Sterownik wejściowy do touchscreenów WM97xx dla DirectFB.
+%package image-ffmpeg
+Summary: FFmpeg image provider for DirectFB
+Summary(pl.UTF-8): DirectFB - wtyczka dostarczająca grafikę FFmpeg
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description image-ffmpeg
+DirectFB image provider using FFmpeg codecs.
+
+%description image-ffmpeg -l pl.UTF-8
+Ten pakiet zawiera wtyczkę dla DirectFB dostarczajacą grafikę przy
+użyciu kodeków FFmpeg.
+
%package image-imlib2
Summary: Imlib2 image provider for DirectFB
Summary(pl.UTF-8): DirectFB - wtyczka dostarczająca grafikę Imlib2
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
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.
%patch8 -p1
%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
%{?with_xine_vdpau:--enable-xine-vdpau} \
--enable-x11 \
--enable-zlib \
-%ifarch %{ix86} %{x8664}
+%ifarch %{ix86} %{x8664} x32
%ifnarch i386 i486
--enable-mmx \
%endif
%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.0
+%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.0
+%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.0
+%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.0
+%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.0
+%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.0
+%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
%{?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
%defattr(644,root,root,755)
%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_wm97xx_ts.so
+%if %{with ffmpeg}
+%files image-ffmpeg
+%defattr(644,root,root,755)
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_ffmpeg.so
+%endif
+
%files image-imlib2
%defattr(644,root,root,755)
%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_imlib2.so
%files video-xine
%defattr(644,root,root,755)
%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_xine.so
+%if %{with xine_vdpau}
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_xine_vdpau.so
+%endif
%files -n xine-output-video-dfb
%defattr(644,root,root,755)
%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.0
+%attr(755,root,root) %ghost %{_libdir}/lib++dfb-1.7.so.6
%files c++-devel
%defattr(644,root,root,755)
%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.0
+%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
%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.0
+%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
%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)
%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.0
+%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
%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.0
+%attr(755,root,root) %ghost %{_libdir}/libsawman-1.7.so.6
%attr(755,root,root) %{dfbdir}/wm/libdirectfbwm_sawman.so
%files -n SaWMan-devel