Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=316cad926e06613bfb50f91e5dbc56b6aa9d54a3
commit 316cad926e06613bfb50f91e5dbc56b6aa9d54a3 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Fri Dec 28 14:15:34 2007 +0100 directfb-1.1.1-2-i686 revert one patch from git to make splashy work again thx crazy for pointing out the right commit :) diff --git a/source/xlib/directfb/05cca1e20a8f14738b5b97a23afb8e15a2a54473.diff b/source/xlib/directfb/05cca1e20a8f14738b5b97a23afb8e15a2a54473.diff new file mode 100644 index 0000000..71f152d --- /dev/null +++ b/source/xlib/directfb/05cca1e20a8f14738b5b97a23afb8e15a2a54473.diff @@ -0,0 +1,64 @@ +From: Denis Oliver Kropp <[EMAIL PROTECTED]> +Date: Tue, 9 Oct 2007 01:46:06 +0000 (+0200) +Subject: Made argument to fusion_skirmish_lock_count() const. +X-Git-Url: http://git.directfb.org/?p=core%2FDirectFB.git;a=commitdiff_plain;h=05cca1e20a8f14738b5b97a23afb8e15a2a54473 + +Made argument to fusion_skirmish_lock_count() const. + +Added unimplemented fusion_skirmish_lock_count() for single app. +--- + +diff --git a/lib/fusion/lock.c b/lib/fusion/lock.c +index fbdedd3..9e1dc56 100644 +--- a/lib/fusion/lock.c ++++ b/lib/fusion/lock.c +@@ -135,7 +135,7 @@ fusion_skirmish_swoop( FusionSkirmish *skirmish ) + } + + DirectResult +-fusion_skirmish_lock_count( const FusionSkirmish *skirmish, int *lock_count ) ++fusion_skirmish_lock_count( FusionSkirmish *skirmish, int *lock_count ) + { + int data[2]; + +@@ -372,7 +372,7 @@ fusion_skirmish_swoop( FusionSkirmish *skirmish ) + } + + DirectResult +-fusion_skirmish_lock_count( const FusionSkirmish *skirmish, int *lock_count ) ++fusion_skirmish_lock_count( FusionSkirmish *skirmish, int *lock_count ) + { + D_ASSERT( skirmish != NULL ); + +@@ -503,18 +503,6 @@ fusion_skirmish_swoop (FusionSkirmish *skirmish) + } + + DirectResult +-fusion_skirmish_lock_count( const FusionSkirmish *skirmish, int *lock_count ) +-{ +- D_ASSERT( skirmish != NULL ); +- +- D_UNIMPLEMENTED(); +- +- *lock_count = 0; +- +- return DFB_UNIMPLEMENTED; +-} +- +-DirectResult + fusion_skirmish_dismiss (FusionSkirmish *skirmish) + { + D_ASSERT( skirmish != NULL ); +diff --git a/lib/fusion/lock.h b/lib/fusion/lock.h +index 9740ffc..5d55e34 100644 +--- a/lib/fusion/lock.h ++++ b/lib/fusion/lock.h +@@ -79,7 +79,7 @@ DirectResult fusion_skirmish_swoop ( FusionSkirmish *skirmish ); + /* + * Find out how many times current thread has acquired lock. + */ +-DirectResult fusion_skirmish_lock_count( const FusionSkirmish *skirmish, int *lock_count ); ++DirectResult fusion_skirmish_lock_count( FusionSkirmish *skirmish, int *lock_count ); + + /* + * Unlock. diff --git a/source/xlib/directfb/FrugalBuild b/source/xlib/directfb/FrugalBuild index 089ac0f..816932e 100644 --- a/source/xlib/directfb/FrugalBuild +++ b/source/xlib/directfb/FrugalBuild @@ -5,16 +5,19 @@ pkgname=directfb _F_archive_name=DirectFB pkgver=1.1.1 _pkgver=1.1-0 -pkgrel=1 +pkgrel=2 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device." url="http://www.directfb.org"; license="LGPL" -depends=('sdl' 'sysfsutils' 'freetype2' 'libpng' 'libjpeg' 'libmpeg3' 'zlib') +depends=('sdl' 'sysfsutils' 'freetype2' 'libpng' 'libjpeg' 'libmpeg3' 'zlib' 'libx11' 'libxext') +makedepends=('xextproto') groups=('xlib') 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-$pkgver.tar.gz) -sha1sums=('93d0ea5ca4b10291ca55d1eb6fecc544966eadad') +source=(http://www.directfb.org/downloads/Core/$_F_archive_name-$pkgver.tar.gz \ + 05cca1e20a8f14738b5b97a23afb8e15a2a54473.diff) +sha1sums=('93d0ea5ca4b10291ca55d1eb6fecc544966eadad' \ + '515640daf37d19870c8e4b7ab066904e46133679') subpkgs=("$pkgname-video-i810" "$pkgname-video-i830" "$pkgname-video-mga" "$pkgname-video-nv" "$pkgname-video-savage" \ "$pkgname-video-sis" "$pkgname-video-neomagic" "$pkgname-video-ati" "$pkgname-video-nsc" \ @@ -66,7 +69,7 @@ build() { sed -i '/-O3/d' configure || return 1 Fbuild --enable-x11 --enable-zlib --enable-sdl --enable-mmx --enable-sse \ --enable-jpeg --enable-png --enable-freetype --enable-sysfs --enable-static \ - --enable-debug --disable-vnc --enable-fbdev --enable-fbcon \ + --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 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
