mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

directfb: fix after update (of someone else)

Browse source 
(semi-)automatic updates are nice, but it needs at least to check
that the package still compiles
This commit is contained in:
Vladimír Čunát 2013-02-02 10:47:21 +01:00
parent 3f3ac212fb
commit 9463175461
2 changed files with 8 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/libraries/directfb/default.nix
View file

@ -1,5 +1,5 @@
{stdenv, fetchurl, perl, zlib, libjpeg, freetype, libpng, giflib
, enableX11 ? true, libX11, xproto, xextproto, libXext, renderproto, libXrender
{ stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib
, enableX11 ? true, xlibs
, enableSDL ? true, SDL }:
let s = import ./src-for-default.nix; in
@ -10,16 +10,14 @@ stdenv.mkDerivation {
sha256 = s.hash;
};
patches = [ ./ftbfs.patch ];
buildNativeInputs = [ perl ];
buildInputs = [ zlib libjpeg freetype giflib libpng ]
buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ]
++ stdenv.lib.optional enableSDL SDL
++ stdenv.lib.optionals enableX11 [
xproto libX11 libXext xextproto
renderproto libXrender
];
++ stdenv.lib.optionals enableX11 (with xlibs; [
xproto libX11 libXext #xextproto
#renderproto libXrender
]);
NIX_LDFLAGS="-lgcc_s";
@ -31,7 +29,7 @@ stdenv.mkDerivation {
"--enable-fbdev"
"--enable-mmx"
"--enable-sse"
"--enable-sysfs"
#"--enable-sysfs" # not recognized
"--with-software"
"--with-smooth-scaling"
] ++ stdenv.lib.optionals enableX11 [

25
pkgs/development/libraries/directfb/ftbfs.patch
View file

@ -1,25 +0,0 @@
From: André Draszik <andre.draszik@st.com>
Date: Wed, 28 Sep 2011 17:36:00 +0000 (+0100)
Subject: generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871
X-Git-Url: http://git.directfb.org/?p=core%2FDirectFB.git;a=commitdiff_plain;h=ef5e1398fe4037b63d6513e450f107fcfe91047f
generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871
../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c: In function 'stretch_hvx':
../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: error: 'DSPF_ARGBF88871' undeclared (first use in this function)
../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: note: each undeclared identifier is reported only once for each function it appears in
---
diff --git a/src/gfx/generic/generic_stretch_blit.c b/src/gfx/generic/generic_stretch_blit.c
index 65076f4..6dd987b 100644
--- a/src/gfx/generic/generic_stretch_blit.c
+++ b/src/gfx/generic/generic_stretch_blit.c
@@ -441,7 +441,7 @@ stretch_hvx( CardState *state, DFBRectangle *srect, DFBRectangle *drect )
}
break;
- case DSPF_ARGBF88871:
+ case DSPF_RGBAF88871:
if (state->blittingflags & DSBLIT_SRC_PREMULTIPLY) {
for (i=0; i<gfxs->Blut->num_entries; i++) {
int alpha = entries[i].a + 1;