Mercurial > mxe-octave

changeset 2536:3cdb83ce7351

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package libshout
author Mark Brand <mabrand@mabrand.nl>
date Sun, 20 May 2012 23:13:14 +0200
parents 4a6fc9512b17
children 2de591821f11
files index.html src/libshout-1-fixes.patch src/libshout.mk
diffstat 3 files changed, 3 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Sat May 19 09:57:21 2012 +0200
+++ b/index.html	Sun May 20 23:13:14 2012 +0200
@@ -1500,7 +1500,7 @@
     </tr>
     <tr>
         <td id="libshout-package">libshout</td>
-        <td id="libshout-version">2.2.2</td>
+        <td id="libshout-version">2.3.0</td>
         <td id="libshout-website"><a href="http://www.icecast.org/">libshout</a></td>
     </tr>
     <tr>
--- a/src/libshout-1-fixes.patch	Sat May 19 09:57:21 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 25255ff19813e122e6442518b29a55c15860d3a3 Mon Sep 17 00:00:00 2001
-From: MXE
-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");
-+#ifdef __MINGW32__
-+	  Sleep(1000);
-+#else
- 	  sleep(1);
-+#endif
- 	  ret = shout_get_connected(shout);
- 	}
- 	
-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__
- typedef __int64 int64_t;
- typedef unsigned __int64 uint64_t;
- typedef unsigned __int32 uint32_t;
- typedef __int32 int32_t;
- typedef int  ssize_t;
- #endif
-+#endif
-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 <sys/types.h>
- #ifdef WIN32
-+#ifndef __MINGW32__
- #include <os.h>
- #endif
-+#endif
- 
- #define SHOUTERR_SUCCESS	(0)
- #define SHOUTERR_INSANE		(-1)
--- 
-1.7.1
-
--- a/src/libshout.mk	Sat May 19 09:57:21 2012 +0200
+++ b/src/libshout.mk	Sun May 20 23:13:14 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := libshout
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := cabc409e63f55383f4d85fac26d3056bf0365aac
+$(PKG)_CHECKSUM := a6f26441ec27b6f9b55fba38b99bd1d7ca17fecf
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://downloads.us.xiph.org/releases/$(PKG)/$($(PKG)_FILE)
@@ -18,9 +18,9 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-shared \
-        --disable-debug \
         --disable-thread \
         --infodir='$(1)/sink' \
         --mandir='$(1)/sink'