aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>1998-03-24 06:47:21 +0800
committermarkm <markm@FreeBSD.org>1998-03-24 06:47:21 +0800
commitb443b039a2b6b81e166dadec0bf83dc0963f6722 (patch)
treeb3f8d5252dc20fd244886bb428278e7af69d7fe4
parentd29a209bf6662671b8ad79a13709b7db3a10a97d (diff)
downloadfreebsd-ports-gnome-b443b039a2b6b81e166dadec0bf83dc0963f6722.tar.gz
freebsd-ports-gnome-b443b039a2b6b81e166dadec0bf83dc0963f6722.tar.zst
freebsd-ports-gnome-b443b039a2b6b81e166dadec0bf83dc0963f6722.zip
Make fxtv work with CURRENT and STABLE. This is not the optimum solution,
but while the correct solution is being sought, this is probably the best. Submitted by: Randall Hopper OK'ed By: Satoshi Asami
-rw-r--r--graphics/fxtv/files/patch-ab23
-rw-r--r--multimedia/fxtv/files/patch-ab23
2 files changed, 46 insertions, 0 deletions
diff --git a/graphics/fxtv/files/patch-ab b/graphics/fxtv/files/patch-ab
new file mode 100644
index 000000000000..58c6a1fec039
--- /dev/null
+++ b/graphics/fxtv/files/patch-ab
@@ -0,0 +1,23 @@
+--- ../fxtv-0.46.ORIG/tvcapture.c Tue Oct 28 01:59:41 1997
++++ tvcapture.c Sun Mar 22 16:43:45 1998
+@@ -1126,7 +1126,7 @@
+ /* Just mmap the biggest buffer we'll need and be done with it. */
+ /* (Buffer used for non-directvideo captures) */
+ c->drv_buf = (TV_UINT8 *) mmap( (caddr_t)0, MAX_MMAP_BUF_SIZE,
+- PROT_READ|PROT_WRITE, 0, c->fd, (off_t)0 );
++ PROT_READ, MAP_SHARED, c->fd, (off_t)0 );
+ if ( c->drv_buf == (TV_UINT8 *) -1 ) {
+ fprintf( stderr, "mmap of driver buffer failed: %s\n",
+ strerror(errno) );
+@@ -1537,9 +1537,9 @@
+ video.ramsize = 0;
+
+ /* If TDEC is on, may be a while before old trash gets written on */
+- if ( c->fps != c->fps_max )
++/* if ( c->fps != c->fps_max )
+ memset( c->drv_buf, '\0',
+- g.w * g.h * c->pix_geom_list[ c->pix_geom_idx ].Bpp );
++ g.w * g.h * c->pix_geom_list[ c->pix_geom_idx ].Bpp ); */
+ }
+ memcpy( &pix_geom, &c->pix_geom_list[ c->pix_geom_idx ],
+ sizeof( pix_geom ) );
diff --git a/multimedia/fxtv/files/patch-ab b/multimedia/fxtv/files/patch-ab
new file mode 100644
index 000000000000..58c6a1fec039
--- /dev/null
+++ b/multimedia/fxtv/files/patch-ab
@@ -0,0 +1,23 @@
+--- ../fxtv-0.46.ORIG/tvcapture.c Tue Oct 28 01:59:41 1997
++++ tvcapture.c Sun Mar 22 16:43:45 1998
+@@ -1126,7 +1126,7 @@
+ /* Just mmap the biggest buffer we'll need and be done with it. */
+ /* (Buffer used for non-directvideo captures) */
+ c->drv_buf = (TV_UINT8 *) mmap( (caddr_t)0, MAX_MMAP_BUF_SIZE,
+- PROT_READ|PROT_WRITE, 0, c->fd, (off_t)0 );
++ PROT_READ, MAP_SHARED, c->fd, (off_t)0 );
+ if ( c->drv_buf == (TV_UINT8 *) -1 ) {
+ fprintf( stderr, "mmap of driver buffer failed: %s\n",
+ strerror(errno) );
+@@ -1537,9 +1537,9 @@
+ video.ramsize = 0;
+
+ /* If TDEC is on, may be a while before old trash gets written on */
+- if ( c->fps != c->fps_max )
++/* if ( c->fps != c->fps_max )
+ memset( c->drv_buf, '\0',
+- g.w * g.h * c->pix_geom_list[ c->pix_geom_idx ].Bpp );
++ g.w * g.h * c->pix_geom_list[ c->pix_geom_idx ].Bpp ); */
+ }
+ memcpy( &pix_geom, &c->pix_geom_list[ c->pix_geom_idx ],
+ sizeof( pix_geom ) );