Added gcc-4.0.x patch thanks to Ian Kumlien <pomac@vapor.com> and Olivier Rolland <billl@users.sf.net>. Closes bug #103299.

(Portage version: 2.0.51.22-r2)

4 files changed, 186 insertions, 4 deletions

diff --git a/app-cdr/ogmrip/ChangeLog b/app-cdr/ogmrip/ChangeLog
index 837b491db691..1fcbc70a84dc 100644
--- a/app-cdr/ogmrip/ChangeLog
+++ b/app-cdr/ogmrip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/ogmrip
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/ogmrip/ChangeLog,v 1.4 2005/08/20 11:45:02 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/ogmrip/ChangeLog,v 1.5 2005/08/28 04:28:24 metalgod Exp $
+
+  28 Aug 2005; Luis Medinas <metalgod@gentoo.org>
+  +files/ogmrip-0.9.0-gcc4.patch, ogmrip-0.9.0.ebuild:
+  Added gcc-4.0.x patch thanks to Ian Kumlien <pomac@vapor.com> and Olivier
+  Rolland <billl@users.sf.net>. Closes bug #103299.
 
 *ogmrip-0.9.0 (20 Aug 2005)
 
diff --git a/app-cdr/ogmrip/Manifest b/app-cdr/ogmrip/Manifest
index 25b5cdc3771f..ac51b6201a8c 100644
--- a/app-cdr/ogmrip/Manifest
+++ b/app-cdr/ogmrip/Manifest
@@ -2,8 +2,9 @@ MD5 84251556efab856207ebd207e8c88cb2 ChangeLog 869
 MD5 f6ae03147b33c97f5bb09d5de8690601 metadata.xml 227
 MD5 e9e0fe8f55d0b1473e3b88a15cdfca18 ogmrip-0.6.2.ebuild 1766
 MD5 3b0e56fe697e3f3ea90c291a02fa9c40 ogmrip-0.8.2.ebuild 1855
-MD5 e85c65087f57e2bf99ecc8fbf3fcecc4 ogmrip-0.9.0.ebuild 1937
+MD5 485aaeca5c539f4124bf8df37e65ed71 ogmrip-0.9.0.ebuild 1867
 MD5 aa7f34882cf21f05139524a800cb1ccb files/digest-ogmrip-0.6.2 64
 MD5 605be9978689669c27e4a0d5fbcd57d9 files/digest-ogmrip-0.8.2 64
 MD5 d3c45dfbfd5046c58d6a1e774471e280 files/ogmrip-0.9.0-lang.patch 450
+MD5 0b8ceac327eb68f927a2fbb841bfb53a files/ogmrip-0.9.0-gcc4.patch 5279
 MD5 87e11fb2b44c544d59834a678e353021 files/digest-ogmrip-0.9.0 64
