summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2015-01-26 10:41:57 +0000
committerJeroen Roovers <jer@gentoo.org>2015-01-26 10:41:57 +0000
commitae0350ebb436d1096db41df6e56137cdb1ce52cc (patch)
treed1303171656ab5da2b29b0d53dd5d6999dba83c7 /media-sound/gramofile
parentStable for x86, wrt bug #534896 (diff)
downloadgentoo-2-ae0350ebb436d1096db41df6e56137cdb1ce52cc.tar.gz
gentoo-2-ae0350ebb436d1096db41df6e56137cdb1ce52cc.tar.bz2
gentoo-2-ae0350ebb436d1096db41df6e56137cdb1ce52cc.zip
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)
Diffstat (limited to 'media-sound/gramofile')
-rw-r--r--media-sound/gramofile/ChangeLog13
-rw-r--r--media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch20
-rw-r--r--media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch39
-rw-r--r--media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch20
-rw-r--r--media-sound/gramofile/gramofile-1.6_p9.ebuild46
5 files changed, 124 insertions, 14 deletions
diff --git a/media-sound/gramofile/ChangeLog b/media-sound/gramofile/ChangeLog
index 95a8ab8c7c2e..85f53bbbe03e 100644
--- a/media-sound/gramofile/ChangeLog
+++ b/media-sound/gramofile/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for media-sound/gramofile
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gramofile/ChangeLog,v 1.21 2009/07/02 19:30:05 maekke Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gramofile/ChangeLog,v 1.22 2015/01/26 10:41:57 jer Exp $
+
+*gramofile-1.6_p9 (26 Jan 2015)
+
+ 26 Jan 2015; Jeroen Roovers <jer@gentoo.org> +gramofile-1.6_p9.ebuild,
+ files/gramofile-1.6-strlen_and_exit.patch,
+ +files/gramofile-1.6_p9-gentoo.patch,
+ +files/gramofile-1.6_p9-strlen_and_exit.patch:
+ Debian patchlevel bump. Clean up patch. Introduce patchlevel in PV. Fix
+ building against sys-libs/ncurses[tinfo] (bug #529736).
02 Jul 2009; Markus Meier <maekke@gentoo.org> gramofile-1.6-r1.ebuild:
amd64 stable, bug #273384
diff --git a/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch b/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
index 0b6c4dcb999d..4c35dd3eb2ff 100644
--- a/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
+++ b/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
@@ -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 @@ diff -ur gramofile-1.6.orig/bplaysrc/Makefile gramofile-1.6/bplaysrc/Makefile
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 @@ diff -ur gramofile-1.6.orig/gramofile.c gramofile-1.6/gramofile.c
#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 @@ diff -ur gramofile-1.6.orig/Makefile gramofile-1.6/Makefile
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>
diff --git a/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch b/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch
new file mode 100644
index 000000000000..9fdbe1477233
--- /dev/null
+++ b/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch
@@ -0,0 +1,39 @@
+--- 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
diff --git a/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch b/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch
new file mode 100644
index 000000000000..0369914779fd
--- /dev/null
+++ b/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch
@@ -0,0 +1,20 @@
+--- 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
diff --git a/media-sound/gramofile/gramofile-1.6_p9.ebuild b/media-sound/gramofile/gramofile-1.6_p9.ebuild
new file mode 100644
index 000000000000..711bbca0caf3
--- /dev/null
+++ b/media-sound/gramofile/gramofile-1.6_p9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gramofile/gramofile-1.6_p9.ebuild,v 1.1 2015/01/26 10:41:57 jer Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Transfer sound from gramophone records to CD"
+HOMEPAGE="http://www.opensourcepartners.nl/~costar/gramofile"
+SRC_URI="
+ mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}.orig.tar.gz
+ mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ sys-libs/ncurses
+ sci-libs/fftw:2.1
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+ epatch "${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
+ EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch ${P/_p*}/debian/patches
+
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-strlen_and_exit.patch
+
+ tc-export CC PKG_CONFIG
+}
+
+src_install() {
+ dobin ${PN}
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe bplay_gramo brec_gramo
+ dodoc ChangeLog README TODO *.txt
+ newdoc ${P/_p*}/debian/changelog ChangeLog.debian
+}