Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC-WinRT
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
73
Issues
73
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
VLC-WinRT
Commits
7ca3488f
Commit
7ca3488f
authored
Dec 03, 2018
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove now unneeded patch
We do not build shout examples anymore
parent
c2aa1e4d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
46 deletions
+0
-46
0018-contrib-shout-usleep-is-not-a-Windows-API.patch
...ches/0018-contrib-shout-usleep-is-not-a-Windows-API.patch
+0
-46
No files found.
libvlc/patches/0018-contrib-shout-usleep-is-not-a-Windows-API.patch
deleted
100644 → 0
View file @
c2aa1e4d
From db8c8193756ad2552df54db409a784c3d9345f26 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:03:37 +0200
Subject: [PATCH 18/38] contrib: shout: usleep() is not a Windows API
---
contrib/src/shout/rules.mak | 1 +
contrib/src/shout/shout-win32.patch | 14 ++++++++++++++
2 files changed, 15 insertions(+)
create mode 100644 contrib/src/shout/shout-win32.patch
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index c4a1c15fab..a61550f9b7 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -25,6 +25,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
$(APPLY) $(SRC)/shout/no-examples.patch
$(APPLY) $(SRC)/shout/shout-strings.patch
+ $(APPLY) $(SRC)/shout/shout-win32.patch
$(call pkg_static,"shout.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
diff --git a/contrib/src/shout/shout-win32.patch b/contrib/src/shout/shout-win32.patch
new file mode 100644
index 0000000000..f29926ef1d
--- /dev/null
+++ b/contrib/src/shout/shout-win32.patch
@@ -0,0 +1,14 @@
+--- libshout-2.4.1/examples/nonblocking.c.win32 2018-03-29 11:06:58.356033300 +0200
++++ libshout-2.4.1/examples/nonblocking.c 2018-03-29 11:10:39.018958800 +0200
+@@ -70,7 +70,11 @@ int main()
+ printf("Connection pending...\n");
+
+ while (ret == SHOUTERR_BUSY) {
++#ifdef _WIN32
++ Sleep(10);
++#else
+ usleep(10000);
++#endif
+ ret = shout_get_connected(shout);
+ }
+
--
2.19.2
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