mpegedit broken on 5.0

[Miguel Mendez]

On Mon, 7 Apr 2003 15:01:14 -0700
Kris Kennaway <kris at obsecurity.org> wrote:

> http://bento.freebsd.org/errorlogs/i386-5-latest/mpegedit-2.2.log
> 
> Can someone please investigate/fix?

Yet another broken C++ problem. I've started fixing it, it currently
breaks in another file. This is what I've done so far, if I have time
before leaving for university, I'll resend a more proper fix. Maybe our
friend Simon Schubert can have a go at it too, since I'm not C++ guru by
any means.

diff -ruN mpegedit.old/files/patch-ad mpegedit/files/patch-ad
--- mpegedit.old/files/patch-ad	Sat Feb 12 20:17:19 2000
+++ mpegedit/files/patch-ad	Tue Apr  8 09:07:48 2003
@@ -1,6 +1,17 @@
 --- editor/mono_window.C.orig	Sat May 20 17:47:32 1995
-+++ editor/mono_window.C	Thu Feb  3 21:27:07 2000
-@@ -24,6 +24,8 @@
++++ editor/mono_window.C	Tue Apr  8 09:07:32 2003
+@@ -19,11 +19,19 @@
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#if __GNUC__>=3
++#include <iostream>
++using namespace std;
++#endif
++
++
+ #include "mono_window.H"
+ #include "yuv.H"
  #include <assert.h>
  #include <stdlib.h>
  
@@ -9,7 +20,7 @@
  MonoWindow::MonoWindow(UI_Globals *parent,world_c x,world_c y,
  		       unsigned int height,unsigned int width,
  		       void (*cb)(void) )
-@@ -137,7 +139,7 @@
+@@ -137,7 +145,7 @@
        
        ximage=XCreateImage(DispPointer(),None,8,ZPixmap,0,&dummy,
  			  width,height,8,0);
@@ -18,7 +29,7 @@
        assert(ximage->data!=NULL);
  #ifdef SH_MEM
      }
-@@ -154,7 +156,7 @@
+@@ -154,7 +162,7 @@
    for(int j = 0; j < GRAY_RANGE; j ++)
      {
        tmp_pixel = col_array[j];
@@ -27,7 +38,7 @@
      }
    XFreeGC(DispPointer(),gc);
  
-@@ -222,7 +224,7 @@
+@@ -222,7 +230,7 @@
  	  for(int j = 0; j < i; j ++)
  	    {
  	      tmp_pixel = col_array[j];
@@ -36,7 +47,7 @@
  	    }
  	  cerr << "Unable to allocate the colours required to make the\n"
  	       << "monochrome window.  Please re-run with the option "
-@@ -254,7 +256,7 @@
+@@ -254,7 +262,7 @@
  {
    assert(Frame.width()==ximage->width);
    assert(Frame.height()==ximage->height);
diff -ruN mpegedit.old/files/patch-ae mpegedit/files/patch-ae
--- mpegedit.old/files/patch-ae	Sat Feb 12 20:17:19 2000
+++ mpegedit/files/patch-ae	Tue Apr  8 09:09:45 2003
@@ -1,6 +1,17 @@
 --- editor/bw_window.C.orig	Mon May  8 16:15:00 1995
-+++ editor/bw_window.C	Thu Feb  3 21:29:23 2000
-@@ -24,6 +24,8 @@
++++ editor/bw_window.C	Tue Apr  8 09:09:08 2003
+@@ -19,11 +19,19 @@
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#if __GNUC__>=3
++#include <iostream>
++using namespace std;
++#endif
++
++
+ #include "bw_window.H"
+ #include "yuv.H"
  #include <assert.h>
  #include <stdlib.h>
  
@@ -9,7 +20,7 @@
  BwWindow::BwWindow(UI_Globals *parent,world_c x,world_c y,unsigned int height,
  		   unsigned int width, void (*cb)(void) )
  : YUV_Window(parent,x,y,height,width,this, ButtonPressMask |
-@@ -143,7 +145,7 @@
+@@ -143,7 +151,7 @@
  			  height,8,0);
        ximage->byte_order = MSBFirst;
        ximage->bitmap_bit_order = MSBFirst;
@@ -18,7 +29,7 @@
        assert(ximage->data!=NULL);
  #ifdef SH_MEM
      }
-@@ -213,7 +215,7 @@
+@@ -213,7 +221,7 @@
  {
    assert(Frame.width()==ximage->width);
    assert(Frame.height()==ximage->height);


-- 
        Miguel Mendez - flynn at energyhq.homeip.net
        GPG Public Key :: http://energyhq.homeip.net/files/pubkey.txt
        EnergyHQ :: http://www.energyhq.tk
	Tired of Spam? -> http://www.trustic.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 186 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20030408/62890056/attachment.bin