ports/62177: Support moved header files in 5.x in Nuppelvideo port

[Steve O'Hara-Smith]

>Number:         62177
>Category:       ports
>Synopsis:       Support moved header files in 5.x in Nuppelvideo port
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 31 11:30:15 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Steve O'Hara-Smith
>Release:        
>Organization:
>Environment:
>Description:
	Nuppelvideo cannot be compiled on recent FreeBSD 5.x because the
	header files for the Brooktree and Meteor interfaces have been
	moved.

>How-To-Repeat:
	Attempt to build the Nuppelvideo port on a recent 5.x machine

>Fix:

	Apply the following patch in $PORTSDIR/multimedia/nuppelvideo.

Index: files/patch-nuvrec.c
===================================================================
RCS file: /ncvs/ports/multimedia/nuppelvideo/files/patch-nuvrec.c,v
retrieving revision 1.1
diff -u -r1.1 patch-nuvrec.c
--- files/patch-nuvrec.c	5 Mar 2003 22:27:25 -0000	1.1
+++ files/patch-nuvrec.c	18 Dec 2003 19:30:04 -0000
@@ -1,12 +1,17 @@
 diff -ur ../NuppelVideo-0.52a/nuvrec.c ./nuvrec.c
 --- ../NuppelVideo-0.52a/nuvrec.c	Wed Jul  4 23:59:58 2001
 +++ ./nuvrec.c	Mon Feb 10 21:43:02 2003
-@@ -27,14 +27,22 @@
+@@ -27,14 +27,27 @@
  #include <sys/stat.h>
  #include <sys/time.h>
  #include <sys/resource.h>
++#if __FreeBSD__ >= 502100
++#include <dev/bktr/ioctl_meteor.h>
++#include <dev/bktr/ioctl_bt848.h>
++#else
 +#include <machine/ioctl_meteor.h>
 +#include <machine/ioctl_bt848.h>
++#endif
  #include <sys/soundcard.h>
 -#include <linux/videodev.h>
 -#include <linux/wait.h>
@@ -26,7 +31,7 @@
  // #define TESTINPUT 1
  // #define TESTSPLIT 1
  #define KEYFRAMEDIST 30
-@@ -47,11 +55,28 @@
+@@ -47,11 +60,28 @@
    #define MAXBYTESFORCE  2100000000
  #endif
  
@@ -57,7 +62,7 @@
  int fd;     // output file haendle
  int ostr=0;
  __s8 *strm;
-@@ -71,10 +96,10 @@
+@@ -71,10 +101,10 @@
  unsigned long long audiobytes;
  int effectivedsp;
  int ntsc=0; // default to PAL, this info is only for the video header
@@ -70,7 +75,7 @@
  
  //#define DP(DSTRING) fprintf(stderr, "%s\n", DSTRING);
  #define DP(DSTRING)
-@@ -173,9 +198,6 @@
+@@ -173,9 +203,6 @@
    kill(pid,  9);
    if (recordaudio) kill(pid2, 9);
  
@@ -80,7 +85,7 @@
    if (!quiet) fprintf(stderr, "\n"); // preserve status line
    exit(i);
  }
-@@ -201,24 +223,25 @@
+@@ -201,24 +228,25 @@
      unsigned char *startaudio;
  
      if (init_shm) {
@@ -111,7 +116,7 @@
  
      videobuffer    = (struct vidbuffertype *)sharedbuffer;
      startaudiodesc = (char *)(sharedbuffer + video_buffer_count*sizeof(vidbuffertyp));
-@@ -899,24 +922,6 @@
+@@ -899,24 +927,6 @@
  #ifdef TESTINPUT
    tf+=2; // when reading from files we won't lose frames ;)
  #else
@@ -136,7 +141,7 @@
   // here is the non preferable timecode - drop algorithm - fallback
   if (!usebttv) {
  
-@@ -1073,21 +1078,125 @@
+@@ -1073,21 +1083,125 @@
     exit(-1);
  }
  
@@ -270,7 +275,7 @@
    double  frequency=0.0;
    long v4lfrequency=0;
    int volume = -1;
-@@ -1277,109 +1386,28 @@
+@@ -1277,109 +1391,28 @@
    testinput();
  #else
  

	


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