Mercurial > mxe-octave

annotate src/libshout-1-fixes.patch @ 2353:99516e73b368

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move doc/index.html -> index.html
author Volker Grabsch <vog@notjusthosting.com>
date Thu, 29 Mar 2012 12:14:15 +0200
parents f653602a0500
children f79b2ad2be45
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 1241
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
798
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
1241
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
4 Contains ad hoc patches for cross building.
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
5
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
6 From 25255ff19813e122e6442518b29a55c15860d3a3 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 1241
diff changeset
7 From: MXE
1241
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
8 Date: Fri, 1 Oct 2010 17:20:29 +0200
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
9 Subject: [PATCH] mingw fixes
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
10
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
11
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
12 diff --git a/examples/nonblocking.c b/examples/nonblocking.c
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
13 index 0f4aa68..49a3d36 100644
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
14 --- a/examples/nonblocking.c
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
15 +++ b/examples/nonblocking.c
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
16 @@ -68,7 +68,11 @@ int main()
798
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 while (ret == SHOUTERR_BUSY) {
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 printf("Connection pending. Sleeping...\n");
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 +#ifdef __MINGW32__
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 + Sleep(1000);
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 +#else
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 sleep(1);
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 +#endif
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 ret = shout_get_connected(shout);
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 }
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27
1241
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
28 diff --git a/include/os.h b/include/os.h
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
29 index 7d065b3..d7ae425 100755
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
30 --- a/include/os.h
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
31 +++ b/include/os.h
798
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 @@ -1,7 +1,9 @@
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 #ifdef _WIN32
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34 +#ifndef __MINGW32__
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 typedef __int64 int64_t;
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 typedef unsigned __int64 uint64_t;
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 typedef unsigned __int32 uint32_t;
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 typedef __int32 int32_t;
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 typedef int ssize_t;
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40 #endif
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 +#endif
1241
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
42 diff --git a/include/shout/shout.h.in b/include/shout/shout.h.in
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
43 index 43b0e7a..b026c10 100644
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
44 --- a/include/shout/shout.h.in
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
45 +++ b/include/shout/shout.h.in
798
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 @@ -23,8 +23,10 @@
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48 #include <sys/types.h>
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
49 #ifdef WIN32
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50 +#ifndef __MINGW32__
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
51 #include <os.h>
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52 #endif
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53 +#endif
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
54
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55 #define SHOUTERR_SUCCESS (0)
0292c7229519 new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 #define SHOUTERR_INSANE (-1)
1241
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
57 --
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
58 1.7.1
3c3b8b1aaf3d convert patch format
Mark Brand <mabrand@mabrand.nl>
parents: 798
diff changeset
59