[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/
commit: fa91b755b8244bb01575a2b2f056f5aecbbdcc4c Author: Arthur Zamarin gentoo org> AuthorDate: Sat May 6 10:03:43 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 6 10:03:43 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa91b755 x11-plugins/gkrellm-radio: Stabilize 2.0.4-r2 sparc, #902627 Signed-off-by: Arthur Zamarin gentoo.org> x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild index 08c973fee939..f874b192ebb9 100644 --- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild +++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="2" -KEYWORDS="~amd64 ~ppc ~sparc x86" +KEYWORDS="~amd64 ~ppc sparc x86" IUSE="lirc" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/
commit: 7f20d3c41e64afd34b54d10cccad4e5af91daffa Author: Sam James gentoo org> AuthorDate: Wed Mar 22 05:26:13 2023 + Commit: Sam James gentoo org> CommitDate: Wed Mar 22 05:26:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f20d3c4 x11-plugins/gkrellm-radio: Stabilize 2.0.4-r2 x86, #902627 Signed-off-by: Sam James gentoo.org> x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild index a9205427505b..08c973fee939 100644 --- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild +++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="2" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc ~sparc x86" IUSE="lirc" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/
commit: 8dd7681260ec85aec7135a00fbb199fe1b371fe0 Author: David Seifert gentoo org> AuthorDate: Fri Feb 10 21:14:13 2023 + Commit: David Seifert gentoo org> CommitDate: Fri Feb 10 21:14:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd76812 x11-plugins/gkrellm-radio: fix IndirectInherits on multilib Signed-off-by: David Seifert gentoo.org> x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild | 4 ++-- x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild index f46b39d00e72..4ede19cfcb87 100644 --- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild +++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners" HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php; diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild index b2f7d13cf996..a9205427505b 100644 --- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild +++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners" HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php;
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/
commit: 2a0496de1dfd3a4fa14961dd95fc50f6792ad4bb Author: Sam James gentoo org> AuthorDate: Fri Feb 3 11:06:51 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 3 11:06:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0496de x11-plugins/gkrellm-radio: adopt Help very much still welcome, just adopting so it's not m-n and can fix the easy bugs at least. Signed-off-by: Sam James gentoo.org> x11-plugins/gkrellm-radio/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x11-plugins/gkrellm-radio/metadata.xml b/x11-plugins/gkrellm-radio/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellm-radio/metadata.xml +++ b/x11-plugins/gkrellm-radio/metadata.xml @@ -1,5 +1,8 @@ https://www.gentoo.org/dtd/metadata.dtd;> - + + s...@gentoo.org + Sam James +
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/files/, x11-plugins/gkrellm-radio/
commit: 1a97a24657069537f1351df6c215924143ddf7e9 Author: Sam James gentoo org> AuthorDate: Fri Feb 3 09:55:04 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 3 09:55:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a97a246 x11-plugins/gkrellm-radio: fix musl build Closes: https://bugs.gentoo.org/833164 Signed-off-by: Sam James gentoo.org> ...krellm-radio-2.0.4-Use-standard-int-types.patch | 152 + .../gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild| 37 + 2 files changed, 189 insertions(+) diff --git a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-Use-standard-int-types.patch b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-Use-standard-int-types.patch new file mode 100644 index ..ed29ace772fa --- /dev/null +++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-Use-standard-int-types.patch @@ -0,0 +1,152 @@ +From 6cbfd2d76c5c48913c29bf1b27e0fdadba508a7a Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 3 Feb 2023 09:53:57 + +Subject: [PATCH] Use standard int types + +Bug: https://bugs.gentoo.org/833164 +Signed-off-by: Sam James +--- a/videodev.h b/videodev.h +@@ -1,6 +1,7 @@ + #ifndef __LINUX_VIDEODEV_H + #define __LINUX_VIDEODEV_H + ++#include + #include + + #ifdef __KERNEL__ +@@ -73,44 +74,44 @@ struct video_channel + int channel; + char name[32]; + int tuners; +- __u32 flags; ++ uint32_t flags; + #define VIDEO_VC_TUNER1 /* Channel has a tuner */ + #define VIDEO_VC_AUDIO2 /* Channel has audio */ +- __u16 type; ++ uint16_t type; + #define VIDEO_TYPE_TV 1 + #define VIDEO_TYPE_CAMERA 2 +- __u16 norm; /* Norm set by channel */ ++ uint16_t norm; /* Norm set by channel */ + }; + + struct video_tuner + { + int tuner; + char name[32]; +- ulong rangelow, rangehigh; /* Tuner range */ +- __u32 flags; ++ unsigned long rangelow, rangehigh; /* Tuner range */ ++ uint32_t flags; + #define VIDEO_TUNER_PAL 1 + #define VIDEO_TUNER_NTSC 2 + #define VIDEO_TUNER_SECAM 4 + #define VIDEO_TUNER_LOW 8 /* Uses KHz not MHz */ + #define VIDEO_TUNER_NORM 16 /* Tuner can set norm */ + #define VIDEO_TUNER_STEREO_ON 128 /* Tuner is seeing stereo */ +- __u16 mode; /* PAL/NTSC/SECAM/OTHER */ ++ uint16_t mode; /* PAL/NTSC/SECAM/OTHER */ + #define VIDEO_MODE_PAL0 + #define VIDEO_MODE_NTSC 1 + #define VIDEO_MODE_SECAM 2 + #define VIDEO_MODE_AUTO 3 +- __u16 signal; /* Signal strength 16bit scale */ ++ uint16_t signal;/* Signal strength 16bit scale */ + }; + + struct video_picture + { +- __u16 brightness; +- __u16 hue; +- __u16 colour; +- __u16 contrast; +- __u16 whiteness; /* Black and white only */ +- __u16 depth; /* Capture depth */ +- __u16 palette;/* Palette in use */ ++ uint16_tbrightness; ++ uint16_thue; ++ uint16_tcolour; ++ uint16_tcontrast; ++ uint16_twhiteness; /* Black and white only */ ++ uint16_tdepth; /* Capture depth */ ++ uint16_t palette; /* Palette in use */ + #define VIDEO_PALETTE_GREY1 /* Linear greyscale */ + #define VIDEO_PALETTE_HI240 2 /* High 240 cube (BT848) */ + #define VIDEO_PALETTE_RGB565 3 /* 565 16 bit RGB */ +@@ -134,9 +135,9 @@ struct video_picture + struct video_audio + { + int audio; /* Audio channel */ +- __u16 volume; /* If settable */ +- __u16 bass, treble; +- __u32 flags; ++ uint16_tvolume; /* If settable */ ++ uint16_tbass, treble; ++ uint32_tflags; + #define VIDEO_AUDIO_MUTE 1 + #define VIDEO_AUDIO_MUTABLE 2 + #define VIDEO_AUDIO_VOLUME4 +@@ -147,24 +148,24 @@ struct video_audio + #define VIDEO_SOUND_STEREO2 + #define VIDEO_SOUND_LANG1 4 + #define VIDEO_SOUND_LANG2 8 +-__u16 mode; /* detected audio carriers or one to set */ +-__u16 balance;/* Stereo balance */ +-__u16 step; /* Step actual volume uses */ ++uint16_t mode; /* detected audio carriers or one to set */ ++uint16_t balance;/* Stereo balance */ ++uint16_t step; /* Step actual volume uses */ + }; + + struct video_clip + { +- __s32 x,y; +- __s32 width, height; ++ int32_t x,y; ++ int32_t width, height; + struct video_clip *next; /* For user use/driver use only */ + }; + + struct video_window + { +- __u32 x,y;/* Position
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/files/
commit: 044f58f365f00c8ab96a1fe8505f24665169060b Author: Sam James gentoo org> AuthorDate: Fri Feb 3 05:01:20 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 3 05:08:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=044f58f3 x11-plugins/gkrellm-radio: scrub patches Bug: https://bugs.gentoo.org/892251 Signed-off-by: Sam James gentoo.org> x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch index a5fcabfea07b..e718366fa093 100644 --- a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch +++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch @@ -1,5 +1,5 @@ a/Makefile 2003-09-20 13:02:15.0 +0200 -+++ b/Makefile_new 2013-03-16 14:38:19.122375762 +0100 +--- a/Makefile b/Makefile_new @@ -9,8 +9,8 @@ DISTFILES=gkrellm_radio.c radio.c radio.h videodev.h README Makefile CHANGES
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/
commit: 7156f0be1b6635071cd83c104ac44bd3809ce406 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Aug 29 07:34:00 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Aug 29 08:36:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7156f0be x11-plugins/gkrellm-radio: drop 2.0.4 Closes: https://bugs.gentoo.org/867175 Signed-off-by: Andreas Sturmlechner gentoo.org> .../gkrellm-radio/gkrellm-radio-2.0.4.ebuild | 33 -- 1 file changed, 33 deletions(-) diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild deleted file mode 100644 index 37e9b9d77ffe.. --- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gkrellm-plugin toolchain-funcs - -DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners" -SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz; -HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php; - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~amd64 ~ppc sparc x86" -IUSE="lirc" - -RDEPEND=" - app-admin/gkrellm:2[X] - lirc? ( app-misc/lirc )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${PN} -PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) - -src_configure() { - PLUGIN_SO=( radio$(get_modname) ) - default -} - -src_compile() { - use lirc && myconf="${myconf} WITH_LIRC=1" - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf} -}
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/
commit: 8e6af6e067d6473704034fdcef477803ab090ddb Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Aug 29 07:20:29 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Aug 29 07:20:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e6af6e0 x11-plugins/gkrellm-radio: x86 stable wrt bug #867175 Signed-off-by: Agostino Sarubbo gentoo.org> x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild index ede1053a00c5..f46b39d00e72 100644 --- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild +++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="2" -KEYWORDS="~amd64 ~ppc sparc ~x86" +KEYWORDS="~amd64 ~ppc sparc x86" IUSE="lirc" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/
commit: ffaa5b57a4e7b2ccb5d60459006ba560358c0f60 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Aug 28 20:45:28 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Aug 28 20:45:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffaa5b57 x11-plugins/gkrellm-radio: Stabilize 2.0.4-r1 sparc, #867175 Signed-off-by: Arthur Zamarin gentoo.org> x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild index d5fcf32c4c2f..ede1053a00c5 100644 --- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild +++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="2" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc sparc ~x86" IUSE="lirc" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/files/, x11-plugins/gkrellm-radio/
commit: ed5040037d97726d76f6bad5a062547784ad12d5 Author: Thomas Bracht Laumann Jespersen laumann xyz> AuthorDate: Mon Apr 4 11:42:06 2022 + Commit: Sam James gentoo org> CommitDate: Thu Apr 21 19:54:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed504003 x11-plugins/gkrellm-radio: update EAPI 6 -> 8 Signed-off-by: Thomas Bracht Laumann Jespersen laumann.xyz> Signed-off-by: Sam James gentoo.org> .../files/gkrellm-radio-2.0.4-r1-pkgconfig.patch | 15 + .../gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild| 36 ++ 2 files changed, 51 insertions(+) diff --git a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-r1-pkgconfig.patch b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-r1-pkgconfig.patch new file mode 100644 index ..94405dc469df --- /dev/null +++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-r1-pkgconfig.patch @@ -0,0 +1,15 @@ +Respect user's pkg-config +--- a/Makefile b/Makefile +@@ -15,8 +15,9 @@ OBJS=gkrellm_radio.o radio.o + PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins + INSTALL = install -c + INSTALL_PROGRAM = $(INSTALL) -s +-GTK_CONFIG = pkg-config gtk+-2.0 +-CFLAGS := ${CFLAGS} -fPIC -I$(GKRELLMDIR)/include `$(GTK_CONFIG) --cflags` -DVERSION=\"$(VERSION)\" -Wall ++PKG_CONFIG ?= pkg-config ++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags) ++CFLAGS := ${CFLAGS} -fPIC -I$(GKRELLMDIR)/include ${GTK_INCLUDE} -DVERSION=\"$(VERSION)\" -Wall + + ifdef WITH_LIRC + CFLAGS := ${CFLAGS} -DHAVE_LIRC diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild new file mode 100644 index ..d5fcf32c4c2f --- /dev/null +++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gkrellm-plugin toolchain-funcs + +DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners" +HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php; +SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz; +S="${WORKDIR}/${PN}" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="lirc" + +RDEPEND=" + app-admin/gkrellm:2[X] + lirc? ( app-misc/lirc )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-r1-pkgconfig.patch +) + +src_configure() { + PLUGIN_SO=( radio$(get_modname) ) + default +} + +src_compile() { + use lirc && myconf="${myconf} WITH_LIRC=1" + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf} +}
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/
commit: 7a6935c6f1397b4d193d746c5f6f6e49c042f285 Author: Sam James gentoo org> AuthorDate: Thu Mar 10 22:41:12 2022 + Commit: Sam James gentoo org> CommitDate: Thu Mar 10 22:41:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a6935c6 x11-plugins/gkrellm-radio: fix commands in global scope Closes: https://bugs.gentoo.org/788067 Signed-off-by: Sam James gentoo.org> x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild index 6d3870ddc036..37e9b9d77ffe 100644 --- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild +++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild @@ -22,7 +22,10 @@ DEPEND="${RDEPEND}" S=${WORKDIR}/${PN} PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) -PLUGIN_SO=( radio$(get_modname) ) +src_configure() { + PLUGIN_SO=( radio$(get_modname) ) + default +} src_compile() { use lirc && myconf="${myconf} WITH_LIRC=1"
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/
commit: ac70897f8ce3a674e3802d7b4f0d8ab51b8357ea Author: David Seifert gentoo org> AuthorDate: Wed Jan 3 22:34:33 2018 + Commit: David Seifert gentoo org> CommitDate: Thu Jan 4 09:16:01 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac70897f x11-plugins/gkrellm-radio: Eclass update Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../gkrellm-radio/gkrellm-radio-2.0.4.ebuild| 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild index 541296313c5..5f7915f9827 100644 --- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild +++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild @@ -1,28 +1,29 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit gkrellm-plugin toolchain-funcs DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners" SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz; HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php; -DEPEND="lirc? ( app-misc/lirc )" -RDEPEND="${DEPEND} - app-admin/gkrellm[X] -" - -IUSE="lirc" -SLOT="2" LICENSE="GPL-2" +SLOT="2" KEYWORDS="~amd64 ppc sparc x86" +IUSE="lirc" -PLUGIN_SO="radio.so" -S="${WORKDIR}/${PN}" +RDEPEND=" + app-admin/gkrellm:2[X] + lirc? ( app-misc/lirc )" +DEPEND="${RDEPEND}" +S=${WORKDIR}/${PN} PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) +PLUGIN_SO=( radio$(get_modname) ) + src_compile() { use lirc && myconf="${myconf} WITH_LIRC=1" emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/files/, x11-plugins/gkrellm-radio/
commit: bf5e766c3cc6509c0ea8fd9c7a8c1aabda363155 Author: Pacho Ramos gentoo org> AuthorDate: Thu Aug 25 12:43:23 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Thu Aug 25 12:53:54 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5e766c x11-plugins/gkrellm-radio: Respect LDFLAGS and fix dependencies (#340138 by Michael Mair-Keimberger (iamnr3)) Package-Manager: portage-2.3.0 .../files/gkrellm-radio-2.0.4-makefile.patch | 22 ++ .../gkrellm-radio/gkrellm-radio-2.0.4.ebuild | 21 + 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch new file mode 100644 index ..a5fcabf --- /dev/null +++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch @@ -0,0 +1,22 @@ +--- a/Makefile 2003-09-20 13:02:15.0 +0200 b/Makefile_new 2013-03-16 14:38:19.122375762 +0100 +@@ -9,8 +9,8 @@ + + DISTFILES=gkrellm_radio.c radio.c radio.h videodev.h README Makefile CHANGES + +-CC=gcc +-LDFLAGS= ++CC=$(CC) ++LDFLAGS=$(LDFLAGS) + OBJS=gkrellm_radio.o radio.o + PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins + INSTALL = install -c +@@ -35,7 +35,7 @@ + export PACKAGE LOCALEDIR + + radio.so: $(OBJS) +- $(CC) -shared -Wl -o radio.so $(OBJS) $(LDFLAGS) ++ $(CC) -shared -o radio.so $(OBJS) $(LDFLAGS) + (cd po && ${MAKE} all ) + + %.o: %.c diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild index b1e09da..f3a86c9 100644 --- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild +++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild @@ -1,25 +1,30 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -inherit gkrellm-plugin +EAPI=6 +inherit gkrellm-plugin toolchain-funcs -IUSE="lirc" - -S=${WORKDIR}/${PN} DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners" SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz; HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php; DEPEND="lirc? ( app-misc/lirc )" +RDEPEND="${DEPEND} + app-admin/gkrellm[X] +" +IUSE="lirc" SLOT="2" LICENSE="GPL-2" -KEYWORDS="ppc sparc x86" +KEYWORDS="~amd64 ppc sparc x86" + +PLUGIN_SO="radio.so" +S="${WORKDIR}/${PN}" -PLUGIN_SO=radio.so +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) src_compile() { use lirc && myconf="${myconf} WITH_LIRC=1" - emake ${myconf} || die + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf} }