diff --git a/contrib/src/flac/SHA512SUMS b/contrib/src/flac/SHA512SUMS
deleted file mode 100644
index df50890e230788557f6b615c5988b5bd1d1a47ec..0000000000000000000000000000000000000000
--- a/contrib/src/flac/SHA512SUMS
+++ /dev/null
@@ -1 +0,0 @@
-9f62a83c2041ec6f02c0df65b796a920a0cd6ba6c2c034bb69535bca5df57ed69f96fe4bb41c0d5ccc229241d90efd2c7ec3785662b5a582a8e20e2e991e6477 flac-1.3.0.tar.xz
diff --git a/contrib/src/flac/libFLAC-pc.patch b/contrib/src/flac/libFLAC-pc.patch
deleted file mode 100644
index 8b5105aac045d7e397e278f14c1445f764b2f175..0000000000000000000000000000000000000000
--- a/contrib/src/flac/libFLAC-pc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- flac/src/libFLAC/flac.pc.in.orig 2013-05-05 14:05:30.059024229 +0200
-+++ flac/src/libFLAC/flac.pc.in 2013-05-05 14:06:25.529822137 +0200
-@@ -7,6 +7,6 @@
- Description: Free Lossless Audio Codec Library
- Version: @VERSION@
- Requires.private: @OGG_PACKAGE@
--Libs: -L${libdir} -lFLAC
-+Libs: -L${libdir} -lFLAC -logg
- Libs.private: -lm
- Cflags: -I${includedir}
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
deleted file mode 100644
index 857593aad79323ae8c2986aaa25bd6b184eb050c..0000000000000000000000000000000000000000
--- a/contrib/src/flac/rules.mak
+++ /dev/null
@@ -1,56 +0,0 @@
-# FLAC
-
-FLAC_VERSION := 1.3.0
-FLAC_URL := https://downloads.xiph.org/releases/flac/flac-$(FLAC_VERSION).tar.xz
-
-PKGS += flac
-ifeq ($(call need_pkg,"flac"),)
-PKGS_FOUND += flac
-endif
-
-$(TARBALLS)/flac-$(FLAC_VERSION).tar.xz:
- $(call download,$(FLAC_URL))
-
-.sum-flac: flac-$(FLAC_VERSION).tar.xz
-
-flac: flac-$(FLAC_VERSION).tar.xz .sum-flac
- $(UNPACK)
- $(APPLY) $(SRC)/flac/libFLAC-pc.patch
-ifdef HAVE_DARWIN_OS
- cd $(UNPACK_DIR) && sed -e 's,-dynamiclib,-dynamiclib -arch $(ARCH),' -i.orig configure
-endif
-ifdef HAVE_ANDROID
-ifeq ($(ANDROID_ABI), x86)
- # cpu.c:130:29: error: sys/ucontext.h: No such file or directory
- # defining USE_OBSOLETE_SIGCONTEXT_FLAVOR allows us to bypass that
- cd $(UNPACK_DIR) && sed -i.orig -e s/"# undef USE_OBSOLETE_SIGCONTEXT_FLAVOR"/"#define USE_OBSOLETE_SIGCONTEXT_FLAVOR"/g src/libFLAC/cpu.c
-endif
-endif
- $(UPDATE_AUTOCONFIG)
- $(MOVE)
-
-FLACCONF := $(HOSTCONF) \
- --disable-thorough-tests \
- --disable-doxygen-docs \
- --disable-xmms-plugin \
- --disable-cpplibs \
- --disable-oggtest
-# TODO? --enable-sse
-ifdef HAVE_DARWIN_OS
-ifneq ($(findstring $(ARCH),i386 x86_64),)
-FLACCONF += --disable-asm-optimizations
-endif
-endif
-ifdef HAVE_ANDROID
-ifeq ($(ANDROID_ABI), x86)
-FLACCONF += --disable-asm-optimizations
-endif
-endif
-
-DEPS_flac = ogg
-
-.flac: flac
- cd $< && $(HOSTVARS) ./configure $(FLACCONF)
- cd $</include && $(MAKE) install
- cd $</src && $(MAKE) -C share install && $(MAKE) -C libFLAC install
- touch $@
diff --git a/contrib/src/ogg/SHA512SUMS b/contrib/src/ogg/SHA512SUMS
deleted file mode 100644
index 19d4dbc4b89ba740bc4b3c78f924ad0e4e760977..0000000000000000000000000000000000000000
--- a/contrib/src/ogg/SHA512SUMS
+++ /dev/null
@@ -1 +0,0 @@
-980d8916b5d6bf22376105869a9b9d5312cee81f0ff1f6aa9f34359e92a93b7b34555a4c4f124922d87ef7e48a4b9451e35d9b536929b9144fcc22bcf6debbf0 libogg-1.3.1.tar.xz
diff --git a/contrib/src/ogg/libogg-1.1.patch b/contrib/src/ogg/libogg-1.1.patch
deleted file mode 100644
index bf74b0cb8316e20a6ddc96ea325af21656361474..0000000000000000000000000000000000000000
--- a/contrib/src/ogg/libogg-1.1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- libogg/configure.in 2010-11-01 21:13:42.000000000 +0100
-+++ libogg.new/configure.in 2010-11-03 23:59:54.267733114 +0100
-@@ -28,17 +28,17 @@
- case $host in
- *-*-irix*)
- DEBUG="-g -signed"
-- CFLAGS="-O2 -w -signed"
-+ EXTRA_CFLAGS="-O2 -w -signed"
- PROFILE="-p -g3 -O2 -signed"
- ;;
- sparc-sun-solaris*)
- DEBUG="-v -g"
-- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
-+ EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
- PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
- ;;
- *)
- DEBUG="-g"
-- CFLAGS="-O"
-+ EXTRA_CFLAGS="-O"
- PROFILE="-g -p"
- ;;
- esac
-@@ -46,27 +46,27 @@
- case $host in
- *-*-linux*)
- DEBUG="-g -Wall -fsigned-char"
-- CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
-+ EXTRA_CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
- PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
- ;;
- sparc-sun-*)
- DEBUG="-g -Wall -fsigned-char"
-- CFLAGS="-O20 -ffast-math -fsigned-char"
-+ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char"
- PROFILE="-pg -g -O20 -fsigned-char"
- ;;
- *-*-darwin*)
- DEBUG="-fno-common -g -Wall -fsigned-char"
-- CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
-+ EXTRA_CFLAGS="-fno-common -O3 -Wall -fsigned-char -ffast-math"
- PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
- ;;
- *)
- DEBUG="-g -Wall -fsigned-char"
-- CFLAGS="-O20 -fsigned-char"
-+ EXTRA_CFLAGS="-O20 -fsigned-char"
- PROFILE="-O20 -g -pg -fsigned-char"
- ;;
- esac
- fi
--CFLAGS="$CFLAGS $cflags_save"
-+CFLAGS="$EXTRA_CFLAGS $cflags_save"
- DEBUG="$DEBUG $cflags_save"
- PROFILE="$PROFILE $cflags_save"
-
diff --git a/contrib/src/ogg/libogg-disable-check.patch b/contrib/src/ogg/libogg-disable-check.patch
deleted file mode 100644
index 5801b372bed2e636816b3b42693f824b77dd7b05..0000000000000000000000000000000000000000
--- a/contrib/src/ogg/libogg-disable-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru libogg/src/Makefile.am libogg/src/Makefile.am
---- libogg/src/Makefile.am 2011-08-04 19:07:42.000000000 +0200
-+++ libogg-f/src/Makefile.am 2012-03-21 13:05:23.000000000 +0100
-@@ -9,7 +9,7 @@
-
- # build and run the self tests on 'make check'
-
--noinst_PROGRAMS = test_bitwise test_framing
-+noinst_PROGRAMS =
-
- test_bitwise_SOURCES = bitwise.c
- test_bitwise_CFLAGS = -D_V_SELFTEST
diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
deleted file mode 100644
index 50dcf0ae16b1ee7d9129fb99a0f4d04c9dbf9bc8..0000000000000000000000000000000000000000
--- a/contrib/src/ogg/rules.mak
+++ /dev/null
@@ -1,29 +0,0 @@
-# libogg
-
-OGG_VERSION := 1.3.1
-
-OGG_URL := https://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.xz
-#OGG_URL := $(CONTRIB_VIDEOLAN)/libogg-$(OGG_VERSION).tar.xz
-
-PKGS += ogg
-ifeq ($(call need_pkg,"ogg >= 1.0"),)
-PKGS_FOUND += ogg
-endif
-
-$(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
- $(call download,$(OGG_URL))
-
-.sum-ogg: libogg-$(OGG_VERSION).tar.xz
-
-ogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
- $(UNPACK)
- $(APPLY) $(SRC)/ogg/libogg-1.1.patch
- $(APPLY) $(SRC)/ogg/libogg-disable-check.patch
- $(UPDATE_AUTOCONFIG)
- $(MOVE)
-
-.ogg: ogg
- $(RECONF)
- cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
- cd $< && $(MAKE) install
- touch $@
diff --git a/contrib/src/vorbis/SHA512SUMS b/contrib/src/vorbis/SHA512SUMS
deleted file mode 100644
index 7f4234f42329111e1cf7cccda14f4c0a2f41fe93..0000000000000000000000000000000000000000
--- a/contrib/src/vorbis/SHA512SUMS
+++ /dev/null
@@ -1 +0,0 @@
-f705c7740bec2dc6584ab8f103491a9d462136e3fa76454bde47e2ba04466b896ef066f7f925ad0a44d4c659c962717bc9099b3cecc20f12270d0ad53369ad53 libvorbis-1.3.4.tar.xz
diff --git a/contrib/src/vorbis/android.patch b/contrib/src/vorbis/android.patch
deleted file mode 100644
index ba42da7cf674124a96acf10c28b2bf38236bf05c..0000000000000000000000000000000000000000
--- a/contrib/src/vorbis/android.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libvorbis/configure.ac.orig 2012-09-07 00:17:47.000000000 +0200
-+++ libvorbis/configure.ac 2012-09-07 00:18:01.000000000 +0200
-@@ -130,5 +130,5 @@
- DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
-- CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
-+ CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
- # PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
-- PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
-+ PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline"
-
-
diff --git a/contrib/src/vorbis/ios.patch b/contrib/src/vorbis/ios.patch
deleted file mode 100644
index 44fd3c166678f6d48853ef0bb615ad7fae30e5e5..0000000000000000000000000000000000000000
--- a/contrib/src/vorbis/ios.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libvorbis/configure.ac.orig 2012-09-07 00:17:47.000000000 +0200
-+++ libvorbis/configure.ac 2012-09-07 00:18:01.000000000 +0200
-@@ -199,8 +199,8 @@
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
- *-*-darwin*)
- DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
-- CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
-- PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
-+ CFLAGS="-DDARWIN -fno-common -Wall -O3 -ffast-math -fsigned-char"
-+ PROFILE="-DDARWIN -fno-common -Wall -pg -O3 -ffast-math -fsigned-char";;
- *-*-os2*)
- # Use -W instead of -Wextra because gcc on OS/2 is an old version.
- DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
diff --git a/contrib/src/vorbis/osx.patch b/contrib/src/vorbis/osx.patch
deleted file mode 100644
index 8ae481292edf599bcc92f31ba379bb284edcdb65..0000000000000000000000000000000000000000
--- a/contrib/src/vorbis/osx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libvorbis/configure.ac.orig 2012-09-07 00:17:47.000000000 +0200
-+++ libvorbis/configure.ac 2012-09-07 00:18:01.000000000 +0200
-@@ -199,8 +199,8 @@
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
- *-*-darwin*)
- DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
-- CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
-- PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
-+ CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
-+ PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
- *-*-os2*)
- # Use -W instead of -Wextra because gcc on OS/2 is an old version.
- DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
deleted file mode 100644
index e20cc74939bb51d9bd29e92209afed9c105b7c59..0000000000000000000000000000000000000000
--- a/contrib/src/vorbis/rules.mak
+++ /dev/null
@@ -1,53 +0,0 @@
-# libvorbis
-
-VORBIS_VERSION := 1.3.4
-VORBIS_URL := https://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.xz
-#VORBIS_URL := $(CONTRIB_VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz
-
-ifdef HAVE_FPU
-PKGS += vorbis
-endif
-ifeq ($(call need_pkg,"vorbis >= 1.1"),)
-PKGS_FOUND += vorbis
-endif
-PKGS_ALL += vorbisenc
-ifdef BUILD_ENCODERS
-PKGS += vorbisenc
-endif
-ifeq ($(call need_pkg,"vorbisenc >= 1.1"),)
-PKGS_FOUND += vorbisenc
-endif
-
-$(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
- $(call download,$(VORBIS_URL))
-
-.sum-vorbis: libvorbis-$(VORBIS_VERSION).tar.xz
-
-vorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
- $(UNPACK)
-ifndef HAVE_IOS
- $(APPLY) $(SRC)/vorbis/osx.patch
-else
- $(APPLY) $(SRC)/vorbis/ios.patch
-endif
-ifdef HAVE_ANDROID
- $(APPLY) $(SRC)/vorbis/android.patch
-endif
- $(UPDATE_AUTOCONFIG)
- $(MOVE)
-
-DEPS_vorbis = ogg
-
-.vorbis: vorbis
- $(RECONF) -Im4
- cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-docs --disable-examples --disable-oggtest
- cd $< && $(MAKE) install
- touch $@
-
-.sum-vorbisenc: .sum-vorbis
- touch $@
-
-DEPS_vorbisenc = vorbis
-
-.vorbisenc:
- touch $@