Index: Makefile =================================================================== RCS file: /home/pcvs/ports/devel/directfb/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- Makefile 13 Mar 2008 14:27:14 -0000 1.29 +++ Makefile 19 Mar 2008 15:22:17 -0000 @@ -6,8 +6,7 @@ # PORTNAME= directfb -PORTVERSION= 0.9.16 -PORTREVISION= 8 +PORTVERSION= 1.1.0 CATEGORIES= devel MASTER_SITES= http://www.directfb.org/downloads/Old/ DISTNAME= DirectFB-${PORTVERSION} @@ -18,15 +17,20 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ - LDFLAGS="${PTHREAD_LIBS}" +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +CONFIGURE_ARGS= --enable-sdl USE_AUTOTOOLS= libtool:15 USE_SDL= sdl GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes USE_PERL5= yes -PLIST_SUB+= DIRECTFB_VERSION=${PORTVERSION} + +MAN1= directfb-csource.1 dfbg.1 +MAN5= directfbrc.5 + +.include .if exists(${LOCALBASE}/lib/libfreetype.so.9) WITH_FREETYPE2= yes @@ -41,11 +45,6 @@ PLIST_SUB+= WITH_FREETYPE2="@comment " .endif -MAN1= directfb-csource.1 dfbg.1 -MAN5= directfbrc.5 - -.include - .if ${ARCH} == "alpha" BROKEN= Does not compile on alpha .endif @@ -53,6 +52,16 @@ post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - ${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|ulong|u_long|g' \ + ${WRKSRC}/src/gfx/generic/stretch_hvx_8.h \ + ${WRKSRC}/src/gfx/generic/stretch_hvx_16.h \ + ${WRKSRC}/src/gfx/generic/stretch_hvx_32.h \ + ${WRKSRC}/src/gfx/generic/stretch_hvx_88.h \ + ${WRKSRC}/src/misc/conf.c + +post-configure: + @${REINPLACE_CMD} -e 's|LIBS = -pthread|LIBS = -pthread -llwres|' \ + ${WRKSRC}/lib/direct/Makefile .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/devel/directfb/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 24 Nov 2005 15:39:11 -0000 1.3 +++ distinfo 13 Mar 2008 21:05:24 -0000 @@ -1,3 +1,3 @@ -MD5 (DirectFB-0.9.16.tar.gz) = 7a33720caed3f179d4f558821b2fff91 -SHA256 (DirectFB-0.9.16.tar.gz) = 1b3d56f6c6d29e09b77a8b08678fa71b91363e856c17742bb1f8a7b11639938d -SIZE (DirectFB-0.9.16.tar.gz) = 915045 +MD5 (DirectFB-1.1.0.tar.gz) = da30fa2748c7501913c8832a83e654ab +SHA256 (DirectFB-1.1.0.tar.gz) = 0ee87256a278079955d78e4f235c15a174afbb507b5434f1966cd3e5f5a3f23a +SIZE (DirectFB-1.1.0.tar.gz) = 2624473 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/directfb/pkg-plist,v retrieving revision 1.6 diff -u -r1.6 pkg-plist --- pkg-plist 1 Feb 2007 02:41:24 -0000 1.6 +++ pkg-plist 14 Mar 2008 01:40:16 -0000 @@ -1,106 +1,202 @@ +%%WITH_FREETYPE2%%bin/mkdgiff +bin/directfb-csource +bin/dfbdump bin/dfbg +bin/dfbinfo +bin/dfbinput +bin/dfblayer +bin/dfbscreen +bin/dfbpenmount +bin/mkdfiff bin/directfb-config -bin/directfb-csource -include/directfb/dfb_types.h include/directfb/directfb.h include/directfb/directfb_keyboard.h include/directfb/directfb_keynames.h -include/directfb-internal/directfb_internals.h -include/directfb-internal/directfb_version.h +include/directfb/directfb_strings.h +include/directfb/directfb_util.h +include/directfb/directfb_version.h +include/directfb/directfbgl.h +include/directfb/dfb_types.h +include/directfb/dfiff.h +include/directfb/dgiff.h +include/directfb/direct/build.h +include/directfb/direct/clock.h +include/directfb/direct/conf.h +include/directfb/direct/debug.h +include/directfb/direct/direct.h +include/directfb/direct/hash.h +include/directfb/direct/interface.h +include/directfb/direct/interface_implementation.h +include/directfb/direct/list.h +include/directfb/direct/log.h +include/directfb/direct/mem.h +include/directfb/direct/memcpy.h +include/directfb/direct/messages.h +include/directfb/direct/modules.h +include/directfb/direct/serial.h +include/directfb/direct/signals.h +include/directfb/direct/stream.h +include/directfb/direct/system.h +include/directfb/direct/thread.h +include/directfb/direct/trace.h +include/directfb/direct/tree.h +include/directfb/direct/types.h +include/directfb/direct/utf8.h +include/directfb/direct/util.h +include/directfb/fusion/shm/pool.h +include/directfb/fusion/shm/shm.h +include/directfb/fusion/shm/shm_internal.h +include/directfb/fusion/arena.h +include/directfb/fusion/build.h +include/directfb/fusion/call.h +include/directfb/fusion/conf.h +include/directfb/fusion/fusion.h +include/directfb/fusion/fusion_internal.h +include/directfb/fusion/hash.h +include/directfb/fusion/lock.h +include/directfb/fusion/object.h +include/directfb/fusion/property.h +include/directfb/fusion/protocol.h +include/directfb/fusion/reactor.h +include/directfb/fusion/ref.h +include/directfb/fusion/shmalloc.h +include/directfb/fusion/types.h +include/directfb/fusion/vector.h +include/directfb-internal/core/clipboard.h +include/directfb-internal/core/colorhash.h +include/directfb-internal/core/coredefs.h include/directfb-internal/core/coretypes.h -include/directfb-internal/core/core.h +include/directfb-internal/core/core_parts.h include/directfb-internal/core/core_system.h -include/directfb-internal/core/coredefs.h +include/directfb-internal/core/core.h include/directfb-internal/core/fonts.h -include/directfb-internal/core/fusion/arena.h -include/directfb-internal/core/fusion/fusion.h -include/directfb-internal/core/fusion/list.h -include/directfb-internal/core/fusion/lock.h -include/directfb-internal/core/fusion/object.h -include/directfb-internal/core/fusion/property.h -include/directfb-internal/core/fusion/reactor.h -include/directfb-internal/core/fusion/ref.h -include/directfb-internal/core/fusion/shmalloc.h -include/directfb-internal/core/fusion/fusion_types.h include/directfb-internal/core/gfxcard.h include/directfb-internal/core/graphics_driver.h include/directfb-internal/core/input.h include/directfb-internal/core/input_driver.h +include/directfb-internal/core/layer_context.h +include/directfb-internal/core/layer_control.h +include/directfb-internal/core/layer_region.h include/directfb-internal/core/layers.h -include/directfb-internal/core/modules.h +include/directfb-internal/core/layers_internal.h include/directfb-internal/core/palette.h -include/directfb-internal/core/sig.h +include/directfb-internal/core/screen.h +include/directfb-internal/core/screens.h +include/directfb-internal/core/screens_internal.h include/directfb-internal/core/state.h -include/directfb-internal/core/surfaces.h -include/directfb-internal/core/surfacemanager.h +include/directfb-internal/core/wm.h +include/directfb-internal/core/surface.h +include/directfb-internal/core/surface_buffer.h +include/directfb-internal/core/surface_pool.h include/directfb-internal/core/system.h -include/directfb-internal/core/thread.h include/directfb-internal/core/windows.h +include/directfb-internal/core/windows_internal.h +include/directfb-internal/core/windowstack.h +include/directfb-internal/core/wm_module.h include/directfb-internal/display/idirectfbpalette.h include/directfb-internal/display/idirectfbsurface.h include/directfb-internal/display/idirectfbsurface_layer.h include/directfb-internal/display/idirectfbsurface_window.h include/directfb-internal/display/idirectfbdisplaylayer.h +include/directfb-internal/display/idirectfbscreen.h +include/directfb-internal/gfx/generic/generic.h include/directfb-internal/gfx/clip.h include/directfb-internal/gfx/convert.h include/directfb-internal/gfx/util.h -include/directfb-internal/idirectfb.h include/directfb-internal/input/idirectfbinputdevice.h include/directfb-internal/input/idirectfbinputbuffer.h -include/directfb-internal/interface_implementation.h include/directfb-internal/media/idirectfbdatabuffer.h include/directfb-internal/media/idirectfbfont.h include/directfb-internal/media/idirectfbimageprovider.h include/directfb-internal/media/idirectfbvideoprovider.h include/directfb-internal/misc/conf.h -include/directfb-internal/misc/cpu_accel.h include/directfb-internal/misc/gfx_util.h -include/directfb-internal/misc/mem.h -include/directfb-internal/misc/memcpy.h -include/directfb-internal/misc/tree.h -include/directfb-internal/misc/utf8.h include/directfb-internal/misc/util.h include/directfb-internal/windows/idirectfbwindow.h -lib/libdirectfb-0.9.so -lib/libdirectfb-0.9.so.16 -lib/libdirectfb.a -lib/libdirectfb.la +include/directfb-internal/idirectfb.h +lib/libdirect-1.1.so.0 +lib/libdirect-1.1.so +lib/libdirect.so +lib/libdirect.la +lib/libdirect.a +lib/libfusion-1.1.so.0 +lib/libfusion-1.1.so +lib/libfusion.so +lib/libfusion.la +lib/libfusion.a +lib/libdirectfb-1.1.so.0 +lib/libdirectfb-1.1.so lib/libdirectfb.so -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_default.a -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_default.la -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_default.so -%%WITH_FREETYPE2%%lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.a -%%WITH_FREETYPE2%%lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.la -%%WITH_FREETYPE2%%lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.so -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.a -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.a -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.a -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.a -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la -lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so +lib/libdirectfb.la +lib/libdirectfb.a +lib/directfb-1.1-0/gfxdrivers/libdirectfb_sdlgraphics.so +lib/directfb-1.1-0/gfxdrivers/libdirectfb_sdlgraphics.la +lib/directfb-1.1-0/gfxdrivers/libdirectfb_sdlgraphics.a +lib/directfb-1.1-0/inputdrivers/libdirectfb_x11input.so +lib/directfb-1.1-0/inputdrivers/libdirectfb_x11input.la +lib/directfb-1.1-0/inputdrivers/libdirectfb_x11input.a +lib/directfb-1.1-0/inputdrivers/libdirectfb_sdlinput.so +lib/directfb-1.1-0/inputdrivers/libdirectfb_sdlinput.la +lib/directfb-1.1-0/inputdrivers/libdirectfb_sdlinput.a +lib/directfb-1.1-0/systems/libdirectfb_x11.so +lib/directfb-1.1-0/systems/libdirectfb_x11.la +lib/directfb-1.1-0/systems/libdirectfb_x11.a +lib/directfb-1.1-0/systems/libdirectfb_sdl.so +lib/directfb-1.1-0/systems/libdirectfb_sdl.la +lib/directfb-1.1-0/systems/libdirectfb_sdl.a +lib/directfb-1.1-0/wm/libdirectfbwm_default.so +lib/directfb-1.1-0/wm/libdirectfbwm_default.la +lib/directfb-1.1-0/wm/libdirectfbwm_default.a +lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_default.so +lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_default.la +lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_default.a +%%WITH_FREETYPE2%%lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_ft2.so +%%WITH_FREETYPE2%%lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_ft2.la +%%WITH_FREETYPE2%%lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_ft2.a +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.a +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.a +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.a +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.a +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la +lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.a +lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so +lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la +lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.a + +libdata/pkgconfig/direct.pc +libdata/pkgconfig/fusion.pc libdata/pkgconfig/directfb.pc libdata/pkgconfig/directfb-internal.pc -share/directfb-%%DIRECTFB_VERSION%%/cursor.dat -share/directfb-%%DIRECTFB_VERSION%%/font.data -@dirrm share/directfb-%%DIRECTFB_VERSION%% -@dirrm lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBVideoProvider -@dirrm lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider -@dirrm lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont -@dirrm lib/directfb-%%DIRECTFB_VERSION%%/interfaces -@dirrm lib/directfb-%%DIRECTFB_VERSION%% -@dirrm include/directfb-internal/windows -@dirrm include/directfb-internal/misc -@dirrm include/directfb-internal/media -@dirrm include/directfb-internal/input -@dirrm include/directfb-internal/gfx -@dirrm include/directfb-internal/display -@dirrm include/directfb-internal/core/fusion +share/directfb-1.1.0/cursor.dat @dirrm include/directfb-internal/core +@dirrm include/directfb-internal/display +@dirrm include/directfb-internal/gfx/generic +@dirrm include/directfb-internal/gfx +@dirrm include/directfb-internal/input +@dirrm include/directfb-internal/media +@dirrm include/directfb-internal/misc +@dirrm include/directfb-internal/windows @dirrm include/directfb-internal +@dirrm include/directfb/fusion/shm +@dirrm include/directfb/fusion +@dirrm include/directfb/direct @dirrm include/directfb +@dirrm lib/directfb-1.1-0/gfxdrivers +@dirrm lib/directfb-1.1-0/inputdrivers +@dirrm lib/directfb-1.1-0/systems +@dirrm lib/directfb-1.1-0/wm +@dirrm lib/directfb-1.1-0/interfaces/IDirectFBImageProvider +@dirrm lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider +@dirrm lib/directfb-1.1-0/interfaces/IDirectFBFont +@dirrm lib/directfb-1.1-0/interfaces +@dirrm lib/directfb-1.1-0 +@dirrm share/directfb-1.1.0 Index: files/patch-configure =================================================================== RCS file: /home/pcvs/ports/devel/directfb/files/patch-configure,v retrieving revision 1.1 diff -u -r1.1 patch-configure --- files/patch-configure 19 Jan 2003 14:26:13 -0000 1.1 +++ files/patch-configure 13 Mar 2008 21:06:51 -0000 @@ -19,12 +19,3 @@ if test x$need_libc_r = xyes; then echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6 -@@ -6391,7 +6392,7 @@ - DFB_INTERNAL_CFLAGS="$DFB_INTERNAL_CFLAGS -DDFB_DEBUG" - DFB_CFLAGS="$DFB_CFLAGS -O3 -g3 -fno-inline" - else -- DFB_CFLAGS="$DFB_CFLAGS -O3 -g" -+ DFB_CFLAGS="$DFB_CFLAGS -O" - if test "x$enable_profiling" = xno; then - DFB_CFLAGS_OMIT_FRAME_POINTER="-fomit-frame-pointer" - fi Index: files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_jpeg.c =================================================================== RCS file: /home/pcvs/ports/devel/directfb/files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_jpeg.c,v retrieving revision 1.1 diff -u -r1.1 patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_jpeg.c --- files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_jpeg.c 5 Nov 2007 10:04:34 -0000 1.1 +++ files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_jpeg.c 19 Mar 2008 15:16:05 -0000 @@ -1,20 +0,0 @@ ---- interfaces/IDirectFBImageProvider/idirectfbimageprovider_jpeg.c.orig 2007-11-02 12:40:44.000000000 +0100 -+++ interfaces/IDirectFBImageProvider/idirectfbimageprovider_jpeg.c 2007-11-02 12:42:20.000000000 +0100 -@@ -464,7 +464,7 @@ - BUG("unsupported format not filtered before"); - return DFB_BUG; - } -- (__u8*)row_ptr += pitch; -+ row_ptr = (__u8*)row_ptr + pitch; - } - } - else { /* image must be scaled */ -@@ -474,7 +474,7 @@ - while (cinfo.output_scanline < cinfo.output_height) { - jpeg_read_scanlines(&cinfo, buffer, 1); - copy_line32( (__u32*)row_ptr, *buffer, cinfo.output_width); -- (__u32*)row_ptr += cinfo.output_width; -+ row_ptr = (__u32*)row_ptr + cinfo.output_width; - } - dfb_scale_linear_32( dst, image_data, cinfo.output_width, - cinfo.output_height, rect.w, rect.h, Index: files/patch-src-core-input.c =================================================================== RCS file: /home/pcvs/ports/devel/directfb/files/patch-src-core-input.c,v retrieving revision 1.1 diff -u -r1.1 patch-src-core-input.c --- files/patch-src-core-input.c 5 Nov 2007 10:04:34 -0000 1.1 +++ files/patch-src-core-input.c 19 Mar 2008 15:16:40 -0000 @@ -1,11 +0,0 @@ ---- src/core/input.c.orig 2002-12-29 01:17:06.000000000 +0100 -+++ src/core/input.c 2007-11-02 12:17:48.000000000 +0100 -@@ -1312,7 +1312,7 @@ - - write( fd, buf24, surface->width * 3 ); - -- ((__u8*)data) += pitch; -+ data = (__u8*)data + pitch; - } - - dfb_surface_unlock( surface, (surface->caps & DSCAPS_FLIPPING) ); Index: files/patch-src-display-idirectfbsurface.c =================================================================== RCS file: /home/pcvs/ports/devel/directfb/files/patch-src-display-idirectfbsurface.c,v retrieving revision 1.1 diff -u -r1.1 patch-src-display-idirectfbsurface.c --- files/patch-src-display-idirectfbsurface.c 5 Nov 2007 10:04:34 -0000 1.1 +++ files/patch-src-display-idirectfbsurface.c 13 Mar 2008 21:55:21 -0000 @@ -1,15 +1,10 @@ ---- src/display/idirectfbsurface.c.orig 2007-11-02 12:19:20.000000000 +0100 -+++ src/display/idirectfbsurface.c 2007-11-02 12:27:33.000000000 +0100 -@@ -298,9 +298,9 @@ - if (ret) - return ret; +--- src/display/idirectfbsurface.c.orig 2008-03-13 22:54:08.000000000 +0100 ++++ src/display/idirectfbsurface.c 2008-03-13 22:54:14.000000000 +0100 +@@ -32,7 +32,6 @@ + #include + #include + #include +-#include -- (__u8*)(*ptr) += data->area.current.y * (*pitch) + -- data->area.current.x * -- DFB_BYTES_PER_PIXEL(data->surface->format); -+ *ptr = (__u8 *)(*ptr) + (data->area.current.y * (*pitch) + -+ data->area.current.x * -+ DFB_BYTES_PER_PIXEL(data->surface->format)); - - data->locked = front + 1; + #include Index: files/patch-src-gfx-generic-generic.c =================================================================== RCS file: /home/pcvs/ports/devel/directfb/files/patch-src-gfx-generic-generic.c,v retrieving revision 1.1 diff -u -r1.1 patch-src-gfx-generic-generic.c --- files/patch-src-gfx-generic-generic.c 5 Nov 2007 10:04:34 -0000 1.1 +++ files/patch-src-gfx-generic-generic.c 19 Mar 2008 15:16:53 -0000 @@ -1,12 +0,0 @@ ---- src/gfx/generic/generic.c.orig 2007-11-02 12:36:17.000000000 +0100 -+++ src/gfx/generic/generic.c 2007-11-02 12:40:03.000000000 +0100 -@@ -555,7 +555,8 @@ - __u16 *S = (__u16*)Bop; - - if (((long)D)&2) { -- *(((__u16*)D)++) = *S; -+ D = (__u16*)D++; -+ *D = *S; - i += SperD; - w--; - } Index: files/patch-src-misc-gfx_util.c =================================================================== RCS file: /home/pcvs/ports/devel/directfb/files/patch-src-misc-gfx_util.c,v retrieving revision 1.1 diff -u -r1.1 patch-src-misc-gfx_util.c --- files/patch-src-misc-gfx_util.c 5 Nov 2007 10:04:34 -0000 1.1 +++ files/patch-src-misc-gfx_util.c 19 Mar 2008 15:17:11 -0000 @@ -1,71 +0,0 @@ ---- src/misc/gfx_util.c.orig 2007-11-02 12:28:22.000000000 +0100 -+++ src/misc/gfx_util.c 2007-11-02 12:32:42.000000000 +0100 -@@ -138,14 +138,14 @@ - *(__u8 *)dst++ = *src >> 24; - src++; - } -- (__u8 *)dst += dskip; -+ dst = (__u8 *)dst + dskip; - } - break; - - case DSPF_ARGB: - for (y = 0; y < h; y++) { - dfb_memcpy (dst, src, w * 4); -- (__u8 *)dst += w * 4 + dskip; -+ dst = (__u8 *)dst + (w * 3 + dskip); - src += w; - } - break; -@@ -174,10 +174,10 @@ - a, dst_format, palette); - break; - } -- (__u8 *)dst += DFB_BYTES_PER_PIXEL (dst_format); -+ dst = (__u8 *)dst + (DFB_BYTES_PER_PIXEL (dst_format)); - src++; - } -- (__u8 *)dst += dskip; -+ dst = (__u8 *)dst + dskip; - } - break; - } -@@ -380,7 +380,7 @@ - x += x_step; - } - -- return dst; -+ return (char *)dst; - } - - void dfb_scale_linear_32( void *dst, __u32 *src, int sw, int sh, -@@ -446,9 +446,9 @@ - y_start++; - } - -- (__u8 *)outbuf = -+ outbuf = - dst + i * (DFB_BYTES_PER_PIXEL (dst_format) * dw + dskip); -- (__u8 *)outbuf_end = outbuf + DFB_BYTES_PER_PIXEL (dst_format) * dw; -+ outbuf_end = outbuf + DFB_BYTES_PER_PIXEL (dst_format) * dw; - x = scaled_x_offset; - x_start = x >> SCALE_SHIFT; - dest_x = 0; -@@ -462,7 +462,7 @@ - x += x_step; - x_start = x >> SCALE_SHIFT; - dest_x++; -- (__u8 *)outbuf += DFB_BYTES_PER_PIXEL (dst_format); -+ outbuf = (__u8 *)outbuf + DFB_BYTES_PER_PIXEL (dst_format); - } - - new_outbuf = scale_line (run_weights, filter.n_x, filter.n_y, outbuf, -@@ -480,7 +480,7 @@ - x >> SCALE_SHIFT, sw, dst_format, palette); - - x += x_step; -- (__u8 *)outbuf += DFB_BYTES_PER_PIXEL (dst_format); -+ outbuf = (__u8 *)outbuf + DFB_BYTES_PER_PIXEL (dst_format); - } - - y += y_step; Index: files/patch-src-misc-memcpy.c =================================================================== RCS file: /home/pcvs/ports/devel/directfb/files/patch-src-misc-memcpy.c,v retrieving revision 1.1 diff -u -r1.1 patch-src-misc-memcpy.c --- files/patch-src-misc-memcpy.c 5 Nov 2007 10:04:34 -0000 1.1 +++ files/patch-src-misc-memcpy.c 19 Mar 2008 15:17:25 -0000 @@ -1,46 +0,0 @@ ---- src/misc/memcpy.c.orig 2007-11-02 12:33:04.000000000 +0100 -+++ src/misc/memcpy.c 2007-11-02 12:35:27.000000000 +0100 -@@ -226,8 +226,8 @@ - "movq %%mm6, 48(%1)\n" - "movq %%mm7, 56(%1)\n" - :: "r" (from), "r" (to) : "memory"); -- ((const unsigned char *)from)+=64; -- ((unsigned char *)to)+=64; -+ from = (const unsigned char *)from + 64; -+ to = (unsigned char *)to + 64; - } - __asm__ __volatile__ ("emms":::"memory"); - } -@@ -288,8 +288,8 @@ - "movntq %%mm6, 48(%1)\n" - "movntq %%mm7, 56(%1)\n" - :: "r" (from), "r" (to) : "memory"); -- ((const unsigned char *)from)+=64; -- ((unsigned char *)to)+=64; -+ from = (const unsigned char *)from + 64; -+ to = (unsigned char *)to + 64; - } - /* since movntq is weakly-ordered, a "sfence" - * is needed to become ordered again. */ -@@ -346,8 +346,8 @@ - "movntps %%xmm2, 32(%1)\n" - "movntps %%xmm3, 48(%1)\n" - :: "r" (from), "r" (to) : "memory"); -- ((const unsigned char *)from)+=64; -- ((unsigned char *)to)+=64; -+ from = (const unsigned char *)from + 64; -+ to = (unsigned char *)to + 64; - } - else - /* -@@ -368,8 +368,8 @@ - "movntps %%xmm2, 32(%1)\n" - "movntps %%xmm3, 48(%1)\n" - :: "r" (from), "r" (to) : "memory"); -- ((const unsigned char *)from)+=64; -- ((unsigned char *)to)+=64; -+ from = (const unsigned char *)from + 64; -+ to = (unsigned char *)to + 64; - } - /* since movntq is weakly-ordered, a "sfence" - * is needed to become ordered again. */ Index: files/patch-tools::Makefile.in =================================================================== RCS file: /home/pcvs/ports/devel/directfb/files/patch-tools::Makefile.in,v retrieving revision 1.1 diff -u -r1.1 patch-tools::Makefile.in --- files/patch-tools::Makefile.in 19 Jan 2003 14:26:13 -0000 1.1 +++ files/patch-tools::Makefile.in 19 Mar 2008 15:17:42 -0000 @@ -1,11 +0,0 @@ ---- tools/Makefile.in.orig Wed Jan 15 21:06:35 2003 -+++ tools/Makefile.in Sun Jan 19 19:17:52 2003 -@@ -157,7 +157,7 @@ - @DIRECTFB_CSOURCE_TRUE@dfbg$(EXEEXT) - @DIRECTFB_CSOURCE_FALSE@bin_PROGRAMS = dfbg$(EXEEXT) - noinst_PROGRAMS = dfbdump$(EXEEXT) dfbsummon$(EXEEXT) \ --fusion_bench$(EXEEXT) raw15toraw24$(EXEEXT) raw16toraw24$(EXEEXT) \ -+raw15toraw24$(EXEEXT) raw16toraw24$(EXEEXT) \ - raw32toraw24$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -