From a3b505cc355af975c4c38704c6f0222b5d6569f9 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 15 Sep 2014 17:19:01 -0700
Subject: libmikmod: update and support mingw-w64

See #492.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
---
 src/libmikmod-1-fixes.patch | 47 ---------------------------------------------
 src/libmikmod.mk            | 23 ++++++++++------------
 2 files changed, 10 insertions(+), 60 deletions(-)
 delete mode 100644 src/libmikmod-1-fixes.patch

diff --git a/src/libmikmod-1-fixes.patch b/src/libmikmod-1-fixes.patch
deleted file mode 100644
index fd0d775..0000000
--- a/src/libmikmod-1-fixes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From e740945ac2db92c3d1de0e805e0e8ea76f2e1373 Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Sat, 24 Mar 2012 01:43:51 +0100
-Subject: [PATCH] libmikmod-config should include -pthread for static
-
-
-diff --git a/libmikmod-config.in b/libmikmod-config.in
-index 8698715..c788c8a 100644
---- a/libmikmod-config.in
-+++ b/libmikmod-config.in
-@@ -50,7 +50,7 @@ while test $# -gt 0 ; do
- 	;;
- 	--libs)
- 		libdir=-L${exec_prefix}/lib
--		echo $libdir -lmikmod @LIBRARY_LIB@
-+		echo $libdir -lmikmod @LIBRARY_LIB@ -pthread
- 	;;
- 	*)
- 		echo "${usage}" 1>&2
--- 
-1.7.9.2
-
-diff --git a/libmikmod/Makefile.in b/libmikmod/Makefile.in
---- a/libmikmod/Makefile.in
-+++ b/libmikmod/Makefile.in
-@@ -23,13 +23,15 @@
- LIBOBJS=@LIBOBJS@
- LIBRARY_LIB=@LIBRARY_LIB@
- 
-+SHELL=@SHELL@
-+
- CC=@CC@
- INSTALL=@INSTALL@
- LIBTOOL=@LIBTOOL@
- MKINSTALLDIRS=${top_srcdir}/mkinstalldirs
- 
- DEFS=@DEFS@
--CFLAGS=@CFLAGS@ -Dunix
-+CFLAGS=@CFLAGS@ 
- COMPILE=$(LIBTOOL) --silent --mode=compile $(CC) $(DEFS) $(CFLAGS) -I$(top_srcdir)/include -I$(top_builddir) -I$(top_builddir)/include -DMIKMOD_H=$(top_srcdir)/include/mikmod.h
- 
- LIB = libmikmod.la
diff --git a/src/libmikmod.mk b/src/libmikmod.mk
index bfc555a..a4c0384 100644
--- a/src/libmikmod.mk
+++ b/src/libmikmod.mk
@@ -3,27 +3,27 @@
 
 PKG             := libmikmod
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.2.0
-$(PKG)_CHECKSUM := 6d30f59019872699bdcc9bcf6893eea9d6b12c13
+$(PKG)_VERSION  := 3.3.7
+$(PKG)_CHECKSUM := f936d92ed9752d9f47a3340bdafc78159a270ca9
 $(PKG)_SUBDIR   := libmikmod-$($(PKG)_VERSION)
 $(PKG)_FILE     := libmikmod-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://mikmod.shlomifish.org/files/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc pthreads
+$(PKG)_URL      := http://sourceforge.net/projects/mikmod/files/libmikmod/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://mikmod.shlomifish.org/' | \
-    $(SED) -n 's,.*libmikmod-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    $(WGET) -q -O- 'http://sourceforge.net/projects/mikmod/files/libmikmod/' | \
+    $(SED) -n 's,.*<a href="/projects/mikmod/files/libmikmod/\([0-9][^>]*\)/".*,\1,p' | \
+    $(SORT) -Vr | \
     head -1
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i 's,`uname`,MinGW,g' '$(1)/configure'
+    $(if $(BUILD_STATIC), \
+        $(SED) -i 's!defined(MIKMOD_STATIC)!1!g' '$(1)/include/mikmod.h')
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        CONFIG_SHELL='$(SHELL)' \
-        CFLAGS='-msse2'
+        --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
     '$(TARGET)-gcc' \
@@ -32,7 +32,4 @@ define $(PKG)_BUILD
         `'$(PREFIX)/$(TARGET)/bin/libmikmod-config' --cflags --libs`
 endef
 
-$(PKG)_BUILD_x86_64-w64-mingw32 =
-$(PKG)_BUILD_i686-w64-mingw32 =
-
 $(PKG)_BUILD_SHARED =
-- 
cgit v0.12