X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=DirectFB.spec;h=3389a90acc47a368c372feedab2f9b003b6d09a0;hb=27d0b85e66802cdb2347b836ff8e4f7e73937b0a;hp=53964d95e35759b06d4aa9969342cceedf71e7f3;hpb=f1ef3ba86f12989e2c779b579e7f617f574a4c4b;p=packages%2FDirectFB.git

diff --git a/DirectFB.spec b/DirectFB.spec
index 53964d9..3389a90 100644
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -1,21 +1,26 @@
+#
+# Conditional build:
+%bcond_with	multi		# build Multi-application core (requires working /dev/fusion*)
+%bcond_without	static_libs	# don't build static libraries
+#
 Summary:	DirectFB - Hardware graphics acceleration
-Summary(pl):	DirectFB - Wspomaganie grafiki
+Summary(pl.UTF-8):	DirectFB - Wspomaganie grafiki
 Name:		DirectFB
-Version:	0.9.21
+Version:	1.0.1
 Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		Libraries
-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
+Source0:	http://www.directfb.org/downloads/Core/%{name}-%{version}.tar.gz
+# Source0-md5:	539e4b304d08bb0a2080c7b3f321d96f
+Source1:	http://www.directfb.org/downloads/Extras/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
+Patch3:		%{name}-gcc4.patch
+Patch4:		%{name}-llh-ppc.patch
+Patch5:		%{name}-link.patch
 URL:		http://www.directfb.org/
 BuildRequires:	SDL-devel
 BuildRequires:	autoconf >= 2.52
@@ -24,22 +29,33 @@ BuildRequires:	freetype-devel >= 2.0.2
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libpng-devel >= 1.0
 BuildRequires:	libtool
+BuildRequires:	libvncserver-devel
+%{?with_multi:BuildRequires:	linux-fusion-devel >= 3.0}
 BuildRequires:	sed >= 4.0
-BuildRequires:	sysfsutils-devel
+BuildRequires:	sysfsutils-devel >= 1.3.0-3
+BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	zlib-devel >= 1.1.3
+%{?with_multi:Provides:	DirectFB(multi)}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		dfbdir	%{_libdir}/directfb-%{version}
+%define		dfbdir	%{_libdir}/directfb-1.0-0
+
+%define		specflags	-fno-strict-aliasing
+
+%ifarch %{ix86}
+# gcc running out of registers with -O0 in generic_mmx.h
+%define		debugcflags	-O1 -g
+%endif
 
 %description
 DirectFB hardware graphics acceleration - libraries.
 
-%description -l pl
+%description -l pl.UTF-8
 Wspomaganie grafiki DirectFB - biblioteki.
 
 %package devel
 Summary:	DirectFB - development package
-Summary(pl):	DirectFB - pliki nag³ówkowe
+Summary(pl.UTF-8):	DirectFB - pliki nagłówkowe
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	zlib-devel >= 1.1.3
@@ -47,80 +63,207 @@ Requires:	zlib-devel >= 1.1.3
 %description devel
 DirectFB header files.
 
-%description devel -l pl
-Pliki nag³ówkowe dla DirectFB.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe dla DirectFB.
 
 %package static
 Summary:	DirectFB static libraries
-Summary(pl):	Statyczne biblioteki DirectFB
+Summary(pl.UTF-8):	Statyczne biblioteki DirectFB
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 DirectFB static libraries.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczne biblioteki DirectFB.
 
 %package doc
 Summary:	DirectFB - documentation
-Summary(pl):	DirectFB - dokumentacja
-Group:		Development/Libraries
+Summary(pl.UTF-8):	DirectFB - dokumentacja
+Group:		Documentation
 
 %description doc
 DirectFB documentation and tutorials.
 
-%description doc -l pl
+%description doc -l pl.UTF-8
 Dokumentacja dla systemu DirectFB wraz z wprowadzeniem.
 
 %package core-sdl
 Summary:	SDL core system for DirectFB
-Summary(pl):	System SDL dla DirectFB
+Summary(pl.UTF-8):	System SDL dla DirectFB
 Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description core-sdl
 This package contains SDL core system module for DirectFB.
 
-%description core-sdl -l pl
-Ten pakiet zawiera modu³ systemu SDL dla DirectFB.
+%description core-sdl -l pl.UTF-8
+Ten pakiet zawiera moduł systemu SDL dla DirectFB.
+
+%package core-vnc
+Summary:	VNC core system for DirectFB
+Summary(pl.UTF-8):	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.UTF-8
+Ten pakiet zawiera moduł systemu VNC dla DirectFB.
+
+%package core-x11
+Summary:	X11 core system for DirectFB
+Summary(pl.UTF-8):	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.UTF-8
+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
+Summary(pl.UTF-8):	DirectFB - wtyczka dostarczająca fonty poprzez FreeType2
 Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description font-ft2
 This package contains FreeType2 font provider for DirectFB.
 
