From 20bc1575dea2e076efd1bc31100dfe464d1e247a Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Wed, 21 Dec 2005 14:40:04 +0000 Subject: Add patch to fix crashing when not using lirc. Package-Manager: portage-2.1_pre1 --- media-video/gxine/ChangeLog | 9 ++- media-video/gxine/Manifest | 13 +++-- media-video/gxine/files/digest-gxine-0.5.2 | 1 - media-video/gxine/files/digest-gxine-0.5.2-r1 | 1 + media-video/gxine/files/gxine-0.5.2-nolirc.patch | 24 ++++++++ media-video/gxine/gxine-0.5.2-r1.ebuild | 72 ++++++++++++++++++++++++ media-video/gxine/gxine-0.5.2.ebuild | 65 --------------------- 7 files changed, 112 insertions(+), 73 deletions(-) delete mode 100644 media-video/gxine/files/digest-gxine-0.5.2 create mode 100644 media-video/gxine/files/digest-gxine-0.5.2-r1 create mode 100644 media-video/gxine/files/gxine-0.5.2-nolirc.patch create mode 100644 media-video/gxine/gxine-0.5.2-r1.ebuild delete mode 100644 media-video/gxine/gxine-0.5.2.ebuild (limited to 'media-video/gxine') diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog index de84ccbd4951..0f359d8ef5a2 100644 --- a/media-video/gxine/ChangeLog +++ b/media-video/gxine/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/gxine # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.58 2005/12/21 00:12:39 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.59 2005/12/21 14:40:04 flameeyes Exp $ + +*gxine-0.5.2-r1 (21 Dec 2005) + + 21 Dec 2005; Diego Pettenò + +files/gxine-0.5.2-nolirc.patch, -gxine-0.5.2.ebuild, + +gxine-0.5.2-r1.ebuild: + Add patch to fix crashing when not using lirc. 21 Dec 2005; Diego Pettenò ChangeLog: Recreate manifest as I got disconnected. diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest index fcd991e06f39..c44fede986e8 100644 --- a/media-video/gxine/Manifest +++ b/media-video/gxine/Manifest @@ -1,20 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 79ac676753b5eaf9292025dcec0cce41 ChangeLog 8870 +MD5 f4929d77077a9beb7251ca7c42f5fa91 ChangeLog 9086 MD5 fb579db8b42db43fb5c027ca8c78e951 files/digest-gxine-0.4.5 64 MD5 b81fee13e52e93af9f5571f8babacf2e files/digest-gxine-0.5.1-r1 64 -MD5 c46aa3000139ed5d885183c1bda05075 files/digest-gxine-0.5.2 64 +MD5 c46aa3000139ed5d885183c1bda05075 files/digest-gxine-0.5.2-r1 64 MD5 0b50a3889d71fe54fb9249c53257d9d6 files/gxine-0.4.1-menu-fix.patch 873 MD5 b15c6d10dbe3551c6692caf851c718b3 files/gxine-0.5.1-pixmap-fixup.patch 1013 +MD5 1c7eb906eb1d70dbb36ec8d8f3bd5c07 files/gxine-0.5.2-nolirc.patch 840 MD5 79d0920e2fdab22f9ef6792340afbdd8 gxine-0.4.5.ebuild 1512 MD5 493c7bd41110af3329229754b8226087 gxine-0.5.1-r1.ebuild 1613 -MD5 dcec70b3b408e2dc48e7e7824adbcbce gxine-0.5.2.ebuild 1553 +MD5 c31bab3e957e180fdf7754d594f2cf24 gxine-0.5.2-r1.ebuild 1637 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDqJ4DAiZjviIA2XgRAsKSAKCgvudzVynE5pT7BtbuEZ5Up0EB3wCgwHbK -dkQqwCUQxZcxGR47dg24xtA= -=Dbpw +iD8DBQFDqWlcAiZjviIA2XgRAk9pAKCDpoF9/O9k8cxu85ZiGxfaOmcIrwCdE9j2 +MYLHPrwu6Wc4uZrc+RA0Vyc= +=W7ti -----END PGP SIGNATURE----- diff --git a/media-video/gxine/files/digest-gxine-0.5.2 b/media-video/gxine/files/digest-gxine-0.5.2 deleted file mode 100644 index b4fcb9e89cfc..000000000000 --- a/media-video/gxine/files/digest-gxine-0.5.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 3c2340aae58098eccc89d9b02c908ec0 gxine-0.5.2.tar.bz2 825558 diff --git a/media-video/gxine/files/digest-gxine-0.5.2-r1 b/media-video/gxine/files/digest-gxine-0.5.2-r1 new file mode 100644 index 000000000000..b4fcb9e89cfc --- /dev/null +++ b/media-video/gxine/files/digest-gxine-0.5.2-r1 @@ -0,0 +1 @@ +MD5 3c2340aae58098eccc89d9b02c908ec0 gxine-0.5.2.tar.bz2 825558 diff --git a/media-video/gxine/files/gxine-0.5.2-nolirc.patch b/media-video/gxine/files/gxine-0.5.2-nolirc.patch new file mode 100644 index 000000000000..e0f61d72d8fb --- /dev/null +++ b/media-video/gxine/files/gxine-0.5.2-nolirc.patch @@ -0,0 +1,24 @@ +Index: gxine-0.5.2/src/menu.c +=================================================================== +--- gxine-0.5.2.orig/src/menu.c ++++ gxine-0.5.2/src/menu.c +@@ -348,7 +348,9 @@ JS_CB (EngineLog, "log_show ();") + JS_CB (JSConsole, "js_console_show ();") + JS_CB (StreamInfo, "stream_info_show ();") + JS_CB (SetupWizards, "run_wizards ();") ++#ifdef HAVE_LIRC + JS_CB (ReloadLIRC, "reload_lirc ();") ++#endif + + #define CB(name, stock, label, key) \ + { #name, (stock), (label), (key), NULL, G_CALLBACK(js_##name##_cb) } +@@ -482,7 +484,9 @@ static GtkWidget *add_menu_ui (GtkUIMana + "\n" + "\n" + "\n" ++#ifdef HAVE_LIRC + "\n" ++#endif + "\n" + "\n" + "\n" diff --git a/media-video/gxine/gxine-0.5.2-r1.ebuild b/media-video/gxine/gxine-0.5.2-r1.ebuild new file mode 100644 index 000000000000..d09847d38bf3 --- /dev/null +++ b/media-video/gxine/gxine-0.5.2-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.2-r1.ebuild,v 1.1 2005/12/21 14:40:04 flameeyes Exp $ + +inherit eutils nsplugins fdo-mime + +DESCRIPTION="GTK+ Front-End for libxine" +HOMEPAGE="http://xine.sourceforge.net/" +LICENSE="GPL-2" + +DEPEND="media-libs/libpng + >=media-libs/xine-lib-1_beta10 + >=x11-libs/gtk+-2.6 + >=dev-libs/glib-2.6 + >=dev-lang/spidermonkey-1.5_rc6-r1 + lirc? ( app-misc/lirc ) + X? ( || ( ( x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXrender ) + virtual/x11 ) )" +RDEPEND="nls? ( sys-devel/gettext ) + dev-util/pkgconfig + X? ( || ( ( x11-base/xorg-server + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXaw + x11-proto/xineramaproto + x11-proto/xproto + x11-proto/xextproto ) + virtual/x11 ) )" + +IUSE="nls lirc nsplugin" + +SLOT="0" +# Those needs spidermonkey: ~sparc +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +SRC_URI="mirror://sourceforge/xine/${P}.tar.bz2" + +src_unpack() { + unpack ${A} + cd ${S} + + epatch "${FILESDIR}/${P}-nolirc.patch" +} + +src_compile() { + econf \ + $(use_enable nls) \ + $(use_enable lirc) \ + $(use_with nsplugin browser-plugin) \ + --disable-gtk-compat \ + --disable-dependency-tracking || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR=${D} \ + docdir=/usr/share/doc/${PF} \ + docsdir=/usr/share/doc/${PF} \ + install || die + + dodoc AUTHORS ChangeLog NEWS README + + use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} diff --git a/media-video/gxine/gxine-0.5.2.ebuild b/media-video/gxine/gxine-0.5.2.ebuild deleted file mode 100644 index 6160054fb1fc..000000000000 --- a/media-video/gxine/gxine-0.5.2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.2.ebuild,v 1.1 2005/12/21 00:06:25 flameeyes Exp $ - -inherit eutils nsplugins fdo-mime - -DESCRIPTION="GTK+ Front-End for libxine" -HOMEPAGE="http://xine.sourceforge.net/" -LICENSE="GPL-2" - -DEPEND="media-libs/libpng - >=media-libs/xine-lib-1_beta10 - >=x11-libs/gtk+-2.6 - >=dev-libs/glib-2.6 - >=dev-lang/spidermonkey-1.5_rc6-r1 - lirc? ( app-misc/lirc ) - X? ( || ( ( x11-libs/libX11 - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrender ) - virtual/x11 ) )" -RDEPEND="nls? ( sys-devel/gettext ) - dev-util/pkgconfig - X? ( || ( ( x11-base/xorg-server - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXaw - x11-proto/xineramaproto - x11-proto/xproto - x11-proto/xextproto ) - virtual/x11 ) )" - -IUSE="nls lirc nsplugin" - -SLOT="0" -# Those needs spidermonkey: ~sparc -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -SRC_URI="mirror://sourceforge/xine/${P}.tar.bz2" - -src_compile() { - econf \ - $(use_enable nls) \ - $(use_enable lirc) \ - $(use_with nsplugin browser-plugin) \ - --disable-gtk-compat \ - --disable-dependency-tracking || die "econf failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR=${D} \ - docdir=/usr/share/doc/${PF} \ - docsdir=/usr/share/doc/${PF} \ - install || die - - dodoc AUTHORS ChangeLog NEWS README - - use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} -- cgit v1.2.3-65-gdbad