From 02e2208f46f4e2c00fb9743cbc47350bdd233bfa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 16 Jan 2018 17:34:21 +0000 Subject: gentoo resync : 16.01.2018 --- media-plugins/Manifest.gz | Bin 53382 -> 53386 bytes media-plugins/gkrellmpc/Manifest | 1 - .../gkrellmpc/files/gkrellmpc-0.1_beta9-mt.patch | 152 --------------------- media-plugins/mediastreamer-silk/Manifest | 4 +- 4 files changed, 2 insertions(+), 155 deletions(-) delete mode 100644 media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta9-mt.patch (limited to 'media-plugins') diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz index e169498a6c8d..961294d08d4e 100644 Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ diff --git a/media-plugins/gkrellmpc/Manifest b/media-plugins/gkrellmpc/Manifest index 9d5d0b02187c..2c02679119a3 100644 --- a/media-plugins/gkrellmpc/Manifest +++ b/media-plugins/gkrellmpc/Manifest @@ -1,5 +1,4 @@ AUX gkrellmpc-0.1_beta10-mt.patch 4392 BLAKE2B 2a249c576091573c4f5c92f622b0d9ac1a8ffb1a38c0b4a6f8b1d475ea2db85c1358deaec8ac72570d09379167f63deb5a947711928ab86525a7eeb5980b7b9d SHA512 5928192cde4513470f9af952d6aa8a3b5044a6bdcc8aead26420a2cc7e9ed21dd3ac0043a5d481559c6eaad770de54c44b6d5395efb1baa2de80bc26d2536cdb -AUX gkrellmpc-0.1_beta9-mt.patch 4427 BLAKE2B e3aea0f5a15cf589dd614a4080c38c04a39bf590cab23d1986fea74d05826582c97877d824f670e222e887257a2f4fe147c175d8aa9a505ede2e1aae3e181761 SHA512 0bf96cba88e6b2596b86318f72a87842d0641068a18bb3a07a9b5654296322bb12e58f281e8ab412e2f9a4c6fc5e0aef9714e91b97ec41d41c39cf5ec720b09b DIST gkrellmpc-0.1_beta10.tar.gz 25388 BLAKE2B 2e3c97e7d5887e1c3ea6a693cde19470e476943658de607266aac9a3ecbc2a5215fcc266638909d2ad024f303adb19475504ea4f7b79b3e97f566d90899721d3 SHA512 f5d687264f08146bf1eb54aee6d42a200fb97008a355d26a68be91b04e4bd622fc222725bf498c0837eacb8b94d6aede5aa1a05ed504fe5f9b790a9cd08d3973 EBUILD gkrellmpc-0.1_beta10.ebuild 859 BLAKE2B 89421c770f6ced3a94022a4a3659b9a180644431c395145b4093e7b3177f40933c22bfb6bc6cee152a41c8841a9339507ffcda64f9976c3ab50c7941946c1471 SHA512 37bbf33f883dd373f490e947030c4dcf4d92fdbbf0d8d79cbe17795e085def544e05e3c8016e53eff7eb6e94276aebb59bb0b630a2eecb2afccc446b5a61bad4 MISC metadata.xml 346 BLAKE2B d69895932fc6b3694132354e64a117da6105daa64ba1cb40a41ea2597f96c3e548c02196b2fda8256ef7813ab71d2b668b0d83e89caef95d4ae444a884668fe6 SHA512 119190e5845f3d61be09d34f525870e139c566f3ec4838c23425b764dd1c53507286c55d437e620d4e9958e195dfd58bc778cca58afc97cb4b52c76ba05f56c0 diff --git a/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta9-mt.patch b/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta9-mt.patch deleted file mode 100644 index 4de5688a2b5e..000000000000 --- a/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta9-mt.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff -uNr gkrellmpc-0.1_beta9/gkrellmpc.c gkrellmpc-0.1_beta9.mine/gkrellmpc.c ---- gkrellmpc-0.1_beta9/gkrellmpc.c 2005-01-05 22:33:16.000000000 +0300 -+++ gkrellmpc-0.1_beta9.mine/gkrellmpc.c 2009-04-05 19:51:12.000000000 +0400 -@@ -132,7 +132,7 @@ - /* 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; -@@ -254,7 +254,7 @@ - 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(); - } - -@@ -428,7 +428,7 @@ - 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(""); - } -diff -uNr gkrellmpc-0.1_beta9/mpd.c gkrellmpc-0.1_beta9.mine/mpd.c ---- gkrellmpc-0.1_beta9/mpd.c 2005-01-05 22:33:16.000000000 +0300 -+++ gkrellmpc-0.1_beta9.mine/mpd.c 2009-04-05 20:30:38.000000000 +0400 -@@ -12,18 +12,32 @@ - #include - #include - -+#include -+#include -+ - 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 @@ - } - - 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 @@ - 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,40 @@ - retval = FALSE; - } - -- if (retval) { -- gkrellm_draw_decal_pixmap(mpc_panel, mpc_status_decal, D_MISC_LED1); -- mpc_update_label("MPD"); -- mpc_update_songname(""); -- } - -- return(retval); -+err: -+ pthread_mutex_unlock(&mpc_mutex); -+ return NULL; -+} -+ -+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_unlock(&mpc_mutex); - return (TRUE); - } - -diff -uNr gkrellmpc-0.1_beta9/mpd.h gkrellmpc-0.1_beta9.mine/mpd.h ---- gkrellmpc-0.1_beta9/mpd.h 2005-01-05 22:33:16.000000000 +0300 -+++ gkrellmpc-0.1_beta9.mine/mpd.h 2009-04-05 19:51:25.000000000 +0400 -@@ -10,5 +10,6 @@ - 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/mediastreamer-silk/Manifest b/media-plugins/mediastreamer-silk/Manifest index 61692df04b99..61b2b0fa38d5 100644 --- a/media-plugins/mediastreamer-silk/Manifest +++ b/media-plugins/mediastreamer-silk/Manifest @@ -1,5 +1,5 @@ AUX mediastreamer-silk-0.0.1-sdk.patch 1570 BLAKE2B a87dbe2e941f3dfb9bd5b10304a6311d08f1a96a70b605c96d25d009f9143e7967ad1642c918569972993b1546450cbc43ac23c81f5a168f63ff04e1144158f7 SHA512 c3bc9086c1a08e1a5757d4a06bb4f63ff115896deb704358b09f356a639c2f82addc05ec7da700f192d85aba13a7ab76741d5e22786f00d84ff50542ca9bd719 -DIST SILK_SDK_SRC_v1.0.8.zip 65910872 SHA256 424536084ac2d5c105e22f8048d19103dd83cb54bc32187377f5341d17e1b838 SHA512 2d56552052ec8180de9bbbce2f89d76df63c1bf6a8ac936dacab104d39526c16b9ccac33e5602f3a757bb12057c2e6da6f955ae370b05b93ff1427632c3a9489 WHIRLPOOL a301ba53e3fd1d56bc45d75709eb1b13edcacb7b68811862f2bbb7eba561242594feff6ac13f460593eb97917ecf63d947997316561a74d0d879e7823caccbea -DIST mssilk-0.0.1.tar.gz 57674 SHA256 58f89360a06e5b8414c2a1389b2e0d801ea1548041d7791ca16c1fc3f136e1b0 SHA512 78325c0cf28bf035212583c76aa92f1291442e3f4fbe4c354056ad2b20ff72ba8d7149250431906942352c4deec7912567f512775d5a1dfe07b6b2bd44b5552e WHIRLPOOL da0d9ef8f0d0d83c8a29e981346c876e19f207dbc5f662d53e81dfd2d92c158294008625a9a261e153e33fd50a4bbf4af0d3d58da5a2e66f2871539d01da14bb +DIST SILK_SDK_SRC_v1.0.8.zip 65910872 BLAKE2B e51dd92c1a13fe36475ac997ddd27dfca94dcc8f417e343e5d55657da67b5b32b7d7248fa9a202b051edd4be133fce5e07bae8720a2fb66dbe0f5bd4631978aa SHA512 2d56552052ec8180de9bbbce2f89d76df63c1bf6a8ac936dacab104d39526c16b9ccac33e5602f3a757bb12057c2e6da6f955ae370b05b93ff1427632c3a9489 +DIST mssilk-0.0.1.tar.gz 57674 BLAKE2B 87d43e3d66fe53c5965ee7edec3a69a80dff9839fdf37dbb7ff9b161c3b470cbe0aad9db1d59b28f9b2daf835b501562e6ee65cc0894ef33ba546813e4d7167c SHA512 78325c0cf28bf035212583c76aa92f1291442e3f4fbe4c354056ad2b20ff72ba8d7149250431906942352c4deec7912567f512775d5a1dfe07b6b2bd44b5552e EBUILD mediastreamer-silk-0.0.1.ebuild 774 BLAKE2B 787cb5c044d5080646f20f7eac9d8e6b77a6480e2e051aab1b821dc241b8f7845e3ac0e0c7fb504dcef67a2e59bb64a8d2954187ecf51bb518e8ec971b0d67c1 SHA512 123535dcfc6c4b4197f25009321a7b4e29abd1f1b5f97baa87a90fb0a96565ee5bc3e7d6b61f79afb2ecef97ad8f3bd6fbc67d454242652b9d1754484f02157f MISC metadata.xml 250 BLAKE2B 2ea879960a826fa9be35ec3a0988634da4268c54a8f4a484936356f1fac9e100b779dd43d7a3a684f121e5de5bae7195991e4d378d36b18f97155208fae728d0 SHA512 a5334e41fb3acb7a8cce473ca9616ecea8fe484e870173f0a26042cd8aca0bc7fa4fe52e9cf10b7495c44608e15f1c71564b3f92a44611ba830b08785666b2ac -- cgit v1.2.3