Upstream patch, bug 282561

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 107 insertions, 2 deletions

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 <beandog@gentoo.org> +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/Manifest b/media-video/ogmrip/Manifest
index 344d341ced2a..f911f595d6c3 100644
--- a/media-video/ogmrip/Manifest
+++ b/media-video/ogmrip/Manifest
@@ -1,9 +1,11 @@
 AUX ogmrip-0.13.0-libdvdread.patch 498 RMD160 e68aedc68c45be5111bcbebfe5fb7ffa0ba40c1c SHA1 ebfa6cf9de3b0e3a8369f0e5050dca660298f29b SHA256 e82e1f0268d519c90abb6c22de65e32c78651f05f4d9cffaa63db0083eca8874
+AUX ogmrip-0.13.0-no-profile.patch 891 RMD160 32e619e412667345ed765bd7a33f330f515366bc SHA1 8a4812adab9926dde6a254fa3043855abfb9d2e7 SHA256 b430ccb4369a39d9091c11f9533f67c677e0ba1dee2d0f70557117de46651922
 AUX ogmrip-werror.patch 426 RMD160 b3e5eef6f464ff15809a5558f72ace8ce54be9ae SHA1 8358359be19bf718a96b3067279ed84caade8445 SHA256 c76a69fa82ad9d3f69c2002be8465974cf3ed6ca8a00f2b588ba11ee25b031d1
 DIST gnome-mplayer-0.9.6-gconf-2.m4.tgz 763 RMD160 cdf17b11dea5da26cc9a17fff953480ee1c39a0f SHA1 e0403cd21c59e305ae26e2d511740a9b1ea17be1 SHA256 d392f4cdb99f398ffb67674a2f0e64debcc4574f5ea203c1c25e91532fce894f
 DIST ogmrip-0.12.3.tar.gz 2883021 RMD160 7f91b5bb763646a67b2f50080f8a3bb36acd13ff SHA1 237a9d59acb6d45189dd31613898ff4ffd09bc43 SHA256 9e56dc14d82fdd8e89c708279f2389f7fcde53615e8c13ac85c24c63954edcd1
 DIST ogmrip-0.13.0.tar.gz 3275788 RMD160 30706983b52cfa80ab1f2422de785411c048553d SHA1 06b0facadc5bcc7af59c3b38f3230877c1ee8997 SHA256 d2553c11969e8e0f13d27ee9a3d9141f4af6daddf46530cf47a4f5ef17e8cec6
 EBUILD ogmrip-0.12.3.ebuild 2317 RMD160 b7e6edd963c9f5bc8cfd34e8464ead4070926854 SHA1 c103238aa267d9d5480e8b5e000dc76f05b2dca4 SHA256 a1331e91165d68538ffe95756105260055ebe44e34515c1f4bf14890592325fd
+EBUILD ogmrip-0.13.0-r1.ebuild 2404 RMD160 58c0aebaac0c893c130b6ed4a394ea91d42e2f4a SHA1 5ec16a5f733f799e7a9fa07d1624d71e5074a85f SHA256 12131a7ec03c50cd9dea4d67ec88b7b1649c2f6539253cf33393e8df1d6276ab
 EBUILD ogmrip-0.13.0.ebuild 2359 RMD160 ff290daaf543752f63174d2e2c6bbaa52b2543c5 SHA1 5a4b721c5b631c9d318bf319f2a7376c7417623b SHA256 6468fb74df90c537403106c791c4bce8162568c2e887c1c7d7328e63d00903f0
-MISC ChangeLog 6926 RMD160 66927c54337b8e602385dc14f8cf74225de7652a SHA1 54dda41c11d1df11f9a071a575da31fb1f361e9f SHA256 3808f57a603e62081733679bc6a55431310f5c86142eb7c66249cbefc94eb9ee
+MISC ChangeLog 7101 RMD160 e8eb3cb32f7cb08c020d3bc1e8d3147cde1965b6 SHA1 1d0a455979e93d3b3bc99feac870c6c50a235a60 SHA256 988f88ef59e366b1e499e35035515435f52cadf85163ef9c7e7e81e96dd7025b
 MISC metadata.xml 449 RMD160 b535f21bb82fe18f270c623e9246fada5d4f389a SHA1 d45301a60016eeda1698a9b02de8326ef4bbbeeb SHA256 7ddfc7f6e9ffd1f154c7bfad79dba0672cfc3da9d369d09175d06106eb345d36
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, "<b>%s</b>\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
+}