[gentoo-commits] repo/gentoo:master commit in: media-sound/rcenter/files/, media-sound/rcenter/

2020-08-08 Thread David Seifert
commit: 05773148d8b7921a9b51f7ad64ed63b0d7ac2ee7
Author: David Seifert  gentoo  org>
AuthorDate: Sat Aug  8 16:54:00 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Aug  8 16:54:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05773148

media-sound/rcenter: Fix building under -fno-common

Closes: https://bugs.gentoo.org/707648
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: David Seifert  gentoo.org>

 .../rcenter/files/rcenter-0.6.2-fno-common.patch   | 29 ++
 media-sound/rcenter/rcenter-0.6.2.ebuild   |  3 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/media-sound/rcenter/files/rcenter-0.6.2-fno-common.patch 
b/media-sound/rcenter/files/rcenter-0.6.2-fno-common.patch
new file mode 100644
index 000..11f3efdd38b
--- /dev/null
+++ b/media-sound/rcenter/files/rcenter-0.6.2-fno-common.patch
@@ -0,0 +1,29 @@
+--- a/button.h
 b/button.h
+@@ -60,8 +60,8 @@
+ button_max = 34
+ };
+ 
+-char *button_name[button_max];
+-int button_code[button_max];
++extern char *button_name[button_max];
++extern int button_code[button_max];
+ 
+ unsigned int speaker_code(unsigned int code);
+ 
+--- a/main.h
 b/main.h
+@@ -18,9 +18,9 @@
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+-char *midi_device;
++extern char *midi_device;
+ 
+-int delay_sec;
+-int delay_usec;
++extern int delay_sec;
++extern int delay_usec;
+ 
+-int string_digit_limit;
++extern int string_digit_limit;

diff --git a/media-sound/rcenter/rcenter-0.6.2.ebuild 
b/media-sound/rcenter/rcenter-0.6.2.ebuild
index 295c65fb14a..a32acc38076 100644
--- a/media-sound/rcenter/rcenter-0.6.2.ebuild
+++ b/media-sound/rcenter/rcenter-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,6 +17,7 @@ KEYWORDS="amd64 -sparc x86"
 PATCHES=(
"${FILESDIR}"/${P}-makefile.patch
"${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/rcenter/files/, media-sound/rcenter/

2019-10-17 Thread David Seifert
commit: e45fb07f462fbf8336483ccfa9d675ea0cfdb8f7
Author: David Seifert  gentoo  org>
AuthorDate: Thu Oct 17 10:11:17 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Oct 17 10:11:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e45fb07f

media-sound/rcenter: Port to EAPI 7

Bug: https://bugs.gentoo.org/697272
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: David Seifert  gentoo.org>

 ...nter-0.6.2-Wimplicit-function-declaration.patch | 11 
 .../rcenter/files/rcenter-0.6.2-makefile.patch | 15 +++
 media-sound/rcenter/rcenter-0.6.2.ebuild   | 31 +++---
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git 
a/media-sound/rcenter/files/rcenter-0.6.2-Wimplicit-function-declaration.patch 
b/media-sound/rcenter/files/rcenter-0.6.2-Wimplicit-function-declaration.patch
new file mode 100644
index 000..00de497890f
--- /dev/null
+++ 
b/media-sound/rcenter/files/rcenter-0.6.2-Wimplicit-function-declaration.patch
@@ -0,0 +1,11 @@
+--- a/main.c
 b/main.c
+@@ -28,6 +28,8 @@
+ #include 
+ #include 
+ #include 
++#include 
++#include 
+ 
+ // use the first one of these that exists
+ static char *default_device[] = {"/dev/midi00", "/dev/midi", NULL};

diff --git a/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch 
b/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch
index 2c5fbd761a8..aa579b0d925 100644
--- a/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch
+++ b/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch
@@ -1,8 +1,13 @@
-Index: rcenter-0.6.2/Makefile
-===
 rcenter-0.6.2.orig/Makefile
-+++ rcenter-0.6.2/Makefile
-@@ -19,9 +19,9 @@ button.o : button.c
+--- a/Makefile
 b/Makefile
+@@ -1,6 +1,4 @@
+ ALLFILES = *.c *.h Makefile LICENSE HISTORY README config
+-CC = gcc
+-CFLAGS = -O2
+ BINARIES = rcenter
+ PREFIX= /usr/local
+ 
+@@ -19,9 +17,9 @@
  main.o : main.c
  
  rcenter : main.o lowlevel.o handler.o button.o

diff --git a/media-sound/rcenter/rcenter-0.6.2.ebuild 
b/media-sound/rcenter/rcenter-0.6.2.ebuild
index d071eadc0d7..295c65fb14a 100644
--- a/media-sound/rcenter/rcenter-0.6.2.ebuild
+++ b/media-sound/rcenter/rcenter-0.6.2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
-
-IUSE=""
+inherit toolchain-funcs
 
 DESCRIPTION="Rcenter - A program to control the EMU10K Remote Control"
 HOMEPAGE="http://rooster.stanford.edu/~ben/projects/rcenter.php;
@@ -16,21 +14,22 @@ SLOT="0"
 #-sparc: emu10k1 doesn't get recognized on sparc hardware
 KEYWORDS="amd64 -sparc x86"
 
-src_unpack() {
-   unpack ${A}
-   cd "${S}"
-   epatch "${FILESDIR}/${P}-makefile.patch"
-}
+PATCHES=(
+   "${FILESDIR}"/${P}-makefile.patch
+   "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+)
 
-src_compile() {
-   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+src_configure() {
+   tc-export CC
 }
 
 src_install() {
-   chmod 755 rcenter
dobin rcenter
-   dodir /usr/share/rcenter
-   cp -R config "${D}"/usr/share/rcenter/
+   fperms 755 /usr/bin/rcenter
+
+   insinto /usr/share/rcenter
+   doins -r config
+
dodoc HISTORY README
 }
 
@@ -38,7 +37,7 @@ pkg_postinst() {
elog "Rcenter Installed  - However You need to setup the scripts"
elog "for making remote control commands actually work"
elog
-   elog "The Skel scripts can be copied from /usr/share/rcenter/config to 
/.rcenter"
+   elog "The Skel scripts can be copied from 
${EROOT}/usr/share/rcenter/config to /.rcenter"
elog "Where  is a person who will use rcenter"
elog "Remeber to use emu-config -i to turn on the remote"
 }