From ae11b1a52c30a423c224e2f9d0f7be43cbf4e55d Mon Sep 17 00:00:00 2001 From: Steve Dibb Date: Thu, 24 Sep 2009 00:01:26 +0000 Subject: Upstream patch, bug 282561 (Portage version: 2.2_rc40/cvs/Linux x86_64) --- media-video/ogmrip/ChangeLog | 8 ++- .../ogmrip/files/ogmrip-0.13.0-no-profile.patch | 22 +++++++ media-video/ogmrip/ogmrip-0.13.0-r1.ebuild | 75 ++++++++++++++++++++++ 3 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 media-video/ogmrip/files/ogmrip-0.13.0-no-profile.patch create mode 100644 media-video/ogmrip/ogmrip-0.13.0-r1.ebuild (limited to 'media-video/ogmrip') diff --git a/media-video/ogmrip/ChangeLog b/media-video/ogmrip/ChangeLog index 27754de9fc7c..ffa02806018c 100644 --- a/media-video/ogmrip/ChangeLog +++ b/media-video/ogmrip/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/ogmrip # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.36 2009/07/21 20:36:08 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.37 2009/09/24 00:01:26 beandog Exp $ + +*ogmrip-0.13.0-r1 (24 Sep 2009) + + 24 Sep 2009; Steve Dibb +ogmrip-0.13.0-r1.ebuild, + +files/ogmrip-0.13.0-no-profile.patch: + Upstream patch, bug 282561 *ogmrip-0.13.0 (21 Jul 2009) diff --git a/media-video/ogmrip/files/ogmrip-0.13.0-no-profile.patch b/media-video/ogmrip/files/ogmrip-0.13.0-no-profile.patch new file mode 100644 index 000000000000..76951ff4492c --- /dev/null +++ b/media-video/ogmrip/files/ogmrip-0.13.0-no-profile.patch @@ -0,0 +1,22 @@ +Index: src/ogmrip-main.c +=================================================================== +--- src/ogmrip-main.c (révision 1788) ++++ src/ogmrip-main.c (copie de travail) +@@ -1012,9 +1012,15 @@ + return NULL; + } + ++ profile = ogmrip_options_dialog_get_active_profile (OGMRIP_OPTIONS_DIALOG (data->options_dialog)); ++ if (!profile) ++ { ++ g_set_error (error, OGMDVD_DISC_ERROR, OGMDVD_DISC_ERROR_UNKNOWN, "%s\n\n%s", ++ _("No available profile"), _("You must create at least one profile before you can encode.")); ++ return NULL; ++ } ++ + encoding = ogmrip_encoding_new (title, OGMRIP_DEFAULT_FILE_NAME ".avi"); +- +- profile = ogmrip_options_dialog_get_active_profile (OGMRIP_OPTIONS_DIALOG (data->options_dialog)); + ogmrip_encoding_set_profile (encoding, profile); + + ogmrip_encoding_set_label (encoding, gtk_entry_get_text (GTK_ENTRY (data->title_entry))); diff --git a/media-video/ogmrip/ogmrip-0.13.0-r1.ebuild b/media-video/ogmrip/ogmrip-0.13.0-r1.ebuild new file mode 100644 index 000000000000..58f1fbcc863f --- /dev/null +++ b/media-video/ogmrip/ogmrip-0.13.0-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.0-r1.ebuild,v 1.1 2009/09/24 00:01:26 beandog Exp $ + +EAPI=2 +inherit autotools eutils gnome2 + +DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4" +HOMEPAGE="http://ogmrip.sourceforge.net/" +SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz + mirror://gentoo/gnome-mplayer-0.9.6-gconf-2.m4.tgz" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="aac debug doc dts gtk hal libnotify matroska mp3 mp4 nls ogm spell srt theora vorbis x264 xvid" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +RDEPEND=">=dev-libs/glib-2.14 + >=app-i18n/enca-1 + >=media-libs/libdvdread-0.9.6 + >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] + virtual/eject + aac? ( >=media-libs/faac-1.26 ) + gtk? ( >=x11-libs/gtk+-2.12 + >=gnome-base/gconf-2.24 + >=gnome-base/libglade-2.6.3 + libnotify? ( >=x11-libs/libnotify-0.4.4 ) + media-video/mplayer[jpeg] ) + hal? ( >=sys-apps/hal-0.5.9 ) + matroska? ( >=media-video/mkvtoolnix-2.4 ) + mp3? ( >=media-sound/lame-3.98 ) + mp4? ( >=media-video/gpac-0.4.4 ) + ogm? ( >=media-sound/ogmtools-1.3 ) + spell? ( >=app-text/enchant-1.2 ) + srt? ( media-libs/libpng + || ( ( >=app-text/tesseract-2 media-libs/tiff ) + >=app-text/gocr-0.45 >=app-text/ocrad-0.15 ) ) + theora? ( >=media-libs/libtheora-1 ) + vorbis? ( >=media-sound/vorbis-tools-1.2 )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext + >=dev-util/intltool-0.35 ) + dev-util/gtk-doc-am + >=dev-util/pkgconfig-0.12 + doc? ( >=dev-libs/libxslt-1.1.24 )" + +pkg_setup() { + DOCS="AUTHORS ChangeLog README TODO" + + G2CONF="${G2CONF} + $(use_enable aac aac-support) + $(use_enable debug maintainer-mode) + $(use_enable gtk gtk-support) + $(use_enable hal hal-support) + $(use_enable libnotify libnotify-support) + $(use_enable matroska mkv-support) + $(use_enable mp3 mp3-support) + $(use_enable mp4 mp4-support) + $(use_enable ogm ogm-support) + $(use_enable spell enchant-support) + $(use_enable srt srt-support) + $(use_enable theora theora-support) + $(use_enable vorbis vorbis-support) + $(use_enable x264 x264-support) + $(use_enable xvid xvid-support) + $(use_enable nls) + --disable-gtk-doc" +} + +src_prepare() { + gnome2_src_prepare + epatch "${FILESDIR}"/${P}-libdvdread.patch + epatch "${FILESDIR}"/${P}-no-profile.patch + AT_M4DIR=${WORKDIR} eautoreconf +} -- cgit v1.2.3-65-gdbad