#
-# TODO:
-# - update to 1.0.0rc2
-# - fix x86-64 int32<->ptr64 casts.
-#
-# tree.c:88: warning: cast from pointer to integer of different size
-# tree.c:102: warning: cast from pointer to integer of different size
-# fonts.c:144: warning: cast to pointer from integer of different size
-# fonts.c:211: warning: cast to pointer from integer of different size
-# gfxcard.c:1451: warning: cast to pointer from integer of different size
-# fbdev.c:459: warning: cast from pointer to integer of different size
-# fbdev.c:578: warning: cast from pointer to integer of different size
-# fbdev.c:708: warning: cast from pointer to integer of different size
-# idirectfbfont_ft2.c:130: warning: cast from pointer to integer of different size
-# idirectfbfont_ft2.c:292: warning: cast from pointer to integer of different size
-# idirectfbfont_ft2.c:653: warning: cast to pointer from integer of different size
-#
# 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.UTF-8): DirectFB - Wspomaganie grafiki
Name: DirectFB
-Version: 0.9.25.1
-Release: 2
+Version: 1.2.6
+Release: 1
Epoch: 1
License: LGPL v2+
Group: Libraries
Source0: http://www.directfb.org/downloads/Core/%{name}-%{version}.tar.gz
-# Source0-md5: b6d4ecf9cd3787bd2728af9110ed53cf
+# Source0-md5: 411c3318966e7834bf505b4388deaf52
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
-Patch3: %{name}-sh.patch
-Patch4: %{name}-gcc4.patch
-Patch5: %{name}-llh-ppc.patch
-Patch6: %{name}-link.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
BuildRequires: libpng-devel >= 1.0
BuildRequires: libtool
BuildRequires: libvncserver-devel
-%{?with_multi:BuildRequires: linux-fusion-devel >= 3.0}
+%{?with_multi:BuildRequires: linux-fusion-devel >= 8.0}
+%{?with_multi:BuildRequires: linux-fusion-devel < 9}
BuildRequires: sed >= 4.0
BuildRequires: sysfsutils-devel >= 1.3.0-3
+BuildRequires: tslib-devel >= 0.0.2
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-0.9.25
+%define dfbdir %{_libdir}/directfb-1.2-0
%define specflags -fno-strict-aliasing
%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
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
UWAGA: do działania potrzebuje ustawienia "mut-device" w directfbrc.
+%package input-tslib
+Summary: tslib-based touchscreen input driver for DirectFB
+Summary(pl.UTF-8): Oparty na tslib sterownik wejściowy do touchscreenów dla DirectFB
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description input-tslib
+tslib-based touchscreen input driver for DirectFB
+
+%description input-tslib -l pl.UTF-8
+Oparty na tslib sterownik wejściowy do touchscreenów dla DirectFB.
+
+%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
%patch0 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%build
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
+%{__autoheader}
%{__automake}
# MMX and SSE are detected at runtime, so it's safe to enable
%configure \
--enable-sse \
%endif
%endif
- --with-inputdrivers=elo-input,joystick,keyboard,linuxinput,lirc,mutouch,penmount,ps2mouse,serialmouse,sonypijogdial,wm97xx
+ --with-inputdrivers=dbox2remote,dreamboxremote,dynapro,elo-input,gunze,joystick,keyboard,linuxinput,lirc,mutouch,penmount,ps2mouse,serialmouse,sonypijogdial,tslib,ucb1x00,wm97xx \
+ %{!?with_static_libs:--disable-static}
%{__make} \
X11_CFLAGS= \
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/dfbdump
+%attr(755,root,root) %{_bindir}/dfbfx
%attr(755,root,root) %{_bindir}/dfbg
%attr(755,root,root) %{_bindir}/dfbinfo
%attr(755,root,root) %{_bindir}/dfbinput
+%attr(755,root,root) %{_bindir}/dfbinspector
%attr(755,root,root) %{_bindir}/dfblayer
+%attr(755,root,root) %{_bindir}/dfbmaster
%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.*.*.*
-%attr(755,root,root) %{_libdir}/libfusion-*.so.*.*.*
-%attr(755,root,root) %{_libdir}/libuniquewm-*.so.*.*.*
-%attr(755,root,root) %{_libdir}/libvoodoo-*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libdirect-1.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdirect-1.2.so.0
+%attr(755,root,root) %{_libdir}/libdirectfb-1.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdirectfb-1.2.so.0
+%attr(755,root,root) %{_libdir}/libfusion-1.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfusion-1.2.so.0
+%attr(755,root,root) %{_libdir}/libuniquewm-1.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libuniquewm-1.2.so.0
+%attr(755,root,root) %{_libdir}/libvoodoo-1.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvoodoo-1.2.so.0
%dir %{dfbdir}
%dir %{dfbdir}/gfxdrivers
%attr(755,root,root) %{dfbdir}/gfxdrivers/*.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_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
%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
%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/IDirectFBSurface
%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBSurface/lib*.so
%dir %{dfbdir}/interfaces/IDirectFBVideoProvider
-%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
%dir %{dfbdir}/interfaces/IDirectFBWindow
%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBWindow/lib*.so
%dir %{dfbdir}/systems
+%attr(755,root,root) %{dfbdir}/systems/libdirectfb_devmem.so
%attr(755,root,root) %{dfbdir}/systems/libdirectfb_fbdev.so
%dir %{dfbdir}/wm
%attr(755,root,root) %{dfbdir}/wm/*.so
-#%{_datadir}/directfb-%{version}
-%{_datadir}/directfb-0.9.25
+%{_datadir}/directfb-%{version}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/directfbrc
%{_mandir}/man1/dfbg.1*
-%{_mandir}/man5/*
+%{_mandir}/man5/directfbrc.5*
%files devel
%defattr(644,root,root,755)
%{_libdir}/libvoodoo.la
%{_includedir}/directfb
%{_includedir}/directfb-internal
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/direct.pc
+%{_pkgconfigdir}/directfb-internal.pc
+%{_pkgconfigdir}/directfb.pc
+%{_pkgconfigdir}/fusion.pc
+%{_pkgconfigdir}/voodoo.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)
%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/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-tslib
+%defattr(644,root,root,755)
+%attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_tslib.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