packages: DirectFB/DirectFB-gcc4.patch, DirectFB/DirectFB.spec, DirectFB/Di...

Thu Nov 18 08:33:36 CET 2010

Author: qboosh                       Date: Thu Nov 18 07:33:36 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.4.11
- updated gcc4 patch, removed obsolete link,libpng patches

---- Files affected:
packages/DirectFB:
   DirectFB-gcc4.patch (1.5 -> 1.6) , DirectFB.spec (1.93 -> 1.94) , DirectFB-libpng.patch (1.1 -> NONE)  (REMOVED), DirectFB-link.patch (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/DirectFB/DirectFB-gcc4.patch
diff -u packages/DirectFB/DirectFB-gcc4.patch:1.5 packages/DirectFB/DirectFB-gcc4.patch:1.6

--- packages/DirectFB/DirectFB-gcc4.patch:1.5	Wed Sep  3 21:15:21 2008
+++ packages/DirectFB/DirectFB-gcc4.patch	Thu Nov 18 08:33:31 2010
@@ -1,20 +1,20 @@
---- DirectFB-1.2.3/include/directfb.h.orig	2008-08-19 11:25:16.000000000 +0200
-+++ DirectFB-1.2.3/include/directfb.h	2008-09-03 17:34:21.868983118 +0200
-@@ -970,7 +970,7 @@
-                                            any character advance of fixed or
-                                            proportional fonts */
-      DFDESC_FRACT_HEIGHT = 0x00000020,  /* fractional height is set */
--     DFDESC_FRACT_WIDTH  = 0x00000040,  /* fractional width is set */
-+     DFDESC_FRACT_WIDTH  = 0x00000040   /* fractional width is set */
+--- DirectFB-1.4.11/include/directfb.h.orig	2010-11-15 22:13:05.000000000 +0100
++++ DirectFB-1.4.11/include/directfb.h	2010-11-17 21:15:55.575104966 +0100
+@@ -1045,7 +1045,7 @@
+      DFDESC_FRACT_WIDTH       = 0x00000040,  /* fractional width is set */
+      DFDESC_OUTLINE_WIDTH     = 0x00000080,  /* outline width is set */
+      DFDESC_OUTLINE_OPACITY   = 0x00000100,  /* outline opacity is set */
+-     DFDESC_ROTATION          = 0x00000200,  /* rotation is set */
++     DFDESC_ROTATION          = 0x00000200   /* rotation is set */
  } DFBFontDescriptionFlags;
  
  /*
-@@ -3108,7 +3108,7 @@
-      DSPD_SRC_ATOP       =  9, /* fs: da      fd: 1.0-sa */
+@@ -3314,7 +3314,7 @@
       DSPD_DST_ATOP       = 10, /* fs: 1.0-da  fd: sa     */
       DSPD_ADD            = 11, /* fs: 1.0     fd: 1.0    */
