From bb4ba7fd8a9c46b39156a263226b8e6c1d670d82 Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Thu, 11 Oct 2018 10:35:22 +0200
Subject: [PATCH] bump version libvorbis-1.3.6

---
 make/archives.mk  |  4 ++--
 make/libraries.mk | 36 +++++++++++++++++++++++-------------
 make/versions.mk  |  3 +++
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/make/archives.mk b/make/archives.mk
index 4a733d4..667cf83 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -109,8 +109,8 @@ $(ARCHIVE)/OpenThreads-$(LIBOPENTHREADS_VER).tar.gz:
 $(ARCHIVE)/libogg-$(LIBOGG_VER).tar.gz:
 	$(WGET) https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-$(LIBOGG_VER).tar.gz
 
-$(ARCHIVE)/libvorbis-1.3.2.tar.bz2:
-	$(WGET) http://www.fhloston-paradise.de/libvorbis-1.3.2.tar.bz2
+$(ARCHIVE)/libvorbis-$(LIBVORBIS_VER).tar.xz:
+	$(WGET) https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-$(LIBVORBIS_VER).tar.xz
 
 $(ARCHIVE)/ncurses-$(NCURSES_VER).tar.gz:
 	$(WGET) http://ftp.gnu.org/pub/gnu/ncurses/ncurses-$(NCURSES_VER).tar.gz
diff --git a/make/libraries.mk b/make/libraries.mk
index a952dbd..1f1b674 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -717,20 +717,30 @@ $(D)/libsigc: $(ARCHIVE)/libsigc++-$(LIBSIGC_VER).tar.xz | $(TARGETPREFIX)
 	$(REMOVE)/libsigc++-$(LIBSIGC_VER)
 	$(TOUCH)
 
-# for some reason, libvorbis does not work with "--prefix=/"
-$(D)/libvorbis: $(D)/libogg $(ARCHIVE)/libvorbis-1.3.2.tar.bz2 | $(TARGETPREFIX)
+$(D)/libvorbis: $(D)/libogg $(ARCHIVE)/libvorbis-$(LIBVORBIS).tar.xz | $(TARGETPREFIX)
 	$(START_BUILD)
-	$(UNTAR)/libvorbis-1.3.2.tar.bz2
-	pushd $(BUILD_TMP)/libvorbis-1.3.2 && \
-		patch -p1 < $(PATCHES)/libvorbis-1.3.2-nodoc.diff && \
-		patch -p1 < $(PATCHES)/libvorbis-1.3.2-smaller-chunksize.diff && \
-		$(CONFIGURE) --enable-shared --prefix=$(TARGETPREFIX) LDFLAGS="-Wl,-rpath-link,$(TARGETLIB)" && \
-		$(MAKE) && \
-		$(MAKE) install
-	# $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libvorbis.pc
-	# $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libvorbisenc.pc
-	# $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libvorbisfile.pc
-	$(REMOVE)/libvorbis-1.3.2
+	$(UNTAR)/libvorbis-$(LIBVORBIS).tar.xz
+	pushd $(BUILD_TMP)/libvorbis-$(LIBVORBIS_VER); \
+		$(CONFIGURE) \
+			--prefix= \
+			--docdir=/.remove \
+			--mandir=/.remove \
+			--disable-docs \
+			--disable-examples \
+			--disable-oggtest \
+		; \
+		$(MAKE); \
+		$(MAKE) install DESTDIR=$(TARGET_DIR) docdir=/.remove
+	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/vorbis.pc
+	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/vorbisenc.pc
+	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/vorbisfile.pc
+	$(REWRITE_LIBTOOL)/libvorbis.la
+	$(REWRITE_LIBTOOL)/libvorbisenc.la
+	$(REWRITE_LIBTOOL)/libvorbisfile.la
+	$(REWRITE_LIBTOOLDEP)/libvorbis.la
+	$(REWRITE_LIBTOOLDEP)/libvorbisenc.la
+	$(REWRITE_LIBTOOLDEP)/libvorbisfile.la
+	$(REMOVE)/libvorbis-$(LIBVORBIS_VER)
 	$(TOUCH)
 
 $(D)/libogg: $(ARCHIVE)/libogg-$(LIBOGG_VER).tar.gz | $(TARGETPREFIX)
diff --git a/make/versions.mk b/make/versions.mk
index 6368419..3f66679 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -179,6 +179,9 @@ OPENSSL_SUBVER=p
 # libogg
 LIBOGG_VER = 1.3.3
 
+# libvorbisidec is an Ogg Vorbis audio decoder (also known as "tremor"), implemented with no floating point arithmetic. This makes it particularly amenable to use on systems which lack floating point hardware
+LIBVORBIS_VER = 1.3.6
+
 # openthreads; an object-oriented thread interface for C++ programmers
 LIBOPENTHREADS_VER=3.2
 
-- 
2.39.5