diff options
| -rw-r--r-- | media-video/xine-ui/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/xine-ui/Manifest | 2 | ||||
| -rw-r--r-- | media-video/xine-ui/files/digest-xine-ui-0.9.23-r2 | 1 | ||||
| -rw-r--r-- | media-video/xine-ui/files/implicit-config.patch | 59 | ||||
| -rw-r--r-- | media-video/xine-ui/xine-ui-0.9.23-r2.ebuild | 57 |
5 files changed, 127 insertions, 1 deletions
diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog index c61c5a3730b5..a3bc5735caf5 100644 --- a/media-video/xine-ui/ChangeLog +++ b/media-video/xine-ui/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/xine-ui # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.51 2004/04/14 15:49:13 swtaylor Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.52 2004/04/19 08:42:27 phosphan Exp $ + +*xine-ui-0.9.23-r2 (19 Apr 2004) + + 19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> xine-ui-0.9.23-r2.ebuild, + files/implicit-config.patch: + Adding the security patch from bug #48108 and making the aalib dependency + optional (bug #38979). 14 Apr 2004; Scott W Taylor <swtaylor@gentoo.org> xine-ui-0.9.23-r1.ebuild: purging xine-bugreport from .23 as well diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest index e45825cc0e52..895a62f7f6f6 100644 --- a/media-video/xine-ui/Manifest +++ b/media-video/xine-ui/Manifest @@ -1,4 +1,5 @@ MD5 d8cb167064fc4556b071967d3079ef52 xine-ui-0.9.21-r1.ebuild 1612 +MD5 902a5476e0a715bdc060e533a44bc19b xine-ui-0.9.23-r2.ebuild 1442 MD5 95c595d0435e6a5efd362dccda2ea2fd xine-ui-0.9.22-r2.ebuild 1466 MD5 151e217a87e10ebbb3322f5b56acb758 xine-ui-0.9.13-r1.ebuild 1634 MD5 39a6578d1db67971775d1a2b23ffd4d9 xine-ui-0.9.23-r1.ebuild 1431 @@ -13,6 +14,7 @@ MD5 32aa0f3c22f337999efc35a1eff3cd94 files/digest-xine-ui-0.9.21-r1 67 MD5 a40013de7a4c30965b9adb242f6d9203 files/digest-xine-ui-0.9.22-r1 67 MD5 a40013de7a4c30965b9adb242f6d9203 files/digest-xine-ui-0.9.22-r2 67 MD5 72e97c4b1f21cf5aa998c87b95c7b383 files/digest-xine-ui-0.9.23-r1 67 +MD5 72e97c4b1f21cf5aa998c87b95c7b383 files/digest-xine-ui-0.9.23-r2 67 MD5 93797247103115aaa2ec56d8de5a6ec7 files/preserve-CFLAGS.diff 5500 MD5 24814788406be1e1ce09035b2c867399 files/symlink-bug.patch 4326 MD5 f9ec30bd10b5c9d431b5d382310fe87d files/xine-ui-configure.patch 336 diff --git a/media-video/xine-ui/files/digest-xine-ui-0.9.23-r2 b/media-video/xine-ui/files/digest-xine-ui-0.9.23-r2 new file mode 100644 index 000000000000..6f5eb90bbc14 --- /dev/null +++ b/media-video/xine-ui/files/digest-xine-ui-0.9.23-r2 @@ -0,0 +1 @@ +MD5 526c96a7c08d2913e6f328e347fe615f xine-ui-0.9.23.tar.gz 2798551 diff --git a/media-video/xine-ui/files/implicit-config.patch b/media-video/xine-ui/files/implicit-config.patch new file mode 100644 index 000000000000..ccc1b37a6004 --- /dev/null +++ b/media-video/xine-ui/files/implicit-config.patch @@ -0,0 +1,59 @@ +--- src/xitk/config_wrapper.c 2004/01/25 03:19:14 1.16 ++++ src/xitk/config_wrapper.c 2004/03/16 21:13:27 1.17 +@@ -140,9 +140,18 @@ + * Handle 'cfg:/' mrl style + */ + void config_mrl(char *mrl) { ++ xine_cfg_entry_t entry; + char *key; + char *config; + char *_mrl; ++ ++ if (!xine_config_lookup_entry(gGui->xine, "misc.implicit_config", &entry) || ++ entry.type != XINE_CONFIG_TYPE_BOOL || !entry.num_value) { ++ xine_info(_("You tried to change the configuration with a cfg: MRL.\n" ++ "This is not allowed unless you enable the 'misc.implicit_config' setting " ++ "after reading and understanding its help text.")); ++ return; ++ } + + xine_strdupa(_mrl, mrl); + config = strchr(_mrl, '/'); +@@ -157,7 +166,6 @@ + *str_value++ = '\0'; + + if(str_value && strlen(str_value)) { +- xine_cfg_entry_t entry; + + if(xine_config_lookup_entry(gGui->xine, key, &entry)) { + +--- src/fb/config_wrapper.c 2003/11/08 10:19:48 1.2 ++++ src/fb/config_wrapper.c 2004/03/18 14:40:44 1.4 +@@ -136,10 +136,19 @@ + * Handle 'cfg:/' mrl style + */ + void config_mrl(const char *mrl) { ++ xine_cfg_entry_t entry; + char *key; + char *config; + char *_mrl; + ++ if (!xine_config_lookup_entry(fbxine.xine, "misc.implicit_config", &entry) || ++ entry.type != XINE_CONFIG_TYPE_BOOL || !entry.num_value) { ++ fprintf(stderr, "You tried to change the configuration with a cfg: MRL.\n" ++ "This is not allowed unless you enable the 'misc.implicit_config' setting " ++ "after reading and understanding its help text."); ++ return; ++ } ++ + xine_strdupa(_mrl, mrl); + config = strchr(_mrl, '/'); + +@@ -153,7 +162,6 @@ + *str_value++ = '\0'; + + if(str_value && strlen(str_value)) { +- xine_cfg_entry_t entry; + + if(xine_config_lookup_entry(fbxine.xine, key, &entry)) { + diff --git a/media-video/xine-ui/xine-ui-0.9.23-r2.ebuild b/media-video/xine-ui/xine-ui-0.9.23-r2.ebuild new file mode 100644 index 000000000000..9c180cee2705 --- /dev/null +++ b/media-video/xine-ui/xine-ui-0.9.23-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.23-r2.ebuild,v 1.1 2004/04/19 08:42:27 phosphan Exp $ + +inherit eutils + +DESCRIPTION="Xine movie player" +HOMEPAGE="http://xine.sourceforge.net/" +SRC_URI="mirror://sourceforge/xine/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha" +IUSE="X gnome nls directfb lirc aalib" + +DEPEND="media-libs/libpng + >=media-libs/xine-lib-1_rc3 + >=net-misc/curl-7.10.2 + lirc? ( app-misc/lirc ) + X? ( virtual/x11 ) + aalib? ( media-libs/aalib ) + gnome? ( gnome-base/ORBit ) + directfb? ( media-libs/aalib + >=dev-libs/DirectFB-0.9.9 )" +RDEPEND="nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/implicit-config.patch + epatch ${FILESDIR}/symlink-bug.patch + epatch ${FILESDIR}/preserve-CFLAGS-${PV}.diff + epatch ${FILESDIR}/true-false.patch + use directfb || sed -i "s:dfb::" src/Makefile.in + sed -i "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in +} + +src_compile() { + rm misc/xine-bugreport + local myconf="" + use X || myconf="${myconf} --disable-x11 --disable-xv" + use nls || myconf="${myconf} --disable-nls" + use lirc || myconf="${myconf} --disable-lirc" + use aalib || sed -e 's:no_aalib="":no_aalib="yes":g' \ + -i configure || die "could not disable aalib" + econf ${myconf} || die + emake || die +} + +src_install() { + make DESTDIR=${D} \ + docdir=/usr/share/doc/${PF} \ + docsdir=/usr/share/doc/${PF} \ + install || die + + dodoc AUTHORS ChangeLog INSTALL NEWS README +} |