X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=DirectFB.spec;h=d97e7b4281a37d7ce3849112ddae572805986982;hb=a86e3925c3f9af8496ca38ba33e1e35a4da8fd38;hp=09d03fc14b55dee492772aa2f6cef509f719a806;hpb=478435c72cc598fa453125a89f66efa2af496dce;p=packages%2FDirectFB.git

diff --git a/DirectFB.spec b/DirectFB.spec
index 09d03fc..d97e7b4 100644
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -1,29 +1,39 @@
 #
 # Conditional build:
-# _without_mpg		- don't build support for MPG/MPEG3
+%bcond_with	multi		# build Multi-application core
 #
 Summary:	DirectFB - Hardware graphics acceleration
 Summary(pl):	DirectFB - Wspomaganie grafiki
 Name:		DirectFB
-Version:	0.9.20
+Version:	0.9.23
 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:	f52ee63851fe56ee494bcf09ef559bf3
+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
+Patch4:		%{name}-sh.patch
+Patch5:		%{name}-drivers.patch
 URL:		http://www.directfb.org/
 BuildRequires:	SDL-devel
-BuildRequires:	autoconf
+BuildRequires:	XFree86-devel
+BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	freetype-devel >= 2.0.2
 BuildRequires:	libjpeg-devel >= 6b
-%{!?_without_mpg:BuildRequires:	libmpeg3-devel}
 BuildRequires:	libpng-devel >= 1.0
+BuildRequires:	libvncserver-devel
 BuildRequires:	libtool
+%{?with_multi:BuildRequires:	linux-fusion-devel}
+BuildRequires:	sed >= 4.0
+BuildRequires:	sysfsutils-devel >= 1.3.0-3
 BuildRequires:	zlib-devel >= 1.1.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,7 +49,8 @@ Wspomaganie grafiki DirectFB - biblioteki.
 Summary:	DirectFB - development package
 Summary(pl):	DirectFB - pliki nag³ówkowe
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	zlib-devel >= 1.1.3
 
 %description devel
 DirectFB header files.
@@ -51,7 +62,7 @@ Pliki nag
 Summary:	DirectFB static libraries
 Summary(pl):	Statyczne biblioteki DirectFB
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 DirectFB static libraries.
@@ -74,7 +85,7 @@ Dokumentacja dla systemu DirectFB wraz z wprowadzeniem.
 Summary:	SDL core system for DirectFB
 Summary(pl):	System SDL dla DirectFB
 Group:		Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description core-sdl
 This package contains SDL core system module for DirectFB.
@@ -82,11 +93,35 @@ This package contains SDL core system module for DirectFB.
 %description core-sdl -l pl
 Ten pakiet zawiera modu³ systemu SDL dla DirectFB.
 
+%package core-vnc
+Summary:	VNC core system for DirectFB
+Summary(pl):	System VNC dla DirectFB
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description core-vnc
+This package contains VNC core system module for DirectFB.
+
+%description core-vnc -l pl
+Ten pakiet zawiera modu³ systemu VNC dla DirectFB.
+
+%package core-x11
+Summary:	X11 core system for DirectFB
+Summary(pl):	System X11 dla DirectFB
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description core-x11
+This package contains X11 core system module for DirectFB.
+
+%description core-x11 -l pl
+Ten pakiet zawiera modu³ systemu X11 dla DirectFB.
+
 %package font-ft2
 Summary:	FreeType2 font provider for DirectFB
 Summary(pl):	DirectFB - wtyczka dostarczaj±ca fonty poprzez FreeType2
 Group:		Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description font-ft2
 This package contains FreeType2 font provider for DirectFB.
@@ -99,7 +134,7 @@ bibliotek
 Summary:	JPEG image provider for DirectFB
 Summary(pl):	DirectFB - wtyczka dostarczaj±ca grafikê JPEG
 Group:		Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description image-jpeg
 This package contains JPEG image provider for DirectFB.
@@ -111,7 +146,7 @@ Ten pakiet zawiera wtyczk
 Summary:	PNG image provider for DirectFB
 Summary(pl):	DirectFB - wtyczka dostarczaj±ca grafikê PNG
 Group:		Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description image-png
 This package contains PNG image provider for DirectFB.
