diff options
author | Joerg Bornkessel <hd_brummy@gentoo.org> | 2014-02-23 20:25:39 +0000 |
---|---|---|
committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2014-02-23 20:25:39 +0000 |
commit | 743882259c62f29d86189a4a7d1864728f398e97 (patch) | |
tree | b4dfb35cc4166eced95cdeb3aeadd31e860c1fed /media-plugins/vdr-music | |
parent | eapi=5; converted to vdr-plugin-2.eclass (diff) | |
download | historical-743882259c62f29d86189a4a7d1864728f398e97.tar.gz historical-743882259c62f29d86189a4a7d1864728f398e97.tar.bz2 historical-743882259c62f29d86189a4a7d1864728f398e97.zip |
cleanup old
Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x34C2808A
Diffstat (limited to 'media-plugins/vdr-music')
12 files changed, 16 insertions, 763 deletions
diff --git a/media-plugins/vdr-music/ChangeLog b/media-plugins/vdr-music/ChangeLog index 331b32083204..eb57e529a958 100644 --- a/media-plugins/vdr-music/ChangeLog +++ b/media-plugins/vdr-music/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-plugins/vdr-music -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.12 2013/06/30 10:30:01 hd_brummy Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.13 2014/02/23 20:25:35 hd_brummy Exp $ + + 23 Feb 2014; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-music-0.2.0.ebuild, + -files/vdr-music-0.2.0-ImageMagick-header.diff, + -files/vdr-music-0.2.0-gcc4.3.diff, -files/vdr-music-0.2.0-gentoo.diff, + -files/vdr-music-0.2.0-glibc-2.10.patch, + -files/vdr-music-0.2.0-graphtftcoverfix.diff, + -files/vdr-music-0.2.0-lyrics.diff, -files/vdr-music-0.2.0-vdr-1.5.x.diff, + -vdr-music-0.9.3.ebuild, -files/vdr-music-0.9.3-makefile.patch: + cleanup old *vdr-music-0.9.9 (30 Jun 2013) diff --git a/media-plugins/vdr-music/Manifest b/media-plugins/vdr-music/Manifest index afaf7f6f9779..b4f144478267 100644 --- a/media-plugins/vdr-music/Manifest +++ b/media-plugins/vdr-music/Manifest @@ -2,27 +2,15 @@ Hash: SHA256 AUX music.mk 4856 SHA256 d65b42ff1beb8ac9d68fa7620afbbc554a09ad465085daf3f95ff75e5fd10c6b SHA512 3d8ca939504dbb592537b495a27029ad7c19a953d498e6d206c2f07b1143b5c4379d2a2680709d4faa83e16c42c01eb2ec7291589044caa34ca4000df9fc7aa6 WHIRLPOOL 934fd30944286c3c4af1e05f8d1cb918020d35ddd942c94bbdd439f7d96b3f085baaa592f184aece73b1a78e294b66ca57c399dd63412cb0d5d05bc4248ddabd -AUX vdr-music-0.2.0-ImageMagick-header.diff 819 SHA256 b08f248145d73f54e240c00cb74477ec483e614e199a3033f72cd3c839a587b9 SHA512 a6a0946f2be5fb23548e4ace687c6334f39b700e2859e1f1cd9244063d40a2124227ef8db7aedf199899a3b013256e9455566239f3187f1e028259755c6f5834 WHIRLPOOL cab24e0e7ccaa86ba8efdefaf3d5dffce65f1ab9f11c40d2831a13dfdbadf15ffea9a0bcd4f57e279e880f79d766bd9859a6ed229a3833801afb314b6bcde219 -AUX vdr-music-0.2.0-gcc4.3.diff 352 SHA256 25afec3855c59156e9e4e069e844fb2799e79a074b8d4a70aec2d8e981e097ed SHA512 d7d5fc77be9416fe4595cfe3c0d8cfb4001232d1e64cb9c8a5e7620a1d01aec323a042b5557178a4b96dc89305d1ee7ecba75891f131e7f0eca79d8290932cdc WHIRLPOOL 22d6273a69e0ca5da9c1e3e6bea7305eca6404a07c651f8807243f5ceecc1e94a2dfa4bf0ee419e0786227f2a67f5bc3875c3cb863b97019ba4faa33b9a5e6fb -AUX vdr-music-0.2.0-gentoo.diff 8984 SHA256 24e86049c3fe7d8f08b3b1f07e9d8da33d12bfb7aae3169eae939773372acadb SHA512 dfaaf1bb0fbdcb54c612c3c69696253f6b2ba6cb8a126065ed8998bc3e7aafa81b1c0c86923f4ea1b36e4c402811f8d19dd5999b6d249d3a0c1a04849338e6dd WHIRLPOOL 93d1b4d4cf6985a2042a967bf4db18b216171e9f9b8414abe5eb949ebeee92353196bce0cfd96531ffe3d960616a83e856043b7b912b33f487a3daf18b8dcde0 -AUX vdr-music-0.2.0-glibc-2.10.patch 3136 SHA256 8a81ba9d30af6090fee17ad3232f0e223c3d0a4838123639059efc2c9a8ac481 SHA512 9319dc9c4cde2ea9aed5c5e304272a9c46e7341d575561df70122e62528fe6f38fee156e40d952d80c010dd3cf1b70fa56b5c5bc772c02e3332c2de551d35bc7 WHIRLPOOL 672794815d027a3f304a8da16eef9ec824378bce572983fac27137eaf962722cda5aaebddd0e34d2791783fca9243f6965a0d9e793702ca5bdbf370d9fb74687 -AUX vdr-music-0.2.0-graphtftcoverfix.diff 7418 SHA256 0a0d120292092f9bbc998f2b37d3518cf93cd4999b0039f109829e70998076b6 SHA512 278e0d966707c0391cf310d00ee37d4e522609aa8ff644e357f856ace1a42482184065e3fd94d681e89946a55581ed971da4dc08cd8e1c47e130b21e806e89b5 WHIRLPOOL 7ad2e804efdb3c24ade331482220857809a44b57421888190fa87512f285db329b33ff6d8267badb8d2735cdf332d0a82f7fe02c4e5372f46ad1ab441604503f -AUX vdr-music-0.2.0-lyrics.diff 650 SHA256 854319d92e5d4a6840be922d4c891dbb01813fadb2377236379b75e50fdcf12f SHA512 829e50f7cffa9474a5d9dc851235467bb94d42f8a9434e41d1e1910ae552de20ff0e8e188e647fadc05849c48255143baeb03b56dd459ca70cde365545cb31ac WHIRLPOOL 6fc1f773be595ac24f9627f1ce6b135878fbe006b7db312442cdb6f8378a8267dd69caba41f1030dd8ccf8b481308878df054df2965b069cee4aa43fe4965a30 -AUX vdr-music-0.2.0-vdr-1.5.x.diff 742 SHA256 5db123db44bad1309fd478e1ad46f86d01de02f5f1655d766868f569e0c293c9 SHA512 da34c55d71290e76c13c6f9e96394e9858e9f1bdf6a7367de7acaf1e54b3428c4c65d8866b20920443391afec60f621af0f471db219855748b3f0b1d72b7dd63 WHIRLPOOL c5127fb776a1c99e2e8ee8e716940a36ac64fd4c3af8a2402342752317f9d6bee31222d3dd743539628ac4ed12ea7ac7fdeca7ab0034007ad325a1684502386b -AUX vdr-music-0.9.3-makefile.patch 544 SHA256 876f14b2b57392a691e953cab13491a3b04f44345aeb3904a6ace18b4bb746d8 SHA512 e42011fc05184b392d8716f911a77542a5143ef195fa3bdc143fb856288ea97325b44b844a9dea23ea33ba9b3fd56355b9bc0a9480ae69889f780beff004de1b WHIRLPOOL 82a630653299bdf76ca09a74a4e7a925893a53ed94132bb345a0807759f2d88663e3003cfe83e1b0540f09dda59b4d9c8013ae898436c1fd53c216edcfd0881c -DIST vdr-music-0.2.0.tar.gz 507411 SHA256 f01149d0d32cc32dabbf8868f2ef0c45540205a102d69138ccedc57976740b20 -DIST vdr-music-0.9.3-testing.tgz 820528 SHA256 8b9776b7dfc5f080724bec63824fa636de075097df5c18e29518fea9ad0c3bcc SHA512 5cec5b2eac4e8af1afd43a0881bb243b047b7763ecdc01666b5608ebcc4b3987f626c9f0dc7b4b28600e81b85a64e7cd2273691c71cb57f062b95a8fb3bebb32 WHIRLPOOL a46f3559b0aa20d10b685f358c0aec5655277e2cb0a8f0fe25ea3246083b4214d932792edee3db854beb5df46425f0a7a9add0dd2b2f3b4b605517f33b893511 DIST vdr-music-0.9.9-dev2.tgz 2189767 SHA256 90e46c227e08e8539d7c86d7a6b7b5c85eae3374e95bd32f7c62e81ff1e6a017 SHA512 65d9d6b1c76144dfcdb67d884c6cb44066c2bb15ccad0da1e011941b54695f47e4ae104397db1d77d6108ec7cdd81b785901a05fa1c6e07e42df71d021ab1fa7 WHIRLPOOL 45fcab4c44d1b38afd797c53870ead584aa7238d45e0a335d47b41ed31373eaa5af408e5a902cbad6c7e0b942fcd6a80aa316c7684b2bc18052c5c119dc369f4 -EBUILD vdr-music-0.2.0.ebuild 2663 SHA256 60c38a2d4923d613c0dd8c4380adb5ffb011de3ed92989a431f00dd75fadfc65 SHA512 d2f602b005feffacfa21ff31758655c51ad0e4d817ee66a114bff3601acac0eab3a6fb5e11363015d266da6fc8d5b150d2a739fceaa11c7fc1edbfebcc25d1af WHIRLPOOL 86cd31d78f972124d295214ea0ab3da79200a791ea1a9e58b301a5018036d328ee269477a82aed5c2df99baab3a4835773aaa445cf3890650fcb6eeddcdd3180 -EBUILD vdr-music-0.9.3.ebuild 1824 SHA256 4ef8c05ce5690a6b5626c952834963ed6ba4c6498b1514d43dd249a60d67a3dc SHA512 492a72a7e754503307d5d750e80e04643f80f84662a13f25765cb64cc1f5758e592d3831e8006f27cb0646dd57d581f575110c41636e59f27a7a55d0b5463328 WHIRLPOOL e548932ec753b9014fd3e32dc71a73f0d23b365313dd06a8122128cd0079d6dd0eb26fc4be34e0c1f63e63654d6458fb5e09ba346df069f5f507db05678ed75b EBUILD vdr-music-0.9.9.ebuild 1797 SHA256 6f8f18f3d9f0918d6417ac2c3f53b63bb0de48eca097f1b87788900ef5c5c863 SHA512 477b10fe2d8624d905ce5b90c7ddbbb3d67330378ea6ee9741919b730f2b528e14d69f546dec786935982694d20972b8ef89ad98eabfa76b8a3ea82d2f76a0e5 WHIRLPOOL 1f9398882e6ed85fdf6898b612e0b178f742ae252e2b383172c1926d6f439c52533c576247e269598f1fa4615b31e6e639f4dde5b699a296c532e4710603474b -MISC ChangeLog 2377 SHA256 36f7123730ed3fc09479b09aa9f580d7a68d03516c4c65d93c79f8c26c038867 SHA512 60dcb39a6cfc3e56f956a9c34c793fd35901c34771bffb5a5b707dce7fa9050905a86fd312077a2fd8154c66634b850ff0317fb0a3f1375d383f45d191963a26 WHIRLPOOL ec2292b93cedc6dcd735b5033eb80a08b3f078d1853235b3a886d88738c370319abc58debae8276f3dff4d5528d5f1d2ab1209e2d4738ad9551fda0300ec98cc +MISC ChangeLog 2830 SHA256 486f5b49e2dfff9704d683cd5bb2c6d017be6a831195ce75e846073247ef4aab SHA512 3dcbadf6135e536842e27d154f725afe234c29e182838a80b4bb18c551f4364e215391f78321d9e0f9b35fa3d18cc3c087035ab96a4aae8359cb1a17bbdbd9c4 WHIRLPOOL 93ea1e3c322ada0d1d0c86f51f43a6d97ceb1a82179a2fb44a78187940010ae7fde580d497a1c18b7bf29d3aefed60af76a0d2b77cd122642c493782d5cb2d9f MISC metadata.xml 607 SHA256 ac2b9a31e45d2c781f579c460e5952d58a45756ca6c305c31a042a68a5a978e9 SHA512 3bc98a2bf1d2977e5b0d96b5036b0cfd7ed4eb0cbf12d1a1cbf2dab82d28dccff03b973089ee905ac7378b388426cc2cac3fc3aaac7a9ed37d07290f4df9c807 WHIRLPOOL e33113c3b5ac597e69f4dc17aa5602e2bc28f751dece8923faf16507367f0fd09fff16960f51031cd68cf2d16bbd487de3a580e0f0953d5dbde47f33a7a2a4be -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -Comment: signed/commited by hd_brummy@gentoo.org +Comment: added by hd_brummy@gentoo.org -iD8DBQFR0Aixdn07HTTCgIoRCGGRAKCTNXEnlsGoJi6v/tiWrpLqa/zHswCgspvV -JDjiXwsD6IDpwcryTj9YGTI= -=uIH2 +iD8DBQFTCllAdn07HTTCgIoRCE1gAJ98hMbDjPTOZZJc1CzI4sL4VnTSTQCgkllS +USNQVWBJ6Q9MAethmMp9N3k= +=YTLn -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff b/media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff deleted file mode 100644 index 2dc217633aa1..000000000000 --- a/media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur music-0.2.0.orig/bitmap.c music-0.2.0/bitmap.c ---- music-0.2.0.orig/bitmap.c 2010-12-30 00:51:40.000000000 +0100 -+++ music-0.2.0/bitmap.c 2010-12-30 00:50:33.000000000 +0100 -@@ -10,7 +10,7 @@ - #define X_DISPLAY_MISSING - - #ifdef HAVE_MAGICK --#include <Magick++.h> -+#include <ImageMagick/Magick++.h> - using namespace Magick; - cBitmapCache cMP3Bitmap::mCache(MP3Setup.MaxCacheFill); - #else -diff -Naur music-0.2.0.orig/Makefile music-0.2.0/Makefile ---- music-0.2.0.orig/Makefile 2010-12-30 00:51:40.000000000 +0100 -+++ music-0.2.0/Makefile 2010-12-30 00:50:17.000000000 +0100 -@@ -141,7 +141,8 @@ - - ifdef HAVE_MAGICK - DEFINES += -DHAVE_MAGICK -- LIBS += -lMagick -lMagick++ -+ LIBS += $(shell Magick++-config --libs) -+ INCLUDES += -I/usr/include/ImageMagick - else - DEFINES += -DHAVE_IMLIB2 - LIBS += -lImlib2 diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-gcc4.3.diff b/media-plugins/vdr-music/files/vdr-music-0.2.0-gcc4.3.diff deleted file mode 100644 index 163056d6db3a..000000000000 --- a/media-plugins/vdr-music/files/vdr-music-0.2.0-gcc4.3.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru music-0.2.0-orig/imagecache.h music-0.2.0/imagecache.h ---- music-0.2.0-orig/imagecache.h 2009-01-13 21:43:51.680447146 +0100 -+++ music-0.2.0/imagecache.h 2009-01-13 21:47:06.427098002 +0100 -@@ -8,6 +8,7 @@ - #include <map> - #include <vector> - #include <string> -+#include <stdlib.h> - - template<class key_type, class data_type> - class cxCache { diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-gentoo.diff b/media-plugins/vdr-music/files/vdr-music-0.2.0-gentoo.diff deleted file mode 100644 index 5d18f840884d..000000000000 --- a/media-plugins/vdr-music/files/vdr-music-0.2.0-gentoo.diff +++ /dev/null @@ -1,126 +0,0 @@ -diff -Naur music-0.2.0.orig/mplayer.c music-0.2.0/mplayer.c ---- music-0.2.0.orig/mplayer.c 2008-01-06 16:31:48.000000000 +0100 -+++ music-0.2.0/mplayer.c 2008-01-06 16:36:16.000000000 +0100 -@@ -824,7 +824,7 @@ - { - if(!CheckVDRVersion(1,1,16,"mplayer")) return false; - i18n_name=Name(); -- MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayersources.conf")); -+ MPlaySources.Load(AddDirectory(ConfigDirectory( "mplayer"),"mplayersources.conf")); - if(MPlaySources.Count()<1) { - esyslog("ERROR: you must have defined at least one source in mplayersources.conf"); - fprintf(stderr,"No source(s) defined in mplayersources.conf\n"); -diff -Naur music-0.2.0.orig/music/data/musiccmds.dat music-0.2.0/music/data/musiccmds.dat ---- music-0.2.0.orig/music/data/musiccmds.dat 2008-01-06 16:31:48.000000000 +0100 -+++ music-0.2.0/music/data/musiccmds.dat 2008-01-06 16:34:33.000000000 +0100 -@@ -39,19 +39,19 @@ - ########################################################################################################################################################### - # - ---- EIGENE KOMMANDOS ---------------------------------------------------------------------------------------------------------- : echo --Speichere aktuelle Abspielliste permanent? : /etc/vdr/plugins/music/scripts/music_savepl.sh; --Speichere aktuelles Suchergebnis permanent? : /etc/vdr/plugins/music/scripts/music_savesl.sh; --Kopiere Track zu CopyDir? : /etc/vdr/plugins/music/scripts/music_copytrack.sh --Lösche ausgewähltes Verzeichnis komplett? : screen -A -m -d -S deletecopydir /etc/vdr/plugins/music/scripts/music_deletecopydir.sh -+Speichere aktuelle Abspielliste permanent? : /usr/share/vdr/music/scripts/music_savepl.sh; -+Speichere aktuelles Suchergebnis permanent? : /usr/share/vdr/music/scripts/music_savesl.sh; -+Kopiere Track zu CopyDir? : /usr/share/vdr/music/scripts/music_copytrack.sh -+Lösche ausgewähltes Verzeichnis komplett? : screen -A -m -d -S deletecopydir /usr/share/vdr/music/scripts/music_deletecopydir.sh - -------------------------------------------------------------------------------------------------------------------------------- : echo - CD auswerfen? : /usr/bin/eject /dev/hdc; - CD einziehen? : /usr/bin/eject -t /dev/hdc; --CD Disk Info? : /usr/bin/eject -t /dev/hdc; /etc/vdr/plugins/music/scripts/music_cddiskinfo.sh; --CD Disk loeschen? : screen -A -m -d -S cdblank /etc/vdr/plugins/music/scripts/music_cdblank.sh; --Abgespeicherte Playliste als Audio-CD brennen? : screen -A -m -d -S cdburn /etc/vdr/plugins/music/scripts/music_burnaudiocd.sh --Abgespeicherte Playliste als MP3-Daten-CD brennen?: screen -A -m -d -S mp3burn /etc/vdr/plugins/music/scripts/music_burnmp3cd.sh --Tracks der abgespeicherten Playliste kopieren? : screen -A -m -d -S copyall /etc/vdr/plugins/music/scripts/music_copyall.sh -+CD Disk Info? : /usr/bin/eject -t /dev/hdc; /usr/share/vdr/music/scripts/music_cddiskinfo.sh; -+CD Disk loeschen? : screen -A -m -d -S cdblank /usr/share/vdr/music/scripts/music_cdblank.sh; -+Abgespeicherte Playliste als Audio-CD brennen? : screen -A -m -d -S cdburn /usr/share/vdr/music/scripts/music_burnaudiocd.sh -+Abgespeicherte Playliste als MP3-Daten-CD brennen?: screen -A -m -d -S mp3burn /usr/share/vdr/music/scripts/music_burnmp3cd.sh -+Tracks der abgespeicherten Playliste kopieren? : screen -A -m -d -S copyall /usr/share/vdr/music/scripts/music_copyall.sh - -------------------------------------------------------------------------------------------------------------------------------- : echo - Hilfe : cat /etc/vdr/plugins/music/data/help.dat; - Check Path : echo $PATH; --Neue Themedatei erstellen : /etc/vdr/plugins/music/scripts/music_createtheme.sh; -+Neue Themedatei erstellen : /usr/share/vdr/music/scripts/music_createtheme.sh; -diff -Naur music-0.2.0.orig/music/data/webstreams.dat music-0.2.0/music/data/webstreams.dat ---- music-0.2.0.orig/music/data/webstreams.dat 2008-01-06 16:31:48.000000000 +0100 -+++ music-0.2.0/music/data/webstreams.dat 2008-01-06 16:42:26.000000000 +0100 -@@ -1,25 +1,25 @@ - #-------------------------------------------------------------------------------------------------------------------------------- : echo - # UPDATE WEBSTREAMS - #-------------------------------------------------------------------------------------------------------------------------------- : echo --TIP: --Change ../music/data/webstreams.dat with your editor. --Maybe you can uncomment the lines too. --After that, delete these lines -+# TIP: -+# Change ../music/data/webstreams.dat with your editor. -+# Maybe you can uncomment the lines too. -+# After that, delete these lines - - #---- Top Streams ---------------------------------------------------------------------------- : echo -- * Genre Top 10 *? : echo "/VDR/bin/shout2vdr.sh 'TopTen'" | at now; -+ * Genre Top 10 *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'TopTen'" | at now; - #---- Electronic ---------------------------------------------------------------------------- : echo -- * Genre Dance *? : echo "/VDR/bin/shout2vdr.sh 'Disco'" | at now; -- * Genre Club *? : echo "/VDR/bin/shout2vdr.sh 'Club'" | at now; -- * Genre House *? : echo "/VDR/bin/shout2vdr.sh 'House'" | at now; -- * Genre Trance *? : echo "/VDR/bin/shout2vdr.sh 'Trance'" | at now; -- * Genre Techno *? : echo "/VDR/bin/shout2vdr.sh 'Techno'" | at now; -+ * Genre Dance *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Disco' | at now; -+ * Genre Club *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Club'" | at now; -+ * Genre House *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'House'" | at now; -+ * Genre Trance *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Trance'" | at now; -+ * Genre Techno *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Techno'" | at now; - #---- Pop/Rock ---------------------------------------------------------------------------- : echo -- * Genre Top 40 *? : echo "/VDR/bin/shout2vdr.sh 'Top 40'" | at now; -- * Genre Metal Rock *? : echo "/VDR/bin/shout2vdr.sh 'Metal'" | at now; -- * Genre Rock *? : echo "/VDR/bin/shout2vdr.sh 'Rock'" | at now; -- * Genre Pop *? : echo "/VDR/bin/shout2vdr.sh 'Pop'" | at now; -- * Genre 80s *? : echo "/VDR/bin/shout2vdr.sh '80s'" | at now; -- * Genre Oldies *? : echo "/VDR/bin/shout2vdr.sh 'Oldies'" | at now; -- * Genre Classic Rock/Pop *? : echo "/VDR/bin/shout2vdr.sh 'Classic'" | at now; -+ * Genre Top 40 *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Top 40'" | at now; -+ * Genre Metal Rock *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Metal'" | at now; -+ * Genre Rock *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Rock'" | at now; -+ * Genre Pop *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Pop'" | at now; -+ * Genre 80s *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr '80s'" | at now; -+ * Genre Oldies *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Oldies'" | at now; -+ * Genre Classic Rock/Pop *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Classic'" | at now; - #-------------------------------------------------------------------------------------------------------------------------------- : echo -diff -Naur music-0.2.0.orig/music/musicsources.conf music-0.2.0/music/musicsources.conf ---- music-0.2.0.orig/music/musicsources.conf 2008-01-06 16:31:48.000000000 +0100 -+++ music-0.2.0/music/musicsources.conf 2008-01-06 16:45:20.000000000 +0100 -@@ -1,3 +1,3 @@ --/vdr_daten/mp3;Lokale Musik;0;*.mp3/*.ogg/*.wav/*.MP3/*.OGG/*.WAV/*.m3u/*.M3U/*.pls/*.PLS -+/mnt/music;Lokale Musik;0;*.mp3/*.ogg/*.wav/*.MP3/*.OGG/*.WAV/*.m3u/*.M3U/*.pls/*.PLS - /mnt/cdfs;CD-Rom;1;*.mp3/*.wav/*.MP3/*.WAV/*.m3u/*.M3U/*.pls/*.PLS - /media/usbstick;USB-Stick;1;*.mp3/*.ogg/*.wav/*.MP3/*.OGG/*.WAV/*.m3u/*.M3U/*.pls/*.PLS -diff -Naur music-0.2.0.orig/music/scripts/music_savepl.sh music-0.2.0/music/scripts/music_savepl.sh ---- music-0.2.0.orig/music/scripts/music_savepl.sh 2008-01-06 16:31:48.000000000 +0100 -+++ music-0.2.0/music/scripts/music_savepl.sh 2008-01-06 16:44:09.000000000 +0100 -@@ -23,7 +23,7 @@ - # - # - DATE=`date +%Y%m%d_%T` --TARGETDIR="/vdr_daten/mp3" -+TARGETDIR="/mnt/music" - SOURCE="$TARGETDIR/@current.m3u" - TARGET="$TARGETDIR/current-$DATE.m3u" - # -diff -Naur music-0.2.0.orig/music/data/user.dat music-0.2.0/music/data/user.dat ---- music-0.2.0.orig/music/data/user.dat 2008-01-06 17:14:05.000000000 +0100 -+++ music-0.2.0/music/data/user.dat 2008-01-06 17:14:23.000000000 +0100 -@@ -3,11 +3,3 @@ - User2 - User3 - User4 -- --TIP: --Edit ../music/data/user.dat with your editor --Music will do the rest for you :D --Keep care that an user "admin" exists --otherwise you cant do some operations. --Dont forget to delete this lines. --After that , delete these lines. diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-glibc-2.10.patch b/media-plugins/vdr-music/files/vdr-music-0.2.0-glibc-2.10.patch deleted file mode 100644 index 7ace820dd2e4..000000000000 --- a/media-plugins/vdr-music/files/vdr-music-0.2.0-glibc-2.10.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -ur music-0.2.0.orig/data.c music-0.2.0/data.c ---- music-0.2.0.orig/data.c 2007-05-08 22:50:56.000000000 +0300 -+++ music-0.2.0/data.c 2009-08-09 22:43:50.000000000 +0300 -@@ -479,7 +479,7 @@ - description=strdup(Description); - if(Include) { - do { -- char *s=index(Include,'/'); -+ char *s=const_cast<char*> (index(Include,'/')); - int l=s ? s-Include : strlen(Include); - if(l) { - char **s=(char **)realloc(include,(incCount+2)*sizeof(char *)); -diff -ur music-0.2.0.orig/decoder.c music-0.2.0/decoder.c ---- music-0.2.0.orig/decoder.c 2007-05-15 03:59:15.000000000 +0300 -+++ music-0.2.0/decoder.c 2009-08-09 22:47:23.000000000 +0300 -@@ -111,7 +111,7 @@ - { - // if no title, try to build a reasonable from the filename - if(!Title && filename) { -- char *s=rindex(filename,'/'); -+ char *s=const_cast<char*> (rindex(filename,'/')); - if(s && *s=='/') { - s++; - Title=strdup(s); -diff -ur music-0.2.0.orig/decoder-ogg.c music-0.2.0/decoder-ogg.c ---- music-0.2.0.orig/decoder-ogg.c 2007-04-08 22:50:36.000000000 +0300 -+++ music-0.2.0/decoder-ogg.c 2009-08-09 22:50:43.000000000 +0300 -@@ -161,7 +161,7 @@ - for(int i=0 ; i<vc->comments ; i++) { - const char *cc=vc->user_comments[i]; - d(printf("music: decoder-ogg: comment%d='%s'\n",i,cc)) -- char *p=strchr(cc,'='); -+ const char *p=strchr(cc,'='); - if(p) { - const int len=p-cc; - p++; -diff -ur music-0.2.0.orig/decoder-snd.c music-0.2.0/decoder-snd.c ---- music-0.2.0.orig/decoder-snd.c 2007-04-08 22:50:36.000000000 +0300 -+++ music-0.2.0/decoder-snd.c 2009-08-09 22:49:57.000000000 +0300 -@@ -581,7 +581,7 @@ - bool cCDDBDisc::Split(const char *source, char div, char * &first, char * &second, bool only3) - { - int pos=-1, n=0; -- char *p, l[4]={ ' ',div,' ',0 }; -+ const char *p, l[4]={ ' ',div,' ',0 }; - if ((p=strstr(source,l))) { pos=p-source; n=3; } - else if(!only3 && (p=strchr(source,div))) { pos=p-source; n=1; } - if(pos>=0) { -@@ -861,7 +861,7 @@ - { - if(id->Get()) { - int tr; -- char *s=strstr(filename,CDFS_TRACK); -+ char *s=const_cast<char*> (strstr(filename,CDFS_TRACK)); - if(s && sscanf(s+strlen(CDFS_TRACK),"%d",&tr)==1) { - d(printf("music: decoder-snd: looking up disc id %08x track %d\n",id->discid,tr)) - return cddb.Lookup(id,tr-1,this); -diff -ur music-0.2.0.orig/stream.c music-0.2.0/stream.c ---- music-0.2.0.orig/stream.c 2007-04-08 22:50:36.000000000 +0300 -+++ music-0.2.0/stream.c 2009-08-09 22:48:32.000000000 +0300 -@@ -408,7 +408,7 @@ - - bool cNetStream::ParseHeader(const char *buff, const char *name, char **value) - { -- char *s=index(buff,':'); -+ char *s=const_cast<char*> (index(buff,':')); - if(s && !strncasecmp(buff,name,s-buff)) { - s=skipspace(s+1); - d(printf("music: netstream: found header '%s' contents '%s'\n",name,s)) -@@ -532,7 +532,7 @@ - - char *cNetStream::ParseMetaString(const char *buff, const char *name, char **value) - { -- char *s=index(buff,'='); -+ char *s=const_cast<char*> (index(buff,'=')); - if(s && !strncasecmp(buff,name,s-buff)) { - char *end=index(s+2,'\''); - if(s[1]=='\'' && end) { diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-graphtftcoverfix.diff b/media-plugins/vdr-music/files/vdr-music-0.2.0-graphtftcoverfix.diff deleted file mode 100644 index 074de7703c8e..000000000000 --- a/media-plugins/vdr-music/files/vdr-music-0.2.0-graphtftcoverfix.diff +++ /dev/null @@ -1,280 +0,0 @@ -diff -ruN music-0.2.0-orig/Makefile music-0.2.0/Makefile ---- music-0.2.0-orig/Makefile 2007-05-18 15:29:15.000000000 +0200 -+++ music-0.2.0/Makefile 2007-07-29 13:14:03.000000000 +0200 -@@ -52,7 +52,7 @@ - - # INTERNAL USE , DONT UNCOMMENT OR PLUGIN WILL NOT COMPILE - #IM_A_MORON=1 --#HAVE_TUNED_GTFT=1 -+HAVE_GRAPHTFT=1 - - ### The C++ compiler and options: - CXX ?= g++ -@@ -159,8 +159,8 @@ - DEFINES += -DIM_A_MORON - endif - --ifdef HAVE_TUNED_GTFT -- DEFINES += -DHAVE_TUNED_GTFT -+ifdef HAVE_GRAPHTFT -+ DEFINES += -DHAVE_GRAPHTFT - endif - - ifndef WITHOUT_LIBSNDFILE -diff -ruN music-0.2.0-orig/mp3control.c music-0.2.0/mp3control.c ---- music-0.2.0-orig/mp3control.c 2007-05-18 14:32:37.000000000 +0200 -+++ music-0.2.0/mp3control.c 2007-07-29 13:14:03.000000000 +0200 -@@ -156,14 +156,6 @@ - - cMP3Control::~cMP3Control() - { --#ifdef HAVE_TUNED_GTFT -- cPlugin *graphtft=cPluginManager::GetPlugin("graphtft"); -- if(graphtft) cStatus::MsgImageFile(""); --#else -- cPlugin *graphtft=cPluginManager::GetPlugin("graphtft"); -- if(graphtft) graphtft->SetupParse("CoverImage", ""); --#endif -- - if(cmdMenu) {delete cmdMenu;} - cmdMenu = NULL; - -@@ -372,15 +364,6 @@ - } - } - -- --#ifdef HAVE_TUNED_GTFT -- cPlugin *graphtft=cPluginManager::GetPlugin("graphtft"); -- if(graphtft) cStatus::MsgImageFile(coverpicture ? coverpicture:""); --#else -- cPlugin *graphtft=cPluginManager::GetPlugin("graphtft"); -- if(graphtft) graphtft->SetupParse("CoverImage", coverpicture ? coverpicture:""); --#endif -- - } - CanLoadCover = false; - } -diff -ruN music-0.2.0-orig/player-mp3.c music-0.2.0/player-mp3.c ---- music-0.2.0-orig/player-mp3.c 2007-07-05 19:48:54.000000000 +0200 -+++ music-0.2.0/player-mp3.c 2007-07-29 13:14:03.000000000 +0200 -@@ -1974,6 +1974,9 @@ - ExistsLyrics(playing->Fullname()); - - // Cover + Backgroundstuff -+#ifdef HAVE_GRAPHTFT -+ LoadGraphtftImage(playing->Fullname()); -+#endif - - if( (!MP3Setup.EnableVis) || ((showcoveronly) && (!MP3Setup.VisInCoverMode)) ) { - LoadImage(playing->Fullname(), true); -@@ -2171,6 +2174,7 @@ - playModeMutex.Unlock(); - Lock(); - } -+ Unlock(); - } - - void cMP3Player::Pause(void) -@@ -2403,6 +2407,7 @@ - strcpy (imageFile, fullname); - strcpy (coverpicture, ""); - -+ - // Spectrum-Analyzer enabled - if((MP3Setup.EnableVis) && (!coveronly) ) { - p = strncpy(imageFile, MP3VisLoader.VisLoaderBackground(), sizeof(imageFile)); -@@ -2416,11 +2421,6 @@ - } - } - } -- -- -- -- -- - // - // track specific image, e.g. <song>.jpg - // -@@ -2524,13 +2524,160 @@ - if (!strlen (coverpicture)) { - DefaultImage(); - } -- -- if (!(strcmp(coverpicture, oldimagefile))==0) -+ // -+ // path to cover changed ? -+ if (!(strcmp(coverpicture, oldimagefile))==0) { - CanLoadCover=true; -- else -+ } -+ else { - CanLoadCover=false; -+ } -+} -+ -+ -+#ifdef HAVE_GRAPHTFT -+void cMP3Player::LoadGraphtftImage(const char *fullsongpath) -+{ -+ size_t i; -+ char graphcover[256]; -+ char imageFile[256]; -+ char oldimagefile[256]; -+ char *p, *q = NULL; -+ char Artist[256]; -+ char *imageSuffixes[] = { "jpg", "png" }; - -+ d(printf("music[%d]: player: gtft: checking (%s) for images\n", getpid (), fullsongpath)); -+ -+ -+ strcpy (oldimagefile, graphcover); -+ strcpy (imageFile, fullsongpath); -+ strcpy (graphcover, ""); -+ -+ -+ // -+ // track specific image, e.g. <song>.jpg -+ // -+ -+ if (!strlen (graphcover)) -+ { -+ -+ p = strrchr (imageFile, '.'); -+ if (p) -+ { -+ for (i = 0; i < sizeof (imageSuffixes) / sizeof (imageSuffixes[0]); i++) -+ { -+ strcpy (p + 1, imageSuffixes[i]); -+ d(printf("music[%d]: player: gtft: (%s)\n", getpid (), imageFile)); -+ q = CheckImage (imageFile); -+ if (q) -+ { -+ strcpy (graphcover, q); -+ } -+ } -+ } -+ } -+ // -+ // album specific image, e.g. cover-/front-/folder.jpg in song directory -+ // -+ -+ if (!strlen (graphcover)) -+ { -+ std::string fullfilename; -+ std::string Base; -+ -+ fullfilename = imageFile; -+ int len = fullfilename.length(); -+ -+ std::string::size_type pos = fullfilename.rfind('/',len); -+ if(pos!=std::string::npos) { -+ //BaseDir -+ Base = fullfilename.substr(0,pos+1); -+ } -+ -+ d(printf("music[%d]: player: gtft: directory='%s'\n", getpid(), Base.c_str())); -+ -+ std::string jpegs =""; -+ std::string b_jpegs =""; -+ std::string pngs =""; -+ std::string b_pngs =""; -+ -+ jpegs = Base + "*.jpg"; -+ b_jpegs = Base + "*.JPG"; -+ pngs = Base + "*.png"; -+ b_pngs = Base + "*.PNG"; -+ -+ d(printf("music[%d]: player: gtft: search for Cover in (%s)\n", getpid (), Base.c_str())); -+ -+ unsigned int i; -+ glob_t glob_buffer; -+ glob_buffer.gl_offs = 4; -+ glob( jpegs.c_str(), 0 , NULL, &glob_buffer); -+ glob(b_jpegs.c_str(), GLOB_APPEND , NULL, &glob_buffer); -+ glob( pngs.c_str() , GLOB_APPEND , NULL, &glob_buffer); -+ glob(b_pngs.c_str() , GLOB_APPEND , NULL, &glob_buffer); -+ -+ for (i=0; i < glob_buffer.gl_pathc; ++i) { -+ d(printf("music[%d]: player: gtft: (%s)\n", getpid(), glob_buffer.gl_pathv[i])); -+ -+ if(strcasestr(glob_buffer.gl_pathv[i], "cover")) { -+ q = CheckImage (glob_buffer.gl_pathv[i]); -+ } -+ else if(strcasestr(glob_buffer.gl_pathv[i], "front")) { -+ q = CheckImage (glob_buffer.gl_pathv[i]); -+ } -+ else if(strcasestr(glob_buffer.gl_pathv[i], "folder")) { -+ q = CheckImage (glob_buffer.gl_pathv[i]); -+ } -+ -+ if (q) { strcpy (graphcover, q); } -+ } -+ globfree(&glob_buffer); -+ } -+ // -+ // Artist specific image, e.g. Acdc.jpg in Artistcover directory -+ // -+ if (!strlen (graphcover)) { -+ if(artist !=NULL) { -+ strcpy(Artist, MP3Setup.CoverDir); -+ strcat(Artist, "/"); -+ strcat(Artist,artist); -+ strcat(Artist, ".jpg"); -+ if (Artist) { -+ d(printf("music[%d]: player: gtft: (%s)\n", getpid (), Artist)); -+ q = CheckImage (Artist); -+ if (q) { -+ strcpy (graphcover, q); -+ } -+ } -+ } -+ } -+ // -+ // Default image -+ // -+ if (!strlen (graphcover)) { -+ if (!isStream) { -+ file = config; -+ file = file + "/themes/defaultcover"; -+ file = file + MP3Skin.localcover; -+ strcpy(graphcover, file.c_str()); -+ } -+ else { -+ file = config; -+ file = file + "/themes/defaultcover"; -+ file = file + MP3Skin.streamcover; -+ strcpy(graphcover, file.c_str()); -+ } -+ } -+ // -+ // Write imagepath to /tmp -+ if( FILE *f = fopen("/tmp/graphTFT.cover", "w")) { -+ d(printf("music: player-mp3.c: write imagepath '%s' to /tmp/graphTFT.cover\n", graphcover)); -+ fprintf(f, "%s\n", graphcover); -+ fclose(f); -+ } -+ - } -+#endif - - - void cMP3Player::CheckMpeg(void) { -@@ -2646,4 +2793,3 @@ - ptslen = 1; - } - } -- -diff -ruN music-0.2.0-orig/player-mp3.h music-0.2.0/player-mp3.h ---- music-0.2.0-orig/player-mp3.h 2007-05-02 19:43:54.000000000 +0200 -+++ music-0.2.0/player-mp3.h 2007-07-29 13:14:03.000000000 +0200 -@@ -200,6 +200,9 @@ - void WaitPlayMode(ePlayMode mode, bool inv); - void ExistsLyrics(const char *songpath); - void DefaultImage(void); -+#ifdef HAVE_GRAPHTFT -+ void LoadGraphtftImage(const char *fullsongpath); -+#endif - protected: - virtual void Activate(bool On); - virtual void Action(void); diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-lyrics.diff b/media-plugins/vdr-music/files/vdr-music-0.2.0-lyrics.diff deleted file mode 100644 index 4da187354e80..000000000000 --- a/media-plugins/vdr-music/files/vdr-music-0.2.0-lyrics.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- music-0.2.0-orig/lyrics.c 2007-04-10 03:56:26.000000000 +0200 -+++ music-0.2.0/lyrics.c 2007-07-31 15:08:45.000000000 +0200 -@@ -232,8 +232,8 @@ - char *q = NULL; - char songFile[1024]; - -- datei = config; -- datei = datei + "/scripts/music_getlyrics.py"; -+ -+ datei = "/usr/share/vdr/music/scripts/music_getlyrics.py"; - - SetHelp(tr("Parent"),tr("Track-"),tr("Track+"),tr("Save")); - -@@ -279,11 +279,7 @@ - mgr->Next(); - break; - case kBlue: -- if(user_is_admin) - SaveExternLyrics(); -- else -- Skins.Message(mtError, tr("Operation denied !")); -- break; - case kOk: - case kRed: - case kBack: diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-vdr-1.5.x.diff b/media-plugins/vdr-music/files/vdr-music-0.2.0-vdr-1.5.x.diff deleted file mode 100644 index aff8b7beedf0..000000000000 --- a/media-plugins/vdr-music/files/vdr-music-0.2.0-vdr-1.5.x.diff +++ /dev/null @@ -1,30 +0,0 @@ -diff -ruN music-0.2.0/mplayer.c~ music-0.2.0/mplayer.c ---- music-0.2.0/mplayer.c~ -+++ music-0.2.0/mplayer.c -@@ -231,7 +231,12 @@ - #else - Interface->Close(); - #endif -+#if VDRVERSNUM >= 10500 -+ visible = modeOnly = false; -+ SetNeedsFastResponse(visible); -+#else - needsFastResponse=visible=modeOnly=false; -+#endif - } - } - -@@ -302,7 +307,13 @@ - Interface->Clear(); - if(MPlayerSetup.OsdPos>0) Interface->Fill(0,3,Interface->Width(),MPlayerSetup.OsdPos,clrTransparent); - #endif -+#if VDRVERSNUM >= 10500 -+ visible = true; -+ SetNeedsFastResponse(visible); -+ modeOnly=false; -+#else - needsFastResponse=visible=true; modeOnly=false; -+#endif - lastCurrent=lastTotal=-1; - flush=true; - } diff --git a/media-plugins/vdr-music/files/vdr-music-0.9.3-makefile.patch b/media-plugins/vdr-music/files/vdr-music-0.9.3-makefile.patch deleted file mode 100644 index 435c12c18ae4..000000000000 --- a/media-plugins/vdr-music/files/vdr-music-0.9.3-makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur music-0.9.3-testing.orig//Makefile music-0.9.3-testing/Makefile ---- music-0.9.3-testing.orig//Makefile 2010-03-18 18:54:58.000000000 +0100 -+++ music-0.9.3-testing/Makefile 2010-03-18 18:56:11.000000000 +0100 -@@ -72,7 +72,7 @@ - APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) - - ### Test whether VDR has locale support --VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile) -+VDRLOCALE = $(shell grep '^LOCDIR' $(VDRDIR)/Make.config) - - ### The name of the distribution archive: - diff --git a/media-plugins/vdr-music/vdr-music-0.2.0.ebuild b/media-plugins/vdr-music/vdr-music-0.2.0.ebuild deleted file mode 100644 index baaf70dabedd..000000000000 --- a/media-plugins/vdr-music/vdr-music-0.2.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild,v 1.8 2010/12/30 00:02:54 hd_brummy Exp $ - -EAPI="2" - -inherit vdr-plugin - -DESCRIPTION="VDR plugin: music" -HOMEPAGE="http://www.vdr.glaserei-franz.de/" -SRC_URI="http://www.kost.sh/vdr/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86 ~amd64" -IUSE="imagemagick debug vorbis oss ff-card graphtft 4mb-mod sndfile" - -PATCHES=( "${FILESDIR}/${P}-gentoo.diff" - "${FILESDIR}/${P}-vdr-1.5.x.diff" - "${FILESDIR}/${P}-lyrics.diff" - "${FILESDIR}/${P}-gcc4.3.diff" - "${FILESDIR}/${P}-glibc-2.10.patch" - "${FILESDIR}/${P}-ImageMagick-header.diff" ) - -DEPEND=">=media-video/vdr-1.3.30 - media-libs/libmad - media-libs/libid3tag - imagemagick? ( media-gfx/imagemagick[png] ) - vorbis? ( media-libs/libvorbis ) - sndfile? ( media-libs/libsndfile ) - oss? ( media-libs/alsa-oss ) - !imagemagick? ( media-libs/imlib2[png] )" - -RDEPEND="${DEPEND} - virtual/jre - media-tv/shoutcast2vdr - sys-process/at - graphtft? ( >=media-plugins/vdr-graphtft-0.1.5 )" - -src_prepare() { - use graphtft && epatch "${FILESDIR}/${P}-graphtftcoverfix.diff" - - use !ff-card && sed -i Makefile -e "s:HAVE_FFCARD=1:#HAVE_FFCARD=1:" - use !vorbis && sed -i Makefile -e "s:#WITHOUT_LIBVORBISFILE=1:WITHOUT_LIBVORBISFILE=1:" - use !sndfile && sed -i Makefile -e "s:#WITHOUT_LIBSNDFILE=1:WITHOUT_LIBSNDFILE=1:" - use imagemagick && sed -i Makefile -e "s:#HAVE_MAGICK=1:HAVE_MAGICK=1:" - use oss && sed -i Makefile -e "s:#WITH_OSS_OUTPUT=1:WITH_OSS_OUTPUT=1:" - use 4mb-mod && sed -i Makefile -e "s:#HAVE_OSDMOD=1:HAVE_OSDMOD=1:" - use debug && sed -i Makefile -e "s:#DBG=1:DBG=1:" - - vdr-plugin_src_prepare -} - -src_install() { - vdr-plugin_src_install - - insinto /etc/vdr/plugins/music - doins music/musicsources.conf - - insinto /etc/vdr/plugins/music/coverviewer - doins -r music/coverviewer/* - - insinto /etc/vdr/plugins/music/data - doins -r music/data/* - - exeinto /etc/vdr/plugins/music/downloads/music_cover - doexe music/downloads/music_cover/* - - insinto /etc/vdr/plugins/music/playlists - doins music/playlists/* - - insinto /etc/vdr/plugins/music/themes - doins -r music/themes/* - - insinto /etc/vdr/plugins/music/visual - doins -r music/visual/* - - exeinto /usr/share/vdr/music/scripts - doexe music/scripts/* - - keepdir /etc/vdr/plugins/music/lyrics -} - -pkg_postinst() { - vdr-plugin_pkg_postinst - - echo - elog "To complete your media-plugins/vdr-music install" - elog "take a look on:" - echo - elog "media-plugins/vdr-coverviewer" - elog "media-plugins/vdr-picselshow" - echo - elog " Please change your /etc/vdr/plugins/music/musicsources.conf " - echo -} diff --git a/media-plugins/vdr-music/vdr-music-0.9.3.ebuild b/media-plugins/vdr-music/vdr-music-0.9.3.ebuild deleted file mode 100644 index b4278b5a53d4..000000000000 --- a/media-plugins/vdr-music/vdr-music-0.9.3.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.9.3.ebuild,v 1.1 2010/12/31 14:43:39 hd_brummy Exp $ - -EAPI="2" - -inherit vdr-plugin - -MY_P="${P}-testing" -S="${WORKDIR}/music-${PV}-testing" - -DESCRIPTION="VDR plugin: music" -HOMEPAGE="http://www.vdr.glaserei-franz.de/vdrplugins.htm" -SRC_URI="http://www.vdr.glaserei-franz.de/files/${MY_P}.tgz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86 ~amd64" - -IUSE="+hd +truetype +imagemagick debug graphtft sndfile vorbis" - -PATCHES=("${FILESDIR}/${P}-makefile.patch") - -DEPEND=">=media-video/vdr-1.6.0 - media-libs/libmad - media-libs/libid3tag - graphtft? ( media-gfx/imagemagick[png] ) - imagemagick? ( media-gfx/imagemagick[png] ) - sndfile? ( media-libs/libsndfile ) - vorbis? ( media-libs/libvorbis ) - !imagemagick? ( - !graphtft? ( media-libs/imlib2[png] ) - )" - -RDEPEND="sys-process/at - graphtft? ( >=media-plugins/vdr-graphtft-0.1.5 )" - -src_prepare() { - vdr-plugin_src_prepare - - use !vorbis && sed -i Makefile -e "s:#WITHOUT_LIBVORBISFILE=1:WITHOUT_LIBVORBISFILE=1:" - use !hd && sed -i Makefile -e "s:HAVE_HD_OSD=1:#HAVE_HD_OSD=1:" - use !sndfile && sed -i Makefile -e "s:#WITHOUT_LIBSNDFILE=1:WITHOUT_LIBSNDFILE=1:" - use !truetype && sed -i Makefile -e "s:HAVE_FREETYPE=1:#HAVE_FREETYPE=1:" - use !debug && sed -i Makefile -e "s:DEBUG=1:#DEBUG=1:" - use graphtft || use imagemagick && sed -i Makefile \ - -e "s:#HAVE_MAGICK=1:HAVE_MAGICK=1:" \ - -e "s:#MAGICKDIR=:MAGICKDIR=:" -} - -src_install() { - vdr-plugin_src_install - - insinto /etc/vdr/plugins/music - doins -r music/* - chown -R vdr:vdr "${D}"/etc/vdr/plugins/music - - exeinto /usr/share/vdr/music/downloads/music_cover - doexe music/downloads/music_cover/* - chown -R vdr:vdr "${D}"/usr/share/vdr/music -} |