* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/files/, x11-plugins/gkrellm-radio/
@ 2016-08-25 12:54 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2016-08-25 12:54 UTC (permalink / raw
To: gentoo-commits
commit: bf5e766c3cc6509c0ea8fd9c7a8c1aabda363155
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 12:43:23 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 12:53:54 2016 +0000
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 00000000..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.000000000 +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}
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/files/, x11-plugins/gkrellm-radio/
@ 2022-04-21 19:55 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-04-21 19:55 UTC (permalink / raw
To: gentoo-commits
commit: ed5040037d97726d76f6bad5a062547784ad12d5
Author: Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Mon Apr 4 11:42:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 19:54:38 2022 +0000
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 <t <AT> laumann.xyz>
Signed-off-by: Sam James <sam <AT> 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 000000000000..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 000000000000..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}
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/files/, x11-plugins/gkrellm-radio/
@ 2023-02-03 9:59 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-02-03 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 1a97a24657069537f1351df6c215924143ddf7e9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 09:55:04 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 09:55:04 2023 +0000
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 <sam <AT> 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 000000000000..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 <sam@gentoo.org>
+Date: Fri, 3 Feb 2023 09:53:57 +0000
+Subject: [PATCH] Use standard int types
+
+Bug: https://bugs.gentoo.org/833164
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/videodev.h
++++ b/videodev.h
+@@ -1,6 +1,7 @@
+ #ifndef __LINUX_VIDEODEV_H
+ #define __LINUX_VIDEODEV_H
+
++#include <stdint.h>
+ #include <linux/types.h>
+
+ #ifdef __KERNEL__
+@@ -73,44 +74,44 @@ struct video_channel
+ int channel;
+ char name[32];
+ int tuners;
+- __u32 flags;
++ uint32_t flags;
+ #define VIDEO_VC_TUNER 1 /* Channel has a tuner */
+ #define VIDEO_VC_AUDIO 2 /* 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_PAL 0
+ #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_t brightness;
++ uint16_t hue;
++ uint16_t colour;
++ uint16_t contrast;
++ uint16_t whiteness; /* Black and white only */
++ uint16_t depth; /* Capture depth */
++ uint16_t palette; /* Palette in use */
+ #define VIDEO_PALETTE_GREY 1 /* 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_t volume; /* If settable */
++ uint16_t bass, treble;
++ uint32_t flags;
+ #define VIDEO_AUDIO_MUTE 1
+ #define VIDEO_AUDIO_MUTABLE 2
+ #define VIDEO_AUDIO_VOLUME 4
+@@ -147,24 +148,24 @@ struct video_audio
+ #define VIDEO_SOUND_STEREO 2
+ #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 of window */
+- __u32 width,height; /* Its size */
+- __u32 chromakey;
+- __u32 flags;
++ uint32_t x,y; /* Position of window */
++ uint32_t width,height; /* Its size */
++ uint32_t chromakey;
++ uint32_t flags;
+ struct video_clip *clips; /* Set only */
+ int clipcount;
+ #define VIDEO_WINDOW_INTERLACE 1
+@@ -175,10 +176,10 @@ struct video_window
+
+ struct video_capture
+ {
+- __u32 x,y; /* Offsets into image */
+- __u32 width, height; /* Area to capture */
+- __u16 decimation; /* Decimation divder */
+- __u16 flags; /* Flags for capture */
++ uint32_t x,y; /* Offsets into image */
++ uint32_t width, height; /* Area to capture */
++ uint16_t decimation; /* Decimation divder */
++ uint16_t flags; /* Flags for capture */
+ #define VIDEO_CAPTURE_ODD 0 /* Temporal */
+ #define VIDEO_CAPTURE_EVEN 1
+ };
+@@ -200,8 +201,8 @@ struct video_mmap
+
+ struct video_key
+ {
+- __u8 key[8];
+- __u32 flags;
++ uint8_t key[8];
++ uint32_t flags;
+ };
+
+
+--
+2.39.1
+
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
new file mode 100644
index 000000000000..b2f7d13cf996
--- /dev/null
+++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 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
+ "${FILESDIR}"/${P}-Use-standard-int-types.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}
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-03 10:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-25 12:54 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-radio/files/, x11-plugins/gkrellm-radio/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2022-04-21 19:55 Sam James
2023-02-03 9:59 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox