Date: Fri, 17 Jun 2016 15:20:35 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417015 - in head/devel/directfb: . files Message-ID: <201606171520.u5HFKZGT053469@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Jun 17 15:20:35 2016 New Revision: 417015 URL: https://svnweb.freebsd.org/changeset/ports/417015 Log: - Update to 1.4.17 - Unbreak - Switch to options helpers PR: 185885 Submitted by: hardy.schumacher@gmx.de Approved by: maintainer timeout (anatoly.borodin@gmail.com, 2 years) Deleted: head/devel/directfb/files/extra-libpng15 head/devel/directfb/files/patch-lib-direct-conf.c head/devel/directfb/files/patch-src-gfx-generic-generic.c head/devel/directfb/files/patch-tests-dfbtest_window.c head/devel/directfb/files/patch-tools-dfbmaster.c Modified: head/devel/directfb/Makefile head/devel/directfb/distinfo head/devel/directfb/files/patch-doc_Makefile.in head/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c head/devel/directfb/files/patch-lib-direct-interface.c head/devel/directfb/files/patch-lib-direct-log.c head/devel/directfb/files/patch-lib-direct-stream.c head/devel/directfb/files/patch-lib-direct-trace.c head/devel/directfb/files/patch-lib-fusion-call.c head/devel/directfb/files/patch-lib-fusion-lock.c head/devel/directfb/files/patch-lib-fusion-shm-shm.c head/devel/directfb/files/patch-lib-fusion-shmalloc.c head/devel/directfb/files/patch-lib-voodoo-client.c head/devel/directfb/files/patch-lib-voodoo-manager.c head/devel/directfb/files/patch-src__gfx__generic__generic_stretch_blit.c head/devel/directfb/files/patch-tests__voodoo__voodoo_test.h head/devel/directfb/files/patch-tools-dfbdump.c head/devel/directfb/pkg-plist Modified: head/devel/directfb/Makefile ============================================================================== --- head/devel/directfb/Makefile Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/Makefile Fri Jun 17 15:20:35 2016 (r417015) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= directfb -PORTVERSION= 1.4.13 -PORTREVISION= 7 +PORTVERSION= 1.4.17 CATEGORIES= devel -MASTER_SITES= http://www.directfb.org/downloads/Core/${DISTNAME:R}/ +MASTER_SITES= http://sources.buildroot.net/ DISTNAME= DirectFB-${PORTVERSION} MAINTAINER= anatoly.borodin@gmail.com @@ -13,9 +12,6 @@ COMMENT= Graphic development lightweight LICENSE= LGPL21 -BROKEN= Does not fetch -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2016-07-04 LIB_DEPENDS= libpng.so:graphics/png OPTIONS_DEFINE= FREETYPE X11 SDL UNIQUE TEST DOCS @@ -31,10 +27,9 @@ USES= cpe gmake jpeg libtool ncurses pa USE_LDCONFIG= yes USE_PERL5= build PORTDOCS= * -EXTRA_PATCHES= ${FILESDIR}/extra-libpng15:-p1 -DIRECTFB_SHLIB= 5.0.8 # LT_BINARY.LT_AGE.LT_REVISION -DIRECTFB_BIN= 5 # LT_BINARY +DIRECTFB_SHLIB= 6.0.11 # LT_BINARY.LT_AGE.LT_REVISION +DIRECTFB_BIN= ${DIRECTFB_SHLIB:R:R} # LT_BINARY PLIST_SUB+= DIRECTFB_VERSION="${PORTVERSION}" \ DIRECTFB_RELEASE="${PORTVERSION:R}" \ DIRECTFB_SHLIB="${DIRECTFB_SHLIB}" \ @@ -55,7 +50,7 @@ DOCS_BUILD_DEPENDS= man2html:textproc/ma FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_ENABLE= freetype X11_USE= XORG=x11,xext,xproto -X11_CONFIGURE_ENABLE= --x11 +X11_CONFIGURE_ENABLE= x11 SDL_USE= sdl SDL_CONFIGURE_ENABLE= sdl UNIQUE_CONFIGURE_ENABLE= unique @@ -83,7 +78,7 @@ post-patch: @${GREP} -lr alloca\.h ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -e 's|<alloca\.h>|<stdlib.h>|g' -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/html .for f in AUTHORS ChangeLog NEWS README TODO fb.modes docs/README.screenshots docs/*.html ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} Modified: head/devel/directfb/distinfo ============================================================================== --- head/devel/directfb/distinfo Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/distinfo Fri Jun 17 15:20:35 2016 (r417015) @@ -1,2 +1,2 @@ -SHA256 (DirectFB-1.4.13.tar.gz) = ff85ed00ce76c9f6ca7833534c1cbf00358c9a5450dc1649ce3bc283056ab9b5 -SIZE (DirectFB-1.4.13.tar.gz) = 3113159 +SHA256 (DirectFB-1.4.17.tar.gz) = 065a8e3a655b7e633eb1c2cdf55956496a29e0b8bd8ca700f0a5507909c864de +SIZE (DirectFB-1.4.17.tar.gz) = 3346983 Modified: head/devel/directfb/files/patch-doc_Makefile.in ============================================================================== --- head/devel/directfb/files/patch-doc_Makefile.in Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-doc_Makefile.in Fri Jun 17 15:20:35 2016 (r417015) @@ -1,6 +1,6 @@ ---- docs/Makefile.in.orig 2008-06-02 14:05:50.000000000 +0200 -+++ docs/Makefile.in 2008-06-02 14:05:58.000000000 +0200 -@@ -681,7 +681,7 @@ +--- docs/Makefile.in.orig 2012-05-23 13:45:15 UTC ++++ docs/Makefile.in +@@ -803,7 +803,7 @@ uninstall-man: uninstall-man1 uninstall- @HAVE_MAN2HTML_TRUE@ rm -f $(HTMLMANS) @HAVE_MAN2HTML_TRUE@%.html: % Modified: head/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c ============================================================================== --- head/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-gfxdrivers-davinci-davinci_c64x.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,4 +1,4 @@ ---- gfxdrivers/davinci/davinci_c64x.c +--- gfxdrivers/davinci/davinci_c64x.c.orig 2012-05-23 13:43:12 UTC +++ gfxdrivers/davinci/davinci_c64x.c @@ -57,6 +57,8 @@ #define C64X_QLEN direct_page_align( sizeof(c64xTaskControl) ) Modified: head/devel/directfb/files/patch-lib-direct-interface.c ============================================================================== --- head/devel/directfb/files/patch-lib-direct-interface.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-lib-direct-interface.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,4 +1,4 @@ ---- lib/direct/interface.c +--- lib/direct/interface.c.orig 2016-06-08 05:59:40 UTC +++ lib/direct/interface.c @@ -71,7 +71,11 @@ typedef struct { int references; @@ -11,4 +11,4 @@ +#endif static DirectLink *implementations = NULL; - /**************************************************************************************************/ + static inline int Modified: head/devel/directfb/files/patch-lib-direct-log.c ============================================================================== --- head/devel/directfb/files/patch-lib-direct-log.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-lib-direct-log.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,6 +1,6 @@ ---- ./lib/direct/log.c.orig 2010-11-15 22:12:08.000000000 +0100 -+++ ./lib/direct/log.c 2010-12-03 16:44:12.000000000 +0100 -@@ -335,12 +335,14 @@ +--- lib/direct/log.c.orig 2012-05-23 13:43:12 UTC ++++ lib/direct/log.c +@@ -335,12 +335,14 @@ parse_host_addr( const char *hostp D_ERROR( "Direct/Log: Port %s is unreachable!\n", portstr ); return DR_FAILURE; Modified: head/devel/directfb/files/patch-lib-direct-stream.c ============================================================================== --- head/devel/directfb/files/patch-lib-direct-stream.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-lib-direct-stream.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,6 +1,6 @@ ---- lib/direct/stream.c.orig 2007-12-15 14:30:28.000000000 +0200 -+++ lib/direct/stream.c 2008-03-16 14:51:44.000000000 +0200 -@@ -429,7 +429,7 @@ +--- lib/direct/stream.c.orig 2012-05-23 13:43:12 UTC ++++ lib/direct/stream.c +@@ -429,7 +429,7 @@ net_connect( struct addrinfo *addr, int req.imr_multiaddr.s_addr = saddr->sin_addr.s_addr; req.imr_interface.s_addr = 0; Modified: head/devel/directfb/files/patch-lib-direct-trace.c ============================================================================== --- head/devel/directfb/files/patch-lib-direct-trace.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-lib-direct-trace.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,4 +1,4 @@ ---- lib/direct/trace.c +--- lib/direct/trace.c.orig 2012-05-23 13:43:12 UTC +++ lib/direct/trace.c @@ -90,7 +90,7 @@ struct __D_DirectTraceBuffer { Modified: head/devel/directfb/files/patch-lib-fusion-call.c ============================================================================== --- head/devel/directfb/files/patch-lib-fusion-call.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-lib-fusion-call.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,4 +1,4 @@ ---- lib/fusion/call.c +--- lib/fusion/call.c.orig 2012-05-23 13:43:12 UTC +++ lib/fusion/call.c @@ -31,6 +31,7 @@ #include <stdio.h> Modified: head/devel/directfb/files/patch-lib-fusion-lock.c ============================================================================== --- head/devel/directfb/files/patch-lib-fusion-lock.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-lib-fusion-lock.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,6 +1,6 @@ ---- lib/fusion/lock.c +--- lib/fusion/lock.c.orig 2012-05-23 13:43:12 UTC +++ lib/fusion/lock.c -@@ -485,7 +485,7 @@ fusion_skirmish_wait( FusionSkirmish *skirmish, unsigned int timeout ) +@@ -646,7 +646,7 @@ fusion_skirmish_wait( FusionSkirmish *sk /* Install a (fake) signal handler for SIGRESTART. */ act.sa_handler = restart_handler; Modified: head/devel/directfb/files/patch-lib-fusion-shm-shm.c ============================================================================== --- head/devel/directfb/files/patch-lib-fusion-shm-shm.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-lib-fusion-shm-shm.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,4 +1,4 @@ ---- lib/fusion/shm/shm.c +--- lib/fusion/shm/shm.c.orig 2012-05-23 13:43:12 UTC +++ lib/fusion/shm/shm.c @@ -34,7 +34,7 @@ #include <sys/param.h> Modified: head/devel/directfb/files/patch-lib-fusion-shmalloc.c ============================================================================== --- head/devel/directfb/files/patch-lib-fusion-shmalloc.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-lib-fusion-shmalloc.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,4 +1,4 @@ ---- lib/fusion/shmalloc.c +--- lib/fusion/shmalloc.c.orig 2012-05-23 13:43:12 UTC +++ lib/fusion/shmalloc.c @@ -52,6 +52,8 @@ Modified: head/devel/directfb/files/patch-lib-voodoo-client.c ============================================================================== --- head/devel/directfb/files/patch-lib-voodoo-client.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-lib-voodoo-client.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,6 +1,6 @@ ---- ./lib/voodoo/client.c.orig 2010-11-15 22:13:05.000000000 +0100 -+++ ./lib/voodoo/client.c 2010-12-03 16:44:12.000000000 +0100 -@@ -161,12 +161,14 @@ +--- lib/voodoo/client.c.orig 2012-05-23 13:43:12 UTC ++++ lib/voodoo/client.c +@@ -164,12 +164,14 @@ voodoo_client_create( const char *ho D_ERROR( "Direct/Log: Service is unreachable!\n" ); return DR_FAILURE; Modified: head/devel/directfb/files/patch-lib-voodoo-manager.c ============================================================================== --- head/devel/directfb/files/patch-lib-voodoo-manager.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-lib-voodoo-manager.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,5 +1,5 @@ ---- ./lib/voodoo/manager.c.orig 2010-11-02 00:11:20.000000000 +0100 -+++ ./lib/voodoo/manager.c 2010-12-03 16:44:12.000000000 +0100 +--- lib/voodoo/manager.c.orig 2012-05-23 13:43:12 UTC ++++ lib/voodoo/manager.c @@ -41,6 +41,7 @@ #include <sys/socket.h> #include <sys/time.h> @@ -8,7 +8,7 @@ #include <netinet/in.h> #if !VOODOO_BUILD_NO_SETSOCKOPT #include <netinet/ip.h> -@@ -193,10 +194,10 @@ +@@ -193,10 +194,10 @@ voodoo_manager_create( int f D_DEBUG( "Voodoo/Manager: Creating manager at %p.\n", manager ); #if !VOODOO_BUILD_NO_SETSOCKOPT Modified: head/devel/directfb/files/patch-src__gfx__generic__generic_stretch_blit.c ============================================================================== --- head/devel/directfb/files/patch-src__gfx__generic__generic_stretch_blit.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-src__gfx__generic__generic_stretch_blit.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,5 +1,5 @@ ---- ./src/gfx/generic/generic_stretch_blit.c.orig 2011-06-18 23:08:07.000000000 +0200 -+++ ./src/gfx/generic/generic_stretch_blit.c 2011-06-18 23:08:13.000000000 +0200 +--- src/gfx/generic/generic_stretch_blit.c.orig 2012-05-23 13:43:12 UTC ++++ src/gfx/generic/generic_stretch_blit.c @@ -72,6 +72,8 @@ #if DFB_SMOOTH_SCALING Modified: head/devel/directfb/files/patch-tests__voodoo__voodoo_test.h ============================================================================== --- head/devel/directfb/files/patch-tests__voodoo__voodoo_test.h Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-tests__voodoo__voodoo_test.h Fri Jun 17 15:20:35 2016 (r417015) @@ -1,5 +1,5 @@ ---- ./tests/voodoo/voodoo_test.h.orig 2010-12-03 16:44:12.000000000 +0100 -+++ ./tests/voodoo/voodoo_test.h 2010-12-03 16:44:12.000000000 +0100 +--- tests/voodoo/voodoo_test.h.orig 2016-06-08 05:59:40 UTC ++++ tests/voodoo/voodoo_test.h @@ -0,0 +1,10 @@ +#ifndef __VOODOO_TEST_H__ +#define __VOODOO_TEST_H__ Modified: head/devel/directfb/files/patch-tools-dfbdump.c ============================================================================== --- head/devel/directfb/files/patch-tools-dfbdump.c Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/files/patch-tools-dfbdump.c Fri Jun 17 15:20:35 2016 (r417015) @@ -1,6 +1,6 @@ ---- tools/dfbdump.c +--- tools/dfbdump.c.orig 2012-05-23 13:43:12 UTC +++ tools/dfbdump.c -@@ -66,6 +66,8 @@ +@@ -68,6 +68,8 @@ #include <core/windows_internal.h> #include <core/wm.h> Modified: head/devel/directfb/pkg-plist ============================================================================== --- head/devel/directfb/pkg-plist Fri Jun 17 14:58:36 2016 (r417014) +++ head/devel/directfb/pkg-plist Fri Jun 17 15:20:35 2016 (r417015) @@ -15,11 +15,15 @@ bin/dfbscreen %%TEST%%bin/dfbtest_fillrect %%TEST%%bin/dfbtest_font %%TEST%%bin/dfbtest_mirror +%%TEST%%bin/dfbtest_prealloc %%TEST%%bin/dfbtest_reinit +%%TEST%%bin/dfbtest_resize %%TEST%%bin/dfbtest_scale %%TEST%%bin/dfbtest_sync %%TEST%%bin/dfbtest_window +%%TEST%%bin/dfbtest_window_cursor %%TEST%%bin/dfbtest_window_flip_once +%%TEST%%bin/dfbtest_window_surface %%TEST%%bin/direct_stream %%TEST%%bin/direct_test bin/directfb-config @@ -34,6 +38,33 @@ bin/mkdfiff bin/mkdgifft %%UNIQUE%%bin/uwmdump bin/voodooplay +include/directfb-internal/core/CoreDFB.h +include/directfb-internal/core/CoreDFB_CallMode.h +include/directfb-internal/core/CoreDFB_includes.h +include/directfb-internal/core/CoreGraphicsState.h +include/directfb-internal/core/CoreGraphicsStateClient.h +include/directfb-internal/core/CoreGraphicsState_includes.h +include/directfb-internal/core/CoreInputDevice.h +include/directfb-internal/core/CoreInputDevice_includes.h +include/directfb-internal/core/CoreLayer.h +include/directfb-internal/core/CoreLayerContext.h +include/directfb-internal/core/CoreLayerContext_includes.h +include/directfb-internal/core/CoreLayerRegion.h +include/directfb-internal/core/CoreLayerRegion_includes.h +include/directfb-internal/core/CoreLayer_includes.h +include/directfb-internal/core/CorePalette.h +include/directfb-internal/core/CorePalette_includes.h +include/directfb-internal/core/CoreScreen.h +include/directfb-internal/core/CoreScreen_includes.h +include/directfb-internal/core/CoreSlave.h +include/directfb-internal/core/CoreSlave_includes.h +include/directfb-internal/core/CoreSurface.h +include/directfb-internal/core/CoreSurface_includes.h +include/directfb-internal/core/CoreWindow.h +include/directfb-internal/core/CoreWindowStack.h +include/directfb-internal/core/CoreWindowStack_includes.h +include/directfb-internal/core/CoreWindow_includes.h +include/directfb-internal/core/Interface.h include/directfb-internal/core/clipboard.h include/directfb-internal/core/colorhash.h include/directfb-internal/core/core.h @@ -44,6 +75,7 @@ include/directfb-internal/core/coretypes include/directfb-internal/core/fonts.h include/directfb-internal/core/gfxcard.h include/directfb-internal/core/graphics_driver.h +include/directfb-internal/core/graphics_state.h include/directfb-internal/core/input.h include/directfb-internal/core/input_driver.h include/directfb-internal/core/layer_context.h @@ -57,7 +89,9 @@ include/directfb-internal/core/screens.h include/directfb-internal/core/screens_internal.h include/directfb-internal/core/state.h include/directfb-internal/core/surface.h +include/directfb-internal/core/surface_allocation.h include/directfb-internal/core/surface_buffer.h +include/directfb-internal/core/surface_core.h include/directfb-internal/core/surface_pool.h include/directfb-internal/core/surface_pool_bridge.h include/directfb-internal/core/system.h @@ -83,8 +117,10 @@ include/directfb-internal/idirectfb.h include/directfb-internal/input/idirectfbinputbuffer.h include/directfb-internal/input/idirectfbinputdevice.h include/directfb-internal/media/idirectfbdatabuffer.h +include/directfb-internal/media/idirectfbdatabuffer_client.h include/directfb-internal/media/idirectfbfont.h include/directfb-internal/media/idirectfbimageprovider.h +include/directfb-internal/media/idirectfbimageprovider_client.h include/directfb-internal/media/idirectfbvideoprovider.h include/directfb-internal/misc/conf.h include/directfb-internal/misc/gfx_util.h @@ -109,6 +145,7 @@ include/directfb/direct/mem.h include/directfb/direct/memcpy.h include/directfb/direct/messages.h include/directfb/direct/modules.h +include/directfb/direct/mutex.h %%ARCH_POWERPC%%include/directfb/direct/ppc_asm.h %%ARCH_POWERPC%%include/directfb/direct/ppcasm_memcpy.h include/directfb/direct/serial.h @@ -170,6 +207,7 @@ include/directfb/voodoo/server.h include/directfb/voodoo/types.h %%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/gfxdrivers/libdirectfb_sdlgraphics.so %%SDL%%lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/inputdrivers/libdirectfb_sdlinput.so +lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_dispatcher.so lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFB/libidirectfb_requestor.so lib/directfb-%%DIRECTFB_RELEASE%%-%%DIRECTFB_BIN%%/interfaces/IDirectFBDataBuffer/libidirectfbdatabuffer_dispatcher.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606171520.u5HFKZGT053469>