Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
ade7f0e4
Commit
ade7f0e4
authored
Nov 06, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: fix zvbi compilation on Win32
parent
1683e21e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
0 deletions
+49
-0
contrib/src/zvbi/rules.mak
contrib/src/zvbi/rules.mak
+2
-0
contrib/src/zvbi/zvbi-ioctl.patch
contrib/src/zvbi/zvbi-ioctl.patch
+19
-0
contrib/src/zvbi/zvbi-ssize_max.patch
contrib/src/zvbi/zvbi-ssize_max.patch
+28
-0
No files found.
contrib/src/zvbi/rules.mak
View file @
ade7f0e4
...
@@ -15,6 +15,8 @@ $(TARBALLS)/zvbi-$(ZVBI_VERSION).tar.bz2:
...
@@ -15,6 +15,8 @@ $(TARBALLS)/zvbi-$(ZVBI_VERSION).tar.bz2:
zvbi
:
zvbi-$(ZVBI_VERSION).tar.bz2 .sum-zvbi
zvbi
:
zvbi-$(ZVBI_VERSION).tar.bz2 .sum-zvbi
$(UNPACK)
$(UNPACK)
$(APPLY)
$(SRC)
/zvbi/zvbi-ssize_max.patch
$(APPLY)
$(SRC)
/zvbi/zvbi-ioctl.patch
ifdef
HAVE_WIN32
ifdef
HAVE_WIN32
$(APPLY)
$(SRC)
/zvbi/zvbi-win32.patch
$(APPLY)
$(SRC)
/zvbi/zvbi-win32.patch
endif
endif
...
...
contrib/src/zvbi/zvbi-ioctl.patch
0 → 100644
View file @
ade7f0e4
diff -ru zvbi.orig/contrib/ntsc-cc.c zvbi/contrib/ntsc-cc.c
--- zvbi.orig/contrib/ntsc-cc.c 2011-11-06 11:22:47.000000000 +0200
+++ zvbi/contrib/ntsc-cc.c 2011-11-06 11:29:04.000000000 +0200
@@ -32,7 +32,6 @@
#include <fcntl.h>
#include <errno.h>
#include <locale.h>
-#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/time.h>
#ifdef HAVE_GETOPT_LONG
@@ -44,6 +43,7 @@
#include "src/libzvbi.h"
#ifdef ENABLE_V4L2
+# include <sys/ioctl.h>
# include <asm/types.h>
# include "src/videodev2k.h"
#endif
contrib/src/zvbi/zvbi-ssize_max.patch
0 → 100644
View file @
ade7f0e4
Linear memory extents over SSIZE_MAX are undefined, so there is no
point in protecting against them.
diff -ru zvbi.orig/src/export.c zvbi/src/export.c
--- zvbi.orig/src/export.c 2011-11-06 11:22:47.000000000 +0200
+++ zvbi/src/export.c 2011-11-06 11:27:39.000000000 +0200
@@ -1076,8 +1076,6 @@
size_t count;
count = src_size;
- if (unlikely (src_size > SSIZE_MAX))
- count = SSIZE_MAX & -4096;
for (retry = 10;; --retry) {
actual = write (e->_handle.fd, src, count);
@@ -1632,12 +1630,7 @@
free (e->buffer.data);
}
- if (unlikely (e->buffer.offset > (size_t) SSIZE_MAX)) {
- errno = EOVERFLOW;
- actual = -1; /* failed */
- } else {
- actual = e->buffer.offset;
- }
+ actual = e->buffer.offset;
} else {
if (VBI_EXPORT_TARGET_ALLOC == e->target)
free (e->buffer.data);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment