[gentoo-commits] gentoo-x86 commit in media-sound/gramofile/files: gramofile-1.6-strlen_and_exit.patch gramofile-1.6_p3-64bit.patch gramofile-1.6_p3-implicit-declarations.patch

[gentoo-commits] gentoo-x86 commit in media-sound/gramofile/files: gramofile-1.6-strlen_and_exit.patch gramofile-1.6_p3-64bit.patch gramofile-1.6_p3-implicit-declarations.patch

[Samuli Suominen (ssuominen)]

ssuominen    09/05/12 20:06:01

  Added:                gramofile-1.6-strlen_and_exit.patch
  Removed:              gramofile-1.6_p3-64bit.patch
                        gramofile-1.6_p3-implicit-declarations.patch
  Log:
  Apply Debian patchset wrt #137756, #131209 and #214442.
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch?rev=1.1&content-type=text/plain

Index: gramofile-1.6-strlen_and_exit.patch
===================================================================
diff -ur gramofile-1.6.orig/bplaysrc/Makefile gramofile-1.6/bplaysrc/Makefile
--- gramofile-1.6.orig/bplaysrc/Makefile	2009-05-12 22:39:32.000000000 +0300
+++ gramofile-1.6/bplaysrc/Makefile	2009-05-12 22:45:53.000000000 +0300
@@ -6,13 +6,12 @@
         ../clrscr.o ../secshms.o
 #SRCS = bplay.c sndfunc.o shmbuf.c
 
-CC = gcc
-LDFLAGS = 
+CC ?= gcc
 
 ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see ../Makefile!)
 
 # For Linux (and maybe others), use these:
-CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
+CFLAGS += -Wall -DUSEBUFFLOCK -DLP2CD -DVUMETER
 LIBS = -lncurses
 
 # For FreeBSD (and maybe others), use these:
diff -ur gramofile-1.6.orig/gramofile.c gramofile-1.6/gramofile.c
--- gramofile-1.6.orig/gramofile.c	2009-05-12 22:39:32.000000000 +0300
+++ gramofile-1.6/gramofile.c	2009-05-12 22:41:25.000000000 +0300
@@ -11,6 +11,7 @@
 #include "splashscr.h"
 #include <signal.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 #ifndef OLD_CURSES
 #include <ncurses.h>
diff -ur gramofile-1.6.orig/Makefile gramofile-1.6/Makefile
--- gramofile-1.6.orig/Makefile	2009-05-12 22:39:32.000000000 +0300
+++ gramofile-1.6/Makefile	2009-05-12 22:45:28.000000000 +0300
@@ -14,13 +14,12 @@
 OBJS = $(SRCS:.c=.o)
 SHELL = /bin/sh
 
-CC = gcc
-LDFLAGS = 
+CC ?= gcc
 
 ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see bplaysrc/Makefile!)
 
 # For Linux (and maybe others), use these:
-CFLAGS = -Wall -O2 -funroll-loops -DTURBO_MEDIAN -DTURBO_BUFFER
+CFLAGS += -Wall -DTURBO_MEDIAN -DTURBO_BUFFER
 DEPS = $(OBJS) makebplay
 LIBS = -lncurses -lrfftw -lfftw -lm
 COPY_A = -a
diff -ur gramofile-1.6.orig/signpr_cmf3.c gramofile-1.6/signpr_cmf3.c
--- gramofile-1.6.orig/signpr_cmf3.c	2009-05-12 22:39:32.000000000 +0300
+++ gramofile-1.6/signpr_cmf3.c	2009-05-12 22:41:09.000000000 +0300
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include <string.h>
 #ifndef OLD_CURSES
 #include <ncurses.h>
 #else