Version bump (bug #386587 by Olivier Rolland).

(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)

3 files changed, 242 insertions, 1 deletions

diff --git a/media-video/ogmrip/ChangeLog b/media-video/ogmrip/ChangeLog
index 87a502f215b0..b5302a699a84 100644
--- a/media-video/ogmrip/ChangeLog
+++ b/media-video/ogmrip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ogmrip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.46 2011/11/01 12:34:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.47 2011/11/18 11:07:12 radhermit Exp $
+
+*ogmrip-0.13.7 (18 Nov 2011)
+
+  18 Nov 2011; Tim Harder <radhermit@gentoo.org> +ogmrip-0.13.7.ebuild,
+  +files/ogmrip-0.13.7-deprecated.patch:
+  Version bump (bug #386587 by Olivier Rolland).
 
   01 Nov 2011; Pacho Ramos <pacho@gentoo.org> ogmrip-0.13.6.ebuild:
   Drop DEPRECATED flags to make it compile with glib-2.30 and upcoming releases.
diff --git a/media-video/ogmrip/files/ogmrip-0.13.7-deprecated.patch b/media-video/ogmrip/files/ogmrip-0.13.7-deprecated.patch
new file mode 100644
index 000000000000..6c7ad57e5b3f
--- /dev/null
+++ b/media-video/ogmrip/files/ogmrip-0.13.7-deprecated.patch
@@ -0,0 +1,148 @@
+--- configure.in
++++ configure.in
+@@ -38,7 +38,6 @@
+ AM_MAINTAINER_MODE
+ 
+ CFLAGS="$CFLAGS -g -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2"
+-CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+ CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+ 
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2"
+--- ChangeLog
++++ ChangeLog
+@@ -1,5 +1,15 @@
+-19 Aug 2011 Olivier Rolland <billl@users.sf.net>
++9 Oct 2011 Olivier Rolland <billl@users.sf.net>
+ 
++	* configure.in
++	* src/ogmrip-profile-editor.c
++	* src/ogmrip-crop-dialog.c
++	* libogmrip-gtk/ogmrip-source-chooser-widget.c
++	* libogmrip-gtk/ogmrip-x264-options.c
++
++	Removed deprecated GTK+ functions
++
++19 Sep 2011 Olivier Rolland <billl@users.sf.net>
++
+ 	Released OGMRip-0.13.7
+ 
+ 19 Sep 2011 Olivier Rolland <billl@users.sf.net>
+--- src/ogmrip-profile-editor.c
++++ src/ogmrip-profile-editor.c
+@@ -631,6 +631,7 @@
+   {
+     GType codec;
+     GtkTreeModel *model;
++    GtkTreeIter iter;
+     gboolean exists;
+     gint active;
+     gchar *name;
+@@ -641,11 +642,15 @@
+     codec = ogmrip_profile_editor_dialog_get_video_codec_type (dialog, name);
+     g_free (name);
+ 
+-    gtk_combo_box_remove_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), OGMRIP_VIDEO_PRESET_USER);
++    if (gtk_tree_model_iter_nth_child (model, &iter, NULL, OGMRIP_VIDEO_PRESET_USER))
++      gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+ 
+     exists = ogmrip_options_plugin_exists (codec);
+     if (exists)
+-      gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), _("User"));
++    {
++      gtk_list_store_append (GTK_LIST_STORE (model), &iter);
++      gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, _("User"), -1);
++    }
+ 
+     active = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->video_preset_combo));
+     
+--- src/ogmrip-crop-dialog.c
++++ src/ogmrip-crop-dialog.c
+@@ -218,17 +218,20 @@
+ }
+ 
+ static void
+-ogmrip_crop_dialog_scale_value_changed (OGMRipCropDialog *dialog, GtkWidget *scale)
++ogmrip_crop_dialog_scale_button_released (OGMRipCropDialog *dialog, GdkEventButton *event, GtkWidget *scale)
+ {
+-  gulong frame;
+-  gchar *text;
++  if (event->button == 1)
++  {
++    gulong frame;
++    gchar *text;
+ 
+-  frame = (guint) gtk_range_get_value (GTK_RANGE (scale));
+-  text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length);
+-  gtk_label_set_text (GTK_LABEL (dialog->priv->label), text);
+-  g_free (text);
++    frame = (guint) gtk_range_get_value (GTK_RANGE (scale));
++    text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length);
++    gtk_label_set_text (GTK_LABEL (dialog->priv->label), text);
++    g_free (text);
+ 
+-  ogmrip_crop_dialog_grab_frame (dialog, frame);
++    ogmrip_crop_dialog_grab_frame (dialog, frame);
++  }
+ }
+ 
+ G_DEFINE_TYPE (OGMRipCropDialog, ogmrip_crop_dialog, GTK_TYPE_DIALOG)
+@@ -291,9 +294,8 @@
+   dialog->priv->label = glade_xml_get_widget (xml, "frame-label");
+ 
+   dialog->priv->scale = glade_xml_get_widget (xml, "frame-scale");
+-  gtk_range_set_update_policy (GTK_RANGE (dialog->priv->scale), GTK_UPDATE_DELAYED);
+-  g_signal_connect_swapped (dialog->priv->scale, "value-changed",
+-      G_CALLBACK (ogmrip_crop_dialog_scale_value_changed), dialog);
++  g_signal_connect_swapped (dialog->priv->scale, "button-release-event",
++      G_CALLBACK (ogmrip_crop_dialog_scale_button_released), dialog);
+ 
+   g_object_unref (xml);
+ }
+--- libogmrip-gtk/ogmrip-source-chooser-widget.c
++++ libogmrip-gtk/ogmrip-source-chooser-widget.c
+@@ -207,7 +207,12 @@
+   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+   gtk_widget_show (label);
+ 
++#if GTK_CHECK_VERSION(2,24,0)
++  combo = gtk_combo_box_text_new ();
++#else
+   combo = gtk_combo_box_new_text ();
++#endif
++
+   gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+   gtk_widget_show (combo);
+ 
+@@ -231,7 +236,11 @@
+   {
+     str = g_strdup_printf ("%s (%s)", ogmdvd_languages[i][OGMDVD_LANGUAGE_NAME],
+         ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1]);
++#if GTK_CHECK_VERSION(2,24,0)
++    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), str);
++#else
+     gtk_combo_box_append_text (GTK_COMBO_BOX (combo), str);
++#endif
+     g_free (str);
+ 
+     if (strncmp (ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1], lang, 2) == 0)
+--- libogmrip-gtk/ogmrip-x264-options.c
++++ libogmrip-gtk/ogmrip-x264-options.c
+@@ -299,9 +299,16 @@
+   gtk_widget_set_sensitive (dialog->me_combo, x264_have_me);
+ 
+   if (x264_have_me_tesa)
+-    gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->me_combo),
+-        _("Transformed Exhaustive search (tesa - even slower)"));
++  {
++    GtkTreeModel *model;
++    GtkTreeIter iter;
+ 
++    model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->me_combo));
++    gtk_list_store_append (GTK_LIST_STORE (model), &iter);
++    gtk_list_store_set (GTK_LIST_STORE (model), &iter,
++        0, _("Transformed Exhaustive search (tesa - even slower)"), -1);
++  }
++
+   dialog->merange_spin = glade_xml_get_widget (xml, "merange-spin");
+   gtk_widget_set_sensitive (dialog->merange_spin, x264_have_me);
+ 
diff --git a/media-video/ogmrip/ogmrip-0.13.7.ebuild b/media-video/ogmrip/ogmrip-0.13.7.ebuild
new file mode 100644
index 000000000000..14da1d5e9033
--- /dev/null
+++ b/media-video/ogmrip/ogmrip-0.13.7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.7.ebuild,v 1.1 2011/11/18 11:07:12 radhermit Exp $
+
+EAPI=4
+GCONF_DEBUG=no
+inherit autotools-utils 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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="aac dbus dts gtk libnotify matroska mp3 mp4 nls ogm spell srt static-libs theora vorbis x264 xvid"
+
+COMMON_DEPEND=">=dev-libs/glib-2.16:2
+	>=app-i18n/enca-1.9
+	dev-libs/libxml2
+	media-libs/libdvdread
+	>=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?]
+	aac? ( >=media-libs/faac-1.24 )
+	gtk? (
+		>=x11-libs/gtk+-2.12:2
+		gnome-base/libglade
+		gnome-base/gconf
+		dbus? ( dev-libs/dbus-glib )
+		libnotify? ( >=x11-libs/libnotify-0.4.3 )
+		media-video/mplayer[jpeg]
+		)
+	matroska? ( media-video/mkvtoolnix )
+	mp3? ( media-sound/lame )
+	mp4? ( >=media-video/gpac-0.4.2 )
+	ogm? ( media-sound/ogmtools )
+	spell? ( >=app-text/enchant-1.1.0 )
+	srt? ( ||
+		(
+			( >=app-text/tesseract-2 media-libs/tiff )
+			>=app-text/gocr-0.39
+			>=app-text/ocrad-0.15
+		)
+		media-libs/libpng )
+	theora? ( media-libs/libtheora )
+	vorbis? ( media-sound/vorbis-tools )"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext
+		dev-util/intltool )
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog README TODO"
+
+	G2CONF="
+		$(use_enable gtk gtk-support)
+		$(use_enable dbus dbus-support)
+		$(use_enable spell enchant-support)
+		$(use_enable ogm ogm-support)
+		$(use_enable matroska mkv-support)
+		$(use_enable mp4 mp4-support)
+		$(use_enable xvid xvid-support)
+		$(use_enable x264 x264-support)
+		$(use_enable theora theora-support)
+		$(use_enable vorbis vorbis-support)
+		$(use_enable mp3 mp3-support)
+		$(use_enable aac aac-support)
+		$(use_enable srt srt-support)
+		$(use_enable static-libs static)
+		$(use_enable libnotify libnotify-support)
+		$(use_enable nls)
+		--with-html-dir=/usr/share/doc/${PF}/html"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-deprecated.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_install() {
+	# bug #317607
+	MAKEOPTS="${MAKEOPTS} -j1" \
+		gnome2_src_install
+	remove_libtool_files all
+}