diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-20 00:45:22 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-20 00:45:22 +0000 |
| commit | c2b80e225c6a90eab260d2b984a963fa28310bf7 (patch) | |
| tree | b65a1ccb57c9a78fed0a3d5425ab0d199aabcb9d | |
| parent | 5cd82587aa6708b076fedb44c333f27c78ce6aa1 (diff) | |
| download | nixpkgs-c2b80e225c6a90eab260d2b984a963fa28310bf7.tar nixpkgs-c2b80e225c6a90eab260d2b984a963fa28310bf7.tar.gz nixpkgs-c2b80e225c6a90eab260d2b984a963fa28310bf7.tar.bz2 nixpkgs-c2b80e225c6a90eab260d2b984a963fa28310bf7.tar.lz nixpkgs-c2b80e225c6a90eab260d2b984a963fa28310bf7.tar.xz nixpkgs-c2b80e225c6a90eab260d2b984a963fa28310bf7.tar.zst nixpkgs-c2b80e225c6a90eab260d2b984a963fa28310bf7.zip | |
directfb-1.5.3
svn path=/nixpkgs/trunk/; revision=31730
| -rw-r--r-- | pkgs/development/libraries/directfb/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/directfb/ftbfs.patch | 25 | ||||
| -rw-r--r-- | pkgs/development/libraries/directfb/src-for-default.nix | 10 |
3 files changed, 32 insertions, 5 deletions
diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 55a8a823e1c..9b4241aa3be 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { sha256 = s.hash; }; + patches = [ ./ftbfs.patch ]; + buildNativeInputs = [ perl ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] diff --git a/pkgs/development/libraries/directfb/ftbfs.patch b/pkgs/development/libraries/directfb/ftbfs.patch new file mode 100644 index 00000000000..b6907e70be7 --- /dev/null +++ b/pkgs/development/libraries/directfb/ftbfs.patch @@ -0,0 +1,25 @@ +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; diff --git a/pkgs/development/libraries/directfb/src-for-default.nix b/pkgs/development/libraries/directfb/src-for-default.nix index b181d2858f5..c154ac68e4a 100644 --- a/pkgs/development/libraries/directfb/src-for-default.nix +++ b/pkgs/development/libraries/directfb/src-for-default.nix @@ -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"; } |