diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-03-28 23:16:14 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-03-28 23:16:14 +0300 |
| commit | 915a02ccaf1ec09f2258094ab3189e5116713e96 (patch) | |
| tree | cc69275c30be2d312f18efe6fe717a613e761e77 | |
| parent | 96a1e39e78b873ca406c0622acd932b09dd843f1 (diff) | |
| parent | c7a26ccf9dcc5a2ee7d7a1644887d778f17ed0ed (diff) | |
| download | nixpkgs-915a02ccaf1ec09f2258094ab3189e5116713e96.tar nixpkgs-915a02ccaf1ec09f2258094ab3189e5116713e96.tar.gz nixpkgs-915a02ccaf1ec09f2258094ab3189e5116713e96.tar.bz2 nixpkgs-915a02ccaf1ec09f2258094ab3189e5116713e96.tar.lz nixpkgs-915a02ccaf1ec09f2258094ab3189e5116713e96.tar.xz nixpkgs-915a02ccaf1ec09f2258094ab3189e5116713e96.tar.zst nixpkgs-915a02ccaf1ec09f2258094ab3189e5116713e96.zip | |
Merge pull request #14275 from nico202/meterbridge
meterbridge: fix gcc-5 build (thanks to: http://ports.ubuntu.com/pool…
| -rw-r--r-- | pkgs/applications/audio/meterbridge/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index e15febda231..d6ba094f458 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0jb6g3kbfyr5yf8mvblnciva2bmc01ijpr51m21r27rqmgi8gj5k"; }; - patches = [ ./buf_rect.patch ]; + patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; buildInputs = [ pkgconfig SDL SDL_image libjack2 diff --git a/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch b/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch new file mode 100644 index 00000000000..a738cd0b82a --- /dev/null +++ b/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch @@ -0,0 +1,31 @@ +Description: Fix build with gcc-5 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778003 +Author: Jaromír Mikeš <mira.mikes@seznam.cz> +Forwarded: No + +Index: meterbridge/src/linedraw.h +=================================================================== +--- meterbridge.orig/src/linedraw.h ++++ meterbridge/src/linedraw.h +@@ -1,7 +1,7 @@ + #ifndef LINEDRAW_H + #define LINEDRAW_H + +-inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col); ++void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col); + + void draw_ptr(SDL_Surface *surface, int x1, int y1, int x2, int y2, Uint32 nedle_col, Uint32 aa_col); + +Index: meterbridge/src/linedraw.c +=================================================================== +--- meterbridge.orig/src/linedraw.c ++++ meterbridge/src/linedraw.c +@@ -4,7 +4,7 @@ + /* set a pixel on an SDL_Surface, assumes that the surface is 32bit RGBA, + * ordered ABGR (I think), probably wont work on bigendian systems */ + +-inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col) ++void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col) + { + Uint32 *bufp = (Uint32 *)surface->pixels + y*surface->pitch/4 + x; + *bufp = col; |