Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
5972f560
Commit
5972f560
authored
Sep 14, 2015
by
Steve Lhomme
Committed by
Jean-Baptiste Kempf
Sep 14, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: fix live555 usage on Windows App Store builds
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
bd72d72c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
0 deletions
+31
-0
contrib/src/live555/rules.mak
contrib/src/live555/rules.mak
+1
-0
contrib/src/live555/winstore.patch
contrib/src/live555/winstore.patch
+30
-0
No files found.
contrib/src/live555/rules.mak
View file @
5972f560
...
...
@@ -53,6 +53,7 @@ live555: $(LIVE555_FILE) .sum-live555
ifdef
HAVE_ANDROID
cd
live
&&
sed
-e
's%-DPIC%-DPIC -DNO_SSTREAM=1 -DLOCALE_NOT_USED -I
$(ANDROID_NDK)
/platforms/
$(ANDROID_API)
/arch-
$(PLATFORM_SHORT_ARCH)
/usr/include%'
-i
.orig config.linux
endif
cd
live
&&
patch
-lfp1
< ../../src/live555/winstore.patch
mv
live
$@
touch
$@
...
...
contrib/src/live555/winstore.patch
0 → 100644
View file @
5972f560
--- a/liveMedia/include/InputFile.hh 2015-06-24 16:32:45.000000000 +0200
+++ b/liveMedia/include/InputFile.hh 2015-08-04 10:12:13.791494000 +0200
@@ -50,6 +50,7 @@
void CloseInputFile(FILE* fid);
+#undef GetFileSize
u_int64_t GetFileSize(char const* fileName, FILE* fid);
// 0 means zero-length, unbounded, or unknown
--- a/BasicUsageEnvironment/BasicUsageEnvironment0.cpp 2015-06-24 16:32:45.000000000 +0200
+++ b/BasicUsageEnvironment/BasicUsageEnvironment0.cpp 2015-08-04 10:22:41.067003200 +0200
@@ -68,6 +68,7 @@
if (err == 0) err = getErrno();
#if defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_WCE)
+#ifndef _UNICODE
char errMsg[RESULT_MSG_BUFFER_MAX] = "\0";
if (0 != FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, 0, errMsg, sizeof(errMsg)/sizeof(errMsg[0]), NULL)) {
// Remove all trailing '\r', '\n' and '.'
@@ -77,6 +78,7 @@
} else
snprintf(errMsg, sizeof(errMsg)/sizeof(errMsg[0]), "error %d", err);
appendToResultMsg(errMsg);
+#endif
#else
appendToResultMsg(strerror(err));
#endif
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