-%description font-ft2 -l pl
-Ten pakiet zawiera wtyczkê dla DirectFB dostarczaj±c± fonty poprzez
-bibliotekê FreeType2.
+%description font-ft2 -l pl.UTF-8
+Ten pakiet zawiera wtyczkę dla DirectFB dostarczającą fonty poprzez
+bibliotekę FreeType2.
 
 %package image-jpeg
 Summary:	JPEG image provider for DirectFB
-Summary(pl):	DirectFB - wtyczka dostarczaj±ca grafikê JPEG
+Summary(pl.UTF-8):	DirectFB - wtyczka dostarczająca grafikę JPEG
 Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description image-jpeg
 This package contains JPEG image provider for DirectFB.
 
-%description image-jpeg -l pl
-Ten pakiet zawiera wtyczkê dla DirectFB dostarczaj±c± grafikê JPEG.
+%description image-jpeg -l pl.UTF-8
+Ten pakiet zawiera wtyczkę dla DirectFB dostarczającą grafikę JPEG.
 
 %package image-png
 Summary:	PNG image provider for DirectFB
-Summary(pl):	DirectFB - wtyczka dostarczaj±ca grafikê PNG
+Summary(pl.UTF-8):	DirectFB - wtyczka dostarczająca grafikę PNG
 Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description image-png
 This package contains PNG image provider for DirectFB.
 
-%description image-png -l pl
-Ten pakiet zawiera wtyczkê dla DirectFB dostarczaj±c± grafikê PNG.
+%description image-png -l pl.UTF-8
+Ten pakiet zawiera wtyczkę dla DirectFB dostarczającą grafikę PNG.
+
+%package input-dynapro
+Summary:	Dynapro touchscreen input driver for DirectFB
+Summary(pl.UTF-8):	Sterownik wejściowy do touchscreenów Dynapro dla DirectFB
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description input-dynapro
+Dynapro touchscreen input driver for DirectFB.
+
+NOTE: currently it uses hardcoded /dev/ttyS0 port, so don't install it
+unless you don't have Dynapro device connected to this port. It can
+mess with other devices connected to this port (mouse, modem etc.).
+
+%description input-dynapro -l pl.UTF-8
+Sterownik wejściowy do touchscreenów Dynapro dla DirectFB.
+
+UWAGA: aktualnie używa zakodowanego na stałe portu /dev/ttyS0, więc
+nie należy go instalować, jeśli urządzenie Dynapro 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-elo
+Summary:	ELO touchscreen input driver for DirectFB
+Summary(pl.UTF-8):	Sterownik wejściowy do touchscreenów ELO dla DirectFB
+Group:		Libraries
+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 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.UTF-8
+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-gunze
+Summary:	Gunze touchscreen input driver for DirectFB
+Summary(pl.UTF-8):	Sterownik wejściowy do touchscreenów Gunze dla DirectFB
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description input-gunze
+Gunze touchscreen input driver for DirectFB.
+
+NOTE: currently it uses hardcoded /dev/ttyS0 port, so don't install it
+unless you don't have Gunze device connected to this port. It can mess
+with other devices connected to this port (mouse, modem etc.).
+
+%description input-gunze -l pl.UTF-8
+Sterownik wejściowy do touchscreenów Gunze dla DirectFB.
+
+UWAGA: aktualnie używa zakodowanego na stałe portu /dev/ttyS0, więc
+nie należy go instalować, jeśli urządzenie Gunze 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.UTF-8):	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.
+
+NOTE: it needs "mut-device" setting in directfbrc in order to work.
+
+%description input-mutouch -l pl.UTF-8
+Sterownik wejściowy do touchscreenów MuTouch dla DirectFB.
+
+UWAGA: do działania potrzebuje ustawienia "mut-device" w directfbrc.
+
+%package input-ucb1x00
+Summary:	UCB1x00 touchscreen input driver for DirectFB
+Summary(pl.UTF-8):	Sterownik wejściowy do touchscreenów UCB1x00 dla DirectFB
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description input-ucb1x00
+UCB1x00 touchscreen input driver for DirectFB.
+
+%description input-ucb1x00 -l pl.UTF-8
+Sterownik wejściowy do touchscreenów UCB1x00 dla DirectFB.
+
+%package input-wm97xx
+Summary:	WM97xx touchscreen input driver for DirectFB
+Summary(pl.UTF-8):	Sterownik wejściowy do touchscreenów WM97xx dla DirectFB
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description input-wm97xx
+WM97xx touchscreen input driver for DirectFB.
+
+%description input-wm97xx -l pl.UTF-8
+Sterownik wejściowy do touchscreenów WM97xx dla DirectFB.
 
 %prep
 %setup -q -a1
