- updated to 0.9.21 (new soname, as usual)

- updated am patch, added fix,missing-files patches
- libmpeg3 video provides has been moved to DirectFB-extra (WIP)

Changed files:
    DirectFB.spec -> 1.50

diff --git a/DirectFB.spec b/DirectFB.spec
index 86a075ad7364d214745b97e1c490ea86deffb115..203802de532134a7511bd163adf148bd4d0f53b5 100644 (file)
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -1,30 +1,30 @@
-#
-# Conditional build:
-%bcond_without mpg     # don't build support for MPG/MPEG3
-#
 Summary:       DirectFB - Hardware graphics acceleration
 Summary(pl):   DirectFB - Wspomaganie grafiki
 Name:          DirectFB
-Version:       0.9.20
-Release:       3
+Version:       0.9.21
+Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://www.directfb.org/download/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5: e42e8ae43f0ad873643f73cc0a9ae7d0
-Source1:       http://www.directfb.org/download/DirectFB/DFBTutorials-0.5.0.tar.gz
+Source0:       http://www.directfb.org/download/DirectFB/%{name}-%{version}.tar.gz
+# Source0-md5: 22699a04f2f618b287aa0ae1b06045b5
+Source1:       http://www.directfb.org/download/DirectFB-extra/DFBTutorials-0.5.0.tar.gz
 # Source1-md5: 13e443a64bddd68835b574045d9025e9
 Patch0:                %{name}-am.patch
 Patch1:                %{name}-pmake.patch
+Patch2:                %{name}-fix.patch
+# missing files taken from DirectFB CVS
+Patch3:                %{name}-missing-files.patch
 URL:           http://www.directfb.org/
 BuildRequires: SDL-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: freetype-devel >= 2.0.2
 BuildRequires: libjpeg-devel >= 6b
-%{?with_mpg:BuildRequires:     libmpeg3-devel}
 BuildRequires: libpng-devel >= 1.0
 BuildRequires: libtool
+BuildRequires: sed >= 4.0
+BuildRequires: sysfsutils-devel
 BuildRequires: zlib-devel >= 1.1.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -40,7 +40,8 @@ Wspomaganie grafiki DirectFB - biblioteki.
 Summary:       DirectFB - development package
 Summary(pl):   DirectFB - pliki nag³ówkowe
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      zlib-devel >= 1.1.3
 
 %description devel
 DirectFB header files.
@@ -52,7 +53,7 @@ Pliki nag
 Summary:       DirectFB static libraries
 Summary(pl):   Statyczne biblioteki DirectFB
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 DirectFB static libraries.
@@ -75,7 +76,7 @@ Dokumentacja dla systemu DirectFB wraz z wprowadzeniem.
 Summary:       SDL core system for DirectFB
 Summary(pl):   System SDL dla DirectFB
 Group:         Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description core-sdl
 This package contains SDL core system module for DirectFB.
@@ -87,7 +88,7 @@ Ten pakiet zawiera modu
 Summary:       FreeType2 font provider for DirectFB
 Summary(pl):   DirectFB - wtyczka dostarczaj±ca fonty poprzez FreeType2
 Group:         Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description font-ft2
 This package contains FreeType2 font provider for DirectFB.
@@ -100,7 +101,7 @@ bibliotek
 Summary:       JPEG image provider for DirectFB
 Summary(pl):   DirectFB - wtyczka dostarczaj±ca grafikê JPEG
 Group:         Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description image-jpeg
 This package contains JPEG image provider for DirectFB.
@@ -112,7 +113,7 @@ Ten pakiet zawiera wtyczk
 Summary:       PNG image provider for DirectFB
 Summary(pl):   DirectFB - wtyczka dostarczaj±ca grafikê PNG
 Group:         Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description image-png
 This package contains PNG image provider for DirectFB.
@@ -120,40 +121,36 @@ This package contains PNG image provider for DirectFB.
 %description image-png -l pl
 Ten pakiet zawiera wtyczkê dla DirectFB dostarczaj±c± grafikê PNG.
 
-%package video-libmpeg3
-Summary:       MPEG video provider for DirectFB
-Summary(pl):   DirectFB - wtyczka dostarczaj±ca obraz MPEG
-Group:         Libraries
-Requires:      %{name} = %{epoch}:%{version}
-
-%description video-libmpeg3
-This package contains MPEG (MPEG-1 and MPEG-2) video provider for
-DirectFB. It uses libmpeg3 library.
-
-%description video-libmpeg3 -l pl
-Ten pakiet zawiera wtyczkê dla DirectFB dostarczajac± obraz MPEG
-(MPEG-1 i MPEG-2) przy u¿yciu biblioteki libmpeg3.
-
 %prep
 %setup -q -a1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+sed -i -e 's@sysfs/libsysfs.h@libsysfs.h@' \
+       configure.in gfxdrivers/{nvidia/nvidia.c,matrox/matrox_maven.c}
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-CPPFLAGS="-I/usr/include/libmpeg3"
 # MMX and SSE are detected at runtime, so it's safe to enable
 %configure \
+       %{!?debug:--disable-debug} \
        --disable-maintainer-mode \
-       --enable-shared \
-       --enable-static \
+       --enable-elo-input \
        --enable-fast-install \
