jer 15/01/26 10:41:57
Modified: gramofile-1.6-strlen_and_exit.patch
Added: gramofile-1.6_p9-gentoo.patch
gramofile-1.6_p9-strlen_and_exit.patch
Log:
Debian patchlevel bump. Clean up patch. Introduce patchlevel in PV. Fix
building against sys-libs/ncurses[tinfo] (bug #529736).
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.2
media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch?r1=1.1&r2=1.2
Index: gramofile-1.6-strlen_and_exit.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gramofile-1.6-strlen_and_exit.patch 12 May 2009 20:06:01 -0000 1.1
+++ gramofile-1.6-strlen_and_exit.patch 26 Jan 2015 10:41:57 -0000 1.2
@@ -1,6 +1,5 @@
-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
+--- a/bplaysrc/Makefile
++++ b/bplaysrc/Makefile
@@ -6,13 +6,12 @@
../clrscr.o ../secshms.o
#SRCS = bplay.c sndfunc.o shmbuf.c
@@ -17,9 +16,8 @@
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
+--- a/gramofile.c
++++ b/gramofile.c
@@ -11,6 +11,7 @@
#include "splashscr.h"
#include <signal.h>
@@ -28,9 +26,8 @@
#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
+--- a/Makefile
++++ b/Makefile
@@ -14,13 +14,12 @@
OBJS = $(SRCS:.c=.o)
SHELL = /bin/sh
@@ -47,9 +44,8 @@
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
+--- a/signpr_cmf3.c
++++ b/signpr_cmf3.c
@@ -34,6 +34,7 @@
#include <stdlib.h>
#include <stdio.h>
1.1 media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch?rev=1.1&content-type=text/plain
Index: gramofile-1.6_p9-gentoo.patch
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -14,15 +14,12 @@
OBJS = $(SRCS:.c=.o)
SHELL = /bin/sh
-CC = gcc
-LDFLAGS =
-
########## 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
+LIBS = $(shell ${PKG_CONFIG} --libs ncurses) -lrfftw -lfftw -lm
COPY_A = -a
# For FreeBSD (and maybe others), use these:
--- a/bplaysrc/Makefile
+++ b/bplaysrc/Makefile
@@ -6,14 +6,11 @@
../clrscr.o ../secshms.o
#SRCS = bplay.c sndfunc.o shmbuf.c
-CC = gcc
-LDFLAGS =
-
########## CHOOSE YOUR ARCHITECTURE: (NOTE: also see ../Makefile!)
# For Linux (and maybe others), use these:
-CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
-LIBS = -lncurses
+CFLAGS += -Wall -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
+LIBS = $(shell ${PKG_CONFIG} --libs ncurses)
# For FreeBSD (and maybe others), use these:
#CFLAGS = -Wall -O2 -DLP2CD -DVUMETER # -DDEBUG
1.1
media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch?rev=1.1&content-type=text/plain
Index: gramofile-1.6_p9-strlen_and_exit.patch
===================================================================
--- a/gramofile.c
+++ b/gramofile.c
@@ -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>
--- a/signpr_cmf3.c
+++ b/signpr_cmf3.c
@@ -33,6 +33,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
+#include <string.h>
#ifndef OLD_CURSES
#include <ncurses.h>
#else
