>Number:         23879
>Category:       pkg
>Synopsis:       graphics/ffmpeg won't build on FreeBSD; trival fix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Dec 25 09:46:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Michal Pasternak
>Release:        N/A
>Organization:
>Environment:
FreeBSD mainframe.w.lub.pl 4.9-STABLE FreeBSD 4.9-STABLE #0: Tue Dec 23 20:45:53 CET 2003     root@mainframe.w.lub.pl:/usr/obj/usr/src/sys/MP-UX  i386

>Description:
Build will fail at ffmpeg.c and ffserver.c

>How-To-Repeat:
Obvious
>Fix:
cvs server: Diffing .
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/ffmpeg/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo    30 Mar 2002 08:27:26 -0000      1.3
+++ distinfo    25 Dec 2003 09:44:14 -0000
@@ -3,8 +3,8 @@
 SHA1 (ffmpeg-0.4.5.tar.gz) = 7d99250eb20c45b77a08e00ecad1f73d11f57cb8
 Size (ffmpeg-0.4.5.tar.gz) = 280506 bytes
 SHA1 (patch-aa) = e2e7ca0465ea69514a6b36e93451ea7eaca0513c
-SHA1 (patch-ab) = 812984db77f24c49d492162d83106d859b50d0f6
+SHA1 (patch-ab) = 206d326a516a7dfccbc879fc9e4f288ade66150c
 SHA1 (patch-ac) = 1b009f7878ec4b85c0204db210ce26b337422820
 SHA1 (patch-ad) = db06e7ab8d60f523e02051339c5a0b66f8ac497f
 SHA1 (patch-ae) = d0f681ed5878c5e49c3daa956a7e0f28bdaf2b05
-SHA1 (patch-af) = 7eb856297df7793ab06b3107824483de64b922e1
+SHA1 (patch-af) = 7af73165fdfe3af905bbc0448e110370b995cfce
cvs server: Diffing patches
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/ffmpeg/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- patches/patch-ab    22 Mar 2002 11:59:19 -0000      1.2
+++ patches/patch-ab    25 Dec 2003 09:44:14 -0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.2 2002/03/22 11:59:19 tron Exp $
+$NetBSD$
 
 --- ffserver.c.orig    Wed Aug 15 00:38:17 2001
-+++ ffserver.c Fri Mar 22 12:39:59 2002
-@@ -1491,7 +1491,7 @@
++++ ffserver.c Thu Dec 25 09:38:11 2003
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+@@ -1491,7 +1492,7 @@
             "\n"
             "-L            : print the LICENCE\n"
             "-h            : this help\n"
@@ -11,7 +19,7 @@
             );
  }
  
-@@ -1523,10 +1523,10 @@
+@@ -1523,10 +1524,10 @@
  
      register_all();
  
Index: patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/ffmpeg/patches/patch-af,v
retrieving revision 1.1
diff -u -r1.1 patch-af

--- patches/patch-af    30 Mar 2002 08:27:26 -0000      1.1
+++ patches/patch-af    25 Dec 2003 09:44:14 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2002/03/30 08:27:26 tron Exp $
+$NetBSD$
 
 --- ffmpeg.c.orig      Mon Aug 13 23:24:19 2001
-+++ ffmpeg.c   Sat Mar 30 09:25:11 2002
-@@ -31,11 +31,18 @@
++++ ffmpeg.c   Thu Dec 25 09:36:49 2003
+@@ -31,11 +31,21 @@
  #include <sys/time.h>
  #include <sys/resource.h>
  #include <ctype.h>
@@ -15,6 +15,9 @@
  #define MAXINT64 INT64_C(0x7fffffffffffffff)
 +#else
 +#ifdef __NetBSD__
++#define MAXINT64 QUAD_MAX
++#endif
++#ifdef __FreeBSD__
 +#define MAXINT64 QUAD_MAX
 +#endif
 +#endif

>Release-Note:
>Audit-Trail:
>Unformatted: