- updated to 1.4.11

- updated gcc4 patch, removed obsolete link,libpng patches

Changed files:
    DirectFB-gcc4.patch -> 1.6
    DirectFB-libpng.patch -> 1.2
    DirectFB-link.patch -> 1.5
    DirectFB.spec -> 1.94

diff --git a/DirectFB-gcc4.patch b/DirectFB-gcc4.patch
index b247fcffff692c5825059b1f0ba92ef6474abf14..ff931a011c1ea18c124648dd97390a3b049aaa0d 100644 (file)
--- a/DirectFB-gcc4.patch
+++ b/DirectFB-gcc4.patch
@@ -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;
  
  /*

diff --git a/DirectFB-libpng.patch b/DirectFB-libpng.patch
deleted file mode 100644 (file)
index fe60c80..0000000
--- a/DirectFB-libpng.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN DirectFB-1.2.7/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c DirectFB-1.2.7.new/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
---- DirectFB-1.2.7/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c      2009-01-20 13:50:58.000000000 +0100
-+++ DirectFB-1.2.7.new/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c  2010-01-28 19:25:39.434186166 +0100
-@@ -168,7 +168,7 @@
- static DFBResult
- Probe( IDirectFBImageProvider_ProbeContext *ctx )
- {
--     if (png_check_sig( ctx->header, 8 ))
-+     if (png_sig_cmp( ctx->header, 0, 8 ) == 0)
-           return DFB_OK;
- 
-      return DFB_UNSUPPORTED;
-@@ -636,7 +636,7 @@
-           if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
-                u32        key;
-                png_colorp palette    = data->info_ptr->palette;
--               png_bytep  trans      = data->info_ptr->trans;
-+               png_bytep  trans      = data->info_ptr->trans_alpha;
-                int        num_colors = MIN( MAXCOLORMAPSIZE,
-                                             data->info_ptr->num_palette );
-                u8         cmap[3][num_colors];
-@@ -661,7 +661,7 @@
-           }
-           else {
-                /* ...or based on trans rgb value */
--               png_color_16p trans = &data->info_ptr->trans_values;
-+               png_color_16p trans = &data->info_ptr->trans_color;
- 
-                data->color_key = (((trans->red & 0xff00) << 8) |
-                                   ((trans->green & 0xff00)) |
-@@ -672,7 +672,7 @@
-      switch (data->color_type) {
-           case PNG_COLOR_TYPE_PALETTE: {
-                png_colorp palette    = data->info_ptr->palette;
--               png_bytep  trans      = data->info_ptr->trans;
-+               png_bytep  trans      = data->info_ptr->trans_alpha;
-                int        num_trans  = data->info_ptr->num_trans;
-                int        num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
- 

diff --git a/DirectFB-link.patch b/DirectFB-link.patch
deleted file mode 100644 (file)
index 5689f56..0000000
--- a/DirectFB-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- DirectFB-1.2.3/gfxdrivers/sh772x/Makefile.am.orig  2008-08-08 16:10:55.000000000 +0200
-+++ DirectFB-1.2.3/gfxdrivers/sh772x/Makefile.am       2008-09-03 18:43:14.512984794 +0200
-@@ -23,6 +23,9 @@
-       sh7722_jpeglib.c        \
-       sh7722_jpeglib.h
- 
-+libsh7722_jpeg_la_LIBADD = \
-+      $(top_builddir)/src/libdirectfb.la
-+
- libsh7722_jpeg_la_LDFLAGS = \
-       -export-dynamic         \
-       -avoid-version

diff --git a/DirectFB.spec b/DirectFB.spec
index 05924a21b7b26a29dd7617c5a371fc81ec6a2225..eadc8d12fb4f9c2acd4a93e8abb730813d854ea0 100644 (file)
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -6,13 +6,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
@@ -20,9 +20,9 @@ Patch1:               %{name}-pmake.patch
 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
@@ -39,10 +39,11 @@ BuildRequires:      sysfsutils-devel >= 1.3.0-3
 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
 
@@ -288,8 +289,6 @@ Sterownik wejściowy do touchscreenów WM97xx dla DirectFB.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -319,7 +318,8 @@ Sterownik wejściowy do touchscreenów WM97xx dla DirectFB.
        --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 \
@@ -359,17 +359,20 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -382,6 +385,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -392,7 +396,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -416,9 +419,10 @@ rm -rf $RPM_BUILD_ROOT
 %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*