Author: urkud
Date: Fri Jan 20 00:45:22 2012
New Revision: 31730
URL: https://nixos.org/websvn/nix/?rev=31730&sc=1
Log:
directfb-1.5.3
Added:
nixpkgs/trunk/pkgs/development/libraries/directfb/ftbfs.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/directfb/default.nix
nixpkgs/trunk/pkgs/development/libraries/directfb/src-for-default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/directfb/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/directfb/default.nix Thu Jan
19 23:08:47 2012 (r31729)
+++ nixpkgs/trunk/pkgs/development/libraries/directfb/default.nix Fri Jan
20 00:45:22 2012 (r31730)
@@ -10,6 +10,8 @@
sha256 = s.hash;
};
+ patches = [ ./ftbfs.patch ];
+
buildNativeInputs = [ perl ];
buildInputs = [ zlib libjpeg freetype giflib libpng ]
Added: nixpkgs/trunk/pkgs/development/libraries/directfb/ftbfs.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/directfb/ftbfs.patch Fri Jan
20 00:45:22 2012 (r31730)
@@ -0,0 +1,25 @@
+From: André Draszik <[email protected]>
+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;
Modified: nixpkgs/trunk/pkgs/development/libraries/directfb/src-for-default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/directfb/src-for-default.nix
Thu Jan 19 23:08:47 2012 (r31729)
+++ nixpkgs/trunk/pkgs/development/libraries/directfb/src-for-default.nix
Fri Jan 20 00:45:22 2012 (r31730)
@@ -1,9 +1,9 @@
rec {
- version="1.4.3";
- name="directfb-1.4.3";
- hash="0y79lwzq7srlbgrva7b5y8klbp6gmr8hxrayq8njaw7by3jald8l";
-
url="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${version}.tar.gz";;
-
advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.3.tar.gz";;
+ version="1.5.3";
+ name="directfb-1.5.3";
+ hash="1w2i4az6v4sh086s27qbyn5w02s67a7dfm2xdpdm4r2zpgl7axg5";
+
url="http://directfb.org/downloads/Core/DirectFB-1.5/DirectFB-${version}.tar.gz";;
+
advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.5/DirectFB-1.5.3.tar.gz";;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