@@ -129,9 +272,7 @@ Ten pakiet zawiera wtyczk
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
-sed -i -e 's@sysfs/libsysfs.h@libsysfs.h@' \
-	configure.in gfxdrivers/{nvidia/nvidia.c,matrox/matrox_maven.c}
+%patch5 -p1
 
 %build
 %{__libtoolize}
@@ -142,39 +283,41 @@ sed -i -e 's@sysfs/libsysfs.h@libsysfs.h@' \
 %configure \
 	%{!?debug:--disable-debug} \
 	--disable-maintainer-mode \
-	--enable-elo-input \
 	--enable-fast-install \
-	--enable-linux-input \
-	--enable-mutouch \
+	%{?with_multi:--enable-multi} \
 	--enable-sdl \
 	--enable-shared \
 	--enable-static \
 	--enable-unique \
 	--enable-video4linux2 \
 	--enable-voodoo \
+	--enable-x11 \
 	--enable-zlib \
-%ifarch %{ix86}
+%ifarch %{ix86} %{x8664}
 %ifnarch i386 i486
 	--enable-mmx \
 %endif
 %ifnarch i386 i486 i586
-	--enable-sse
+	--enable-sse \
 %endif
 %endif
+	--with-inputdrivers=dynapro,elo-input,gunze,joystick,keyboard,linuxinput,lirc,mutouch,penmount,ps2mouse,serialmouse,sonypijogdial,ucb1x00,wm97xx \
+	%{!?with_static_libs:--disable-static}
 
-%{__make}
+%{__make} \
+	X11_CFLAGS= \
+	X11_LIBS="-lX11 -lXext"
 
 %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}
 
-# dbfdump and dfbg require multi-application core - useless now
-rm -f $RPM_BUILD_ROOT{%{_bindir}/{dfbdump,dfbg},%{_mandir}/man1/dfbg.1}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/directfbrc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -185,11 +328,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %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) %{_bindir}/dfbinput
 %attr(755,root,root) %{_bindir}/dfblayer
+%attr(755,root,root) %{_bindir}/dfbpenmount
 %attr(755,root,root) %{_bindir}/dfbproxy
 %attr(755,root,root) %{_bindir}/dfbscreen
 %attr(755,root,root) %{_bindir}/dfbsummon
+%attr(755,root,root) %{_bindir}/mkdfiff
+%attr(755,root,root) %{_bindir}/mkdgiff
 %attr(755,root,root) %{_bindir}/uwmdump
 %attr(755,root,root) %{_libdir}/libdirect-*.so.*.*.*
 %attr(755,root,root) %{_libdir}/libdirectfb-*.so.*.*.*
@@ -200,12 +349,11 @@ rm -rf $RPM_BUILD_ROOT
 %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_penmount.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
@@ -220,9 +368,11 @@ rm -rf $RPM_BUILD_ROOT
 %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_dgiff.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_dfiff.so
 %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
@@ -236,6 +386,7 @@ rm -rf $RPM_BUILD_ROOT
 %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_gif.so
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
 %dir %{dfbdir}/interfaces/IDirectFBWindow
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBWindow/lib*.so
@@ -244,6 +395,8 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -265,18 +418,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/*.pc
 %{_mandir}/man1/directfb-csource.1*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
-%{dfbdir}/gfxdrivers/*.*[ao]
-%{dfbdir}/inputdrivers/*.*[ao]
-%{dfbdir}/interfaces/*/*.*[ao]
-%{dfbdir}/systems/*.*[ao]
-%{dfbdir}/wm/*.*[ao]
+%{dfbdir}/gfxdrivers/*.[alo]*
+%{dfbdir}/inputdrivers/*.[alo]*
+%{dfbdir}/interfaces/*/*.[alo]*
+%{dfbdir}/systems/*.[alo]*
+%{dfbdir}/wm/*.[alo]*
+%endif
 
 %files doc
 %defattr(644,root,root,755)
-%doc docs/html/*
+%doc docs/html/*.{html,png}
 %{_examplesdir}/%{name}-%{version}
 
 %files core-sdl
@@ -284,6 +439,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
@@ -295,3 +461,27 @@ rm -rf $RPM_BUILD_ROOT
 %files image-png
 %defattr(644,root,root,755)
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
+
+%files input-dynapro
+%defattr(644,root,root,755)
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_dynapro.so
+
+%files input-elo
+%defattr(644,root,root,755)
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_elo.so
+
+%files input-gunze
+%defattr(644,root,root,755)
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_gunze.so
+
+%files input-mutouch
+%defattr(644,root,root,755)
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_mutouch.so
+
+%files input-ucb1x00
+%defattr(644,root,root,755)
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_ucb1x00_ts.so
+
+%files input-wm97xx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_wm97xx_ts.so