diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2006-05-07 13:02:10 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2006-05-07 13:02:10 +0000 |
commit | 9b586f478b95a4123e31c0235d61ce794665bc38 (patch) | |
tree | 8ceb2ccf17a085e2642972fd6560d1c8624615a2 /devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.cxx | |
parent | Add xpi-no-referrer 0.8, an extension to Open URL without sending (diff) |
- Use a better way to detect SDL header
- Add WITH_ESOUND knob and enable the plugin build
- Fix bsdvideo (bktr(4)) plugin and make it buildable on more archs
- Add a small error handler to detect unresolved symbols in plugins
- Add more plugins to pkg-plist
- Add experimental support for firewire(4) based video devices.
The segment of the Makefile is intentionally commented out.
PR: ports/95422, ports/96624
Submitted by: Joerg Pulz <Joerg.Pulz@frm2.tum.de>,
Steve Ames <steve@energistic.com> (maintainer)
Approved by: Steve Ames <steve@energistic.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=161584
Diffstat (limited to 'devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.cxx')
-rw-r--r-- | devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.cxx | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.cxx b/devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.cxx new file mode 100644 index 000000000000..7207595c071b --- /dev/null +++ b/devel/pwlib/files/patch-plugins-vidinput_bsd-vidinput_bsd.cxx @@ -0,0 +1,43 @@ +--- plugins/vidinput_bsd/vidinput_bsd.cxx.orig Tue Aug 9 11:08:09 2005 ++++ plugins/vidinput_bsd/vidinput_bsd.cxx Wed Apr 5 21:35:08 2006 +@@ -122,12 +122,11 @@ + #pragma implementation "vidinput_bsd.h" + + #include "vidinput_bsd.h" +-#include <sys/mman.h> + + PCREATE_VIDINPUT_PLUGIN(BSDCAPTURE); + + /////////////////////////////////////////////////////////////////////////////// +-// PVideoInputDevice_BSDCAPTURE ++// PVideoInputBSDCAPTURE + + PVideoInputDevice_BSDCAPTURE::PVideoInputDevice_BSDCAPTURE() + { +@@ -142,6 +141,7 @@ + + BOOL PVideoInputDevice_BSDCAPTURE::Open(const PString & devName, BOOL startImmediate) + { ++ if (IsOpen()) + Close(); + + deviceName = devName; +@@ -235,10 +235,14 @@ + { + PStringList list; + +- list.AppendString("/dev/bktr0"); +- list.AppendString("/dev/bktr1"); +- list.AppendString("/dev/meteor0"); +- list.AppendString("/dev/meteor1"); ++ if (PFile::Exists("/dev/bktr0")) ++ list.AppendString("/dev/bktr0"); ++ if (PFile::Exists("/dev/bktr1")) ++ list.AppendString("/dev/bktr1"); ++ if (PFile::Exists("/dev/meteor0")) ++ list.AppendString("/dev/meteor0"); ++ if (PFile::Exists("/dev/meteor1")) ++ list.AppendString("/dev/meteor1"); + + return list; + } |