-       --disable-debug \
-       %{!?with_mpg:--disable-libmpeg3} \
+       --enable-linux-input \
+       --enable-mutouch \
        --enable-sdl \
+       --enable-shared \
+       --enable-static \
+       --enable-unique \
+       --enable-video4linux2 \
+       --enable-voodoo \
+       --enable-zlib \
 %ifarch %{ix86}
 %ifnarch i386 i486
        --enable-mmx \
@@ -174,6 +171,9 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 cp -rf DFBTutorials* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+# dbfdump and dfbg require multi-application core - useless now
+rm -f $RPM_BUILD_ROOT{%{_bindir}/{dfbdump,dfbg},%{_mandir}/man1/dfbg.1}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -182,29 +182,64 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-# dbfdump and dfbg require multi-application core - useless now
 %attr(755,root,root) %{_bindir}/dfbinfo
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_bindir}/dfblayer
+%attr(755,root,root) %{_bindir}/dfbproxy
+%attr(755,root,root) %{_bindir}/dfbscreen
+%attr(755,root,root) %{_bindir}/dfbsummon
+%attr(755,root,root) %{_bindir}/uwmdump
+%attr(755,root,root) %{_libdir}/libdirect-*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libdirectfb-*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libfusion-*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libuniquewm-*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libvoodoo-*.so.*.*.*
 %dir %{dfbdir}
 %dir %{dfbdir}/gfxdrivers
 %attr(755,root,root) %{dfbdir}/gfxdrivers/*.so
 %dir %{dfbdir}/inputdrivers
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_elo.so
 %attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_joystick.so
 %attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_keyboard.so
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_linux_input.so
 %attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_lirc.so
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_mutouch.so
 %attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_ps2mouse.so
 %attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_serialmouse.so
 %attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_sonypi.so
 %dir %{dfbdir}/interfaces
+%dir %{dfbdir}/interfaces/IDirectFB
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFB/lib*.so
+%dir %{dfbdir}/interfaces/IDirectFBDataBuffer
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBDataBuffer/lib*.so
+%dir %{dfbdir}/interfaces/IDirectFBDisplayLayer
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBDisplayLayer/lib*.so
+%dir %{dfbdir}/interfaces/IDirectFBEventBuffer
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBEventBuffer/lib*.so
 %dir %{dfbdir}/interfaces/IDirectFBFont
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBFont/libidirectfbfont_default.so
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBFont/libidirectfbfont_dispatcher.so
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBFont/libidirectfbfont_requestor.so
 %dir %{dfbdir}/interfaces/IDirectFBImageProvider
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dispatcher.so
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_requestor.so
+%dir %{dfbdir}/interfaces/IDirectFBInputDevice
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBInputDevice/lib*.so
+%dir %{dfbdir}/interfaces/IDirectFBPalette
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBPalette/lib*.so
+%dir %{dfbdir}/interfaces/IDirectFBScreen
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBScreen/lib*.so
+%dir %{dfbdir}/interfaces/IDirectFBSurface
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBSurface/lib*.so
 %dir %{dfbdir}/interfaces/IDirectFBVideoProvider
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
+%dir %{dfbdir}/interfaces/IDirectFBWindow
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBWindow/lib*.so
 %dir %{dfbdir}/systems
 %attr(755,root,root) %{dfbdir}/systems/libdirectfb_fbdev.so
+%dir %{dfbdir}/wm
+%attr(755,root,root) %{dfbdir}/wm/*.so
 %{_datadir}/directfb-%{version}
 %{_mandir}/man5/*
 
@@ -212,20 +247,29 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/directfb-config
 %attr(755,root,root) %{_bindir}/directfb-csource
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
+%attr(755,root,root) %{_libdir}/libdirect.so
+%attr(755,root,root) %{_libdir}/libdirectfb.so
+%attr(755,root,root) %{_libdir}/libfusion.so
+%attr(755,root,root) %{_libdir}/libuniquewm.so
+%attr(755,root,root) %{_libdir}/libvoodoo.so
+%{_libdir}/libdirect.la
+%{_libdir}/libdirectfb.la
+%{_libdir}/libfusion.la
+%{_libdir}/libuniquewm.la
+%{_libdir}/libvoodoo.la
 %{_includedir}/directfb
 %{_includedir}/directfb-internal
-%{_pkgconfigdir}/*
+%{_pkgconfigdir}/*.pc
 %{_mandir}/man1/directfb-csource.1*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
-%{dfbdir}/gfxdrivers/*.*a
-%{dfbdir}/inputdrivers/*.*a
-%{dfbdir}/interfaces/*/*.*a
-%{dfbdir}/systems/*.*a
+%{dfbdir}/gfxdrivers/*.*[ao]
+%{dfbdir}/inputdrivers/*.*[ao]
+%{dfbdir}/interfaces/*/*.*[ao]
+%{dfbdir}/systems/*.*[ao]
+%{dfbdir}/wm/*.*[ao]
 
 %files doc
 %defattr(644,root,root,755)
@@ -248,9 +292,3 @@ rm -rf $RPM_BUILD_ROOT
 %files image-png
 %defattr(644,root,root,755)
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-
-%if %{with mpg}
-%files video-libmpeg3
-%defattr(644,root,root,755)
-%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_libmpeg3.so
-%endif