X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=DirectFB.spec;h=726ae2fbccd894536f8328daa2b91ae5bbfcf95d;hb=0e011acd5edb74e3ec0e380f60020afc39044a81;hp=d0e8500fc88401ed29db1b1e74aa8b64db7fe3b4;hpb=58eec0d67afb88fa44a5931bb62ba83d4b9ca82f;p=packages%2FDirectFB.git

diff --git a/DirectFB.spec b/DirectFB.spec
index d0e8500..726ae2f 100644
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -1,5 +1,6 @@
 #
 # TODO:
+# - update to 1.0.0rc2
 #	- fix x86-64 int32<->ptr64 casts.
 #
 #	tree.c:88: warning: cast from pointer to integer of different size
@@ -20,13 +21,13 @@
 Summary:	DirectFB - Hardware graphics acceleration
 Summary(pl):	DirectFB - Wspomaganie grafiki
 Name:		DirectFB
-Version:	0.9.24
-Release:	1.1
+Version:	0.9.25.1
+Release:	2
 Epoch:		1
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://www.directfb.org/downloads/Core/%{name}-%{version}.tar.gz
-# Source0-md5:	1f4b56b20d4e6f5c6ceb15c1c4fd2ecd
+# Source0-md5:	b6d4ecf9cd3787bd2728af9110ed53cf
 Source1:	http://www.directfb.org/downloads/Extras/DFBTutorials-0.5.0.tar.gz
 # Source1-md5:	13e443a64bddd68835b574045d9025e9
 Patch0:		%{name}-am.patch
@@ -35,9 +36,9 @@ Patch2:		%{name}-fix.patch
 Patch3:		%{name}-sh.patch
 Patch4:		%{name}-gcc4.patch
 Patch5:		%{name}-llh-ppc.patch
+Patch6:		%{name}-link.patch
 URL:		http://www.directfb.org/
 BuildRequires:	SDL-devel
-BuildRequires:	XFree86-devel
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	freetype-devel >= 2.0.2
@@ -45,14 +46,16 @@ BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libpng-devel >= 1.0
 BuildRequires:	libtool
 BuildRequires:	libvncserver-devel
-%{?with_multi:BuildRequires:	linux-fusion-devel}
+%{?with_multi:BuildRequires:	linux-fusion-devel >= 3.0}
 BuildRequires:	sed >= 4.0
 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-%{version}
+%define		dfbdir	%{_libdir}/directfb-0.9.25
 
 %define		specflags	-fno-strict-aliasing
 
@@ -95,7 +98,7 @@ Statyczne biblioteki DirectFB.
 %package doc
 Summary:	DirectFB - documentation
 Summary(pl):	DirectFB - dokumentacja
-Group:		Development/Libraries
+Group:		Documentation
 
 %description doc
 DirectFB documentation and tutorials.
@@ -186,8 +189,8 @@ Requires:	%{name} = %{epoch}:%{version}-%{release}
 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.).
+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
 Sterownik wej¶ciowy do touchscreenów ELO dla DirectFB.
@@ -221,6 +224,7 @@ UWAGA: do dzia
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -231,11 +235,8 @@ UWAGA: do dzia
 %configure \
 	%{!?debug:--disable-debug} \
 	--disable-maintainer-mode \
-	--enable-elo-input \
 	--enable-fast-install \
-	--enable-linux-input \
 	%{?with_multi:--enable-multi} \
-	--enable-mutouch \
 	--enable-sdl \
 	--enable-shared \
 	--enable-static \
@@ -249,12 +250,14 @@ UWAGA: do dzia
 	--enable-mmx \
 %endif
 %ifnarch i386 i486 i586
-	--enable-sse
+	--enable-sse \
 %endif
 %endif
+	--with-inputdrivers=elo-input,joystick,keyboard,linuxinput,lirc,mutouch,penmount,ps2mouse,serialmouse,sonypijogdial,wm97xx
 
 %{__make} \
-	X11_LIBS=%{_prefix}/X11R6/%{_lib}
+	X11_CFLAGS= \
+	X11_LIBS="-lX11 -lXext"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -279,7 +282,9 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -334,7 +339,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dfbdir}/systems/libdirectfb_fbdev.so
 %dir %{dfbdir}/wm
 %attr(755,root,root) %{dfbdir}/wm/*.so
-%{_datadir}/directfb-%{version}
+#%{_datadir}/directfb-%{version}
+%{_datadir}/directfb-0.9.25
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/directfbrc
 %{_mandir}/man1/dfbg.1*
 %{_mandir}/man5/*