diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2007-05-28 09:06:59 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-05-28 09:06:59 +0000 |
commit | e8454bab5bf79526fe5d03066ce6261ad7edaa76 (patch) | |
tree | d4e9f941ef07e5c1ab17c62bed49edcd76e85663 /media-plugins/vdr-dvdswitch | |
parent | Added ~ppc wrt bug 179890 (diff) | |
download | historical-e8454bab5bf79526fe5d03066ce6261ad7edaa76.tar.gz historical-e8454bab5bf79526fe5d03066ce6261ad7edaa76.tar.bz2 historical-e8454bab5bf79526fe5d03066ce6261ad7edaa76.zip |
Fixed a crash if no image is in the image directory.
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'media-plugins/vdr-dvdswitch')
6 files changed, 81 insertions, 9 deletions
diff --git a/media-plugins/vdr-dvdswitch/ChangeLog b/media-plugins/vdr-dvdswitch/ChangeLog index 113620e697dc..8ef03b5828f3 100644 --- a/media-plugins/vdr-dvdswitch/ChangeLog +++ b/media-plugins/vdr-dvdswitch/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-plugins/vdr-dvdswitch # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/ChangeLog,v 1.11 2007/04/17 09:46:42 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/ChangeLog,v 1.12 2007/05/28 09:06:59 zzam Exp $ + +*vdr-dvdswitch-0.1.3-r1 (28 May 2007) + + 28 May 2007; Matthias Schwarzott <zzam@gentoo.org> + +files/0.1.3/no-files-crash.diff, +files/0.1.3/series, + +vdr-dvdswitch-0.1.3-r1.ebuild: + Fixed a crash if no image is in the image directory. 17 Apr 2007; Matthias Schwarzott <zzam@gentoo.org> files/rc-addon.sh: Removed bash specific stuff. diff --git a/media-plugins/vdr-dvdswitch/Manifest b/media-plugins/vdr-dvdswitch/Manifest index 140506089364..e5f5790e04f1 100644 --- a/media-plugins/vdr-dvdswitch/Manifest +++ b/media-plugins/vdr-dvdswitch/Manifest @@ -1,6 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX 0.1.3/no-files-crash.diff 554 RMD160 9f941fae22fe5d285d28dab9598f4def67b3ee48 SHA1 3d85164f50be2a0dcb76421b14c704995d84075c SHA256 a5b39fb18dedc4296d6259af31eae163f00aa099447f4fb80f229448c726c219 +MD5 63743a1b90bfb2004042a34a92c7653b files/0.1.3/no-files-crash.diff 554 +RMD160 9f941fae22fe5d285d28dab9598f4def67b3ee48 files/0.1.3/no-files-crash.diff 554 +SHA256 a5b39fb18dedc4296d6259af31eae163f00aa099447f4fb80f229448c726c219 files/0.1.3/no-files-crash.diff 554 +AUX 0.1.3/series 20 RMD160 67cf9f4f4b2043760fe0d62d026dbbc69715ae8e SHA1 d51b485b84fed9facf82d526dd6bb6eea4008933 SHA256 b34308686f33c1e5026db00bb216aee03c5541a8808bebfad152a7c2babc3f89 +MD5 5988923457f5537dab0cf7f7ef4bde9b files/0.1.3/series 20 +RMD160 67cf9f4f4b2043760fe0d62d026dbbc69715ae8e files/0.1.3/series 20 +SHA256 b34308686f33c1e5026db00bb216aee03c5541a8808bebfad152a7c2babc3f89 files/0.1.3/series 20 AUX confd 438 RMD160 03278d125bc7383855b829452e1821f118b9787e SHA1 04f980dbe389ad10e508fb7c55ffedc5eb84eeb7 SHA256 8e1ffbe3e2bba72f7aed1799bd15b5b55220f6a68ce2d2da5274add699e8703c MD5 9e9f28f1db0fc474d6b6031552a37292 files/confd 438 RMD160 03278d125bc7383855b829452e1821f118b9787e files/confd 438 @@ -10,14 +18,18 @@ MD5 3d97b03d38696c185d034231185670d7 files/rc-addon.sh 313 RMD160 e8245058b712a9703db7550c12d533c5902a57c9 files/rc-addon.sh 313 SHA256 3f379f1fdf4356b5d38fe1c33612b9a7f003693709abdbd618e90b82a32a3a87 files/rc-addon.sh 313 DIST vdr-dvdswitch-0.1.3.tar.bz2 35924 RMD160 5bf060b534c07bf44ffccc00d18394381609aeb1 SHA1 4db05c44cc648f4fe1bbf3e81debbfe3cdd81af4 SHA256 39b04003ea10439ca92b638ca4be13d56b0afb474e72ea3cffdb84355274240b +EBUILD vdr-dvdswitch-0.1.3-r1.ebuild 849 RMD160 83aa92f6b9388ebeb3a3370091dcff5981e717b0 SHA1 9d5a270f4f5610dbcae8cf6fba46679aee9d7443 SHA256 226a7b64db1186c2452214f3985972365b46d493dd01f3bb858b1c1102093df7 +MD5 6d5b53afeebaaf8acf1f073dc51d8a93 vdr-dvdswitch-0.1.3-r1.ebuild 849 +RMD160 83aa92f6b9388ebeb3a3370091dcff5981e717b0 vdr-dvdswitch-0.1.3-r1.ebuild 849 +SHA256 226a7b64db1186c2452214f3985972365b46d493dd01f3bb858b1c1102093df7 vdr-dvdswitch-0.1.3-r1.ebuild 849 EBUILD vdr-dvdswitch-0.1.3.ebuild 797 RMD160 83b48a666aeffb5ce6a97a5876416bb492e9af81 SHA1 391fba40a702bea52afaed9b585696e5a9cd3dae SHA256 596055ac57129894744bfce8ffad811c1feb9fb7df718620256cad6949041d2d MD5 a28e00d2c87a9433253cb7e13e47342a vdr-dvdswitch-0.1.3.ebuild 797 RMD160 83b48a666aeffb5ce6a97a5876416bb492e9af81 vdr-dvdswitch-0.1.3.ebuild 797 SHA256 596055ac57129894744bfce8ffad811c1feb9fb7df718620256cad6949041d2d vdr-dvdswitch-0.1.3.ebuild 797 -MISC ChangeLog 1716 RMD160 487066f46008d5d135d3be91c33ba0b2377666e2 SHA1 4773a71ada51f4b528ec1dfe17fc9a4a33815d8f SHA256 8fd1b5ed79751b6a4b4dc7473f7f0044ca36474d73396c6666a0fe0f8bb1b966 -MD5 1de7eecc083f310d4cf75a81f04227e7 ChangeLog 1716 -RMD160 487066f46008d5d135d3be91c33ba0b2377666e2 ChangeLog 1716 -SHA256 8fd1b5ed79751b6a4b4dc7473f7f0044ca36474d73396c6666a0fe0f8bb1b966 ChangeLog 1716 +MISC ChangeLog 1955 RMD160 072ed5fac405a8d05de922baf8059bc832666ba2 SHA1 79e43e4270ab1054ebed1dd8e1cde9222d349db2 SHA256 b4638e3d516b6d754c5c7964b339729e6c433d61c846cbd2f33f0c77819e747e +MD5 bf1467e65acf23183d05824e92290c27 ChangeLog 1955 +RMD160 072ed5fac405a8d05de922baf8059bc832666ba2 ChangeLog 1955 +SHA256 b4638e3d516b6d754c5c7964b339729e6c433d61c846cbd2f33f0c77819e747e ChangeLog 1955 MISC metadata.xml 346 RMD160 c617e8253cefe0178391d5057c0ed6db2cc45277 SHA1 88f165ed1f70a82d1a36d4ba22c34879466cdeef SHA256 b8ae743804b148b5482d83ef1ba9d65c2c58e3db422a3d7a144c8568bdadae65 MD5 b6ed62d536a825fcce5afeeb4244fd14 metadata.xml 346 RMD160 c617e8253cefe0178391d5057c0ed6db2cc45277 metadata.xml 346 @@ -25,10 +37,13 @@ SHA256 b8ae743804b148b5482d83ef1ba9d65c2c58e3db422a3d7a144c8568bdadae65 metadata MD5 a7015914739616289fb263fb0c2e3dc1 files/digest-vdr-dvdswitch-0.1.3 259 RMD160 cbee22fdb902fdf2184844c76e87112043841ab0 files/digest-vdr-dvdswitch-0.1.3 259 SHA256 69525529a876021abea9a0aadc0ad4ce8c1f9bba6438d76a306ba0507e3d144d files/digest-vdr-dvdswitch-0.1.3 259 +MD5 a7015914739616289fb263fb0c2e3dc1 files/digest-vdr-dvdswitch-0.1.3-r1 259 +RMD160 cbee22fdb902fdf2184844c76e87112043841ab0 files/digest-vdr-dvdswitch-0.1.3-r1 259 +SHA256 69525529a876021abea9a0aadc0ad4ce8c1f9bba6438d76a306ba0507e3d144d files/digest-vdr-dvdswitch-0.1.3-r1 259 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) +Version: GnuPG v2.0.4 (GNU/Linux) -iD8DBQFGJJeHt2vP6XvVdOcRAqj/AJ0Xifw2hq1dVEmD9R1XN0rcB2rKnQCglMdh -BmhfXGnTVUs3lIXV07f8340= -=+xY0 +iD8DBQFGWpu5t2vP6XvVdOcRAphQAJ0RXtoIcPdBD4jEa+YPqRQJTuO1MQCgsxbi +925n6ZNHpXA8UsoF6HnpmlQ= +=SEF7 -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-dvdswitch/files/0.1.3/no-files-crash.diff b/media-plugins/vdr-dvdswitch/files/0.1.3/no-files-crash.diff new file mode 100644 index 000000000000..867b37bed45f --- /dev/null +++ b/media-plugins/vdr-dvdswitch/files/0.1.3/no-files-crash.diff @@ -0,0 +1,17 @@ +Index: dvdswitch-0.1.3/menu.c +=================================================================== +--- dvdswitch-0.1.3.orig/menu.c ++++ dvdswitch-0.1.3/menu.c +@@ -754,8 +754,10 @@ eOSState cMainMenu::MenuMove(eKeys Key) + SetHelp(); + + mItem = (cMainMenuItem*)Get(Current()); +- MainMenuOptions.setLastSelectItemName(mItem->FileName()); +- MainMenuOptions.LastSelectItemType(mItem->Type()); ++ if (mItem) { ++ MainMenuOptions.setLastSelectItemName(mItem->FileName()); ++ MainMenuOptions.LastSelectItemType(mItem->Type()); ++ } + + return state; + } diff --git a/media-plugins/vdr-dvdswitch/files/0.1.3/series b/media-plugins/vdr-dvdswitch/files/0.1.3/series new file mode 100644 index 000000000000..b08c2759a7c9 --- /dev/null +++ b/media-plugins/vdr-dvdswitch/files/0.1.3/series @@ -0,0 +1 @@ +no-files-crash.diff diff --git a/media-plugins/vdr-dvdswitch/files/digest-vdr-dvdswitch-0.1.3-r1 b/media-plugins/vdr-dvdswitch/files/digest-vdr-dvdswitch-0.1.3-r1 new file mode 100644 index 000000000000..b9221976b8d4 --- /dev/null +++ b/media-plugins/vdr-dvdswitch/files/digest-vdr-dvdswitch-0.1.3-r1 @@ -0,0 +1,3 @@ +MD5 53a98f02806fe014ba2e5a0e41c2b3b6 vdr-dvdswitch-0.1.3.tar.bz2 35924 +RMD160 5bf060b534c07bf44ffccc00d18394381609aeb1 vdr-dvdswitch-0.1.3.tar.bz2 35924 +SHA256 39b04003ea10439ca92b638ca4be13d56b0afb474e72ea3cffdb84355274240b vdr-dvdswitch-0.1.3.tar.bz2 35924 diff --git a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild new file mode 100644 index 000000000000..e0f37a0b33f3 --- /dev/null +++ b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild,v 1.1 2007/05/28 09:06:59 zzam Exp $ + +inherit vdr-plugin + +DESCRIPTION="vdr plugin to play dvds and dvd file structures" +HOMEPAGE="http://vdrportal.de/board/thread.php?threadid=39984" +SRC_URI="http://download.schmidtie.de/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 x86" +IUSE="" + +DEPEND=">=media-video/vdr-1.3.21" +RDEPEND="media-plugins/vdr-dvd + >=media-tv/vdr-dvd-scripts-0.0.1-r5" + +DEFAULT_IMAGE_DIR="/var/vdr/video/dvd-images" + +PATCHES="${FILESDIR}/${PV}/no-files-crash.diff" + +src_unpack() { + vdr-plugin_src_unpack + + # patching default image-dir to /var/vdr/video/dvd-images + sed -e "s:/video/dvd:${DEFAULT_IMAGE_DIR}:" -i setup.c +} |