Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=274a8ff90ccf7ca6c532193886d9494776199548
commit 274a8ff90ccf7ca6c532193886d9494776199548 Author: Marius Cirsta <[email protected]> Date: Fri Jan 24 01:13:13 2014 +0200 directfb-1.7.1-1-x86_64 * fix building diff --git a/source/xlib-extra/directfb/DirectFB-1.6.3-setregion.patch b/source/xlib-extra/directfb/DirectFB-1.6.3-setregion.patch deleted file mode 100644 index 8d25a51..0000000 --- a/source/xlib-extra/directfb/DirectFB-1.6.3-setregion.patch +++ /dev/null @@ -1,85 +0,0 @@ -https://build.opensuse.org/package/view_file?expand=1&file=DirectFB-setregion.patch&package=DirectFB&project=openSUSE%3AFactory - ---- gfxdrivers/cyber5k/cyber5k.c -+++ gfxdrivers/cyber5k/cyber5k.c -@@ -636,7 +636,8 @@ osdSetRegion( CoreLayer - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - DFBResult ret; - -@@ -644,7 +645,7 @@ osdSetRegion( CoreLayer - ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData, - layer_data, region_data, - config, updated, surface, -- palette, lock ); -+ palette, left_lock, right_lock ); - if (ret) - return ret; - ---- gfxdrivers/radeon/radeon_crtc1.c -+++ gfxdrivers/radeon/radeon_crtc1.c -@@ -147,14 +147,15 @@ crtc1SetRegion( CoreLayer - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - - if (updated & ~CLRCF_OPTIONS) { - return OldPrimaryLayerFuncs.SetRegion( layer, - OldPrimaryLayerDriverData, - layer_data, region_data, -- config, updated, surface, palette, lock ); -+ config, updated, surface, palette, left_lock, right_lock ); - } - - return DFB_OK; ---- gfxdrivers/cle266/uc_primary.c -+++ gfxdrivers/cle266/uc_primary.c -@@ -138,7 +138,8 @@ osdSetRegion( CoreLayer - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - DFBResult ret; - UcDriverData *ucdrv = (UcDriverData*) driver_data; -@@ -147,7 +148,7 @@ osdSetRegion( CoreLayer - ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData, - layer_data, region_data, - config, updated, surface, -- palette, lock ); -+ palette, left_lock, right_lock ); - if (ret) - return ret; - ---- gfxdrivers/unichrome/uc_primary.c -+++ gfxdrivers/unichrome/uc_primary.c -@@ -135,7 +135,8 @@ osdSetRegion( CoreLayer - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - DFBResult ret; - UcDriverData *ucdrv = (UcDriverData*) driver_data; -@@ -144,7 +145,7 @@ osdSetRegion( CoreLayer - ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData, - layer_data, region_data, - config, updated, surface, -- palette, lock ); -+ palette, left_lock, right_lock ); - if (ret) - return ret; - diff --git a/source/xlib-extra/directfb/DirectFB-update.patch b/source/xlib-extra/directfb/DirectFB-update.patch new file mode 100644 index 0000000..6aa24f2 --- /dev/null +++ b/source/xlib-extra/directfb/DirectFB-update.patch @@ -0,0 +1,207 @@ +--- wm/unique/uniquewm.c.orig 2012-06-14 18:00:08.000000000 +0200 ++++ wm/unique/uniquewm.c 2012-06-17 13:44:30.032201512 +0200 +@@ -38,6 +38,8 @@ + #include <core/surface.h> + #include <core/surface_buffer.h> + ++#include <fusion/fusion.h> ++ + #include <unique/context.h> + #include <unique/decoration.h> + #include <unique/internal.h> +@@ -275,7 +277,7 @@ + D_MAGIC_ASSERT( wm_shared, WMShared ); + D_ASSERT( wm_shared->context_pool != NULL ); + +- return (UniqueContext*) fusion_object_create( wm_shared->context_pool, wm_data->world ); ++ return (UniqueContext*) fusion_object_create( wm_shared->context_pool, wm_data->world, fusion_id(wm_data->world) ); + } + + UniqueDecoration * +@@ -286,7 +288,7 @@ + D_MAGIC_ASSERT( wm_shared, WMShared ); + D_ASSERT( wm_shared->decoration_pool != NULL ); + +- return (UniqueDecoration*) fusion_object_create( wm_shared->decoration_pool, wm_data->world ); ++ return (UniqueDecoration*) fusion_object_create( wm_shared->decoration_pool, wm_data->world, fusion_id(wm_data->world) ); + } + + UniqueWindow * +@@ -297,7 +299,7 @@ + D_MAGIC_ASSERT( wm_shared, WMShared ); + D_ASSERT( wm_shared->window_pool != NULL ); + +- return (UniqueWindow*) fusion_object_create( wm_shared->window_pool, wm_data->world ); ++ return (UniqueWindow*) fusion_object_create( wm_shared->window_pool, wm_data->world, fusion_id(wm_data->world) ); + } + + /**************************************************************************************************/ +--- wm/unique/test_foo.c.orig 2013-07-09 00:23:17.000000000 +0200 ++++ wm/unique/test_foo.c 2013-07-14 11:21:12.167080126 +0200 +@@ -143,7 +143,7 @@ + shared = context->shared; + D_MAGIC_ASSERT( shared, WMShared ); + +- dfb_layer_context_lock( region->context ); ++ dfb_layer_region_lock( region ); // ??? + + switch (event->type) { + case UIET_MOTION: +@@ -180,7 +180,7 @@ + break; + } + +- dfb_layer_context_unlock( region->context ); ++ dfb_layer_region_unlock( region ); + + return RS_OK; + } +--- gfxdrivers/cle266/uc_primary.c.orig 2012-06-14 18:00:08.000000000 +0200 ++++ gfxdrivers/cle266/uc_primary.c 2012-06-17 21:53:26.644303701 +0200 +@@ -138,7 +138,8 @@ + CoreLayerRegionConfigFlags updated, + CoreSurface *surface, + CorePalette *palette, +- CoreSurfaceBufferLock *lock ) ++ CoreSurfaceBufferLock *left_lock, ++ CoreSurfaceBufferLock *right_lock) + { + DFBResult ret; + UcDriverData *ucdrv = (UcDriverData*) driver_data; +@@ -147,7 +148,7 @@ + ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData, + layer_data, region_data, + config, updated, surface, +- palette, lock ); ++ palette, left_lock, right_lock ); + if (ret) + return ret; + +--- gfxdrivers/cle266/uc_overlay.c.orig 2013-01-12 06:06:23.000000000 +0100 ++++ gfxdrivers/cle266/uc_overlay.c 2013-07-14 13:35:19.513409077 +0200 +@@ -246,7 +246,7 @@ + dfb_surface_flip(surface, false); + + ucovl->field = 0; +- ucovl->lock = lock; ++ ucovl->lock = left_lock; + + ret = uc_ovl_update(ucdrv, ucovl, UC_OVL_FLIP, surface, left_lock); + if (ret) +--- gfxdrivers/cyber5k/cyber5k.c.orig 2012-06-14 18:00:08.000000000 +0200 ++++ gfxdrivers/cyber5k/cyber5k.c 2012-06-18 18:24:36.821203665 +0200 +@@ -636,7 +636,8 @@ + CoreLayerRegionConfigFlags updated, + CoreSurface *surface, + CorePalette *palette, +- CoreSurfaceBufferLock *lock ) ++ CoreSurfaceBufferLock *left_lock, ++ CoreSurfaceBufferLock *right_lock ) + { + DFBResult ret; + +@@ -644,7 +645,7 @@ + ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData, + layer_data, region_data, + config, updated, surface, +- palette, lock ); ++ palette, left_lock, right_lock ); + if (ret) + return ret; + +--- gfxdrivers/radeon/radeon_crtc1.c.orig 2012-06-14 18:00:08.000000000 +0200 ++++ gfxdrivers/radeon/radeon_crtc1.c 2012-06-18 18:37:26.694504689 +0200 +@@ -147,14 +147,15 @@ + CoreLayerRegionConfigFlags updated, + CoreSurface *surface, + CorePalette *palette, +- CoreSurfaceBufferLock *lock ) ++ CoreSurfaceBufferLock *left_lock, ++ CoreSurfaceBufferLock *right_lock) + { + + if (updated & ~CLRCF_OPTIONS) { + return OldPrimaryLayerFuncs.SetRegion( layer, + OldPrimaryLayerDriverData, + layer_data, region_data, +- config, updated, surface, palette, lock ); ++ config, updated, surface, palette, left_lock, right_lock ); + } + + return DFB_OK; +--- gfxdrivers/savage/savage_streams_old.c.orig 2013-07-09 00:23:17.000000000 +0200 ++++ gfxdrivers/savage/savage_streams_old.c 2013-07-14 14:25:41.743282243 +0200 +@@ -347,7 +347,8 @@ + CoreLayerRegionConfigFlags updated, + CoreSurface *surface, + CorePalette *palette, +- CoreSurfaceBufferLock *lock ) ++ CoreSurfaceBufferLock *lock, ++ CoreSurfaceBufferLock *right_lock ) + { + SavageDriverData *sdrv = (SavageDriverData*) driver_data; + SavageSecondaryLayerData *slay = (SavageSecondaryLayerData*) layer_data; +@@ -756,7 +757,8 @@ + CoreLayerRegionConfigFlags updated, + CoreSurface *surface, + CorePalette *palette, +- CoreSurfaceBufferLock *lock ) ++ CoreSurfaceBufferLock *lock, ++ CoreSurfaceBufferLock *right_lock ) + { + SavageDriverData *sdrv = (SavageDriverData*) driver_data; + SavagePrimaryLayerData *play = (SavagePrimaryLayerData*) layer_data; +@@ -767,7 +769,7 @@ + DFB_BYTES_PER_PIXEL(config->format) * 8); + + ret = savage_pfuncs.SetRegion(layer, driver_data, layer_data, region_data, +- config, updated, surface, palette, lock); ++ config, updated, surface, palette, lock, right_lock); + if (ret != DFB_OK) + return ret; + +--- gfxdrivers/unichrome/uc_primary.c.orig 2013-07-09 00:23:17.000000000 +0200 ++++ gfxdrivers/unichrome/uc_primary.c 2013-07-14 15:06:06.646513815 +0200 +@@ -139,7 +139,8 @@ + CoreLayerRegionConfigFlags updated, + CoreSurface *surface, + CorePalette *palette, +- CoreSurfaceBufferLock *lock ) ++ CoreSurfaceBufferLock *lock, ++ CoreSurfaceBufferLock *right_lock ) + { + DFBResult ret; + UcDriverData *ucdrv = (UcDriverData*) driver_data; +@@ -148,7 +149,7 @@ + ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData, + layer_data, region_data, + config, updated, surface, +- palette, lock ); ++ palette, lock, right_lock ); + if (ret) + return ret; + +--- gfxdrivers/unichrome/uc_spic.c.orig 2011-08-11 13:29:49.000000000 +0200 ++++ gfxdrivers/unichrome/uc_spic.c 2013-07-14 15:14:06.013160364 +0200 +@@ -143,7 +143,8 @@ + CoreLayerRegionConfigFlags updated, + CoreSurface *surface, + CorePalette *palette, +- CoreSurfaceBufferLock *lock ) ++ CoreSurfaceBufferLock *lock, ++ CoreSurfaceBufferLock *right_lock ) + { + UcDriverData* ucdrv = (UcDriverData*) driver_data; + +@@ -173,7 +174,10 @@ + void *region_data, + CoreSurface *surface, + DFBSurfaceFlipFlags flags, +- CoreSurfaceBufferLock *lock ) ++ const DFBRegion *left_update, ++ CoreSurfaceBufferLock *lock, ++ const DFBRegion *right_update, ++ CoreSurfaceBufferLock *right_lock ) + { + UcDriverData* ucdrv = (UcDriverData*) driver_data; + diff --git a/source/xlib-extra/directfb/FrugalBuild b/source/xlib-extra/directfb/FrugalBuild index 997709b..2d7194d 100644 --- a/source/xlib-extra/directfb/FrugalBuild +++ b/source/xlib-extra/directfb/FrugalBuild @@ -15,9 +15,9 @@ groups=('xlib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://directfb.org/index.php?path=Main%2FDownloads | Flasttar" source=(http://www.directfb.org/downloads/Core/$_F_archive_name-1.7/$_F_archive_name-$pkgver.tar.gz \ - DirectFB-1.6.3-setregion.patch) + DirectFB-update.patch) sha1sums=('ff3dc6885f2875586849d88ee9f87fca866259b0' \ - 'dea3b81410e98e7fd2bd44c954e52ea60c0852ca') + '715f9b7d09c9d48ce07e8dddf392d679a364e53c') subpkgs=("$pkgname-video-i810" "$pkgname-video-i830" "$pkgname-video-savage" "$pkgname-video-neomagic" \ "$pkgname-video-unichrome" "$pkgname-video-nv" "$pkgname-video-sis" "$pkgname-video-mga" "$pkgname-video-ati" \ @@ -69,19 +69,12 @@ build() { sed -i '/-O3/d' configure || return 1 sed -i '/config.h/d' lib/direct/ppcasm_memcpy_cachable.S || return 1 Fbuild --enable-x11 --enable-zlib --enable-sdl --enable-mmx --enable-sse \ - --enable-jpeg --enable-png --enable-freetype --enable-sysfs --enable-static \ - --disable-debug --disable-vnc --enable-fbdev --enable-fbcon \ - --with-input-drivers=keyboard,joystick,ps2mouse,serialmouse,linuxinput \ - --with-gfx-drivers=i810,i830,matrox,nvidia,sis315,neomagic,savage,ati128 + --enable-jpeg --enable-png --enable-freetype --enable-static \ + --disable-debug --disable-vnc --enable-fbdev \ + --with-inputdrivers=keyboard,joystick,ps2mouse,serialmouse,linuxinput,lirc,mutouch,penmount,sonypijogdial,wm97xx \ + --with-gfxdrivers=i810,i830,matrox,nvidia,sis315,nsc,tdfx,neomagic,radeon,savage,ati128 # Graphics drivers - if [ "$CARCH" != "ppc" ]; then - Fsplit $pkgname-video-i810 usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_i810.{a,la,o,so} - Fsplit $pkgname-video-i830 usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_i830.{a,la,o,so} - Fsplit $pkgname-video-savage usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_savage.{a,la,o,so} - Fsplit $pkgname-video-neomagic usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_neomagic.{a,la,o,so} - Fsplit $pkgname-video-unichrome usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_unichrome.{a,la,o,so} - fi Fsplit $pkgname-video-mga usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_matrox.{a,la,o,so} Fsplit $pkgname-video-nv usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_nvidia.{a,la,o,so} Fsplit $pkgname-video-sis usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_sis315.{a,la,o,so} _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
