From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- media-plugins/vdr-graphlcd/Manifest | 7 - .../graphlcd-0.1.5-radiotext-lcr-service.diff | 126 -------- .../files/0.1.5/graphlcd-0.1.5-span.diff | 356 --------------------- .../files/0.1.5/graphlcd-0.1.5_vdr-1.5.3.diff | 19 -- .../0.1.5/vdr-graphlcd-0.1.5-missing-freetyp2.diff | 30 -- .../0.1.5/vdr-graphlcd-0.1.5-missing-include.patch | 11 - .../vdr-graphlcd/vdr-graphlcd-0.1.9.ebuild | 100 ------ 7 files changed, 649 deletions(-) delete mode 100644 media-plugins/vdr-graphlcd/files/0.1.5/graphlcd-0.1.5-radiotext-lcr-service.diff delete mode 100644 media-plugins/vdr-graphlcd/files/0.1.5/graphlcd-0.1.5-span.diff delete mode 100644 media-plugins/vdr-graphlcd/files/0.1.5/graphlcd-0.1.5_vdr-1.5.3.diff delete mode 100644 media-plugins/vdr-graphlcd/files/0.1.5/vdr-graphlcd-0.1.5-missing-freetyp2.diff delete mode 100644 media-plugins/vdr-graphlcd/files/0.1.5/vdr-graphlcd-0.1.5-missing-include.patch delete mode 100644 media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.9.ebuild (limited to 'media-plugins/vdr-graphlcd') diff --git a/media-plugins/vdr-graphlcd/Manifest b/media-plugins/vdr-graphlcd/Manifest index e940bbfb4376..1ddc9e082030 100644 --- a/media-plugins/vdr-graphlcd/Manifest +++ b/media-plugins/vdr-graphlcd/Manifest @@ -1,12 +1,5 @@ -AUX 0.1.5/graphlcd-0.1.5-radiotext-lcr-service.diff 4396 BLAKE2B 743c14f12f0e0d59dec2ddca1a09761b5f70d9abaa8f49b7f4ab267fb9d710934284e0ab42272b1c3511b3a30ab06db17c543055c6394b0e6385b155ebdd26f3 SHA512 43888da66a50d36e33619716be5ff4447a88d2076feb84991b2298d8ff2d23a01765b16527238916aa6a5fc3e592075a9d59eb18cf511f3d5341e5caa417857c -AUX 0.1.5/graphlcd-0.1.5-span.diff 13307 BLAKE2B d49cb39ac537caa2e40696307bc52709f2b1a5a19a22c3db8d0a7a27a53218f22b42794d0ea646f4b5735c20debfd9049cf18c8f79e08501f2dfdd835ec35319 SHA512 b91995325cce3a161560d223eed99b1556b0b0aea43f0d90a880abcbfdaf6c19ea3bc6d33dde26047340032bc2c5fc7fe185bd7121982eac6144f80f6caecc72 -AUX 0.1.5/graphlcd-0.1.5_vdr-1.5.3.diff 608 BLAKE2B f5ee443ad84342c2ae2e219e07ca471e276520860b24fc4bb3565d3298083dc97ff3769177a495dd12b24fa5a9e50b0e83b11a7843988d98d81f524bb84c7d49 SHA512 3ebcd75ad4325d261f41ab805c62a255a8591d355195ca78d720b97a8ced36235b1902fb15dc42973fb205a49334a882ba58802f377055a68b0e1ba84c130d88 -AUX 0.1.5/vdr-graphlcd-0.1.5-missing-freetyp2.diff 917 BLAKE2B 818306f03bb33a7131ce72f56a7f9f7f21825e4336b12f29d2647d16831be62a3b9a5ceb75d26f37fd583ca6f7f76c1d050e5b92420842fb43ec033a4fea2ec8 SHA512 1b58adacff144453eff988918566f2a3dd40926f9f71d87622319a546db6886d54ba53eda4596e373aaa75a413c6e570c7a17342d65a609b2ed3347f82c9343a -AUX 0.1.5/vdr-graphlcd-0.1.5-missing-include.patch 316 BLAKE2B f89c92f6617eadb9ae0090fe58f1dfd44038d0c36ef9e2bfc3c2b2fcb9656566ede0517ded4aa298c6cc148773d95fdb1531a2ea0c7b2c64e2943f2fcf481870 SHA512 b2a9ea7ab20c2733256f3441382dbaf86f867c553337b2b450524f90cfc65f88cfd42e25d30178ec62e6e041a732b56c14c4b457e171d998169d0b93408d2ae0 AUX confd 565 BLAKE2B caf5867788b96423ba701ea645e212442f7881bb0d16b3c13924b64ff049a8e5dc48ead17f6b197ec4354525d53c168975e78c5650e34ab3a020ceffee0d0c15 SHA512 9b44466d924f5e7ea3ab23ade147a5c18b599714058c51fe8403cb7a0d2cd2be05fcc85a385a064c8b3110a6c88faa857444f6e4dee6c1843348209491e9ea99 AUX rc-addon.sh 247 BLAKE2B f02545696c534397a2667e55e60d1c05067f4f11504ca724a4da71e71d8feb727a13d19601fbf7a08f15fa984139074da73cdd3dcf0ac9f3024af094ec87b149 SHA512 46d27b5feab6881721f480d6cc26e1a9796c9b46f083cf6e2f97523f8b54d2b93d373130e562235ec2a57d95cc37ac956e290467251572f5387db58a32ad1544 -DIST vdr-graphlcd-0.1.9.tgz 286572 BLAKE2B 251b7fce4149c01c9a3a1e64a88b8236e7ca0e041be25edf628df7754a3eb094a61582f9c3746ff28729c6e53cd784ee8b6b02169660ce9119239aac624e9b46 SHA512 46c78fe0c7bc7d67d757323a6a937e9feedcdb3e3f233227024dd84f0cb84ce8f08becd3b4ae9c0b7edfba40804a29fa0e3efc8e74eceb82812f288b8e40c6cd DIST vdr-plugin-graphlcd-1.0.0.tar.bz2 888495 BLAKE2B 0557e0750cfa6baf16b2ca5d6e5b69b206d493717e9337fb84403b171b1a4a558fbbc77e32e2f00c1cc0aaadb1390f807e3cd578725aa2ad6786d037c4bb3251 SHA512 05994707b8e8a5640db3c9d4ea991d81b92d6d3e88de98ffc8a4bdac3b885fed2780958babbfec0967209aa15043a3799f08de0d3005ec6eeabf130de7879822 -EBUILD vdr-graphlcd-0.1.9.ebuild 2565 BLAKE2B 73fa6fdffcc10df8dd1bab96cb5764e01c0b70f8b80bad505589f9bf2f0c874493185b683f154cc07c66db30c475d8581917ca7474005124fa19e2b70ee964ca SHA512 450f94910b7a89925d37ba067a568e5e3d445c8a75f5569a9647492ec45ec282f1c759009f2783d0cb873ff2135b6e7389114327e8a1bb2c93ec260b10b027a4 EBUILD vdr-graphlcd-1.0.0.ebuild 2621 BLAKE2B 231fce4e41eced133aeca5f492d8708320d2a0a4aa267349cdc5c8c68d8e5ceedac20ae52d7af109dc336a913c9089802059c5e3ce749ac56a9f2919786b6483 SHA512 a0012f54b3aa46657fd219395c5f39e08a1d019b9f64a3e6668df4d20bca5d05aa76644f89d636b9d6e7110ab09a9ca44417b4808a716af942096fe7021d0175 MISC metadata.xml 386 BLAKE2B 01915199322435f52711438e316c24feea4ab2852007d26deac46e5f5615c0e3cc5f8b4013a2391acbe4d666d3cc8681b000899434ed9df5ab4f00289f6b3333 SHA512 505462c67b43399c55d08deedd022a88e9a25659a6f9b150800d344bfe7e14cc1e8e73b6789401b7acd519bdfcae170743c898c4c4a354f13a9b1542f273e951 diff --git a/media-plugins/vdr-graphlcd/files/0.1.5/graphlcd-0.1.5-radiotext-lcr-service.diff b/media-plugins/vdr-graphlcd/files/0.1.5/graphlcd-0.1.5-radiotext-lcr-service.diff deleted file mode 100644 index 8c2c180ab2c2..000000000000 --- a/media-plugins/vdr-graphlcd/files/0.1.5/graphlcd-0.1.5-radiotext-lcr-service.diff +++ /dev/null @@ -1,126 +0,0 @@ -diff -Naur graphlcd-0.1.4.orig/state.c graphlcd-0.1.4/state.c ---- graphlcd-0.1.4.orig/state.c 2007-02-04 23:35:16.317687570 +0100 -+++ graphlcd-0.1.4/state.c 2007-02-04 23:42:12.065780817 +0100 -@@ -16,6 +16,7 @@ - - #include - #include -+#include - - #include "compat.h" - -@@ -654,6 +655,8 @@ - - void cGraphLCDState::GetProgramme() - { -+ bool ptitle = false; -+ - mutex.Lock(); - #if VDRVERSNUM < 10300 - const cEventInfo * present = NULL, * following = NULL; -@@ -670,9 +673,11 @@ - { - event.presentTime = present->GetTime(); - event.presentTitle = ""; -- if (!isempty(present->GetTitle())) -+ if (!isempty(present->GetTitle())) { - event.presentTitle = present->GetTitle(); - event.presentSubtitle = ""; -+ ptitle = true; -+ } - if (!isempty(present->GetSubtitle())) - event.presentSubtitle = present->GetSubtitle(); - } -@@ -704,9 +709,11 @@ - { - event.presentTime = present->StartTime(); - event.presentTitle = ""; -- if (!isempty(present->Title())) -+ if (!isempty(present->Title())) { - event.presentTitle = present->Title(); - event.presentSubtitle = ""; -+ ptitle = true; -+ } - if (!isempty(present->ShortText())) - event.presentSubtitle = present->ShortText(); - } -@@ -724,6 +731,54 @@ - } - } - #endif -+ -+#if VDRVERSNUM >= 10330 -+ { // get&display Radiotext -+ cPlugin *p; -+ p = cPluginManager::CallFirstService("RadioTextService-v1.0", NULL); -+ if (p) { -+ RadioTextService_v1_0 rtext; -+ if (cPluginManager::CallFirstService("RadioTextService-v1.0", &rtext)) { -+ if (rtext.rds_info == 2 && strstr(rtext.rds_title, "---") == NULL) { -+ char rtpinfo[2][65], rtstr[140]; -+ strcpy(rtpinfo[0], rtext.rds_title); -+ strcpy(rtpinfo[1], rtext.rds_artist); -+ sprintf(rtstr, "%02d:%02d %s | %s", rtext.title_start->tm_hour, rtext.title_start->tm_min, trim(((std::string)(rtpinfo[0]))).c_str(), trim(((std::string)(rtpinfo[1]))).c_str()); -+ ptitle ? event.presentSubtitle = rtstr : event.presentTitle = rtstr; -+ } -+ else if (rtext.rds_info > 0) { -+ char rtstr[65]; -+ strcpy(rtstr, rtext.rds_text); -+ ptitle ? event.presentSubtitle = trim(rtstr) : event.presentTitle = trim(rtstr); -+ } -+ } -+ } -+ } -+#endif -+ -+#if VDRVERSNUM >= 10330 -+ { // get&display LcrData -+ cPlugin *p; -+ p = cPluginManager::CallFirstService("LcrService-v1.0", NULL); -+ if (p) -+ { -+ LcrService_v1_0 lcrData; -+ if (cPluginManager::CallFirstService("LcrService-v1.0", &lcrData)) -+ { -+ if ( strstr( lcrData.destination, "---" ) == NULL ) -+ { -+ char lcrStringParts[3][25], lcrString[100]; -+ strcpy( lcrStringParts[0], (const char *)lcrData.destination ); -+ strcpy( lcrStringParts[1], (const char *)lcrData.price ); -+ strcpy( lcrStringParts[2], (const char *)lcrData.pulse ); -+ sprintf(lcrString, "%s | %s", trim((std::string)(lcrStringParts[1])).c_str(), trim((std::string)(lcrStringParts[2])).c_str()); -+ event.presentTitle = trim(lcrStringParts[0]); -+ event.presentSubtitle = trim(lcrString); -+ } -+ } -+ } -+ } -+#endif - mutex.Unlock(); - } - -diff -Naur graphlcd-0.1.4.orig/state.h graphlcd-0.1.4/state.h ---- graphlcd-0.1.4.orig/state.h 2007-02-04 23:35:16.317687570 +0100 -+++ graphlcd-0.1.4/state.h 2007-02-04 23:43:05.728759351 +0100 -@@ -130,4 +130,21 @@ - tVolumeState GetVolumeState(); - }; - -+// Radiotext -+struct RadioTextService_v1_0 { -+ int rds_info; -+ int rds_pty; -+ char *rds_text; -+ char *rds_title; -+ char *rds_artist; -+ struct tm *title_start; -+}; -+ -+// LcrData -+struct LcrService_v1_0 { -+ cString destination; -+ cString price; -+ cString pulse; -+}; -+ - #endif diff --git a/media-plugins/vdr-graphlcd/files/0.1.5/graphlcd-0.1.5-span.diff b/media-plugins/vdr-graphlcd/files/0.1.5/graphlcd-0.1.5-span.diff deleted file mode 100644 index 949049af050f..000000000000 --- a/media-plugins/vdr-graphlcd/files/0.1.5/graphlcd-0.1.5-span.diff +++ /dev/null @@ -1,356 +0,0 @@ -diff -Naur graphlcd-0.1.4.orig/display.c graphlcd-0.1.4/display.c ---- graphlcd-0.1.4.orig/display.c 2007-02-04 23:10:36.609384554 +0100 -+++ graphlcd-0.1.4/display.c 2007-02-04 23:17:48.756350745 +0100 -@@ -115,6 +115,7 @@ - nCurrentBrightness = -1; - LastTimeBrightness = 0; - bBrightnessActive = true; -+ LastTimeSA.Set(0); - } - - cGraphLCDDisplay::~cGraphLCDDisplay() -@@ -373,6 +374,11 @@ - update = true; - } - -+ if ( LastTimeSA.TimedOut() ) -+ { -+ update = true; -+ LastTimeSA.Set(1000); -+ } - // update Display every second or due to an update - if (CurrTime != LastTime || update) - { -@@ -1460,6 +1466,8 @@ - nTopY + nProgressbarHeight, - GLCD::clrBlack, false); - -+ DisplaySA(); -+ - if (1 < replay.total && 1 < replay.current) // Don't show full progressbar for endless streams - { - bitmap->DrawRectangle(FRAME_SPACE_X, -@@ -1945,3 +1953,141 @@ - } - mutex.Unlock(); - } -+ -+void cGraphLCDDisplay::DisplaySA() -+{ -+// Spectrum Analyzer visualization -+ if ( GraphLCDSetup.enableSpectrumAnalyzer ) -+ { -+ if (cPluginManager::CallFirstService(SPAN_GET_BAR_HEIGHTS_ID, NULL)) -+ { -+ Span_GetBarHeights_v1_0 GetBarHeights; -+ -+ int bandsSA = 20; -+ int falloffSA = 8; -+ int channelsSA = 1; -+ -+ unsigned int bar; -+ unsigned int *barHeights = new unsigned int[bandsSA]; -+ unsigned int *barHeightsLeftChannel = new unsigned int[bandsSA]; -+ unsigned int *barHeightsRightChannel = new unsigned int[bandsSA]; -+ unsigned int volumeLeftChannel; -+ unsigned int volumeRightChannel; -+ unsigned int volumeBothChannels; -+ unsigned int *barPeaksBothChannels = new unsigned int[bandsSA]; -+ unsigned int *barPeaksLeftChannel = new unsigned int[bandsSA]; -+ unsigned int *barPeaksRightChannel = new unsigned int[bandsSA]; -+ -+ GetBarHeights.bands = bandsSA; -+ GetBarHeights.barHeights = barHeights; -+ GetBarHeights.barHeightsLeftChannel = barHeightsLeftChannel; -+ GetBarHeights.barHeightsRightChannel = barHeightsRightChannel; -+ GetBarHeights.volumeLeftChannel = &volumeLeftChannel; -+ GetBarHeights.volumeRightChannel = &volumeRightChannel; -+ GetBarHeights.volumeBothChannels = &volumeBothChannels; -+ GetBarHeights.name = "graphlcd"; -+ GetBarHeights.falloff = falloffSA; -+ GetBarHeights.barPeaksBothChannels = barPeaksBothChannels; -+ GetBarHeights.barPeaksLeftChannel = barPeaksLeftChannel; -+ GetBarHeights.barPeaksRightChannel = barPeaksRightChannel; -+ -+ if ( cPluginManager::CallFirstService(SPAN_GET_BAR_HEIGHTS_ID, &GetBarHeights )) -+ { -+ int i; -+ int barWidth = 2; -+ int saStartX = FRAME_SPACE_X; -+ int saEndX = saStartX + barWidth*bandsSA*2 + bandsSA/4 - 1; -+ int saStartY = FRAME_SPACE_Y; -+ int saEndY = FRAME_SPACE_Y + bitmap->Height()/2 - 3; -+ -+ LastTimeSA.Set(100); -+ -+ if ( GraphLCDSetup.SAShowVolume ) -+ { -+ -+ saStartX = FRAME_SPACE_X + bitmap->Width()/2 - (barWidth*bandsSA*2 + bandsSA/4)/2 - 2; -+ saEndX = saStartX + barWidth*bandsSA*2 + bandsSA/4 - 1; -+ -+ // left volume -+ bitmap->DrawRectangle(FRAME_SPACE_X, -+ saStartY, -+ saStartX-1, -+ saEndY + 1, -+ GLCD::clrWhite, true); -+ -+ for ( i=0; (iWidth()/2-2) && (i<3*(volumeLeftChannel*saStartX)/100); i++) -+ { -+ bitmap->DrawRectangle(saStartX - i - 2, -+ saStartY + saEndY/2 - i, -+ saStartX - i - 4, -+ saStartY + saEndY/2 + i, -+ GLCD::clrBlack, true); -+ } -+ -+ // right volume -+ bitmap->DrawRectangle(saEndX + 1, -+ saStartY, -+ bitmap->Width() - 1, -+ saEndY + 1, -+ GLCD::clrWhite, true); -+ -+ for ( i=0; (iWidth()/2-2) && (i<3*(volumeRightChannel*saStartX)/100); i++) -+ { -+ bitmap->DrawRectangle(saEndX + 2 + i, -+ saStartY + saEndY/2 - i, -+ saEndX + i + 4, -+ saStartY + saEndY/2 + i, -+ GLCD::clrBlack, true); -+ } -+ } -+ // black background -+ bitmap->DrawRectangle(saStartX, -+ saStartY, -+ saEndX, -+ saEndY + 1, -+ GLCD::clrBlack, true); -+ -+ for ( i=0; i < bandsSA; i++ ) -+ { -+/* if ( channelsSA == 2 ) -+ { -+ bar = barHeightsLeftChannel[i]; -+ bar = barHeightsRightChannel[i]; -+ }*/ -+ if ( channelsSA == 1) -+ { -+ // the bar -+ bar = (barHeights[i]*(saEndY-saStartY))/100; -+ bitmap->DrawRectangle(saStartX + barWidth*2*(i)+ barWidth + 1, -+ saEndY, -+ saStartX + barWidth*2*(i) + barWidth+ barWidth + 1, -+ saEndY - bar, -+ GLCD::clrWhite, true); -+ -+ // the peak -+ bar = (barPeaksBothChannels[i]*(saEndY-saStartY))/100; -+ if ( bar > 0 ) -+ { -+ bitmap->DrawRectangle(saStartX + barWidth*2*(i)+ barWidth + 1, -+ saEndY - bar, -+ saStartX + barWidth*2*(i) + barWidth+ barWidth + 1, -+ saEndY - bar+1, -+ GLCD::clrWhite, true); -+ } -+ } -+ } -+ } -+ -+ delete [] barHeights; -+ delete [] barHeightsLeftChannel; -+ delete [] barHeightsRightChannel; -+ delete [] barPeaksBothChannels; -+ delete [] barPeaksLeftChannel; -+ delete [] barPeaksRightChannel; -+ } -+ } -+} -+ -+//############################################################################################# -+ -+ -diff -Naur graphlcd-0.1.4.orig/display.h graphlcd-0.1.4/display.h ---- graphlcd-0.1.4.orig/display.h 2007-02-04 23:10:36.609384554 +0100 -+++ graphlcd-0.1.4/display.h 2007-02-04 23:20:24.209000170 +0100 -@@ -29,10 +29,33 @@ - #include - #include - -+#define SPAN_CLIENT_CHECK_ID "Span-ClientCheck-v1.0" -+#define SPAN_GET_BAR_HEIGHTS_ID "Span-GetBarHeights-v1.0" - - #define LCDMAXCARDS 4 - static const int kMaxTabCount = 10; - -+struct Span_Client_Check_1_0 { -+ bool *isActive; -+ bool *isRunning; -+}; -+ -+struct Span_GetBarHeights_v1_0 { -+ unsigned int bands; // number of bands to compute -+ unsigned int *barHeights; // the heights of the bars of the two channels combined -+ unsigned int *barHeightsLeftChannel; // the heights of the bars of the left channel -+ unsigned int *barHeightsRightChannel; // the heights of the bars of the right channel -+ unsigned int *volumeLeftChannel; // the volume of the left channels -+ unsigned int *volumeRightChannel; // the volume of the right channels -+ unsigned int *volumeBothChannels; // the combined volume of the two channels -+ const char *name; // name of the plugin that wants to get the data -+ // (must be unique for each client!) -+ unsigned int falloff; // bar falloff value -+ unsigned int *barPeaksBothChannels; // bar peaks of the two channels combined -+ unsigned int *barPeaksLeftChannel; // bar peaks of the left channel -+ unsigned int *barPeaksRightChannel; // bar peaks of the right channel -+}; -+ - enum ThreadState - { - Normal, -@@ -104,6 +127,7 @@ - time_t LastTime; - time_t LastTimeCheckSym; - time_t LastTimeModSym; -+ cTimeMs LastTimeSA; - struct timeval CurrTimeval; - struct timeval UpdateAt; - -@@ -125,6 +149,7 @@ - void DisplayTextItem(); - void DisplayColorButtons(); - void DisplayVolume(); -+ void DisplaySA(); - - void UpdateIn(long usec); - bool CheckAndUpdateSymbols(); -diff -Naur graphlcd-0.1.4.orig/i18n.c graphlcd-0.1.4/i18n.c ---- graphlcd-0.1.4.orig/i18n.c 2007-02-04 23:10:38.792567843 +0100 -+++ graphlcd-0.1.4/i18n.c 2007-02-04 23:23:31.966096053 +0100 -@@ -966,5 +966,53 @@ - # endif - #endif - }, -+{ -+ "Show spectrum analyzer", -+ "Zeige Spectrum Analyzer", -+ "",// TODO Slovenski -+ "",// TODO Italiano -+ "",// TODO Nederlands -+ "",// TODO Portuguçês -+ "",// TODO Franais -+ "",// TODO Norsk -+ "",// TODO Suomi -+ "",// TODO Polski -+ "",// TODO Español -+ "",// TODO Ellinika -+ "",// TODO Svenska -+ "",// TODO Romnâã -+ "",// TODO Magyar -+ "",// TODO Catalàà -+#if VDRVERSNUM > 10302 -+ "",// TODO Russian -+# if VDRVERSNUM > 10307 -+ "",// TODO Croatian -+# endif -+#endif -+ }, -+ { -+ "Show SA volume", -+ "Zeige SA Lautstrke", -+ "",// TODO Slovenski -+ "",// TODO Italiano -+ "",// TODO Nederlands -+ "",// TODO Portugus -+ "",// TODO Franêçais -+ "",// TODO Norsk -+ "",// TODO Suomi -+ "",// TODO Polski -+ "",// TODO Español -+ "",// TODO Ellinika -+ "",// TODO Svenska -+ "",// TODO Romnâã -+ "",// TODO Magyar -+ "",// TODO Catal -+#if VDRVERSNUM > 10302 -+ "",// TODO Russian -+# if VDRVERSNUM > 10307 -+ "",// TODO Croatian -+# endif -+#endif -+ }, - { NULL } - }; -diff -Naur graphlcd-0.1.4.orig/menu.c graphlcd-0.1.4/menu.c ---- graphlcd-0.1.4.orig/menu.c 2007-02-04 23:10:38.862563031 +0100 -+++ graphlcd-0.1.4/menu.c 2007-02-04 23:24:53.710477952 +0100 -@@ -101,4 +101,6 @@ - SetupStore("BrightnessActive", GraphLCDSetup.BrightnessActive = newGraphLCDSetup.BrightnessActive); - SetupStore("BrightnessIdle", GraphLCDSetup.BrightnessIdle = newGraphLCDSetup.BrightnessIdle); - SetupStore("BrightnessDelay", GraphLCDSetup.BrightnessDelay = newGraphLCDSetup.BrightnessDelay); -+ SetupStore("enableSpectrumAnalyzer", GraphLCDSetup.enableSpectrumAnalyzer = newGraphLCDSetup.enableSpectrumAnalyzer); -+ SetupStore("SAShowVolume", GraphLCDSetup.SAShowVolume = newGraphLCDSetup.SAShowVolume); - } -diff -Naur graphlcd-0.1.4.orig/plugin.c graphlcd-0.1.4/plugin.c ---- graphlcd-0.1.4.orig/plugin.c 2007-02-04 23:10:38.862563031 +0100 -+++ graphlcd-0.1.4/plugin.c 2007-02-04 23:26:57.655292837 +0100 -@@ -54,6 +54,7 @@ - virtual cOsdObject * MainMenuAction(); - virtual cMenuSetupPage * SetupMenu(); - virtual bool SetupParse(const char * Name, const char * Value); -+ virtual bool Service(const char *Id, void *Data); - }; - - cPluginGraphLCD::cPluginGraphLCD() -@@ -243,8 +244,24 @@ - else if (!strcasecmp(Name, "BrightnessActive")) GraphLCDSetup.BrightnessActive = atoi(Value); - else if (!strcasecmp(Name, "BrightnessIdle")) GraphLCDSetup.BrightnessIdle = atoi(Value); - else if (!strcasecmp(Name, "BrightnessDelay")) GraphLCDSetup.BrightnessDelay = atoi(Value); -+ else if (!strcasecmp(Name, "enableSpectrumAnalyzer")) GraphLCDSetup.enableSpectrumAnalyzer = atoi(Value); -+ else if (!strcasecmp(Name, "SAShowVolume")) GraphLCDSetup.SAShowVolume = atoi(Value); - else return false; - return true; - } - -+bool cPluginGraphLCD::Service(const char *Id, void *Data) -+{ -+ if (strcmp(Id, SPAN_CLIENT_CHECK_ID) == 0) -+ { -+ if ( GraphLCDSetup.enableSpectrumAnalyzer && (Data != NULL) ) -+ { -+ *((Span_Client_Check_1_0*)Data)->isActive = true; -+ } -+ return true; -+ } -+ -+ return false; -+} -+ - VDRPLUGINCREATOR(cPluginGraphLCD); // Don't touch this! -diff -Naur graphlcd-0.1.4.orig/setup.c graphlcd-0.1.4/setup.c ---- graphlcd-0.1.4.orig/setup.c 2007-02-04 23:10:38.865896137 +0100 -+++ graphlcd-0.1.4/setup.c 2007-02-04 23:27:59.671030635 +0100 -@@ -52,7 +52,9 @@ - ScrollTime(500), - BrightnessActive(100), - BrightnessIdle(100), -- BrightnessDelay(30) -+ BrightnessDelay(30), -+ enableSpectrumAnalyzer(1), -+ SAShowVolume(1) - { - } - -diff -Naur graphlcd-0.1.4.orig/setup.h graphlcd-0.1.4/setup.h ---- graphlcd-0.1.4.orig/setup.h 2007-02-04 23:10:38.865896137 +0100 -+++ graphlcd-0.1.4/setup.h 2007-02-04 23:28:55.347204140 +0100 -@@ -54,6 +54,8 @@ - int BrightnessActive; - int BrightnessIdle; - int BrightnessDelay; -+ int enableSpectrumAnalyzer; -+ int SAShowVolume; - - public: - cGraphLCDSetup(void); diff --git a/media-plugins/vdr-graphlcd/files/0.1.5/graphlcd-0.1.5_vdr-1.5.3.diff b/media-plugins/vdr-graphlcd/files/0.1.5/graphlcd-0.1.5_vdr-1.5.3.diff deleted file mode 100644 index fac88fb5e615..000000000000 --- a/media-plugins/vdr-graphlcd/files/0.1.5/graphlcd-0.1.5_vdr-1.5.3.diff +++ /dev/null @@ -1,19 +0,0 @@ -fix compile Probs up from vdr-1.5.3 - -Joerg Bornkessel 2007 06 26 - -diff -Naur graphlcd-0.1.5.orig/layout.c graphlcd-0.1.5/layout.c ---- graphlcd-0.1.5.orig/layout.c 2007-06-26 21:43:52.000000000 +0200 -+++ graphlcd-0.1.5/layout.c 2007-06-26 21:46:05.000000000 +0200 -@@ -65,7 +65,11 @@ - file += "/fonts/"; - file += url.substr(4, pos - 4); - } -+#if APIVERSNUM >= 10503 -+ return font.LoadFT2(file, cCharSetConv::SystemCharacterTable(), size); -+#else - return font.LoadFT2(file, I18nCharSets()[Setup.OSDLanguage], size); -+#endif - } - else - { diff --git a/media-plugins/vdr-graphlcd/files/0.1.5/vdr-graphlcd-0.1.5-missing-freetyp2.diff b/media-plugins/vdr-graphlcd/files/0.1.5/vdr-graphlcd-0.1.5-missing-freetyp2.diff deleted file mode 100644 index 2c10c8697420..000000000000 --- a/media-plugins/vdr-graphlcd/files/0.1.5/vdr-graphlcd-0.1.5-missing-freetyp2.diff +++ /dev/null @@ -1,30 +0,0 @@ -#bug 203856 - -diff -Naur graphlcd-0.1.5_orig/Makefile graphlcd-0.1.5/Makefile ---- graphlcd-0.1.5_orig/Makefile 2007-02-05 19:24:03.000000000 +0100 -+++ graphlcd-0.1.5/Makefile 2007-12-31 02:08:00.000000000 +0100 -@@ -9,6 +9,9 @@ - # - PLUGIN = graphlcd - -+# define this if you built graphlcd-base with freetype: -+HAVE_FREETYPE2 = 1 -+ - ### The version number of this plugin (taken from the main source file): - - VERSION = $(shell grep 'static const char \*VERSION *=' plugin.c | awk '{ print $$6 }' | sed -e 's/[";]//g') -@@ -51,9 +54,12 @@ - - INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(INSTALLPREFIX)/include - --DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' --DEFINES += -D_GNU_SOURCE -+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' - -+ifdef HAVE_FREETYPE2 -+ INCLUDES += -I$(INSTALLPREFIX)/include/freetype2 -+ DEFINES += -DHAVE_FREETYPE2 -+endif - - ### The object files (add further files here): - diff --git a/media-plugins/vdr-graphlcd/files/0.1.5/vdr-graphlcd-0.1.5-missing-include.patch b/media-plugins/vdr-graphlcd/files/0.1.5/vdr-graphlcd-0.1.5-missing-include.patch deleted file mode 100644 index e96823bec88e..000000000000 --- a/media-plugins/vdr-graphlcd/files/0.1.5/vdr-graphlcd-0.1.5-missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru graphlcd-0.1.4-orig/display.c graphlcd-0.1.4/display.c ---- graphlcd-0.1.4-orig/display.c 2007-02-05 11:32:23.963790615 +0100 -+++ graphlcd-0.1.4/display.c 2007-02-05 11:32:35.890079873 +0100 -@@ -29,6 +29,7 @@ - - #include - #include -+#include - - #include "compat.h" - diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.9.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.9.ebuild deleted file mode 100644 index ba2e889c515b..000000000000 --- a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.9.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit vdr-plugin-2 - -VERSION="502" # every bump, new version - -DESCRIPTION="VDR Plugin: support output on Graphical LCD " -HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd" -SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" - -KEYWORDS="~amd64 ~x86" - -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -DEPEND=">=media-video/vdr-1.6 - >=app-misc/graphlcd-base-${PV}" -RDEPEND="${DEPEND}" - -pkg_setup() { - vdr-plugin-2_pkg_setup - - if ! getent group lp | grep -q vdr; then - echo - einfo "Add user 'vdr' to group 'lp' for full user access to parport device" - echo - elog "User vdr added to group lp" - gpasswd -a vdr lp - fi - if ! getent group usb | grep -q vdr; then - echo - einfo "Add user 'vdr' to group 'usb' for full user access to usb device" - echo - elog "User vdr added to group usb" - gpasswd -a vdr usb - fi -} - -src_prepare() { - vdr-plugin-2_src_prepare - - sed -i "s:/usr/local:/usr:" Makefile - - sed -i "s:i18n.c:i18n.h:g" Makefile - - sed -i "s:include \$(VDRDIR)/Make.global:-include \$(VDRDIR)/Make.global:" Makefile -} - -src_install() { - vdr-plugin-2_src_install - - insopts -m0644 -ovdr -gvdr - - insinto /usr/share/vdr/${VDRPLUGIN}/logos - doins -r ${VDRPLUGIN}/logos/* - - insinto /usr/share/vdr/${VDRPLUGIN}/fonts - doins ${VDRPLUGIN}/fonts/*.fnt - - for font in /usr/share/fonts/corefonts/*.ttf; do - elog ${font} - dosym ${font} /usr/share/vdr/graphlcd/fonts - done - - insinto /etc/vdr/plugins/${VDRPLUGIN} - doins ${VDRPLUGIN}/logonames.alias.* - doins ${VDRPLUGIN}/fonts.conf.* - - dosym /usr/share/vdr/${VDRPLUGIN}/fonts /etc/vdr/plugins/${VDRPLUGIN}/fonts - dosym /usr/share/vdr/${VDRPLUGIN}/logos /etc/vdr/plugins/${VDRPLUGIN}/logos - dosym /etc/graphlcd.conf /etc/vdr/plugins/${VDRPLUGIN}/graphlcd.conf - - dosym /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias.1.3 /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias -} - -pkg_preinst() { - - if [[ -e /etc/vdr/plugins/graphlcd/fonts ]] && [[ ! -L /etc/vdr/plugins/graphlcd/fonts ]] \ - || [[ -e /etc/vdr/plugins/graphlcd/logos ]] && [[ ! -L /etc/vdr/plugins/graphlcd/logos ]] ;then - - elog "Remove wrong DIR in /etc/vdr/plugins/graphlcd from prior install" - elog "Press CTRL+C to abbort" - epause - rmdir -R /etc/vdrplugins/graphlcd/{fonts,logos} - fi -} - -pkg_postinst() { - vdr-plugin-2_pkg_postinst - - elog "Add additional options in /etc/conf.d/vdr.graphlcd" - elog - elog "Please copy or link one of the supplied fonts.conf.*" - elog "files in /etc/vdr/plugins/graphlcd/ to" - elog "/etc/vdr/plugins/graphlcd/fonts.conf" -} -- cgit v1.2.3