Date: Thu, 18 Dec 2003 20:37:35 +0100 From: Steve O'Hara-Smith <steve@sohara.org> To: freebsd-multimedia@freebsd.org Cc: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> Subject: TEST please - ffmpeg and nuppelvideo patches for moved header files Message-ID: <20031218203735.6fe53706.steve@sohara.org>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Hi,
I've attached patches for the ffmpeg and nuppelvideo ports for the
moved bktr header files after 5.2.
I haven't got a -current box so I'm hoping somebody listening on
multimedia will be kind enough to smoke test them on -current :)
--
C:>WIN | Directable Mirrors
The computer obeys and wins. |A Better Way To Focus The Sun
You lose and Bill collects. | licenses available - see:
| http://www.sohara.org/
[-- Attachment #2 --]
Index: files/grab_bsdbktr.c
===================================================================
RCS file: /ncvs/ports/multimedia/ffmpeg/files/grab_bsdbktr.c,v
retrieving revision 1.7
diff -u -r1.7 grab_bsdbktr.c
--- files/grab_bsdbktr.c 7 Sep 2003 23:52:59 -0000 1.7
+++ files/grab_bsdbktr.c 17 Dec 2003 18:22:29 -0000
@@ -24,8 +24,13 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "avformat.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 <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
[-- Attachment #3 --]
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031218203735.6fe53706.steve>