From: Hans de Goede <j.w.r.degoede@hhs.nl>
To: Thierry Merle <thierry.merle@free.fr>
Cc: video4linux-list@redhat.com, v4l2 library <v4l2-library@linuxtv.org>
Subject: PATCH: libv4l-0.3.4-sync.patch
Date: Mon, 07 Jul 2008 21:27:08 +0200 [thread overview]
Message-ID: <48726E0C.9050505@hhs.nl> (raw)
[-- Attachment #1: Type: text/plain, Size: 355 bytes --]
Hi,
This patch syncs mercurial with the 0.3.4 tarbal I've just released, which
contains the following single (brownpaperbag) fix:
* The mmap64 support in 0.3.3, has caused a bug in libv4l1 when running on
32 bit systems (who uses those now a days?), this bug caused v4l1
compatibility to not work at all, this release fixes this
Regards,
Hans
[-- Attachment #2: libv4l-0.3.4-sync.patch --]
[-- Type: text/x-patch, Size: 2051 bytes --]
Sync mercurial with 0.3.4 release (which contains a single fix):
* The mmap64 support in 0.3.3, has caused a bug in libv4l1 when running on
32 bit systems (who uses those now a days?), this bug caused v4l1
compatibility to not work at all, this release fixes this
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
diff -r fb3e549faf69 v4l2-apps/lib/libv4l/ChangeLog
--- a/v4l2-apps/lib/libv4l/ChangeLog Sun Jul 06 14:07:34 2008 +0200
+++ b/v4l2-apps/lib/libv4l/ChangeLog Mon Jul 07 21:22:23 2008 +0200
@@ -1,3 +1,10 @@
+libv4l-0.3.4 (the brownpaperbag release)
+----------------------------------------
+* The mmap64 support in 0.3.3, has caused a bug in libv4l1 when running on
+ 32 bit systems (who uses those now a days?), this bug caused v4l1
+ compatibility to not work at all, this release fixes this
+
+
libv4l-0.3.3
------------
* Add open64 and mmap64 wrappers to the LD_PRELOAD wrapper libs, so that
diff -r fb3e549faf69 v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h
--- a/v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h Sun Jul 06 14:07:34 2008 +0200
+++ b/v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h Mon Jul 07 21:22:23 2008 +0200
@@ -21,6 +21,15 @@
#include <stdio.h>
#include <pthread.h>
+
+/* On 32 bits archs we always use mmap2, on 64 bits archs there is no mmap2 */
+#ifdef __NR_mmap2
+#define SYS_mmap2 __NR_mmap2
+#define MMAP2_PAGE_SHIFT 12
+#else
+#define SYS_mmap2 SYS_mmap
+#define MMAP2_PAGE_SHIFT 0
+#endif
#define V4L1_MAX_DEVICES 16
#define V4L1_NO_FRAMES 4
diff -r fb3e549faf69 v4l2-apps/lib/libv4l/libv4l1/libv4l1.c
--- a/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c Sun Jul 06 14:07:34 2008 +0200
+++ b/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c Mon Jul 07 21:22:23 2008 +0200
@@ -639,7 +639,7 @@
}
if (devices[index].v4l1_frame_pointer == MAP_FAILED) {
- devices[index].v4l1_frame_pointer = (void *)syscall(SYS_mmap, NULL,
+ devices[index].v4l1_frame_pointer = (void *)syscall(SYS_mmap2, NULL,
(size_t)mbuf->size,
PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
[-- Attachment #3: Type: text/plain, Size: 164 bytes --]
--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
reply other threads:[~2008-07-07 19:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48726E0C.9050505@hhs.nl \
--to=j.w.r.degoede@hhs.nl \
--cc=thierry.merle@free.fr \
--cc=v4l2-library@linuxtv.org \
--cc=video4linux-list@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox