From a9cae873d9b91acf58afa8d896eda8200c99c529 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 1 Oct 2010 18:51:07 +0200 Subject: convert patch format These were the remaining *-1-fixes.patch that were not in "git format-patch" format. --- src/libshout-1-fixes.patch | 34 ++++++++++++++++++++++++---------- src/openal-1-fixes.patch | 42 ++++++++++++++++++++++++++++-------------- 2 files changed, 52 insertions(+), 24 deletions(-) diff --git a/src/libshout-1-fixes.patch b/src/libshout-1-fixes.patch index 11a6b74..7488eb3 100644 --- a/src/libshout-1-fixes.patch +++ b/src/libshout-1-fixes.patch @@ -1,10 +1,19 @@ This file is part of mingw-cross-env. See doc/index.html for further information. -diff -urN a/examples/nonblocking.c b/examples/nonblocking.c ---- a/examples/nonblocking.c 2006-06-19 19:54:05.000000000 +0200 -+++ b/examples/nonblocking.c 2010-02-21 19:55:04.834952292 +0100 -@@ -68,7 +68,11 @@ +Contains ad hoc patches for cross building. + +From 25255ff19813e122e6442518b29a55c15860d3a3 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Fri, 1 Oct 2010 17:20:29 +0200 +Subject: [PATCH] mingw fixes + + +diff --git a/examples/nonblocking.c b/examples/nonblocking.c +index 0f4aa68..49a3d36 100644 +--- a/examples/nonblocking.c ++++ b/examples/nonblocking.c +@@ -68,7 +68,11 @@ int main() while (ret == SHOUTERR_BUSY) { printf("Connection pending. Sleeping...\n"); @@ -16,9 +25,10 @@ diff -urN a/examples/nonblocking.c b/examples/nonblocking.c ret = shout_get_connected(shout); } -diff -urN a/include/os.h b/include/os.h ---- a/include/os.h 2005-06-27 23:33:22.000000000 +0200 -+++ b/include/os.h 2010-02-21 19:55:04.834952292 +0100 +diff --git a/include/os.h b/include/os.h +index 7d065b3..d7ae425 100755 +--- a/include/os.h ++++ b/include/os.h @@ -1,7 +1,9 @@ #ifdef _WIN32 +#ifndef __MINGW32__ @@ -29,9 +39,10 @@ diff -urN a/include/os.h b/include/os.h typedef int ssize_t; #endif +#endif -diff -urN a/include/shout/shout.h.in b/include/shout/shout.h.in ---- a/include/shout/shout.h.in 2005-06-27 23:33:21.000000000 +0200 -+++ b/include/shout/shout.h.in 2010-02-21 20:14:04.762887368 +0100 +diff --git a/include/shout/shout.h.in b/include/shout/shout.h.in +index 43b0e7a..b026c10 100644 +--- a/include/shout/shout.h.in ++++ b/include/shout/shout.h.in @@ -23,8 +23,10 @@ #include @@ -43,3 +54,6 @@ diff -urN a/include/shout/shout.h.in b/include/shout/shout.h.in #define SHOUTERR_SUCCESS (0) #define SHOUTERR_INSANE (-1) +-- +1.7.1 + diff --git a/src/openal-1-fixes.patch b/src/openal-1-fixes.patch index 5510d7a..4f0563b 100644 --- a/src/openal-1-fixes.patch +++ b/src/openal-1-fixes.patch @@ -1,9 +1,18 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +This file is part of mingw-cross-env. +See doc/index.html for further information. -diff -urN openal-soft-1.12.854.orig/include/AL/al.h openal-soft-1.12.854.new/include/AL/al.h ---- openal-soft-1.12.854.orig/include/AL/al.h 2010-03-29 17:23:32.000000000 +1100 -+++ openal-soft-1.12.854.new/include/AL/al.h 2010-10-01 01:04:45.000000000 +1000 +Contains ad hoc patches for cross building. + +From 0ea58dd9662da43ee86682a35608f913f522aadb Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Fri, 1 Oct 2010 18:44:51 +0200 +Subject: [PATCH] cross building workarounds + + +diff --git a/include/AL/al.h b/include/AL/al.h +index c409701..f4cf45b 100644 +--- a/include/AL/al.h ++++ b/include/AL/al.h @@ -5,6 +5,10 @@ extern "C" { #endif @@ -15,7 +24,7 @@ diff -urN openal-soft-1.12.854.orig/include/AL/al.h openal-soft-1.12.854.new/inc #if defined(_WIN32) && !defined(_XBOX) #if defined(AL_BUILD_LIBRARY) #define AL_API __declspec(dllexport) -@@ -18,6 +22,7 @@ +@@ -18,6 +22,7 @@ extern "C" { #define AL_API extern #endif #endif @@ -23,9 +32,10 @@ diff -urN openal-soft-1.12.854.orig/include/AL/al.h openal-soft-1.12.854.new/inc #if defined(_WIN32) #define AL_APIENTRY __cdecl -diff -urN openal-soft-1.12.854.orig/include/AL/alc.h openal-soft-1.12.854.new/include/AL/alc.h ---- openal-soft-1.12.854.orig/include/AL/alc.h 2010-03-29 17:23:52.000000000 +1100 -+++ openal-soft-1.12.854.new/include/AL/alc.h 2010-10-01 01:04:45.000000000 +1000 +diff --git a/include/AL/alc.h b/include/AL/alc.h +index 4e84af4..67f8797 100644 +--- a/include/AL/alc.h ++++ b/include/AL/alc.h @@ -5,6 +5,10 @@ extern "C" { #endif @@ -37,7 +47,7 @@ diff -urN openal-soft-1.12.854.orig/include/AL/alc.h openal-soft-1.12.854.new/in #if defined(_WIN32) && !defined(_XBOX) #if defined(AL_BUILD_LIBRARY) #define ALC_API __declspec(dllexport) -@@ -18,6 +22,7 @@ +@@ -18,6 +22,7 @@ extern "C" { #define ALC_API extern #endif #endif @@ -45,13 +55,17 @@ diff -urN openal-soft-1.12.854.orig/include/AL/alc.h openal-soft-1.12.854.new/in #if defined(_WIN32) #define ALC_APIENTRY __cdecl -diff -urN openal-soft-1.12.854.orig/openal.pc.in openal-soft-1.12.854.new/openal.pc.in ---- openal-soft-1.12.854.orig/openal.pc.in 2008-07-24 04:55:49.000000000 +1000 -+++ openal-soft-1.12.854.new/openal.pc.in 2010-10-01 01:04:45.000000000 +1000 -@@ -7,5 +7,5 @@ +diff --git a/openal.pc.in b/openal.pc.in +index aaf95bb..d78376f 100644 +--- a/openal.pc.in ++++ b/openal.pc.in +@@ -7,5 +7,5 @@ Name: OpenAL Description: OpenAL is a cross-platform 3D audio API Requires: @PKG_CONFIG_REQUIRES@ Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -l@LIBNAME@ @PKG_CONFIG_LIBS@ +Libs: -L${libdir} -l@LIBNAME@ @PKG_CONFIG_LIBS@ -lwinmm Cflags: -I${includedir} +-- +1.7.1 + -- cgit v0.12