Hello community,
here is the log from the commit of package DirectFB
checked in at Tue Jul 11 20:22:57 CEST 2006.
--------
--- DirectFB/DirectFB.changes 2006-02-21 17:02:05.000000000 +0100
+++ DirectFB/DirectFB.changes 2006-07-11 12:41:09.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Jul 10 13:10:35 CEST 2006 - mskibbe@suse.de
+
+- updated to version 0.9.25 (including some fixes for stability
+ and speed)
+- change paths in specfile (from /usr/bin/ to %{_bindir})
+
+-------------------------------------------------------------------
Old:
----
DirectFB-0.9.24-headers.patch
DirectFB-0.9.24.tar.bz2
New:
----
DirectFB-0.9.25-headers.patch
DirectFB-0.9.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ DirectFB.spec ++++++
--- /var/tmp/diff_new_pack.x7vlwr/_old 2006-07-11 20:22:04.000000000 +0200
+++ /var/tmp/diff_new_pack.x7vlwr/_new 2006-07-11 20:22:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package DirectFB (Version 0.9.24)
+# spec file for package DirectFB (Version 0.9.25)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,17 +16,17 @@
License: LGPL
Group: System/Libraries
Autoreqprov: on
-Version: 0.9.24
-Release: 6
+Version: 0.9.25
+Release: 1
Summary: Graphics Library for Framebuffer Devices
Source: %name-%version.tar.bz2
-Patch0: %name-%version.patch
-Patch2: %name-%version-matroxi2c.diff
-Patch3: %name-%version-headers.patch
+Patch0: %name-0.9.24.patch
+Patch2: %name-0.9.24-matroxi2c.diff
+Patch3: %name-0.9.25-headers.patch
Patch4: %name-cc-cflags.patch
Patch5: %name-int.patch
-Patch6: %name-%version-warning.patch
-Patch7: %name-%version-argv-argc.patch
+Patch6: %name-0.9.24-warning.patch
+Patch7: %name-0.9.24-argv-argc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -51,7 +51,7 @@
%setup -q
%patch0 -p1
%patch2 -p1
-%patch3 -p1
+%patch3
%patch4 -p1
%patch5 -p1
%patch6
@@ -94,15 +94,17 @@
%_libdir/directfb-%version
%_libdir/libuniquewm*
/usr/share/directfb-%version
-/usr/bin/dfbg
-/usr/bin/dfbdump
-/usr/bin/dfbinfo
-/usr/bin/dfblayer
-/usr/bin/directfb-config
-/usr/bin/directfb-csource
-/usr/bin/dfbscreen
-/usr/bin/dfbsummon
-/usr/bin/uwmdump
+%{_bindir}/dfbg
+%{_bindir}/dfbdump
+%{_bindir}/dfbinfo
+%{_bindir}/dfblayer
+%{_bindir}/directfb-config
+%{_bindir}/directfb-csource
+%{_bindir}/dfbscreen
+%{_bindir}/dfbsummon
+%{_bindir}/uwmdump
+%{_bindir}/dfbinput
+%{_bindir}/dfbpenmount
/usr/include/directfb
%_libdir/libdirect*
%_libdir/libfusion*
@@ -112,6 +114,10 @@
%doc %_mandir/man5/directfbrc.5.gz
%changelog -n DirectFB
+* Mon Jul 10 2006 - mskibbe@suse.de
+- updated to version 0.9.25 (including some fixes for stability
+ and speed)
+- change paths in specfile (from /usr/bin/ to %%{_bindir})
* Tue Feb 21 2006 - hvogel@suse.de
- fix arg* usage [#146446]
* Thu Feb 16 2006 - hvogel@suse.de
++++++ DirectFB-0.9.24-argv-argc.patch ++++++
--- /var/tmp/diff_new_pack.x7vlwr/_old 2006-07-11 20:22:04.000000000 +0200
+++ /var/tmp/diff_new_pack.x7vlwr/_new 2006-07-11 20:22:04.000000000 +0200
@@ -1,6 +1,6 @@
--- src/misc/conf.c
+++ src/misc/conf.c
-@@ -1069,8 +1069,8 @@
+@@ -1167,8 +1167,8 @@
}
/* Read settings from command line. */
++++++ DirectFB-0.9.24-matroxi2c.diff ++++++
--- /var/tmp/diff_new_pack.x7vlwr/_old 2006-07-11 20:22:04.000000000 +0200
+++ /var/tmp/diff_new_pack.x7vlwr/_new 2006-07-11 20:22:04.000000000 +0200
@@ -1,6 +1,5 @@
-diff -Nur DirectFB-0.9.21/gfxdrivers/matrox/i2c-userspace.h DirectFB-0.9.21.matroxi2c/gfxdrivers/matrox/i2c-userspace.h
---- DirectFB-0.9.21/gfxdrivers/matrox/i2c-userspace.h 1970-01-01 01:00:00.000000000 +0100
-+++ DirectFB-0.9.21.matroxi2c/gfxdrivers/matrox/i2c-userspace.h 2005-01-12 16:07:19.975385412 +0100
+--- DirectFB-0.9.25/gfxdrivers/matrox/i2c-userspace.h
++++ DirectFB-0.9.25/gfxdrivers/matrox/i2c-userspace.h
@@ -0,0 +1,66 @@
+#ifndef I2C_USERSPACE_H
+#define I2C_USERSPACE_H
@@ -68,9 +67,8 @@
+}
+
+#endif
-diff -Nur DirectFB-0.9.21/gfxdrivers/matrox/matrox_maven.c DirectFB-0.9.21.matroxi2c/gfxdrivers/matrox/matrox_maven.c
---- DirectFB-0.9.21/gfxdrivers/matrox/matrox_maven.c 2004-04-29 21:08:36.000000000 +0200
-+++ DirectFB-0.9.21.matroxi2c/gfxdrivers/matrox/matrox_maven.c 2005-01-12 16:05:58.862215098 +0100
+--- DirectFB-0.9.25/gfxdrivers/matrox/matrox_maven.c
++++ DirectFB-0.9.25/gfxdrivers/matrox/matrox_maven.c
@@ -31,12 +31,16 @@
#include
#include
++++++ DirectFB-0.9.24.patch ++++++
--- /var/tmp/diff_new_pack.x7vlwr/_old 2006-07-11 20:22:04.000000000 +0200
+++ /var/tmp/diff_new_pack.x7vlwr/_new 2006-07-11 20:22:04.000000000 +0200
@@ -1,7 +1,6 @@
-diff -Nur DirectFB-0.9.21/interfaces/IDirectFBFont/idirectfbfont_default.c DirectFB-0.9.21.henne/interfaces/IDirectFBFont/idirectfbfont_default.c
---- DirectFB-0.9.21/interfaces/IDirectFBFont/idirectfbfont_default.c 2004-04-05 14:27:56.000000000 +0200
-+++ DirectFB-0.9.21.henne/interfaces/IDirectFBFont/idirectfbfont_default.c 2005-01-12 15:08:41.314434544 +0100
-@@ -155,7 +155,7 @@
+--- DirectFB-0.9.25/interfaces/IDirectFBFont/idirectfbfont_default.c
++++ DirectFB-0.9.25/interfaces/IDirectFBFont/idirectfbfont_default.c
+@@ -160,7 +160,7 @@
else
key = index;
@@ -10,7 +9,7 @@
start = i + 1;
index++;
-@@ -173,7 +173,7 @@
+@@ -178,7 +178,7 @@
else
key = index;
@@ -19,9 +18,8 @@
}
dfb_surface_soft_lock( surface, DSLF_WRITE, &dst, &pitch, 0 );
-diff -Nur DirectFB-0.9.21/interfaces/IDirectFBFont/idirectfbfont_ft2.c DirectFB-0.9.21.henne/interfaces/IDirectFBFont/idirectfbfont_ft2.c
---- DirectFB-0.9.21/interfaces/IDirectFBFont/idirectfbfont_ft2.c 2004-12-11 18:25:00.000000000 +0100
-+++ DirectFB-0.9.21.henne/interfaces/IDirectFBFont/idirectfbfont_ft2.c 2005-01-12 15:12:59.411911731 +0100
+--- DirectFB-0.9.25/interfaces/IDirectFBFont/idirectfbfont_ft2.c
++++ DirectFB-0.9.25/interfaces/IDirectFBFont/idirectfbfont_ft2.c
@@ -127,7 +127,7 @@
else
index = FT_Get_Char_Index( face, glyph );
@@ -31,7 +29,7 @@
load_flags |= FT_LOAD_RENDER;
if ((err = FT_Load_Glyph( face, index, load_flags ))) {
-@@ -245,7 +245,7 @@
+@@ -289,7 +289,7 @@
else
index = FT_Get_Char_Index( face, glyph );
@@ -40,7 +38,7 @@
if ((err = FT_Load_Glyph( face, index, load_flags ))) {
D_HEAVYDEBUG( "DirectB/FontFT2: "
-@@ -588,7 +588,7 @@
+@@ -651,7 +651,7 @@
}
}
@@ -49,9 +47,8 @@
face->generic.finalizer = NULL;
font = dfb_font_create( core );
-diff -Nur DirectFB-0.9.21/lib/direct/tree.c DirectFB-0.9.21.henne/lib/direct/tree.c
---- DirectFB-0.9.21/lib/direct/tree.c 2004-03-31 00:51:34.000000000 +0200
-+++ DirectFB-0.9.21.henne/lib/direct/tree.c 2005-01-12 15:21:49.248061272 +0100
+--- DirectFB-0.9.25/lib/direct/tree.c
++++ DirectFB-0.9.25/lib/direct/tree.c
@@ -85,7 +85,7 @@
void *value )
{
@@ -70,10 +67,9 @@
if (fast_key >= 0 && fast_key < 96)
return tree->fast_keys[fast_key];
-diff -Nur DirectFB-0.9.21/src/core/colorhash.c DirectFB-0.9.21.henne/src/core/colorhash.c
---- DirectFB-0.9.21/src/core/colorhash.c 2005-01-12 15:25:39.091348268 +0100
-+++ DirectFB-0.9.21.henne/src/core/colorhash.c 2004-11-23 03:14:17.000000000 +0100
-@@ -183,7 +183,7 @@
+--- DirectFB-0.9.25/src/core/colorhash.c
++++ DirectFB-0.9.25/src/core/colorhash.c
+@@ -186,7 +186,7 @@
{
Colorhash *hash;
unsigned int pixel = PIXEL_ARGB(a, r, g, b);
@@ -82,10 +78,9 @@
D_ASSERT( hash_field != NULL );
D_ASSERT( hash_field->hash != NULL );
-diff -Nur DirectFB-0.9.21/src/core/fonts.c DirectFB-0.9.21.henne/src/core/fonts.c
---- DirectFB-0.9.21/src/core/fonts.c 2004-11-09 00:45:50.000000000 +0100
-+++ DirectFB-0.9.21.henne/src/core/fonts.c 2005-01-12 15:19:55.578259239 +0100
-@@ -136,7 +136,7 @@
+--- DirectFB-0.9.25/src/core/fonts.c
++++ DirectFB-0.9.25/src/core/fonts.c
+@@ -141,7 +141,7 @@
D_ASSERT( ret_data != NULL );
@@ -94,7 +89,7 @@
*ret_data = data;
return DFB_OK;
}
-@@ -206,7 +206,7 @@
+@@ -208,7 +208,7 @@
data->start = data->width = data->height = 0;
}
@@ -103,15 +98,14 @@
*ret_data = data;
-diff -Nur DirectFB-0.9.21/systems/fbdev/fbdev.c DirectFB-0.9.21.henne/systems/fbdev/fbdev.c
---- DirectFB-0.9.21/systems/fbdev/fbdev.c 2004-11-23 03:14:19.000000000 +0100
-+++ DirectFB-0.9.21.henne/systems/fbdev/fbdev.c 2005-01-12 15:17:29.590779829 +0100
-@@ -367,7 +367,7 @@
- dfb_fbdev->framebuffer_base = mmap( NULL, dfb_fbdev->shared->fix.smem_len,
+--- DirectFB-0.9.25/systems/fbdev/fbdev.c
++++ DirectFB-0.9.25/systems/fbdev/fbdev.c
+@@ -467,7 +467,7 @@
+ dfb_fbdev->framebuffer_base = mmap( NULL, shared->fix.smem_len,
PROT_READ | PROT_WRITE, MAP_SHARED,
dfb_fbdev->fd, 0 );
- if ((int)(dfb_fbdev->framebuffer_base) == -1) {
+ if ((long)(dfb_fbdev->framebuffer_base) == -1) {
D_PERROR( "DirectFB/FBDev: "
"Could not mmap the framebuffer!\n");
- SHFREE( dfb_fbdev->shared );
+ SHFREE( pool, shared );
++++++ DirectFB-0.9.24-headers.patch -> DirectFB-0.9.25-headers.patch ++++++
--- DirectFB/DirectFB-0.9.24-headers.patch 2006-02-21 17:02:05.000000000 +0100
+++ DirectFB/DirectFB-0.9.25-headers.patch 2006-07-11 12:34:50.000000000 +0200
@@ -1,33 +1,20 @@
---- DirectFB-0.9.24/include/directfb.h
-+++ DirectFB-0.9.24/include/directfb.h
-@@ -846,7 +846,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 */
- } DFBFontDescriptionFlags;
-
- /*
---- DirectFB-0.9.24/systems/fbdev/fbdev.c
-+++ DirectFB-0.9.24/systems/fbdev/fbdev.c
-@@ -40,7 +40,7 @@
+--- systems/fbdev/fbdev.c
++++ systems/fbdev/fbdev.c
+@@ -40,6 +40,7 @@
#include
#include
#include
--
+#undef _LINUX_TYPES_H
- #include
#include
---- DirectFB-0.9.24/systems/fbdev/vt.c
-+++ DirectFB-0.9.24/systems/fbdev/vt.c
-@@ -40,7 +40,7 @@
+
+--- systems/fbdev/vt.c
++++ systems/fbdev/vt.c
+@@ -40,6 +40,7 @@
#include
#include
#include
--
+#undef _LINUX_TYPES_H
- #include
#include
+
++++++ DirectFB-0.9.24.tar.bz2 -> DirectFB-0.9.25.tar.bz2 ++++++
++++ 92933 lines of diff (skipped)
++++++ DirectFB-cc-cflags.patch ++++++
--- /var/tmp/diff_new_pack.x7vlwr/_old 2006-07-11 20:22:09.000000000 +0200
+++ /var/tmp/diff_new_pack.x7vlwr/_new 2006-07-11 20:22:09.000000000 +0200
@@ -1,6 +1,6 @@
---- DirectFB-0.9.24/configure.in
-+++ DirectFB-0.9.24/configure.in
-@@ -335,8 +335,12 @@
+--- DirectFB-0.9.25/configure.in
++++ DirectFB-0.9.25/configure.in
+@@ -320,8 +320,12 @@
##
AS=$CC
ASFLAGS=$CFLAGS
++++++ DirectFB-int.patch ++++++
--- /var/tmp/diff_new_pack.x7vlwr/_old 2006-07-11 20:22:09.000000000 +0200
+++ /var/tmp/diff_new_pack.x7vlwr/_new 2006-07-11 20:22:09.000000000 +0200
@@ -1,6 +1,6 @@
---- DirectFB-0.9.24/gfxdrivers/matrox/matrox_bes.c
-+++ DirectFB-0.9.24/gfxdrivers/matrox/matrox_bes.c
-@@ -489,15 +489,15 @@
+--- DirectFB-0.9.25/gfxdrivers/matrox/matrox_bes.c
++++ DirectFB-0.9.25/gfxdrivers/matrox/matrox_bes.c
+@@ -508,15 +508,15 @@
/* scale crop values to source dimensions */
if (cropleft)
@@ -21,8 +21,9 @@
/* should horizontal zoom be used? */
if (mdev->g450_matrox)
---- DirectFB-0.9.24/include/dfb_types.h
-+++ DirectFB-0.9.24/include/dfb_types.h
+
+--- DirectFB-0.9.25/include/dfb_types.h
++++ DirectFB-0.9.25/include/dfb_types.h
@@ -8,12 +8,10 @@
#define __u8 u_int8_t
#define __u16 u_int16_t
@@ -36,8 +37,8 @@
#else
---- DirectFB-0.9.24/lib/direct/memcpy.c
-+++ DirectFB-0.9.24/lib/direct/memcpy.c
+--- DirectFB-0.9.25/lib/direct/memcpy.c
++++ DirectFB-0.9.25/lib/direct/memcpy.c
@@ -442,14 +442,14 @@
len &= 63;
@@ -70,11 +71,11 @@
d += 8; s += 8;
}
if (len & 4) {
---- DirectFB-0.9.24/src/gfx/generic/generic_64.h
-+++ DirectFB-0.9.24/src/gfx/generic/generic_64.h
+--- DirectFB-0.9.25/src/gfx/generic/generic_64.h
++++ DirectFB-0.9.25/src/gfx/generic/generic_64.h
@@ -32,7 +32,7 @@
int w, l = gfxs->length;
- __u32 *D = gfxs->Aop;
+ __u32 *D = gfxs->Aop[0];
__u32 Cop = gfxs->Cop;
- __u64 DCop = ((__u64)Cop << 32) | Cop;
+ u_int64_t DCop = ((u_int64_t)Cop << 32) | Cop;
@@ -91,8 +92,8 @@
}
@@ -54,7 +54,7 @@
- __u32 *D = gfxs->Aop;
- __u32 *S = gfxs->Bop;
+ __u32 *D = gfxs->Aop[0];
+ __u32 *S = gfxs->Bop[0];
__u32 Skey = gfxs->Skey;
- __u64 DSkey = ((__u64)Skey << 32) | Skey;
+ u_int64_t DSkey = ((u_int64_t)Skey << 32) | Skey;
@@ -117,8 +118,8 @@
else {
#ifdef WORDS_BIGENDIAN
@@ -106,7 +106,7 @@
- __u32 *D = gfxs->Aop;
- __u32 *S = gfxs->Bop;
+ __u32 *D = gfxs->Aop[0];
+ __u32 *S = gfxs->Bop[0];
__u32 Dkey = gfxs->Dkey;
- __u64 DDkey = ((__u64)Dkey << 32) | Dkey;
+ u_int64_t DDkey = ((u_int64_t)Dkey << 32) | Dkey;
@@ -185,3 +186,15 @@
#endif
for (; w; w--) {
+
+--- DirectFB-0.9.25/gfxdrivers/mach64/mach64.c
++++ DirectFB-0.9.25/gfxdrivers/mach64/mach64.c
+@@ -989,7 +989,7 @@
+ if (drect->y < mdev->clip.y1) {
+ int sy, dy;
+ dy = mdev->clip.y1 - drect->y;
+- sy = (__u64) srect->h * dy / drect->h;
++ sy = (u_int64_t) srect->h * dy / drect->h;
+ srect->y += sy;
+ srect->h -= sy;
+ drect->y += dy;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org