diff options
| author | root <root@alpha.trunkmasters.com> | 2026-06-12 11:50:53 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-06-12 11:50:53 -0500 |
| commit | 290aebdea65a02557706eaeda477fef0437b6a48 (patch) | |
| tree | f87a939169a508a2e943570501b64cc16b411cda /media-plugins/gkrellmpc | |
| parent | 6783ddcd4b73d9ce586a71770caed352bec93b16 (diff) | |
| download | baldeagleos-repo-290aebdea65a02557706eaeda477fef0437b6a48.tar.gz baldeagleos-repo-290aebdea65a02557706eaeda477fef0437b6a48.tar.xz baldeagleos-repo-290aebdea65a02557706eaeda477fef0437b6a48.zip | |
Adding metadata
Diffstat (limited to 'media-plugins/gkrellmpc')
| -rw-r--r-- | media-plugins/gkrellmpc/Manifest | 1 | ||||
| -rw-r--r-- | media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta10-mt.patch | 148 | ||||
| -rw-r--r-- | media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta10-r1-make-test.patch | 10 | ||||
| -rw-r--r-- | media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild | 44 | ||||
| -rw-r--r-- | media-plugins/gkrellmpc/metadata.xml | 16 |
5 files changed, 0 insertions, 219 deletions
diff --git a/media-plugins/gkrellmpc/Manifest b/media-plugins/gkrellmpc/Manifest deleted file mode 100644 index 6d9b079d427a..000000000000 --- a/media-plugins/gkrellmpc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gkrellmpc-0.1_beta10.tar.gz 25388 BLAKE2B 2e3c97e7d5887e1c3ea6a693cde19470e476943658de607266aac9a3ecbc2a5215fcc266638909d2ad024f303adb19475504ea4f7b79b3e97f566d90899721d3 SHA512 f5d687264f08146bf1eb54aee6d42a200fb97008a355d26a68be91b04e4bd622fc222725bf498c0837eacb8b94d6aede5aa1a05ed504fe5f9b790a9cd08d3973 diff --git a/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta10-mt.patch b/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta10-mt.patch deleted file mode 100644 index 876be728abd1..000000000000 --- a/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta10-mt.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- a/gkrellmpc.c -+++ b/gkrellmpc.c -@@ -140,7 +140,7 @@ void mpc_create_plugin (GtkWidget *vbox, gint first_create) { - /* Create the status decal */ - mpc_status_decal = gkrellm_create_decal_pixmap(mpc_panel, gkrellm_decal_misc_pixmap(), gkrellm_decal_misc_mask(), N_MISC_DECALS, style, 0, t); - mpc_status_decal->x = w - mpc_status_decal->w; -- gkrellm_draw_decal_pixmap(mpc_panel, mpc_status_decal, (mpc_mpd ? D_MISC_LED1 : D_MISC_LED0)); -+ gkrellm_draw_decal_pixmap(mpc_panel, mpc_status_decal, (mpc_mpd_connected() ? D_MISC_LED1 : D_MISC_LED0)); - - /* Update t */ - t += mpc_label_decal->h > mpc_status_decal->h ? mpc_label_decal->h : mpc_status_decal->h; -@@ -279,7 +279,7 @@ void mpc_update_plugin () { - static gint x_scroll; - - /* Try to connect to mpd */ -- if (!mpc_mpd && mpc_ticker->ten_second_tick) { -+ if (!mpc_mpd_connected() && mpc_ticker->ten_second_tick) { - mpc_mpd_connect(); - } - -@@ -457,7 +457,7 @@ void mpc_sync_with_mpd() { - status = mpc_mpd_get("status\n"); - currentsong = mpc_mpd_get("currentsong\n"); - -- if (!mpc_mpd) { -+ if (!mpc_mpd_connected()) { - mpc_update_label(_("NO MPD")); - mpc_update_songname(""); - gtk_tooltips_set_tip(mpc_tooltip, mpc_panel->drawing_area, _("MPD is not running"), NULL); ---- a/mpd.c -+++ b/mpd.c -@@ -12,18 +12,32 @@ - #include <sys/socket.h> - #include <netdb.h> - -+#include <errno.h> -+#include <pthread.h> -+ - GIOChannel * mpc_mpd = NULL; -+pthread_mutex_t mpc_mutex = { { 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0, { 0 } } }; //PTHREAD_MUTEX_INITIALIZER; -+ -+gboolean mpc_mpd_connected() { -+ if(pthread_mutex_trylock(&mpc_mutex)){ -+ return (FALSE); -+ } -+ pthread_mutex_unlock(&mpc_mutex); -+ return (gboolean)mpc_mpd; -+} - - /* - * Connects to the MPD server, sets up the mpd object, sets the status decal to ON - */ --gboolean mpc_mpd_connect() { -+void* mpc_mpd_connect_worker(void* arg) { - int sockfd; - struct hostent *server; - struct sockaddr_in serv_addr; - gchar * line; - gchar ** parts; - gboolean retval; -+ -+ pthread_mutex_lock(&mpc_mutex); - - if (mpc_mpd) { - /* -@@ -33,11 +47,11 @@ gboolean mpc_mpd_connect() { - } - - if (!mpc_conf_hostname || !mpc_conf_port) { -- return (FALSE); -+ goto err; - } - -- if ((sockfd = socket(PF_INET, SOCK_STREAM, 0)) == -1) return(FALSE); -- if (!(server = gethostbyname(mpc_conf_hostname))) return(FALSE); -+ if ((sockfd = socket(PF_INET, SOCK_STREAM, 0)) == -1) goto err; -+ if (!(server = gethostbyname(mpc_conf_hostname))) goto err; - - bzero((char *) &serv_addr, sizeof(serv_addr)); - serv_addr.sin_family = AF_INET; -@@ -46,7 +60,7 @@ gboolean mpc_mpd_connect() { - server->h_length); - serv_addr.sin_port = htons(mpc_conf_port); - -- if (connect(sockfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) return(FALSE); -+ if (connect(sockfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) goto err; - - /* Getup the mpd object */ - mpc_mpd = g_io_channel_unix_new(sockfd); -@@ -72,29 +86,39 @@ gboolean mpc_mpd_connect() { - retval = FALSE; - } - -- if (retval) { -- gkrellm_draw_decal_pixmap(mpc_panel, mpc_status_decal, D_MISC_LED1); -- mpc_update_label(_("MPD")); -- mpc_update_songname(""); -- } -+err: -+ pthread_mutex_unlock(&mpc_mutex); -+ return NULL; -+} - -- return(retval); -+gboolean mpc_mpd_connect() { -+ pthread_attr_t attr; -+ pthread_t thread_id; -+ -+ if(pthread_mutex_trylock(&mpc_mutex)){ -+ return (FALSE); -+ } -+ -+ pthread_attr_init(&attr); -+ pthread_create(&thread_id, &attr, mpc_mpd_connect_worker, NULL); -+ -+ pthread_mutex_unlock(&mpc_mutex); -+ -+ return (FALSE); - } - - /* - * Disconnects from MPD, destroys the mpd object, sets the status decal to off - */ - gboolean mpc_mpd_disconnect() { -- -+ pthread_mutex_lock(&mpc_mutex); - if (mpc_mpd) { - g_io_channel_shutdown(mpc_mpd, FALSE, NULL); - free(mpc_mpd); - mpc_mpd = NULL; - } - -- gkrellm_draw_decal_pixmap(mpc_panel, mpc_status_decal, D_MISC_LED0); -- mpc_update_label(_("NO MPD")); -- mpc_update_songname(""); -+ pthread_mutex_lock(&mpc_mutex); - return (TRUE); - } - ---- a/mpd.h -+++ b/mpd.h -@@ -10,5 +10,6 @@ gboolean mpc_mpd_disconnect(); - gboolean mpc_mpd_do(gchar *); - GHashTable * mpc_mpd_get(gchar *); - GPtrArray * mpc_mpd_get_clumps(gchar *, gboolean); -+gboolean mpc_mpd_connected(); - - #endif diff --git a/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta10-r1-make-test.patch b/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta10-r1-make-test.patch deleted file mode 100644 index 9f2007e768d4..000000000000 --- a/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta10-r1-make-test.patch +++ /dev/null @@ -1,10 +0,0 @@ -Makefile: Run gkrellm, not gkrellm2 for test - ---- a/Makefile -+++ b/Makefile -@@ -90,4 +90,4 @@ deinstall uninstall: - if [ -f ~/.gkrellm2/plugins/gkrellmpc.so ]; then rm -f ~/.gkrellm2/plugins/gkrellmpc.so; fi - - test: gkrellmpc.so -- gkrellm2 -p gkrellmpc.so -+ gkrellm -p gkrellmpc.so diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild deleted file mode 100644 index ec01e1133fc6..000000000000 --- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# 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 gkrellm plugin to control the MPD (Music Player Daemon)" -HOMEPAGE="http://mpd.wikia.com/wiki/Client:GKrellMPC" -SRC_URI="http://mina.naguib.ca/dist/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="threads" - -RDEPEND=" - app-admin/gkrellm:2[X] - net-misc/curl -" -DEPEND="${RDEPEND}" - -# Will open gkrellm in X11 display -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${PF}"-make-test.patch ) - -src_prepare() { - if use threads; then - PATCHES+=( "${FILESDIR}/${P}"-mt.patch ) - fi - default -} - -src_configure() { - tc-export CC -} - -pkg_postinst() { - if use threads; then - elog "If you can't connect MPD, please unset USE threads." - elog "See https://bugs.gentoo.org/276970 for information." - fi -} diff --git a/media-plugins/gkrellmpc/metadata.xml b/media-plugins/gkrellmpc/metadata.xml deleted file mode 100644 index 32408e456c55..000000000000 --- a/media-plugins/gkrellmpc/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sound@gentoo.org</email> - <name>Gentoo Sound project</name> - </maintainer> - <maintainer type="person"> - <email>sam@gentoo.org</email> - <name>Sam James</name> - </maintainer> - <use> - <flag name="threads">Use separate thread to init connection (unsafe)</flag> - </use> - <origin>baldeagleos-repo</origin> -</pkgmetadata> |
