Add package libbs2b

The libbs2b.mk file was incorrectly added in 262aa647f04db4aac. Sorry about
that.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

3 files changed, 110 insertions, 6 deletions

diff --git a/index.html b/index.html
index a053b93..144b099 100644
--- a/index.html
+++ b/index.html
@@ -1553,6 +1553,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
         <td class="website"><a href="http://www.videolan.org/developers/libbluray.html">libbluray</a></td>
     </tr>
     <tr>
+        <td class="package">libbs2b</td>
+        <td class="website"><a href="http://bs2b.sourceforge.net/">Bauer Stereophonic-to-Binaural library</a></td>
+    </tr>
+    <tr>
         <td class="package">libcaca</td>
         <td class="website"><a href="http://caca.zoy.org/wiki/libcaca">libcaca</a></td>
     </tr>
diff --git a/src/libbs2b-1-fixes.patch b/src/libbs2b-1-fixes.patch
new file mode 100644
index 0000000..3943333
--- /dev/null
+++ b/src/libbs2b-1-fixes.patch
@@ -0,0 +1,96 @@
+This file is part of MXE.
+See index.html for further information.
+
+From e91b3a8a4edb0d574f0c71372eddf9889c13dc8e Mon Sep 17 00:00:00 2001
+From: Timothy Gu <timothygu99@gmail.com>
+Date: Sun, 31 Aug 2014 13:57:14 -0700
+Subject: [PATCH 1/2] build: Modernize
+
+dist-lzma was removed in automake 1.11.2.
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+
+diff --git a/configure.ac b/configure.ac
+index 5a2f76c..288031a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,13 +5,13 @@ AC_PREREQ([2.63])
+ AC_INIT([libbs2b], [3.1.0], [boris_mikhaylov@users.sourceforge.net])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AM_INIT_AUTOMAKE([1.10.1 -Wall foreign subdir-objects
+-                  dist-zip dist-bzip2 dist-lzma])
++                  dist-zip dist-bzip2 dist-xz])
+ AC_CONFIG_SRCDIR([src/bs2b.h])
+ 
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_CC
+-AC_PROG_LIBTOOL
++LT_INIT
+ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+-- 
+1.9.1
+
+
+From 38e7d5e2641c79c4f34a4731f3f68d60865a9a6b Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Sun, 31 Aug 2014 14:11:44 -0700
+Subject: [PATCH 2/2] Make libsndfile optional
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+
+diff --git a/configure.ac b/configure.ac
+index 288031a..44b3340 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,8 +16,10 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_EXISTS([sndfile], [], [
+-    AC_MSG_ERROR(Please install libsndfile.)
+-])
++    AC_MSG_WARN(libsndfile not found. Program building disabled.)
++], [enable_programs=yes])
++
++AM_CONDITIONAL(PROGRAMS, test "x$enable_programs" = "xyes")
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([fcntl.h malloc.h string.h])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 414aeec..cb46f1a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,11 +1,6 @@
+ lib_LTLIBRARIES = \
+ 	libbs2b.la
+ 
+-bin_PROGRAMS = \
+-	bs2bconvert \
+-	bs2bstream
+-
+-
+ bs2b_HEADERS = \
+ 	bs2b.h \
+ 	bs2bclass.h \
+@@ -24,6 +19,11 @@ libbs2b_la_SOURCES = \
+ 	bs2b.c \
+ 	bs2bclass.cpp
+ 
++if PROGRAMS
++bin_PROGRAMS = \
++	bs2bconvert \
++	bs2bstream
++
+ bs2bconvert_LDADD = \
+ 	libbs2b.la
+ 
+@@ -38,3 +38,4 @@ bs2bstream_LDADD = \
+ 
+ bs2bstream_SOURCES = \
+ 	bs2bstream.c
++endif
+-- 
+1.9.1
+
diff --git a/src/libbs2b.mk b/src/libbs2b.mk
index f1bfb3d..a62c106 100644
--- a/src/libbs2b.mk
+++ b/src/libbs2b.mk
@@ -3,12 +3,12 @@
 
 PKG             := libbs2b
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.7
-$(PKG)_CHECKSUM := 80eaaa5cc576c35dd28863767b795c50cbcc0511
+$(PKG)_VERSION  := 3.1.0
+$(PKG)_CHECKSUM := 353180e0f260b074508c6ddb34259b0d08a12dd7
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/bs2b/libbs2b/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc libsndfile
+$(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://sourceforge.net/projects/bs2b/files/libbs2b/' | \
@@ -17,8 +17,12 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
+    cd '$(1)' && autoreconf -fi
     cd '$(1)' && ./configure \
-        $(MXE_CONFIGURE_OPTS)
-    $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS='-no-undefined'
-    $(MAKE) -C '$(1)' -j 1 install LDFLAGS='-no-undefined'
+        $(MXE_CONFIGURE_OPTS) \
+        ac_cv_func_malloc_0_nonnull=yes
+    # The ac_cv_func_malloc_0_nonnull=yes is needed because the configure
+    # check tries to run a program.
+    $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS='-no-undefined' $(MXE_DISABLE_CRUFT)
+    $(MAKE) -C '$(1)' -j 1 install LDFLAGS='-no-undefined' $(MXE_DISABLE_CRUFT)
 endef
\ No newline at end of file