diff options
| -rw-r--r-- | media-gfx/pornview/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/pornview/files/gtkxine.diff | 35 | ||||
| -rw-r--r-- | media-gfx/pornview/pornview-0.2.0_pre1.ebuild | 15 |
3 files changed, 49 insertions, 8 deletions
diff --git a/media-gfx/pornview/ChangeLog b/media-gfx/pornview/ChangeLog index 89ec0fde822b..efcd0fd79afc 100644 --- a/media-gfx/pornview/ChangeLog +++ b/media-gfx/pornview/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/pornview # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.23 2005/05/07 23:45:04 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.24 2005/08/01 20:56:27 sekretarz Exp $ + + 01 Aug 2005; <sekretarz@gentoo.org> +files/gtkxine.diff, + pornview-0.2.0_pre1.ebuild: + Fixed problems with libxine and gtk, thanks Roland Bär <roland@pinguin.tv> + in bug #81179 07 May 2005; Michael Hanselmann <hansmi@gentoo.org> pornview-0.2.0_pre1.ebuild: diff --git a/media-gfx/pornview/files/gtkxine.diff b/media-gfx/pornview/files/gtkxine.diff new file mode 100644 index 000000000000..e072dbf893bf --- /dev/null +++ b/media-gfx/pornview/files/gtkxine.diff @@ -0,0 +1,35 @@ +--- pornview-0.2.0pre1.orig/src/support/widgets/gtkxine.c 2003-01-03 23:48:21.000000000 +0100 ++++ pornview-0.2.0pre1/src/support/widgets/gtkxine.c 2005-02-11 00:02:53.155157176 +0100 +@@ -376,7 +376,6 @@ + } + } + +- pthread_exit (NULL); + return NULL; + } + +@@ -595,12 +594,6 @@ + (gdk_display)), 0, 0); + #endif + +- /* +- * now, create a xine thread +- */ +- +- pthread_create (&this->thread, NULL, xine_thread, this); +- + return; + } + +@@ -623,11 +616,6 @@ + this->stream = NULL; + + /* +- * stop event thread +- */ +- pthread_cancel (this->thread); +- +- /* + * kill the drivers + */ + if (this->vo_driver != NULL) diff --git a/media-gfx/pornview/pornview-0.2.0_pre1.ebuild b/media-gfx/pornview/pornview-0.2.0_pre1.ebuild index 9b0fb7d32703..c1084b3bdbb1 100644 --- a/media-gfx/pornview/pornview-0.2.0_pre1.ebuild +++ b/media-gfx/pornview/pornview-0.2.0_pre1.ebuild @@ -1,26 +1,26 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1.ebuild,v 1.13 2005/05/07 23:45:04 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1.ebuild,v 1.14 2005/08/01 20:56:27 sekretarz Exp $ inherit eutils -IUSE="avi gtk2 jpeg mpeg nls static" +IUSE="gtk2 jpeg mplayer nls static xine" DESCRIPTION="Image viewer/manager with optional support for MPEG movies." HOMEPAGE="http://pornview.sourceforge.net" LICENSE="GPL-2" DEPEND="media-libs/libpng - avi? ( media-video/mplayer ) + mplayer? ( media-video/mplayer ) jpeg? ( media-libs/jpeg ) gtk2? ( >=x11-libs/gtk+-2.0 ) !gtk2? ( =x11-libs/gtk+-1.2* >=media-libs/gdk-pixbuf-0.16 ) - mpeg? ( =media-libs/xine-lib-1* ) + xine? ( =media-libs/xine-lib-1* ) nls? ( sys-devel/gettext )" SLOT="0" -KEYWORDS="x86 ppc amd64 ~sparc ~hppa" +KEYWORDS="x86 ppc amd64" SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz" RESTRICT="nomirror" @@ -37,9 +37,9 @@ src_compile() { # mplayer and xine movie support cannot be installed at the same # time so prefer xine support over mplayer if both are available - if use mpeg; then + if use xine; then myflags="${myflags} --enable-xine" - elif use avi; then + elif use mplayer; then myflags="${myflags} --disable-xinetest --enable-mplayer" else myflags="${myflags} --disable-xinetest" @@ -50,6 +50,7 @@ src_compile() { use static && myflags="${myflags} --enable-static" epatch ${FILESDIR}/${P}-4.diff || die + epatch ${FILESDIR}/gtkxine.diff || die econf ${myflags} || die "./configure failed" |