diff options
| author | fredb <fredb> | 2003-12-27 18:59:30 +0000 |
|---|---|---|
| committer | fredb <fredb> | 2003-12-27 18:59:30 +0000 |
| commit | a352d35538df07a6823e736df41f19b86ace83d6 (patch) | |
| tree | bc072b1785dd2c2c14d3ec1235264cfc3ee3f5f2 /graphics | |
| parent | c7ffaecb0403f13b4b90fb26623b9738e735225b (diff) | |
| download | pkgsrc-a352d35538df07a6823e736df41f19b86ace83d6.tar.gz | |
FreeBSD has no <getopt.h>, and <sys/types.h> must be included before
<netinet/in.h>. Submitted by Michal Pasternak in PR pkg/23879. I also
tested this on NetBSD 1.6ZG and NetBSD 1.6.2_RC1.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ffmpeg/distinfo | 4 | ||||
| -rw-r--r-- | graphics/ffmpeg/patches/patch-ab | 29 |
2 files changed, 26 insertions, 7 deletions
diff --git a/graphics/ffmpeg/distinfo b/graphics/ffmpeg/distinfo index 6084c4cf800..4f0184ba1f3 100644 --- a/graphics/ffmpeg/distinfo +++ b/graphics/ffmpeg/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2003/12/25 18:49:56 fredb Exp $ +$NetBSD: distinfo,v 1.5 2003/12/27 18:59:30 fredb Exp $ 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) = e5035ac9a90054fbf11dc7aad52f37a1d6d866f5 SHA1 (patch-ac) = 1b009f7878ec4b85c0204db210ce26b337422820 SHA1 (patch-ad) = db06e7ab8d60f523e02051339c5a0b66f8ac497f SHA1 (patch-ae) = d0f681ed5878c5e49c3daa956a7e0f28bdaf2b05 diff --git a/graphics/ffmpeg/patches/patch-ab b/graphics/ffmpeg/patches/patch-ab index b8f6e31f580..c95417378c5 100644 --- a/graphics/ffmpeg/patches/patch-ab +++ b/graphics/ffmpeg/patches/patch-ab @@ -1,8 +1,27 @@ -$NetBSD: patch-ab,v 1.2 2002/03/22 11:59:19 tron Exp $ +$NetBSD: patch-ab,v 1.3 2003/12/27 18:59:30 fredb Exp $ ---- 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.orig 2001-08-14 17:38:17.000000000 -0500 ++++ ffserver.c +@@ -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> +@@ -28,8 +29,9 @@ + #include <errno.h> + #include <sys/time.h> + #include <time.h> ++#ifndef __FreeBSD__ + #include <getopt.h> +-#include <sys/types.h> ++#endif + #include <sys/socket.h> + #include <arpa/inet.h> + #include <netdb.h> +@@ -1491,7 +1493,7 @@ void help(void) "\n" "-L : print the LICENCE\n" "-h : this help\n" @@ -11,7 +30,7 @@ $NetBSD: patch-ab,v 1.2 2002/03/22 11:59:19 tron Exp $ ); } -@@ -1523,10 +1523,10 @@ +@@ -1523,10 +1525,10 @@ int main(int argc, char **argv) register_all(); |