diff options
Diffstat (limited to 'media-plugins')
16 files changed, 31 insertions, 893 deletions
diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog index 422e3903fd11..12862c45158b 100644 --- a/media-plugins/vdr-graphtft/ChangeLog +++ b/media-plugins/vdr-graphtft/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for media-plugins/vdr-graphtft -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.36 2013/06/17 20:08:39 scarabeus Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.37 2014/01/08 12:46:48 hd_brummy Exp $ + + 08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> + -vdr-graphtft-0.3.2.24.ebuild, -files/vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff, + -files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff, + -files/vdr-graphtft-0.3.2.24_gentoo.diff, + -files/vdr-graphtft-0.3.2.24_makefile.diff, -vdr-graphtft-0.3.4.ebuild, + -files/vdr-graphtft-0.3.4_ffmpeg-1.patch, + -files/vdr-graphtft-0.3.4_gcc-4.4.x.diff, + -files/vdr-graphtft-0.3.4_gentoo.diff, + -files/vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch, + -files/vdr-1.7.27.diff: + cleanup 17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> vdr-graphtft-0.3.7.ebuild: Include mem.h so we build against libav9. Fixes bug#443228. diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest index dab7a783cdc3..e6f451ecaac7 100644 --- a/media-plugins/vdr-graphtft/Manifest +++ b/media-plugins/vdr-graphtft/Manifest @@ -4,40 +4,18 @@ Hash: SHA256 AUX confd 1233 SHA256 2ddbe4e535d7f18a002df6760b41f9c24a4cb95695480a210d148bc046582063 SHA512 b2423ebac8b00345cc78c617970413cbe9c0cd7b66f21d23e2e9aafa72fb6ecf97e94d7fbf76fe7d52e9efce8c51f7082fc3dcbd50d53b8631dd47cb66aee526 WHIRLPOOL 3ba68926ba59d59776a12e83cb7e75963c6eb692828676fa7cba04d339754ab077b7c9edf25b401b88832bc09f1237e2ec1b74367131b9acae23f540d89014d6 AUX graphtft-fe 995 SHA256 1f97afe93133b38e0a0679baf7abfa85d532d1908801da1cd1c70e5104338107 SHA512 ea40c2aa8b8f084dd7f195585afbdd038c0d5d1078b305626022ff249141c17ca383139120ed38b7f2bf28c54a4b149573ccf190033ea77c374dd7ea6cc0f85c WHIRLPOOL e7e9648aa4ab90f922e6a829fc1a3d2cdd735a2318363ff0026e498d564a69cb30157ca38e1ca253df3074fe721ebf0bf57a7bf9bba3e0112e971fe9cc15022a AUX rc-addon.sh 347 SHA256 9e0842f058670bfc5af58e2f12a334b31e7741cd3e2f3fb6d1cb5ae8475c3efe SHA512 283877d8961d063c0fd1176078fb249d34dcac46eaa249cbabaa46afc0fe34d2bbc9459c941f32af815de2e2959408d00e8e17bf09d9396f0183fb67450b2138 WHIRLPOOL 7393e9ab4acec65038c2a7120f6d7a0756a83eba5aa154203c8bacb87685170e94d787dd02490addf4c15fbc3d667bd0b89d2c4e06e833cc9a1730890c2b61d0 -AUX vdr-1.7.27.diff 2645 SHA256 96ea5e85342cebcbc98551b766fc02e8b351b616e52f4d1a565e19bac84ce514 SHA512 455f816d9072466b08699c668bbad9170332c3b404d91dc0544b2afc5833785e6c9b37c2ea79f797223e406a1cd210f4a74575bc178b1c902ccc625eeabb6f79 WHIRLPOOL 5528afeab3b6501d6a9e112e4d8ff946b06253b891da01f4a21bd5c799f172527dcf377fbdcfb131a38a92a64f32cf6641c4a9c3988cab9b7332b5ac4117ff0b -AUX vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff 1510 SHA256 5d5274914de62d77ff4fcf5f32a6b12c74be721ce986cd17074c6e1a7947339b SHA512 fc616a7c0239b2caac02256de8a98f9e76dfd8d9ff984be10d531c618e7d75ba67624ad8804ee536e1e1f8f26d35a080887835c902d62f925338addfb9deaafe WHIRLPOOL e4823f21408e10ff151936d4edee6df078a61785508e90d5c8c8af037ae524133d0ad57b6b6ba6779113e89230ddb3102aea4994bbe527d82226a5e154183184 -AUX vdr-graphtft-0.3.2.24_gcc-4.4.x.diff 2903 SHA256 ef4e8dcecaa103c73b3f50d1e5c2ede2b9306f6dd5c000d84e6d64151c3cc864 SHA512 28a73eda7024573a0e317b300b83c96be3fa5d791979d0ba69e89829c5b6a795b6d9ff54b87c3100ac784b83d456714147da256e8bce5cf58ea0d8ae0b09a540 WHIRLPOOL 179f1aea80df6a7493a4da8b847f0decbcfcb402e89ae6a2bc6a547507d65827105bafd2864513377578ef19f0196b05759867851ad98b80f65447f7094071ae -AUX vdr-graphtft-0.3.2.24_gentoo.diff 4754 SHA256 d55e03ebe3a1e50b50178be79746ce6db25afde401f7d94de708715df3bb4d68 SHA512 ec5867e7e2f1a6cb699b53b2c31918e44b06c999fd1a174a6572a8eac0fb53b89997fde76ec8b2ca4b347ff9a0d5b85d7dd186b25d3544b1555014abd3dbe5c5 WHIRLPOOL bc2f621aef43c50a661223970f9eb81bea22e374bd2e37cb9f2bffa4c7c2560788bddeb8c9cd4490080554d86f8c4f02506b8543aa8f6883b65ada5893dd9091 -AUX vdr-graphtft-0.3.2.24_makefile.diff 2202 SHA256 76ea0ceb3967c9c83a299c4231147c57dd1be40cfd390f60456b13ebe56912d0 SHA512 9c8138658a18162436cf80173436c05967c4626decb640d0c304706e30b7771d1784b436dbf281ca934c7fe41b8b1edc102d05bd3d2ddd3875aefe5c33bc2ece WHIRLPOOL 97f8561a1367ce51a8be6ac9b17c1fae391c39f4f24acd9f6d60a966872df3d0155fdf5552f90b8be63a25ab6d9c370011b13f51b752ea4ba07ae55b834511a3 -AUX vdr-graphtft-0.3.4_ffmpeg-1.patch 448 SHA256 179542bc5ae0155cd4ab0d36e47b68ad156ed8ca0475b59447266fcf1597782d SHA512 278c5a2aab4d901fca291e2aca755a7d7f5e0b6c20b5f091e66d4dbe52191c14dfde55632b103226872679f80da1c4551db8e76e29fa7971172c76d6c24a677b WHIRLPOOL 89b4ed6fcdbb2be6e5459a49accd213d945791ae384e662bc1c55efda503d04f1e4acd28bc994fbc96fb15b6e34c158b14065a19f9a84a510cd2b9c55578e936 -AUX vdr-graphtft-0.3.4_gcc-4.4.x.diff 764 SHA256 eef74d7d0c866aa22f2755ba850d2b2f5fb6739f7d9d1a09850dedc324948545 SHA512 bff4b655a4eeee4c4ecdf0f5e4efc259bd2e740a4ee64b8536ad668b2e1be5b607279173c01b1dc36a0636011d0d774fd3b3f28a40efa779efb342ef2c081619 WHIRLPOOL 341838fdbf4519a14a7315249669f20bb02acd0a13633a0fdb7b27f5f14cac40c8bdc42658d2f6be0747ecc0ba12ee659bc4d6cc9d9f07f27e502df099f0471e -AUX vdr-graphtft-0.3.4_gentoo.diff 4673 SHA256 a4da681ef44faa45cb6a4b5657443dee90a6f0707fd9d263c2062e5ba4f266b0 SHA512 1828a1e463eef00eb0097188988b8ab620c766b27c44fbfedbd4209d1c668b6c6e6b0b86c4d16c485fdc5e16300e2c03c323f6dc2e941c9338e5a866b6d47a6a WHIRLPOOL fb89ee44a3bd2ca116da5b58d4fdd8614b995b8e0dde58d8fc4c76010cd0cab24757dfbd387d607d4e731da0213608b1cfbf02e8d6d03b3a4cb3568fda44f046 -AUX vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch 1478 SHA256 c3b8d97bfe7497ba73602009640624f2be573f159b913ad238ada0b3aff4a48c SHA512 3db33a9302b12b05c42509da11a8ad05c31af4ded965f31c62494217220a3c99ad266788d5ffc33a24d196a9b1ecaef7ad7ef184110804ab3963f89578c5c598 WHIRLPOOL 7f6b966c854aa31f209084b070b5229aeb43f3fc6ed22ddd217d17606e6dab50fdeaa96947443fca785170bc4bbd4a2c0d0b526148f3acd8a9f7cf6671a25538 AUX vdr-graphtft-0.3.7_gcc-4.4.x.diff 764 SHA256 eef74d7d0c866aa22f2755ba850d2b2f5fb6739f7d9d1a09850dedc324948545 SHA512 bff4b655a4eeee4c4ecdf0f5e4efc259bd2e740a4ee64b8536ad668b2e1be5b607279173c01b1dc36a0636011d0d774fd3b3f28a40efa779efb342ef2c081619 WHIRLPOOL 341838fdbf4519a14a7315249669f20bb02acd0a13633a0fdb7b27f5f14cac40c8bdc42658d2f6be0747ecc0ba12ee659bc4d6cc9d9f07f27e502df099f0471e AUX vdr-graphtft-0.3.7_gentoo.diff 4673 SHA256 a4da681ef44faa45cb6a4b5657443dee90a6f0707fd9d263c2062e5ba4f266b0 SHA512 1828a1e463eef00eb0097188988b8ab620c766b27c44fbfedbd4209d1c668b6c6e6b0b86c4d16c485fdc5e16300e2c03c323f6dc2e941c9338e5a866b6d47a6a WHIRLPOOL fb89ee44a3bd2ca116da5b58d4fdd8614b995b8e0dde58d8fc4c76010cd0cab24757dfbd387d607d4e731da0213608b1cfbf02e8d6d03b3a4cb3568fda44f046 AUX vdr-graphtft-0.3.7_makefile.diff 2202 SHA256 76ea0ceb3967c9c83a299c4231147c57dd1be40cfd390f60456b13ebe56912d0 SHA512 9c8138658a18162436cf80173436c05967c4626decb640d0c304706e30b7771d1784b436dbf281ca934c7fe41b8b1edc102d05bd3d2ddd3875aefe5c33bc2ece WHIRLPOOL 97f8561a1367ce51a8be6ac9b17c1fae391c39f4f24acd9f6d60a966872df3d0155fdf5552f90b8be63a25ab6d9c370011b13f51b752ea4ba07ae55b834511a3 -DIST vdr-graphtft-0.3.2.24.tar.bz2 145047 SHA256 86c8432c12b5a8cd8818e2b9e5f326547218bbd89d165895b95d51405b4a72d7 -DIST vdr-graphtft-0.3.4.tar.gz 176477 SHA256 e4a6a4ebcce8aad161962a148ecb813609c838e4e9324a605934606dc1d87313 SHA512 37621b0a6ab846d4c823b7d1f13d1b4f3f5181d5949da968086d471e1a877d1b737242e1adee5c290424eb1100db9ebf260a76e7f41080f359a561d800af6f01 WHIRLPOOL 1c7cdd8358124f1c920da0261d79269240393ebb9b61d50e0cc99c37a220389971c7965cafd4191e3221c7dc56aef382537c5a61464c3ce2d879a87ec476528d DIST vdr-graphtft-0.3.7.tar.bz2 147486 SHA256 37c58c0a3051d4ac77bc12f59213be09134e14b9028bd886977b260e2c98da45 SHA512 9f5d8ea490c95bde42071d5010bf4dd339ee99271f9596d2d14575882f8f4101f0877c52373268a9d04d52be328018b2a7be1685c088742b252de44b9c3a387d WHIRLPOOL d03e144877adb3c31f48d92091d6a0fa2d7af00d706b92f6bde90f62fd990181beeabaadf77a3e879e5568c50f3b96295d892e50529f0e7361ef1579923a5c4c -EBUILD vdr-graphtft-0.3.2.24.ebuild 2383 SHA256 68ec5c3af45e9065fe3958051f31a12a410858350dcf8ffb96331b95425590cf SHA512 0b45a87460e362af461f8395358b2fc6ece1f07528f88b604e9cb1c2a959a68f3c556b80c40cfe0460b9f2c9747e6863f5aa72ab8be9876c2b03da77a6c81623 WHIRLPOOL e3a0b436aa3e0fd6f52d38a8f1714524143b96bef3677a523eb0a7a7b7b84dfa659f2c916c00b3fa78109f1d937b58811f1bd47e805360d14c57edff15b2fb94 -EBUILD vdr-graphtft-0.3.4.ebuild 2514 SHA256 df94bed814ac1c152da757b546a1eb12cf1e2790e80cc80f1b69ef824d1d2b69 SHA512 408911228117f9a85d9fe82d87a78369bb139b14cf756adedab6226c85f199da055e350ae3cdd68b29c7b5ce37af523df6098fed676ef69a5fd2325605b40e6a WHIRLPOOL d850937e30f974e26f247e7b36438248e6d984da8c20041293572eebb2fde06cc9a9a76e4462079c6eed3f1923495494e4dcd8ab3fcce798afaf9e7a2319ccaf EBUILD vdr-graphtft-0.3.7.ebuild 2631 SHA256 5df7d8f5c5f37af8eeda8e0c532d1adb2843bcb6924fb39ab2c6ab2cda3cc5c5 SHA512 0246c04e6fbbd806768fe8982df2d479f847c89f77cc7f7a73e8d40a9dcfc903de2a1e4f736ff8c5cb754c3eb0c60b359e7d33d7ee1245ae350f72c2bc3b7c0d WHIRLPOOL 6b61822b8d3c4fb3d97df9f8a6007aaa633ed15dcb44cc112041a1e420c6c636a14cbe4d6c2aa32a707d7c4b9773adcfca720aec087df7d24aef06819022e006 -MISC ChangeLog 8207 SHA256 af3b3c1ee73a0dd0bb76b56cda3d07fc1cbb9129fe4185294329158421e77998 SHA512 c551c49621f66e6d64ba9c820bb8d26d2015f53b0c3bd6b3f299a5a868f035268cab1b8051ec382b8d1ff7a92a749d0149325e1b649cd3dfd01fd810b42bfc62 WHIRLPOOL 1c920d57cf2d1a71b91850aee95f3bde7ee33cd5fd90515f55cde652800d9899a7938ed61fa975d37cd69fc969fe918be50521eff8a281fb35664aa54601be6f +MISC ChangeLog 8732 SHA256 5cfa3cd4ff81c990952981661b0fa77c3b920977d4ed1a0db93a2d5c32c29c04 SHA512 7015a668c273195a4d3afdbf59b1b64268b4d8be5b1d46f68683b46aedff7e672a27f875e347705173a32ba2cd5af3ff8b0084cb2894e770a49de55606b16069 WHIRLPOOL 8ce213899b96446a30a2d6484ef4fa5d31609178781ed1405e1160fe4f08a8d1b9edbedc54a71dbafe1fe3e3b83ce77fd6f060202fb06b158fd3f510c3612ba7 MISC metadata.xml 659 SHA256 305a976d2549db15f2261c7415fd81a8d06ec93956cd10ed271096c7cf9ad5bb SHA512 409b810a9cd79f1fad18e02a01638180cdab8ea15297aef83cefe21fdb4ffdf263162d13abec47890034410b64991e190edbbeb114ef429b371ec9db829d8749 WHIRLPOOL 270ca6768ffb51dba563da5b134ec126192d272e55441d3ad200a0b7acbf3fd71708a68ecfb24702f93ef2a24a7aa14eb2402c65475d7b46056ee27d1b62b2d1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) +Comment: added by hd_brummy@gentoo.org -iQIcBAEBCAAGBQJRv2y+AAoJEOSiRoyO7jvo8KsP/1cpIWfRHuJ23Ajio2WgaLC6 -zuaIEwQYKh5aqwjN6jwyfhgyr6LlYPtLLOGpHU4zPKMIvC2gqg7+AHx8cK9C9zId -ssRUoTjFP/4rZc5cphf9freuEx+k1yM7dtMQnkPRS3RRgmc5PfTS8LlnqPawf9KX -SEE3G7zKQK76QYA77l/GtOQU1HwJPNGVCVolLITkj55fqihHIKiqvTw+grTx1zmH -B51GPHzTUQyeEu3TUXPjxf6EmE2gcdkV85rw1+HaFCvU/lzz62dsIwQwq/vlveTp -krcrYOYRZ9n4q8M5HoZ2tMjM4JEmpR0+dRSCP56cMuMUZXed0w09xTeXQ549DSRf -FuCloBC7Jw2KRDBQU91IN1AqoKfx/ORwbeDSYnLUHyCrz1z5W4KCzDifV1IVSbOS -0td4QAVByP1jpxH900mKtYxnHCJqg5yxpWVojFFS8mXvDur94WM8T2qPONPNFIHT -QmCNKz525PaBieok3+won/Y49ruwkrl9dI8UbIY0wCapdPGgupp5XY4BJ5zfMgnS -xqb4TAgU6aj6stILz+RxFRofDNl0IQxUyE4QDzBHSzisWLDCB1JGwm9fWgZY9ljY -dktdPGWlJdReI4lQ1VLDE5lACbreK+j+uGeBM3J+meX4G53qVdWVXJ86N8wobKJ6 -wIDVvD0bfwVwC7SJ/Gab -=E7n0 +iD8DBQFSzUi5dn07HTTCgIoRCIc/AJ9VVaFKy8lZWbnoxfB5oB+7AUQp+wCgrznD +5lzsi/U9jWu9+qbk+d9rMX8= +=1pGI -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-graphtft/files/vdr-1.7.27.diff b/media-plugins/vdr-graphtft/files/vdr-1.7.27.diff deleted file mode 100644 index 9d8d499b5168..000000000000 --- a/media-plugins/vdr-graphtft/files/vdr-1.7.27.diff +++ /dev/null @@ -1,73 +0,0 @@ -diff -Naur graphtft-30.orig/dspitems.c graphtft-30/dspitems.c ---- graphtft-30.orig/dspitems.c 2012-04-07 03:09:26.000000000 +0200 -+++ graphtft-30/dspitems.c 2012-04-07 03:11:03.000000000 +0200 -@@ -397,7 +397,7 @@ - else if (strcasecmp(var, "Path") == 0) - return Str::notNull(recording->FileName()); - else if (strcasecmp(var, "Time") == 0) -- return formatDateTime(recording->start, fmt, buf, sizeof(buf)); -+ return formatDateTime(recording->Start(), fmt, buf, sizeof(buf)); - else if (strcasecmp(var, "EventID") == 0) - return Str::toStr(!recording->Info() ? na : (int)recording->Info()->EventID()); - else if (strcasecmp(var, "SubTitle") == 0) -diff -Naur graphtft-30.orig/graphtft.c graphtft-30/graphtft.c ---- graphtft-30.orig/graphtft.c 2012-04-07 03:16:05.000000000 +0200 -+++ graphtft-30/graphtft.c 2012-04-07 03:19:52.000000000 +0200 -@@ -311,7 +311,7 @@ - GraphTFTSetup.PluginConfPath = strdup(DATA_DIR); - - #if APIVERSNUM < 10507 -- RegisterI18n(Phrases); -+// RegisterI18n(Phrases); - #endif - - display = new cGraphTFTDisplay(THEMEVERSION); -diff -Naur graphtft-30.orig/graphtft.h graphtft-30/graphtft.h ---- graphtft-30.orig/graphtft.h 2012-04-07 03:16:05.000000000 +0200 -+++ graphtft-30/graphtft.h 2012-04-07 03:21:04.000000000 +0200 -@@ -16,7 +16,7 @@ - #include <vdr/config.h> - - #if APIVERSNUM < 10507 --# include "i18n.h" -+//# include "i18n.h" - # define trNOOP(s) (s) - #endif - -diff -Naur graphtft-30.orig/Makefile graphtft-30/Makefile ---- graphtft-30.orig/Makefile 2012-04-07 03:16:05.000000000 +0200 -+++ graphtft-30/Makefile 2012-04-07 03:18:44.000000000 +0200 -@@ -240,7 +240,7 @@ - ### The object files (add further files here): - - COMMONOBJS = $(PLUGIN).o dspitems.o display.o \ -- i18n.o setup.o osd.o scan.o theme.o common.o sysinfo.o \ -+ setup.o osd.o scan.o theme.o common.o sysinfo.o \ - touchthread.o - - # transfer.o -@@ -311,10 +311,10 @@ - - ### Targets: - --all: libvdr-$(PLUGIN).so i18n -+all: libvdr-$(PLUGIN).so - @cp libvdr-$(PLUGIN).so $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) - --alli: libvdr-$(PLUGIN).so i18n -+alli: libvdr-$(PLUGIN).so - - libvdr-$(PLUGIN).so: $(COMMONOBJS) $(IMLIBOBJS) $(DFBOBJS) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ $(LIBS) -o $@ -diff -Naur graphtft-30.orig/setup.h graphtft-30/setup.h ---- graphtft-30.orig/setup.h 2012-04-07 03:16:05.000000000 +0200 -+++ graphtft-30/setup.h 2012-04-07 03:21:41.000000000 +0200 -@@ -22,7 +22,7 @@ - #include "theme.h" - - #if APIVERSNUM < 10507 --# include "i18n.h" -+//# include "i18n.h" - #endif - - //*************************************************************************** diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff deleted file mode 100644 index 0f62d20d7f15..000000000000 --- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff -ur graphtft-0.2.2.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c graphtft-0.2.2/imlibrenderer/dvbrenderer/mpeg2encoder.c ---- graphtft-0.2.2.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c 2008-11-01 10:02:54.000000000 +0200 -+++ graphtft-0.2.2/imlibrenderer/dvbrenderer/mpeg2encoder.c 2009-07-24 21:11:58.000000000 +0300 -@@ -126,11 +126,11 @@ - int i; - AVPicture avpsrc; - -- avpicture_fill(&avpsrc, buf, PIX_FMT_RGBA32, width, height); -+ avpicture_fill(&avpsrc, buf, PIX_FMT_RGBA, width, height); - - #ifndef HAVE_SWSCALE - -- img_convert(&pic, PIX_FMT_YUV420P, &avpsrc, PIX_FMT_RGBA32, width, height); -+ img_convert(&pic, PIX_FMT_YUV420P, &avpsrc, PIX_FMT_RGBA, width, height); - - #else - -diff -ur graphtft-0.2.2.orig/imlibrenderer/fbrenderer/fbrenderer.c graphtft-0.2.2/imlibrenderer/fbrenderer/fbrenderer.c ---- graphtft-0.2.2.orig/imlibrenderer/fbrenderer/fbrenderer.c 2008-11-01 10:02:05.000000000 +0200 -+++ graphtft-0.2.2/imlibrenderer/fbrenderer/fbrenderer.c 2009-07-24 21:11:39.000000000 +0300 -@@ -192,7 +192,7 @@ - - switch (fb_vinfo.bits_per_pixel) - { -- case 32: tell(4, "fbdevout.c: using 32 bit depth"); fb_type = PIX_FMT_RGBA32; break; -+ case 32: tell(4, "fbdevout.c: using 32 bit depth"); fb_type = PIX_FMT_RGBA; break; - case 24: tell(4, "fbdevout.c: using 24 bit depth"); fb_type = PIX_FMT_RGB24; break; - case 16: tell(4, "fbdevout.c: using 16 bit depth"); fb_type = PIX_FMT_RGB565; break; - default: tell(4, "fbdevout.c: color depth not supported -> %i bits per pixel", diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff deleted file mode 100644 index da23096138fe..000000000000 --- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff +++ /dev/null @@ -1,72 +0,0 @@ -based on patch -http://www.vdr-portal.de/board/thread.php?postid=846248#post846248H -Joerg Bornkessel <hd_brummy@g.o> 22 Aug 2009 -diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/common.h vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/common.h ---- vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/common.h 2008-12-17 22:56:39.000000000 +0100 -+++ vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/common.h 2009-10-06 18:39:53.574720223 +0200 -@@ -17,6 +17,7 @@ - - #include <string> - #include <iconv.h> -+#include <stdint.h> - - using std::string; - - -diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/display.c vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/display.c ---- vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/display.c 2009-02-15 16:06:59.000000000 +0100 -+++ vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/display.c 2009-10-06 18:39:53.578713784 +0200 -@@ -158,7 +158,7 @@ - - int cGraphTFTDisplay::Init(const char* dev, const char* cfgDir, int port) - { -- char* pos = 0; -+ const char* pos = 0; - int devnum = na; - - #ifdef HAVE_DFB -diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/scan.h vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/scan.h ---- vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/scan.h 2008-12-17 22:56:39.000000000 +0100 -+++ vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/scan.h 2009-10-06 18:39:53.578713784 +0200 -@@ -12,6 +12,7 @@ - // Includes - //*************************************************************************** - -+#include <stdio.h> - #include <stdlib.h> - #include <string.h> - -diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/theme.c vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/theme.c ---- vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/theme.c 2009-02-15 16:06:59.000000000 +0100 -+++ vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153-patched/theme.c 2009-10-06 18:39:53.578713784 +0200 -@@ -112,7 +112,7 @@ - { - s++; - -- if (!(e = strchr(s, '}'))) -+ if (!(e = (char *)strchr(s, '}'))) - { - tell(0, "Parsing of [%s] failed, missing bracket '}'", expression); - return fail; -diff -Naur graphtft-24.orig/graphtft-fe/common.cc graphtft-24/graphtft-fe/common.cc ---- graphtft-24.orig/graphtft-fe/common.cc 2009-10-23 15:10:20.000000000 +0200 -+++ graphtft-24/graphtft-fe/common.cc 2009-10-23 15:11:11.000000000 +0200 -@@ -11,6 +11,7 @@ - #include <time.h> - #include <stdio.h> - #include <string.h> -+#include <stdint.h> - - #include <graphtft.hpp> - -diff -Naur graphtft-24.orig/graphtft-fe/graphtft.hpp graphtft-24/graphtft-fe/graphtft.hpp ---- graphtft-24.orig/graphtft-fe/graphtft.hpp 2009-10-23 15:10:20.000000000 +0200 -+++ graphtft-24/graphtft-fe/graphtft.hpp 2009-10-23 15:11:36.000000000 +0200 -@@ -16,6 +16,7 @@ - #include <X11/Xlib.h> - #include <Imlib2.h> - #include <string.h> -+#include <stdint.h> - - #define __FRONTEND - #include <../common.h> diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gentoo.diff deleted file mode 100644 index 9665affdb83e..000000000000 --- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gentoo.diff +++ /dev/null @@ -1,141 +0,0 @@ -addapted to gentoo vdr path -Joerg Bornkessel <hd_brummy@g.o> 22 Aug 2009 -diff -Naur graphtft-0.3.1.orig/dfbrenderer/dfbrenderer.c graphtft-0.3.1/dfbrenderer/dfbrenderer.c ---- graphtft-0.3.1.orig/dfbrenderer/dfbrenderer.c 2009-03-23 19:46:26.000000000 +0100 -+++ graphtft-0.3.1/dfbrenderer/dfbrenderer.c 2009-03-23 19:49:09.000000000 +0100 -@@ -231,7 +231,7 @@ - { - // make path relative to the themes directory - -- asprintf(&path, "%s/graphTFT/themes/%s/%s", -+ asprintf(&path, "%s/themes/%s/%s", - confPath.c_str(), themePath.c_str(), p.c_str()); - } - else -@@ -255,7 +255,7 @@ - - // at least add the default path - -- asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str()); -+ asprintf(&path, "%s/fonts/", confPath.c_str()); - tell(0, "Info: Adding font path '%s'", path); - fontPaths[count] = path; - free(path); -@@ -464,7 +464,7 @@ - else - { - const char* tmp = themePath.c_str(); -- asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname); -+ asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname); - } - - tell(4,"creating imageprovider for %s\n", fpath); -@@ -538,7 +538,7 @@ - else - { - const char* tmp = themePath.c_str(); -- asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname); -+ asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname); - } - - tell(4,"creating imageprovider for %s\n", fpath); -diff -Naur graphtft-0.3.1.orig/dspitems.c graphtft-0.3.1/dspitems.c ---- graphtft-0.3.1.orig/dspitems.c 2009-03-23 19:46:26.000000000 +0100 -+++ graphtft-0.3.1/dspitems.c 2009-03-23 19:49:56.000000000 +0100 -@@ -113,7 +113,7 @@ - if (p[0] != '/') - { - p = string(GraphTFTSetup.PluginConfPath) -- + "/graphTFT/themes/" -+ + "/themes/" - + string(Thms::theTheme->getDir()) - + "/" + p; - } -diff -Naur graphtft-0.3.1.orig/graphtft.c graphtft-0.3.1/graphtft.c ---- graphtft-0.3.1.orig/graphtft.c 2009-03-23 19:46:26.000000000 +0100 -+++ graphtft-0.3.1/graphtft.c 2009-03-23 19:54:23.000000000 +0100 -@@ -22,6 +22,8 @@ - #include <graphtft.h> - #include <span.h> - -+#define DATA_DIR "/usr/share/vdr/graphTFT" -+ - //*************************************************************************** - // cGraphTFTMenu - //*************************************************************************** -@@ -296,15 +298,9 @@ - - #endif - -- // try to get the config dir -- -- if (!ConfigDirectory()) -- return false; -- -- // init - - GraphTFTSetup.setClient(this); -- GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory()); -+ GraphTFTSetup.PluginConfPath = strdup(DATA_DIR); - - #if APIVERSNUM < 10507 - RegisterI18n(Phrases); -@@ -320,7 +316,7 @@ - if (loadThemes() != 0) - return false; - -- if (display->Init(_dev, ConfigDirectory(), port) != success) -+ if (display->Init(_dev, DATA_DIR, port) != success) - { - tell(0, "Error: Initializing graphTFT device faild, aborting!"); - -@@ -353,8 +349,8 @@ - - // look for the themes in the config directory - -- asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", -- ConfigDirectory()); -+ asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort", -+ DATA_DIR); - - p = popen(buffer, "r"); - -diff -Naur graphtft-0.3.1.orig/imlibrenderer/imlibrenderer.c graphtft-0.3.1/imlibrenderer/imlibrenderer.c ---- graphtft-0.3.1.orig/imlibrenderer/imlibrenderer.c 2009-03-23 19:46:26.000000000 +0100 -+++ graphtft-0.3.1/imlibrenderer/imlibrenderer.c 2009-03-23 19:55:19.000000000 +0100 -@@ -123,7 +123,7 @@ - { - // make path relative to the themes directory - -- asprintf(&path, "%s/graphTFT/themes/%s/%s", -+ asprintf(&path, "%s/themes/%s/%s", - confPath.c_str(), themePath.c_str(), p.c_str()); - } - else -@@ -146,7 +146,7 @@ - - // at least add the default path - -- asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str()); -+ asprintf(&path, "%s/fonts/", confPath.c_str()); - tell(0, "Info: Adding font path '%s'", path); - imlib_add_path_to_font_path(path); - free(path); -@@ -217,7 +217,7 @@ - if (fname[0] == '/') - path << fname; - else -- path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; -+ path << confPath << "/themes/" << themePath << "/" << fname; - - if (!fileExists(path.str().c_str())) - { -@@ -289,7 +289,7 @@ - if (fname[0] == '/') - path << fname; - else -- path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; -+ path << confPath << "/themes/" << themePath << "/" << fname; - - if (!fileExists(path.str().c_str())) - { diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_makefile.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_makefile.diff deleted file mode 100644 index f638be630069..000000000000 --- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_makefile.diff +++ /dev/null @@ -1,67 +0,0 @@ -Joerg Bornkessel <hd_brummy@g.o> 22 Okt 2009 -Matthias Schwarzott <zzam@g.o> 23 Okt 2009 -diff -Naur graphtft-24.orig/Makefile graphtft-24/Makefile ---- graphtft-24.orig/Makefile 2009-10-21 21:53:56.000000000 +0200 -+++ graphtft-24/Makefile 2009-10-21 21:57:24.000000000 +0200 -@@ -158,10 +158,10 @@ - DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' - - ifdef HAVE_IMLIB -- LIBS += `imlib2-config --libs` -+ LIBS += $(shell imlib2-config --libs) - - ifdef HAVE_IMAGE_MAGICK -- LIBS += `Magick++-config --libs` -+ LIBS += $(shell Magick++-config --libs) - DEFINES += -DHAVE_IMAGE_MAGICK - endif - -@@ -170,8 +170,8 @@ - endif - - ifdef HAVE_GTOP -- GTOP_INC = `pkg-config libgtop-2.0 --cflags` -- GTOP_LIB = `pkg-config libgtop-2.0 --libs` -+ GTOP_INC = $(shell pkg-config libgtop-2.0 --cflags) -+ GTOP_LIB = $(shell pkg-config libgtop-2.0 --libs) - - DEFINES += -DWITH_SYSINFO - LIBS += $(GTOP_LIB) -@@ -186,8 +186,8 @@ - endif - - ifdef HAVE_DFB -- INCLUDES += `directfb-config --cflags` -- LIBS += `directfb-config --libs` -+ INCLUDES += $(shell directfb-config --cflags) -+ LIBS += $(shell directfb-config --libs) - DEFINES += -DHAVE_DFB - endif - -diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile ---- graphtft-24.orig/graphtft-fe/Makefile 2009-10-22 17:39:55.000000000 +0200 -+++ graphtft-24/graphtft-fe/Makefile 2009-10-22 17:41:29.000000000 +0200 -@@ -1,9 +1,9 @@ - - CXX = g++ - CXXFLAGS = -pipe -ggdb -O2 -Wall -W -D_REENTRANT -fPIC --INCPATH = -I. `Magick++-config --cppflags` -+INCPATH = -I. $(shell Magick++-config --cppflags) - LFLAGS = -Wl,--no-undefined --LIBS = -lpthread `imlib2-config --libs` `Magick++-config --libs` -+LIBS = -lpthread $(shell imlib2-config --libs) $(shell Magick++-config --libs) - AR = ar - - TARGET = graphtft-fe -diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile ---- graphtft-24.orig/graphtft-fe/Makefile 2009-10-23 16:20:43.000000000 +0200 -+++ graphtft-24/graphtft-fe/Makefile 2009-10-23 16:21:20.000000000 +0200 -@@ -17,7 +17,7 @@ - - all: - echo Build graphTFT Frontend -- @(make $(TARGET)) -+ @$(MAKE) $(TARGET) - - - $(TARGET): $(OBJECTS) diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_ffmpeg-1.patch b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_ffmpeg-1.patch deleted file mode 100644 index 76de1ad5fd6e..000000000000 --- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_ffmpeg-1.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: graphtft-30/imlibrenderer/dvbrenderer/mpeg2encoder.c -=================================================================== ---- graphtft-30.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c -+++ graphtft-30/imlibrenderer/dvbrenderer/mpeg2encoder.c -@@ -51,7 +51,6 @@ void mpeg_init(int video_width, int vide - int i = 0; - int status; - -- avcodec_init(); - avcodec_register_all(); - - codec = avcodec_find_encoder(CODEC_ID_MPEG1VIDEO); diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gcc-4.4.x.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gcc-4.4.x.diff deleted file mode 100644 index 4e32c187ac10..000000000000 --- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gcc-4.4.x.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur graphtft-30.orig/graphtft-fe/common.cc graphtft-30/graphtft-fe/common.cc ---- graphtft-30.orig/graphtft-fe/common.cc 2012-03-12 02:10:38.000000000 +0100 -+++ graphtft-30/graphtft-fe/common.cc 2012-03-12 02:30:16.000000000 +0100 -@@ -11,6 +11,7 @@ - #include <time.h> - #include <stdio.h> - #include <string.h> -+#include <stdint.h> - - #include <graphtft.hpp> - -diff -Naur graphtft-30.orig/graphtft-fe/graphtft.hpp graphtft-30/graphtft-fe/graphtft.hpp ---- graphtft-30.orig/graphtft-fe/graphtft.hpp 2012-03-12 02:10:38.000000000 +0100 -+++ graphtft-30/graphtft-fe/graphtft.hpp 2012-03-12 02:30:57.000000000 +0100 -@@ -16,6 +16,7 @@ - #include <X11/Xlib.h> - #include <Imlib2.h> - #include <string.h> -+#include <stdint.h> - - #define __FRONTEND - #include <../common.h> diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gentoo.diff deleted file mode 100644 index ea0e7ad3d748..000000000000 --- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gentoo.diff +++ /dev/null @@ -1,139 +0,0 @@ -diff -Naur graphtft-30.orig/dfbrenderer/dfbrenderer.c graphtft-30/dfbrenderer/dfbrenderer.c ---- graphtft-30.orig/dfbrenderer/dfbrenderer.c 2012-03-12 03:27:38.000000000 +0100 -+++ graphtft-30/dfbrenderer/dfbrenderer.c 2012-03-12 03:29:35.000000000 +0100 -@@ -257,7 +257,7 @@ - { - // make path relative to the themes directory - -- asprintf(&path, "%s/graphTFT/themes/%s/%s", -+ asprintf(&path, "%s/themes/%s/%s", - confPath.c_str(), themePath.c_str(), p.c_str()); - } - else -@@ -281,7 +281,7 @@ - - // at least add the default path - -- asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str()); -+ asprintf(&path, "%s/fonts/", confPath.c_str()); - tell(0, "Info: Adding font path '%s'", path); - fontPaths[count] = path; - free(path); -@@ -483,7 +483,7 @@ - else - { - const char* tmp = themePath.c_str(); -- asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname); -+ asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname); - } - - tell(4,"creating imageprovider for %s", fpath); -@@ -561,7 +561,7 @@ - else - { - const char* tmp = themePath.c_str(); -- asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname); -+ asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname); - } - - tell(4,"creating imageprovider for %s", fpath); -diff -Naur graphtft-30.orig/dspitems.c graphtft-30/dspitems.c ---- graphtft-30.orig/dspitems.c 2012-03-12 03:27:38.000000000 +0100 -+++ graphtft-30/dspitems.c 2012-03-12 03:30:16.000000000 +0100 -@@ -107,7 +107,7 @@ - if (p[0] != '/') - { - p = string(GraphTFTSetup.PluginConfPath) -- + "/graphTFT/themes/" -+ + "/themes/" - + string(Thms::theTheme->getDir()) - + "/" + p; - } -diff -Naur graphtft-30.orig/graphtft.c graphtft-30/graphtft.c ---- graphtft-30.orig/graphtft.c 2012-03-12 03:27:38.000000000 +0100 -+++ graphtft-30/graphtft.c 2012-03-12 03:32:48.000000000 +0100 -@@ -22,6 +22,8 @@ - #include <graphtft.h> - #include <span.h> - -+#define DATA_DIR "/usr/share/vdr/graphTFT" -+ - //*************************************************************************** - // cGraphTFTMenu - //*************************************************************************** -@@ -300,13 +302,13 @@ - - // try to get the config dir - -- if (!ConfigDirectory()) -- return false; -+// if (!ConfigDirectory()) -+// return false; - - // init - - GraphTFTSetup.setClient(this); -- GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory()); -+ GraphTFTSetup.PluginConfPath = strdup(DATA_DIR); - - #if APIVERSNUM < 10507 - RegisterI18n(Phrases); -@@ -322,7 +324,7 @@ - if (loadThemes() != 0) - return false; - -- if (display->Init(_dev, ConfigDirectory(), port) != success) -+ if (display->Init(_dev, DATA_DIR, port) != success) - { - tell(0, "Error: Initializing graphTFT device faild, aborting!"); - -@@ -355,8 +357,8 @@ - - // look for the themes in the config directory - -- asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", -- ConfigDirectory()); -+ asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort", -+ DATA_DIR); - - p = popen(buffer, "r"); - -diff -Naur graphtft-30.orig/imlibrenderer/imlibrenderer.c graphtft-30/imlibrenderer/imlibrenderer.c ---- graphtft-30.orig/imlibrenderer/imlibrenderer.c 2012-03-12 03:27:38.000000000 +0100 -+++ graphtft-30/imlibrenderer/imlibrenderer.c 2012-03-12 03:33:54.000000000 +0100 -@@ -123,7 +123,7 @@ - { - // make path relative to the themes directory - -- asprintf(&path, "%s/graphTFT/themes/%s/%s", -+ asprintf(&path, "%s/themes/%s/%s", - confPath.c_str(), themePath.c_str(), p.c_str()); - } - else -@@ -146,7 +146,7 @@ - - // at least add the default path - -- asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str()); -+ asprintf(&path, "%s/fonts/", confPath.c_str()); - tell(0, "Info: Adding font path '%s'", path); - imlib_add_path_to_font_path(path); - free(path); -@@ -217,7 +217,7 @@ - if (fname[0] == '/') - path << fname; - else -- path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; -+ path << confPath << "/themes/" << themePath << "/" << fname; - - if (!fileExists(path.str().c_str())) - { -@@ -291,7 +291,7 @@ - if (fname[0] == '/') - path << fname; - else -- path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; -+ path << confPath << "/themes/" << themePath << "/" << fname; - - if (!fileExists(path.str().c_str())) - { diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch deleted file mode 100644 index a2e5a6665e73..000000000000 --- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- graphtft-0.3.4/display.c.orig 2011-10-18 10:55:14.000000000 +0200 -+++ graphtft-0.3.4/display.c 2012-03-11 11:52:32.545415663 +0100 -@@ -931,12 +931,15 @@ - // Osd Channel Switch - //*************************************************************************** - --void cGraphTFTDisplay::ChannelSwitch(const cDevice* Device, int ChannelNumber) --{ -+#if VDRVERSNUM >= 10726 -+void cGraphTFTDisplay::ChannelSwitch(const cDevice* Device, int ChannelNumber, bool LiveView) { -+#else -+void cGraphTFTDisplay::ChannelSwitch(const cDevice* Device, int ChannelNumber) { -+ bool LiveView = Device && Device->IsPrimaryDevice() && !EITScanner.UsesDevice(Device); -+#endif - tell(5, "ChannelSwitch on %p: %d", Device, ChannelNumber); - -- if (Device->IsPrimaryDevice() -- && !EITScanner.UsesDevice(Device) -+ if (LiveView - && _channel != ChannelNumber - && cDevice::CurrentChannel() != _channel) - { ---- graphtft-0.3.4/display.h.orig 2011-10-18 10:55:14.000000000 +0200 -+++ graphtft-0.3.4/display.h 2012-03-11 11:57:28.705392921 +0100 -@@ -348,7 +348,11 @@ - - // status interface - -+#if VDRVERSNUM >= 10726 -+ virtual void ChannelSwitch(const cDevice* Device, int ChannelNumber, bool LiveView); -+#else - virtual void ChannelSwitch(const cDevice* Device, int ChannelNumber); -+#endif - virtual void OsdSetEvent(const cEvent* event); - virtual void OsdSetRecording(const cRecording* recording); - virtual void OsdChannel(const char* Text); diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild deleted file mode 100644 index 78e24d52208a..000000000000 --- a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild,v 1.8 2011/04/06 17:08:37 idl0r Exp $ - -EAPI="3" - -RESTRICT="test" - -inherit eutils vdr-plugin flag-o-matic - -S="${WORKDIR}/graphtft-24" - -DESCRIPTION="VDR plugin: GraphTFT" -HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin" -SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.bz2" - -KEYWORDS="~x86 ~amd64" -SLOT="0" -LICENSE="GPL-2 LGPL-2.1" - -IUSE_THEMES="+theme_deepblue theme_avp theme_deeppurple theme_poetter" -IUSE="${IUSE_THEMES} directfb graphtft-fe imagemagick touchscreen" - -DEPEND=">=media-video/vdr-1.6.0_p2-r1[graphtft] - media-libs/imlib2[png,jpeg] - gnome-base/libgtop - >=virtual/ffmpeg-0.4.8_p20090201 - imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] ) - directfb? ( dev-libs/DirectFB ) - graphtft-fe? ( media-libs/imlib2[png,jpeg,X] )" - -RDEPEND="${DEPEND}" - -PDEPEND="theme_deepblue? ( =x11-themes/vdrgraphtft-deepblue-0.3.1 ) - theme_avp? ( =x11-themes/vdrgraphtft-avp-0.3.1 ) - theme_deeppurple? ( =x11-themes/vdrgraphtft-deeppurple-0.3.2 ) - theme_poetter? ( =x11-themes/vdrgraphtft-poetter-0.3.2 )" - -PATCHES=("${FILESDIR}/${P}_gentoo.diff" - "${FILESDIR}/${P}_makefile.diff" - "${FILESDIR}/${P}_gcc-4.4.x.diff" - "${FILESDIR}/${P}_ffmpeg-0.5.diff") - -src_prepare() { - - sed -i Makefile -e "s: WITH_X_COMM = 1:#WITH_X_COMM = 1:" - - ! use touchscreen && sed -i Makefile -e "s:WITH_TOUCH = 1:#WITH_TOUCH = 1:" - - use graphtft-fe && sed -i Makefile \ - -e "s:#WITH_X_COMM:WITH_X_COMM:" - - vdr-plugin_src_prepare - - sed -i "${S}"/imlibrenderer/fbrenderer/fbrenderer.c \ - -i "${S}"/imlibrenderer/dvbrenderer/mpeg2encoder.c \ - -e "s:libavutil/avcodec.h:libavcodec/avcodec.h:" - - # UINT64_C is needed by ffmpeg headers - append-flags -D__STDC_CONSTANT_MACROS -} - -src_compile() { - vdr-plugin_src_compile - - if use graphtft-fe; then - cd "${S}"/graphtft-fe - emake - fi -} - -src_install() { - vdr-plugin_src_install - - dodoc "${S}"/documents/{README,HISTORY,HOWTO.Themes,INSTALL} - - if use graphtft-fe; then - cd "${S}"/graphtft-fe && dobin graphtft-fe - doinit graphtft-fe - fi -} - -pkg_postinst() { - vdr-plugin_pkg_postinst - - if use graphtft-fe; then - echo - elog "Graphtft-fe user:" - elog "Edit /etc/conf.d/vdr.graphtft" - elog "/etc/init.d/graphtft-fe start" - echo - fi -} diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild deleted file mode 100644 index 42446cd4337e..000000000000 --- a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild,v 1.3 2013/01/24 13:05:14 aballier Exp $ - -EAPI="4" - -RESTRICT="test" - -inherit eutils vdr-plugin flag-o-matic - -S="${WORKDIR}/graphtft-30" - -DESCRIPTION="VDR plugin: GraphTFT" -HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="GPL-2 LGPL-2.1" - -IUSE_THEMES="+theme_deepblue theme_avp theme_deeppurple theme_poetter" -IUSE="${IUSE_THEMES} directfb graphtft-fe imagemagick touchscreen" - -DEPEND=">=media-video/vdr-1.6.0_p2-r1[graphtft] - media-libs/imlib2[png,jpeg] - gnome-base/libgtop - >=virtual/ffmpeg-0.4.8_p20090201 - imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] ) - directfb? ( dev-libs/DirectFB ) - graphtft-fe? ( media-libs/imlib2[png,jpeg,X] )" - -RDEPEND="${DEPEND}" - -PDEPEND="theme_deepblue? ( =x11-themes/vdrgraphtft-deepblue-0.3.1 ) - theme_avp? ( =x11-themes/vdrgraphtft-avp-0.3.1 ) - theme_deeppurple? ( =x11-themes/vdrgraphtft-deeppurple-0.3.2 ) - theme_poetter? ( =x11-themes/vdrgraphtft-poetter-0.3.2 )" - -PATCHES=("${FILESDIR}/${P}_gentoo.diff" - "${FILESDIR}/${PN}-0.3.2.24_makefile.diff" - "${FILESDIR}/${P}_gcc-4.4.x.diff" - "${FILESDIR}/${P}_vdr-1.7.26_ChannelSwitch.patch" - "${FILESDIR}/${P}_ffmpeg-1.patch") - -src_prepare() { - - sed -i Makefile -e "s: WITH_X_COMM = 1:#WITH_X_COMM = 1:" - - ! use touchscreen && sed -i Makefile -e "s:WITH_TOUCH = 1:#WITH_TOUCH = 1:" - - use graphtft-fe && sed -i Makefile \ - -e "s:#WITH_X_COMM:WITH_X_COMM:" - - vdr-plugin_src_prepare - - sed -i "${S}"/imlibrenderer/fbrenderer/fbrenderer.c \ - -i "${S}"/imlibrenderer/dvbrenderer/mpeg2encoder.c \ - -e "s:libavutil/avcodec.h:libavcodec/avcodec.h:" - - # UINT64_C is needed by ffmpeg headers - append-flags -D__STDC_CONSTANT_MACROS - - if has_version ">=media-video/vdr-1.7.27"; then - epatch "${FILESDIR}/vdr-1.7.27.diff" - fi -} - -src_compile() { - vdr-plugin_src_compile - - if use graphtft-fe; then - cd "${S}"/graphtft-fe - emake - fi -} - -src_install() { - vdr-plugin_src_install - - dodoc "${S}"/documents/{README,HISTORY,HOWTO.Themes,INSTALL} - - if use graphtft-fe; then - cd "${S}"/graphtft-fe && dobin graphtft-fe - doinit graphtft-fe - fi -} - -pkg_postinst() { - vdr-plugin_pkg_postinst - - if use graphtft-fe; then - echo - elog "Graphtft-fe user:" - elog "Edit /etc/conf.d/vdr.graphtft" - elog "/etc/init.d/graphtft-fe start" - echo - fi -} diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog index c0c3e7ba0a92..c33c734e7f79 100644 --- a/media-plugins/vdr-image/ChangeLog +++ b/media-plugins/vdr-image/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-plugins/vdr-image -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.42 2013/06/17 19:29:23 scarabeus Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.43 2014/01/08 12:50:45 hd_brummy Exp $ + + 08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-image-0.3.0.ebuild: + cleanup 17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> files/vdr-image-0.3.1-ffmpeg-1.patch, vdr-image-0.3.1.ebuild: diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest index 9b6e5976eda9..94f9e8e63658 100644 --- a/media-plugins/vdr-image/Manifest +++ b/media-plugins/vdr-image/Manifest @@ -6,26 +6,15 @@ AUX rc-addon.sh 672 SHA256 1d8a77095882d5b63ddeec7b422cd775b883b8ade3504a22e79d2 AUX vdr-image-0.3.0-gentoo.diff 2348 SHA256 45024beab8174cdd2ac6f0a880fb1a5cefabdfd2781ef8511d71e49592e0357e SHA512 ca6932ae0da10bf1037297dfe4eb1b667ecf78d660479fe332e474746cc1b2afcb6d1a048c511735d5e354dbd8867ee68be75a010eb31fd132382869dd98025c WHIRLPOOL 706b19f7420b8b4f115ac20aba34260884cd8c7393a38b9f1c8afb0190d3130f5b24413be3d2e27cfdc71ea30a2be708530a697967744eefd31a1dd43ac3f929 AUX vdr-image-0.3.1-ffmpeg-1.patch 1307 SHA256 50778e97a4186d462248a5c014a8f6d4065beb341659bb773bec7b64c0347de5 SHA512 ffc0e3f130f0f30b5ac2f5055ba9fbc91d9f67ae855da3ff8c26408ae24ee55e0027d7c086f24d94fe341c0f3764c24e1980a4f5408ffad927621c3697e5c825 WHIRLPOOL c708413afa0615e32e2f2479f2c44ffd8dc0b443bc5582d959367628063c5918c58fa528418517d28ce1ef2d0b3faaec6c44632043376a390b861938d0fe8c27 AUX vdr-image-0.3.1-gentoo.diff 2348 SHA256 45024beab8174cdd2ac6f0a880fb1a5cefabdfd2781ef8511d71e49592e0357e SHA512 ca6932ae0da10bf1037297dfe4eb1b667ecf78d660479fe332e474746cc1b2afcb6d1a048c511735d5e354dbd8867ee68be75a010eb31fd132382869dd98025c WHIRLPOOL 706b19f7420b8b4f115ac20aba34260884cd8c7393a38b9f1c8afb0190d3130f5b24413be3d2e27cfdc71ea30a2be708530a697967744eefd31a1dd43ac3f929 -DIST vdr-image-0.3.0.tar.gz 122950 SHA256 73efc58729fdbf8860841af2f168e952e4ad0885e4d530e9075561233ccdd7f6 DIST vdr-image-0.3.1.tar.gz 124587 SHA256 953c27a6fbebb17590cc6ffe367720d92fb0f256da934bd06bd86aabfaa8e15b SHA512 a5a3b9d29958abc486d5fce4a6423d574894a604f792fe6e73b49daf3c02fe2df1ec7d7538db2a950482a77c7d47ebd8dd498ae55f265a0a7ef013b607dd0efb WHIRLPOOL 6541b2a1f1a7e8da241878d46c0976b2d688522c2143a2d66e6c2b124343a068b000bd2a2df647bd82db858ec73e3db136ea61f77fba28d5369fcbce5dd3d1bb -EBUILD vdr-image-0.3.0.ebuild 1591 SHA256 285cb64d352eacca53b47a753ba45f84647ecc0ba5bef9a091eacd1b530430ba SHA512 f1e6ea632a2eb9ecf5f516a99a03a4936c1a7dd9b8f1cb1e94df9cd0d8e36828100007fc640be17984809892c15d73e477786126f88fff3f19a49935375cb0e4 WHIRLPOOL f502b9b80f7ec1f4119a9dfce75e3a516b4c3f235001533ff9a1224eaed367ceb135f2c8f260406d4105d21eace7d099f98310de73a28957a4dafb451ad804cc EBUILD vdr-image-0.3.1.ebuild 1723 SHA256 4a75894abca07990ffab739c810d9974f51e1ecec40ec3f8060b5023a4d10c2c SHA512 134d9a4c0290dc5080e56d1f9726d5442ea9eef48025dcba06806432bc472da3599a2d67fba14c2977c692a80bc82c3cc7afea3993feaf05c4b055ebfbad2a01 WHIRLPOOL db644b45f7355253fba9d8681fd9dae323de140f2c58ebf9da943e7f8f8ffbdab76094abfe8c204cb264736429a4a5477b08e8b66ae12f28704bc821d50031ad -MISC ChangeLog 7091 SHA256 b63f7bb094ffee9365362c57513d881e3fa04fe819a15bd1b429da2ecbc9cd15 SHA512 067c6e80e8933dae00154a72578551d29d02d712992f486b62a5825cb7f1c68e86ab84d71a25a488523d8c8295ead44482a16afcdf36bad63a078a3813cdbad4 WHIRLPOOL ade08f27ef543ed75369a0af5627c0f346603e8923f0a696248b1d4c27ec25baedfa0b15361be720091f994a422ebb0b1a7dd455d15ce82113fc358a30413d64 +MISC ChangeLog 7182 SHA256 56632ed4d73504f16deca66fdaacbf6c7bdb67f847225673f96a094c127ccc46 SHA512 666f1293b261fac044c0f990249b08588d0c49594c1bda44c16300aaea25d7a0656e198fa4d6fad450fcd0fd175b443b1765314437d6a2341712b7fa06841115 WHIRLPOOL 497a06887440348926e7f5527f0c12103bde609ef260e7ec0a7fc00ca3ed792d363f2c63b5d2bfd15090f81034cd1753b173359c44bd60a8acfb4ab001187bda MISC metadata.xml 435 SHA256 2339bf531037284f03317b33d6fcf743c6ffe74bd48c916e2db2e34c569f6bee SHA512 a92e61c4fda550adf44941a5acc4e9a9bd2a7f7de3e54857c619725a5cc88d3e1fc84ff99584377e2e4062677ed222d92cb8ca926404a118aa8552090f9fda6d WHIRLPOOL 48698d6ba1267dc029dc15061ed9e841b8664fbe6e66e27a331ebb51699910d69a47c93cb498863bbcd367de6e86e5892223eec80002ef1ba82ed54affcf3c1e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) +Comment: added by hd_brummy@gentoo.org -iQIcBAEBCAAGBQJRv2OJAAoJEOSiRoyO7jvo6G8P+wfHMuKviLhWGniovEdeflcZ -PpOqLEb0n/iBNoR89Hd0X3UjzUerp+aDeq5rdrYaiDrPoCbm2q08a31/aexpK7UN -XbGy/mh6dPO6O51TivWTls86VWxXzqTt05VEviKgN2TwU+IZjwtGHTBhu/cdbjTx -JEAtNNJctKOU9J3QgpHt4YjgPP8DiHIxngvBAsWVdVa3Z9F7UDE2TvF6TrmOy8sO -w+kfcrD9JiGlpiWwxYuMgzEPE/Uui8kg5lu4aztMSGUDMXmMpMZQjj20mWmWohAV -R4IwKUzTEsdNEqU+wcpKVGg8jMXFGujj8230FiDJshIPUMXhcPQZ4MJS34+NNppM -gCzDuVaXS4c7SY9HAn3UrPaIoGP3J8b7owQstfdpsKReL7Y7ILHIQ3RHC05cLxcg -NPKzCnnCYZCtPKwsJg6nC/xHguxLIvaPBYZZ3HEqQZNr9DfATQdyARJ+JplHKNFx -e0B5iiFrAkT9YndiLajhvZYiKl9LD2UlBu0a0JJjyP0zxmfcW//ki8BQM7JFXzvI -rU0qCzSeyX66IZrZdT1PcYDv0j/QY0dgeKIlHxUB3f2OFZR3BFHDGjc2FcWzzZiH -IVRn+E+ygmLBhV2qMlb0arI//ZDvRiWihix+O+NwN+QixYHqcFZdyP2AbO4xkhkm -cpOSQVk7mm9ZjTJScTeP -=SZi2 +iD8DBQFSzUmmdn07HTTCgIoRCG85AJ9tug7VrO10mIViSkFJJhznqIoWqACfTUpa +32Lmw/KxPDTVxNMpG7Wwanc= +=LWwi -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-image/vdr-image-0.3.0.ebuild b/media-plugins/vdr-image/vdr-image-0.3.0.ebuild deleted file mode 100644 index 2d1d34532422..000000000000 --- a/media-plugins/vdr-image/vdr-image-0.3.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.3.0.ebuild,v 1.11 2012/05/05 08:27:20 jdhore Exp $ - -EAPI="3" - -inherit vdr-plugin eutils flag-o-matic - -VERSION="678" #every bump, new version - -DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp" -HOMEPAGE="http://projects.vdr-developer.org/projects/plg-image" -SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz" - -KEYWORDS="amd64 x86" -SLOT="0" -LICENSE="GPL-2" -IUSE="exif" - -COMMON_DEPEND=">=media-video/vdr-1.5.8 - >=virtual/ffmpeg-0.4.8_p20080326 - >=media-libs/netpbm-10.0 - exif? ( media-libs/libexif )" - -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" - -RDEPEND="${COMMON_DEPEND} - >=media-tv/gentoo-vdr-scripts-0.2.2" - -VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.0.sh" -BUILD_PARAMS="-j1" - -src_prepare() { - vdr-plugin_src_prepare - - epatch "${FILESDIR}/${P}-gentoo.diff" - - use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile - - if has_version "<=virtual/ffmpeg-0.4.9_p20061016"; then - BUILD_PARAMS="${BUILD_PARAMS} WITHOUT_SWSCALER=1" - fi - - # UINT64_C is needed by ffmpeg headers - append-flags -D__STDC_CONSTANT_MACROS -} - -src_install() { - vdr-plugin_src_install - - insinto /etc/vdr/imagecmds - newins examples/imagecmds.conf imagecmds.example.conf - newins examples/imagecmds.conf.DE imagecmds.example.conf.de - - insinto /etc/vdr/plugins/image - doins examples/imagesources.conf - - into /usr/share/vdr/image - dobin scripts/imageplugin.sh - newbin scripts/mount.sh mount-image.sh -} |