--     DSPD_XOR            = 12, /* fs: 1.0-da  fd: 1.0-sa */
-+     DSPD_XOR            = 12  /* fs: 1.0-da  fd: 1.0-sa */
+      DSPD_XOR            = 12, /* fs: 1.0-da  fd: 1.0-sa */
+-     DSPD_DST            = 13, /* fs: 0.0     fd: 1.0    */
++     DSPD_DST            = 13  /* fs: 0.0     fd: 1.0    */
  } DFBSurfacePorterDuffRule;
  
  /*

================================================================
Index: packages/DirectFB/DirectFB.spec
diff -u packages/DirectFB/DirectFB.spec:1.93 packages/DirectFB/DirectFB.spec:1.94
--- packages/DirectFB/DirectFB.spec:1.93	Sun Mar 14 00:50:26 2010
+++ packages/DirectFB/DirectFB.spec	Thu Nov 18 08:33:31 2010
@@ -7,13 +7,13 @@
 Summary:	DirectFB - Hardware graphics acceleration
 Summary(pl.UTF-8):	DirectFB - Wspomaganie grafiki
 Name:		DirectFB
-Version:	1.2.7
-Release:	5
+Version:	1.4.11
+Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://www.directfb.org/downloads/Core/%{name}-%{version}.tar.gz
-# Source0-md5:	59ca16f600e96c8c104a485ff7c322c6
+Source0:	http://www.directfb.org/downloads/Core/DirectFB-1.4/%{name}-%{version}.tar.gz
+# Source0-md5:	94735ccec21120794adcce93a61445d2
 Source1:	http://www.directfb.org/downloads/Extras/DFBTutorials-0.5.0.tar.gz
 # Source1-md5:	13e443a64bddd68835b574045d9025e9
 Patch0:		%{name}-am.patch
@@ -21,9 +21,9 @@
 Patch2:		%{name}-fix.patch
 Patch3:		%{name}-gcc4.patch
 Patch4:		%{name}-llh-ppc.patch
-Patch5:		%{name}-link.patch
-Patch6:		%{name}-libpng.patch
 URL:		http://www.directfb.org/
+BuildRequires:	OpenGL-devel
+BuildRequires:	OpenGL-GLX-devel
 BuildRequires:	SDL-devel
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -40,10 +40,11 @@
 BuildRequires:	tslib-devel >= 0.0.2
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	zlib-devel >= 1.1.3
+#BuildRequires:	pkgconfig(linotype) -- font provider???
 %{?with_multi:Provides:	DirectFB(multi)}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		dfbdir	%{_libdir}/directfb-1.2-0
+%define		dfbdir	%{_libdir}/directfb-1.4-5
 
 %define		specflags	-fno-strict-aliasing
 
@@ -289,8 +290,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -320,7 +319,8 @@
 	--enable-sse \
 %endif
 %endif
-	--with-inputdrivers=dbox2remote,dreamboxremote,dynapro,elo-input,gunze,joystick,keyboard,linuxinput,lirc,mutouch,penmount,ps2mouse,serialmouse,sonypijogdial,tslib,ucb1x00,wm97xx \
+	--with-inputdrivers=dbox2remote,dreamboxremote,dynapro,elo-input,gunze,joystick,keyboard,linuxinput,lirc,mutouch,penmount,ps2mouse,serialmouse,sonypijogdial,tslib,ucb1x00,wm97xx,zytronic \
+	--with-smooth-scaling \
 	%{!?with_static_libs:--disable-static}
 
 %{__make} -j1 \
@@ -360,17 +360,20 @@
 %attr(755,root,root) %{_bindir}/dfbscreen
 %attr(755,root,root) %{_bindir}/mkdfiff
 %attr(755,root,root) %{_bindir}/mkdgiff
+%attr(755,root,root) %{_bindir}/mkdgifft
+%attr(755,root,root) %{_bindir}/pxa3xx_dump
 %attr(755,root,root) %{_bindir}/uwmdump
-%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
+%attr(755,root,root) %{_bindir}/voodooplay
+%attr(755,root,root) %{_libdir}/libdirect-1.4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdirect-1.4.so.5
+%attr(755,root,root) %{_libdir}/libdirectfb-1.4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdirectfb-1.4.so.5
+%attr(755,root,root) %{_libdir}/libfusion-1.4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfusion-1.4.so.5
+%attr(755,root,root) %{_libdir}/libuniquewm-1.4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libuniquewm-1.4.so.5
+%attr(755,root,root) %{_libdir}/libvoodoo-1.4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvoodoo-1.4.so.5
 %dir %{dfbdir}
 %dir %{dfbdir}/gfxdrivers
 %attr(755,root,root) %{dfbdir}/gfxdrivers/*.so
@@ -383,6 +386,7 @@
 %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}/inputdrivers/libdirectfb_zytronic.so
 %dir %{dfbdir}/interfaces
 %dir %{dfbdir}/interfaces/IDirectFB
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFB/lib*.so
@@ -393,7 +397,6 @@
 %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_dgiff.so
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBFont/libidirectfbfont_dispatcher.so
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBFont/libidirectfbfont_requestor.so
@@ -417,9 +420,10 @@
 %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_dummy.so
 %attr(755,root,root) %{dfbdir}/systems/libdirectfb_fbdev.so
 %dir %{dfbdir}/wm
-%attr(755,root,root) %{dfbdir}/wm/*.so
+%attr(755,root,root) %{dfbdir}/wm/lib*.so
 %{_datadir}/directfb-%{version}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/directfbrc
 %{_mandir}/man1/dfbg.1*
@@ -525,6 +529,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2010/11/18 07:33:31  qboosh
+- updated to 1.4.11
+- updated gcc4 patch, removed obsolete link,libpng patches
+
 Revision 1.93  2010/03/13 23:50:26  sparky
 - BR: pkgconfig
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/DirectFB/DirectFB-gcc4.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/DirectFB/DirectFB.spec?r1=1.93&r2=1.94&f=u