@@ -119,58 +154,96 @@ 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
+%package input-elo
+Summary:	ELO touchscreen input driver for DirectFB
+Summary(pl):	Sterownik wej¶ciowy do touchscreenów ELO dla DirectFB
 Group:		Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description input-elo
+ELO touchscreen input driver for DirectFB.
+
+NOTE: currently it uses hardcoded /dev/ttyS0 port, so don't install it
+unless you don't have ELO device connected to this port. It can mess
+with other devices connected to this port (mouse, modem etc.).
+
+%description input-elo -l pl
+Sterownik wej¶ciowy do touchscreenów ELO dla DirectFB.
+
+UWAGA: aktualnie u¿ywa zakodowanego na sta³e portu /dev/ttyS0, wiêc nie
+nale¿y go instalowaæ, je¶li urz±dzenie ELO nie jest pod³±czone do tego
+portu. Sterownik mo¿e utrudniæ wspó³pracê z innymi urz±dzeniami
+pod³±czonymi do /dev/ttyS0 (jak mysz, modem itp.).
+
+%package input-mutouch
+Summary:	MuTouch touchscreen input driver for DirectFB
+Summary(pl):	Sterownik wej¶ciowy do touchscreenów MuTouch dla DirectFB
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description input-mutouch
+MuTouch touchscreen input driver for DirectFB.
 
-%description video-libmpeg3
-This package contains MPEG (MPEG-1 and MPEG-2) video provider for
-DirectFB. It uses libmpeg3 library.
+NOTE: it needs "mut-device" setting in directfbrc in order to work.
 
-%description video-libmpeg3 -l pl
-Ten pakiet zawiera wtyczkê dla DirectFB dostarczajac± obraz MPEG
-(MPEG-1 i MPEG-2) przy u¿yciu biblioteki libmpeg3.
+%description input-mutouch -l pl
+Sterownik wej¶ciowy do touchscreenów MuTouch dla DirectFB.
+
+UWAGA: do dzia³ania potrzebuje ustawienia "mut-device" w directfbrc.
 
 %prep
 %setup -q -a1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %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 \
-	%{?_without_mpg:--disable-libmpeg3} \
+	--enable-linux-input \
+	%{?with_multi:--enable-multi} \
+	--enable-mutouch \
 	--enable-sdl \
-%ifarch i586 i686 athlon
+	--enable-shared \
+	--enable-static \
+	--enable-unique \
+	--enable-video4linux2 \
+	--enable-voodoo \
+	--enable-x11 \
+	--enable-zlib \
+%ifarch %{ix86}
+%ifnarch i386 i486
 	--enable-mmx \
 %endif
-%ifarch i686 athlon
+%ifnarch i386 i486 i586
 	--enable-sse
 %endif
+%endif
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_sysconfdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 cp -rf DFBTutorials* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+touch %{_sysconfdir}/directfbrc
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -179,54 +252,101 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-# dbfdump and dfbg require multi-application core - useless now
+%doc AUTHORS ChangeLog NEWS README TODO
+%attr(755,root,root) %{_bindir}/dfbdump
+%attr(755,root,root) %{_bindir}/dfbg
 %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_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_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}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/directfbrc
+%{_mandir}/man1/dfbg.1*
 %{_mandir}/man5/*
 
 %files devel
 %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)
-%doc docs/html/*
+%doc docs/html/*.{html,png}
 %{_examplesdir}/%{name}-%{version}
 
 %files core-sdl
@@ -234,6 +354,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_sdlinput.so
 %attr(755,root,root) %{dfbdir}/systems/libdirectfb_sdl.so
 
+%files core-vnc
+%defattr(644,root,root,755)
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_vncinput.so
+%attr(755,root,root) %{dfbdir}/systems/libdirectfb_vnc.so
+
+%files core-x11
+%defattr(644,root,root,755)
+%doc systems/x11/README
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_x11input.so
+%attr(755,root,root) %{dfbdir}/systems/libdirectfb_x11.so
+
 %files font-ft2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
@@ -246,8 +377,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
 
-%if 0%{!?_without_mpg:1}
-%files video-libmpeg3
+%files input-elo
 %defattr(644,root,root,755)
-%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_libmpeg3.so
-%endif
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_elo.so
+
+%files input-mutouch
+%defattr(644,root,root,755)
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_mutouch.so