meterbridge: fix gcc-5 build (thanks to: http://ports.ubuntu.com/pool/universe/m/meterbridge/)

= c7a26ccf a7d34e0c

+32 -1
+1 -1
pkgs/applications/audio/meterbridge/default.nix
··· 10 10 sha256 = "0jb6g3kbfyr5yf8mvblnciva2bmc01ijpr51m21r27rqmgi8gj5k"; 11 11 }; 12 12 13 - patches = [ ./buf_rect.patch ]; 13 + patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; 14 14 15 15 buildInputs = 16 16 [ pkgconfig SDL SDL_image libjack2
+31
pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch
··· 1 + Description: Fix build with gcc-5 2 + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778003 3 + Author: Jaromír Mikeš <mira.mikes@seznam.cz> 4 + Forwarded: No 5 + 6 + Index: meterbridge/src/linedraw.h 7 + =================================================================== 8 + --- meterbridge.orig/src/linedraw.h 9 + +++ meterbridge/src/linedraw.h 10 + @@ -1,7 +1,7 @@ 11 + #ifndef LINEDRAW_H 12 + #define LINEDRAW_H 13 + 14 + -inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col); 15 + +void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col); 16 + 17 + void draw_ptr(SDL_Surface *surface, int x1, int y1, int x2, int y2, Uint32 nedle_col, Uint32 aa_col); 18 + 19 + Index: meterbridge/src/linedraw.c 20 + =================================================================== 21 + --- meterbridge.orig/src/linedraw.c 22 + +++ meterbridge/src/linedraw.c 23 + @@ -4,7 +4,7 @@ 24 + /* set a pixel on an SDL_Surface, assumes that the surface is 32bit RGBA, 25 + * ordered ABGR (I think), probably wont work on bigendian systems */ 26 + 27 + -inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col) 28 + +void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col) 29 + { 30 + Uint32 *bufp = (Uint32 *)surface->pixels + y*surface->pitch/4 + x; 31 + *bufp = col;