projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dea2222)
Debian patchlevel bump. Clean up patch. Introduce patchlevel in PV. Fix building...
authorJeroen Roovers <jer@gentoo.org>
Mon, 26 Jan 2015 10:41:58 +0000 (10:41 +0000)
committerJeroen Roovers <jer@gentoo.org>
Mon, 26 Jan 2015 10:41:58 +0000 (10:41 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

media-sound/gramofile/ChangeLog patch | blob | history
media-sound/gramofile/Manifest patch | blob | history
media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch patch | blob | history
media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch [new file with mode: 0644] patch | blob
media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch [new file with mode: 0644] patch | blob
media-sound/gramofile/gramofile-1.6_p9.ebuild [new file with mode: 0644] patch | blob

diff --git a/media-sound/gramofile/ChangeLog b/media-sound/gramofile/ChangeLog
index 95a8ab8c7c2ec261fbf1d22f2938fb8142a63704..85f53bbbe03e10367e2941d1fdbc4d8228beb1b6 100644 (file)
--- 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/Manifest b/media-sound/gramofile/Manifest
index 25211742f403b1b1284417cf105951d88bb42d7c..0e809a518407127b6c5e6b7c2496c6a9eac5bf95 100644 (file)
--- a/media-sound/gramofile/Manifest
+++ b/media-sound/gramofile/Manifest
@@ -1,6 +1,20 @@
-AUX gramofile-1.6-strlen_and_exit.patch 1974 RMD160 7ed757bc2e3c38779f09f35c0ebcefc3b0a9b1a0 SHA1 5e18281082b59ad18916608829c2db97e39ca9f5 SHA256 ca1dba7a5bdf065b4c931e1308f2754ad96fa91c5f23d8c173989291e3a37753
-DIST gramofile_1.6-8.diff.gz 26697 RMD160 087786ee1552bdfb1128e16a5a66a6d8e318356c SHA1 e8e62c6ea943d33e87836fa981b4438faf4d40e7 SHA256 ec4f879885daf542a1cae8c9f77a5dcd37cf33ac4400159b0d5243486617cc34
-DIST gramofile_1.6.orig.tar.gz 108596 RMD160 3f7c8a8e8053e92ece830bbb1138fc7ed1c49967 SHA1 6e5365d9e04801725be694fefcff5fc10ea2f912 SHA256 d1c9fe01f3b49c8c9141c3e09c15f519dcb9ffdcaabcfa51ece0c41540ba69e2
-EBUILD gramofile-1.6-r1.ebuild 1143 RMD160 7b410b34c4741c2071ee3df49881b221250a61a7 SHA1 57e9c545176de0bbc885a81ad75c94a7f60fe49f SHA256 a76db744900835e73e33b5a5f44304e2d0c3bda95ff0c1ef105a18914b0266dd
-MISC ChangeLog 2990 RMD160 5f7e4d1a64e098b1ca67d88874da34e9fd8f0cc1 SHA1 fc41891eefc3b11590f5f88b1653e59e2b656362 SHA256 66e007f97f5acc825ef11c51bed8a7e5d9a0ac785c7919c21bee057c6483c017
-MISC metadata.xml 780 RMD160 a0c546b49fa144309bffe5782f854fc987ddc13c SHA1 3ef851c33bf261c6320cde89699cb085f7610048 SHA256 4bd1cbb935a5e5c8ce390bd2333aff7edcc95fb06ded76598003f9927980c4e6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gramofile-1.6-strlen_and_exit.patch 1296 SHA256 e03b7cf88428b05228f377e03e36db8d8cf98952bb0e97db2820fdddc1d3efce SHA512 ec630b85aa7099968a84e73e4efa014488c10e899080e2745dacd36808502d24f965905f08b02f11dbed6230cf33f3ce63fc2593d9b0f2bb2e268b75b9a10513 WHIRLPOOL b09a7989d35713d176d0e461b235c7195a62c28b831a8d2ec1f179806f84a97e8b063097015b7c08cb3310d2fa7bd0159b1ac7bdea293c24a8952eefa533c9e1
+AUX gramofile-1.6_p9-gentoo.patch 1100 SHA256 ea00d629bb73ffb57c5c859d0fd8ac75f2aa96d160302db4f62f0d3701aee193 SHA512 bd385cf856c6463e0e04a61b0e02bc2b15fced806fa9fed6612451da99823d526dba3f077c773c14cc0b860301ba56b7a8903c5df12c6ed23b31014b60c8ee3e WHIRLPOOL 7fa55892fe03ae1f74ff828d21ea6844b601aeab4dadda29c1ea09fb8898de81df307684eaa03dcb30c5498daae9c51ee1f7554b16e11e7d1338b74455340f62
+AUX gramofile-1.6_p9-strlen_and_exit.patch 392 SHA256 d199ab63870df7d15a326701c8e43b9af3036276809f149c1c79092226792809 SHA512 266dcbce4654c31e120d97e30e56764bac9f44dd412015c602bd43d902c38eb9fd9aa47dd7fe64961a1ea28eee1bcc992ec1d83a024cb1482a2b8d9e70c55034 WHIRLPOOL 4b122b8d0b3130ced9fc54d654e1f07153080374fb0366f5ad2bafdb7a72f450d69ec9efdc3c42c3dac4b045a9f750ca16b2105e2aaaed3d87082186296b060f
+DIST gramofile_1.6-8.diff.gz 26697 SHA256 ec4f879885daf542a1cae8c9f77a5dcd37cf33ac4400159b0d5243486617cc34 SHA512 f03ab82de0aa8fca44bd5be4e64c0606c08a083ed09039728e163a2e535348c8984acd958bc6589139907101faf867e3030ff2ad09abdc8e3b292864f69e64ae WHIRLPOOL 83cce33030cf2feaa5096129c87ea51387f4856eae82359ca050cb46b91ee25e9d47ab7b37519d28086632e611b6dfeeb2a382e7a208c1e856e8f06874c622ae
+DIST gramofile_1.6-9.diff.gz 25244 SHA256 f18fba5fba9889cf8090c22643fa39e6e93011d66a75e6274311f70244d8826e SHA512 2c3b0131afcbae680432e5fc1bb753bae7c19d5bb4372808a0f86ef704800aea218e3bfe625bffe46ee3cd4a38f89a488141223d22b8f467cab45ee4a962c249 WHIRLPOOL f51ed79b6a61d728dccfd1cb61195909dbd188d16612f3680573b1463027f15d1ed4d8feced4ea9e28a719997041148679c1f796c09b51e4fe499989f27dcb49
+DIST gramofile_1.6.orig.tar.gz 108596 SHA256 d1c9fe01f3b49c8c9141c3e09c15f519dcb9ffdcaabcfa51ece0c41540ba69e2 SHA512 171a7cff4066d625b9263f5462bf3e8fba30a02b629f20f7b38031cf037eb0940cfb54b73671d10948ac3326e272b3576de785310022007e0d4dca4f164815a5 WHIRLPOOL 19c739b5c654f2180740f2d11ce567950d83431844807bc27cedc209378d4105de075946b42999019be3007ed30e0f25b23d40f4263ce6184fc480ce83d057ac
+EBUILD gramofile-1.6-r1.ebuild 1143 SHA256 a76db744900835e73e33b5a5f44304e2d0c3bda95ff0c1ef105a18914b0266dd SHA512 eb07739d3c9595947d2b47cc0543c8ca97208d973bf27bf9cd8cb1047468372c3101e1aff38b0ff64b2ca7d644b733137152b8b5ec4d5958c715cc8c3908acc6 WHIRLPOOL 0874350e408d32ea089ac0a9a4036434c5eebea255ddbafe4427e623b96157a0ba68a2fae2e25b74fa63f8f37086172ed5576229d425de47d24812cae79d3f51
+EBUILD gramofile-1.6_p9.ebuild 1149 SHA256 f762075275f12ee5497536f5d66167c30bc3c0120fc4bf1931a2854894e9af54 SHA512 3929a98c69fa231b95c634ac38b61a85d0ff0c5bd483b7e5f5e7724418e18eb8c0ce3c975985e7786afc4b0350feefbb3fefc4feb110e1770baa4f356c86f8d1 WHIRLPOOL f8a4cafa2295492a350cdf15903bdaebb9c73f847ec09f5f91f30ddff0e385919d94a7b2198e0b6006a452f1619c67797ba8741bd562644b1bc79f4b2624f6b0
+MISC ChangeLog 3360 SHA256 db31b995b982450b8f56401bf789de70903e92117be4bbd87c9cfbcf3444bdfb SHA512 15925421fb94a7226bf5316428ce531eb5dfc2492d326db5a0b53e399e08158292808f0307a9b00eb95ce59927ebd2c76cf78314154e275db0b24f83a967ae1e WHIRLPOOL 644c8ed6910e36326cec95e13201ffe0f3942de6554bcbb2f6ddc1349558d84f341361da1b94865fdacbc43957ba42714ebc04e136c9d999c1b6cf01b15ee0b2
+MISC metadata.xml 780 SHA256 4bd1cbb935a5e5c8ce390bd2333aff7edcc95fb06ded76598003f9927980c4e6 SHA512 d52675fc47e6b59ed9e6f6b4c5d340c367b92f53f2b8b40facf23faa690a315c65d621add78e1c0fb3b89b9e117ae9db7d780d4a1fa0b984c3a76724d3e950f9 WHIRLPOOL 5059b18900de5a40e8e4e659e24323da68bb34488c5896505adda3018d57cd2c456f76b6de2627f415ea0b45748bce9ba19fd3363f34a13d0ea09649fdd4f914
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlTGGfYACgkQVWmRsqeSphNiUQCdHNXzvUcHjzPaXKurYpjL6U7O
+axYAn1lcMeV73QZxfqDvF2ar0aly0Eyl
+=emwD
+-----END PGP SIGNATURE-----
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 0b6c4dcb999d7a08c01a7826f4b90116940ece0f..4c35dd3eb2ff3e6665fa4cf5a1cb9bd02a15a16d 100644 (file)
--- 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 (file)
index 0000000..9fdbe14
--- /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 (file)
index 0000000..0369914
--- /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 (file)
index 0000000..711bbca
--- /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
+}
Unnamed repository; edit this file 'description' to name the repository.