diff --git a/app-cdr/ogmrip/files/ogmrip-0.9.0-gcc4.patch b/app-cdr/ogmrip/files/ogmrip-0.9.0-gcc4.patch
new file mode 100644
index 000000000000..d46ac494489a
--- /dev/null
+++ b/app-cdr/ogmrip/files/ogmrip-0.9.0-gcc4.patch
@@ -0,0 +1,175 @@
+--- libogmrip/ogmrip-codec.h.orig	Wed Aug 24 17:44:16 2005
++++ libogmrip/ogmrip-codec.h	Wed Aug 24 17:44:33 2005
+@@ -59,10 +59,10 @@
+ 
+ void                ogmrip_codec_set_chapters (OGMRipCodec       *codec,
+                                                guint             start,
+-                                               guint             end);
++                                               gint              end);
+ void                ogmrip_codec_get_chapters (OGMRipCodec       *codec,
+                                                guint             *start,
+-                                               guint             *end);
++                                               gint              *end);
+ 
+ G_END_DECLS
+ 
+--- libogmrip/ogmrip-codec.c.orig	Wed Aug 24 17:44:10 2005
++++ libogmrip/ogmrip-codec.c	Wed Aug 24 17:45:10 2005
+@@ -115,17 +115,26 @@
+ }
+ 
+ void
+-ogmrip_codec_set_chapters (OGMRipCodec *codec, guint start, guint end)
++ogmrip_codec_set_chapters (OGMRipCodec *codec, guint start, gint end)
+ {
+   g_return_if_fail (OGMRIP_IS_CODEC (codec));
+ 
+   codec->priv->dirty = TRUE;
+-  codec->priv->start = MIN (start, end);
+-  codec->priv->end = MAX (start, end);
++
++  if (end < 0)
++  {
++    codec->priv->start = start;
++    codec->priv->end = -1;
++  }
++  else
++  {
++    codec->priv->start = MIN (start, end);
++    codec->priv->end = MAX (start, end);
++  }
+ }
+ 
+ void
+-ogmrip_codec_get_chapters (OGMRipCodec *codec, guint *start, guint *end)
++ogmrip_codec_get_chapters (OGMRipCodec *codec, guint *start, gint *end)
+ {
+   g_return_if_fail (OGMRIP_IS_CODEC (codec));
+   g_return_if_fail (start != NULL);
+--- libogmrip/ogmrip-backend.c.orig	Wed Aug 24 17:44:22 2005
++++ libogmrip/ogmrip-backend.c	Wed Aug 24 17:47:30 2005
+@@ -274,7 +274,8 @@
+ 
+   GPtrArray *argv;
+   const gchar *device;
+-  gint vid, aid, start, end;
++  gint vid, aid, end;
++  guint start;
+ 
+   g_return_val_if_fail (OGMRIP_IS_AUDIO (audio), NULL);
+ 
+@@ -370,7 +371,8 @@
+ 
+   GPtrArray *argv;
+   const gchar *device;
+-  gint vid, aid, start, end;
++  gint vid, aid, end;
++  guint start;
+ 
+   g_return_val_if_fail (OGMRIP_IS_AUDIO (audio), NULL);
+ 
+@@ -619,8 +621,8 @@
+   GString *options;
+ 
+   const gchar *device;
+-  gint vid, pass, start, end;
+-  gint bitrate;
++  gint vid, pass, bitrate, end;
++  guint start;
+ 
+   g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL);
+ 
+@@ -729,9 +731,8 @@
+   GString *options;
+ 
+   const gchar *device;
+-  gint vid, pass, start, end;
+-  guint cmp, precmp, subcmp;
+-  gint dia, predia;
++  gint vid, pass, end, dia, predia;
++  guint start, cmp, precmp, subcmp;
+ 
+   g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL);
+ 
+@@ -836,7 +837,8 @@
+   GString *options;
+ 
+   const gchar *device;
+-  gint vid, pass, start, end/*, subq*/;
++  gint vid, pass, end/*, subq*/;
++  guint start;
+ 
+   g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL);
+ 
+@@ -936,7 +938,9 @@
+   GPtrArray *argv;
+ 
+   const gchar *device;
+-  gint vid, start, end;
++  gint vid, end;
++  guint start;
++
+   guint crop_x, crop_y, crop_width, crop_height;
+   guint scale_width, scale_height;
+   gboolean crop, scale;
+@@ -1407,7 +1411,8 @@
+ 
+   GPtrArray *argv;
+   const gchar *device;
+-  gint vid, sid, start, end;
++  gint vid, sid, end;
++  guint start;
+ 
+   g_return_val_if_fail (OGMRIP_IS_SUBP (subp), NULL);
+ 
+--- subrip/spudec.c.orig	Wed Aug 24 17:48:10 2005
++++ subrip/spudec.c	Wed Aug 24 17:48:22 2005
+@@ -365,7 +365,7 @@
+   unsigned int next_off;
+   unsigned int start_pts = 0;
+   unsigned int end_pts = 0;
+-  unsigned int current_nibble[2];
++  unsigned int current_nibble[2] = { 0, 0 };
+   unsigned int control_start;
+   unsigned int display = 0;
+   unsigned int start_col = 0;
+--- subrip/vobsub.h.orig	Wed Aug 24 17:49:10 2005
++++ subrip/vobsub.h	Wed Aug 24 17:49:54 2005
+@@ -13,7 +13,7 @@
+ extern int vobsub_get_packet (void *vobhandle, float pts, void **data,
+                               int *timestamp);
+ extern int vobsub_get_next_packet (void *vobhandle, void **data,
+-                                   int *timestamp);
++                                   unsigned int *timestamp);
+ extern void vobsub_close (void *this);
+ extern unsigned int vobsub_get_indexes_count (void * /* vobhandle */ );
+ extern char *vobsub_get_id (void * /* vobhandle */ ,
+@@ -27,7 +27,7 @@
+ extern void vobsub_out_output (void *me, const unsigned char *packet, int len,
+                                double pts);
+ extern void vobsub_out_close (void *me);
+-extern int vobsub_set_from_lang (void *vobhandle, unsigned char *lang);
++extern int vobsub_set_from_lang (void *vobhandle, char *lang);
+ extern unsigned int vobsub_get_forced_subs_flag (void const *const vobhandle);
+ extern void vobsub_seek (void *vobhandle, float pts);
+ 
+--- subrip/vobsub.c.orig	Wed Aug 24 17:48:45 2005
++++ subrip/vobsub.c	Wed Aug 24 17:49:45 2005
+@@ -1417,7 +1417,7 @@
+ }
+ 
+ int
+-vobsub_set_from_lang (void *vobhandle, unsigned char *lang)
++vobsub_set_from_lang (void *vobhandle, char *lang)
+ {
+   int i;
+   vobsub_t *vob = (vobsub_t *) vobhandle;
+@@ -1471,7 +1471,7 @@
+ }
+ 
+ int
+-vobsub_get_next_packet (void *vobhandle, void **data, int *timestamp)
++vobsub_get_next_packet (void *vobhandle, void **data, unsigned int *timestamp)
+ {
+   vobsub_t *vob = (vobsub_t *) vobhandle;
+   if (vob->spu_streams && 0 <= vobsub_id
diff --git a/app-cdr/ogmrip/ogmrip-0.9.0.ebuild b/app-cdr/ogmrip/ogmrip-0.9.0.ebuild
index 68c34121fabb..e5f8919a6019 100644
--- a/app-cdr/ogmrip/ogmrip-0.9.0.ebuild
+++ b/app-cdr/ogmrip/ogmrip-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/ogmrip/ogmrip-0.9.0.ebuild,v 1.1 2005/08/20 11:45:02 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/ogmrip/ogmrip-0.9.0.ebuild,v 1.2 2005/08/28 04:28:24 metalgod Exp $
 
 inherit gnome2 eutils
 
@@ -52,5 +52,6 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/ogmrip-0.9.0-lang.patch
+	epatch ${FILESDIR}/${P}-lang.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
 }