diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 09755ce..ec30f8d 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,7 +1,6 @@
 AUX mixxx-1.12.0_beta1-use-cpp-built-in-types.patch 944 SHA256 69e1e1af26f0893ea7d5a3c2eb0cd8207e50b9a0de30194dc7719d3057cd1540 SHA512 6d0750bb3d1261602af99d401b63183d1c2380cd4958c1236fe1d4f618f541b3e77ed00ea14b341a474fc929c21b9ce20f8cb051de7f23db002d2d1c0c68a357 WHIRLPOOL e0294c52f45309bad2f07120c4480690d3373810689166ee7b328f689ddb93a1e50d44570dc7e81426dec8827cd4b476527772a6ef60936f6656288d47bdc024
 AUX mixxx-1.12.9999-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
-AUX mixxx-1.12.9999-fix-soundsourceffmpeg-build.patch 4421 SHA256 350844528cbe1cd28d05dbaa3968466a57b42d1ded06c9370571be481f327276 SHA512 e4818c95e1e097e0e283057d83c94b371b0b340dee46da35d60c56a2d8fab976761aeffe8dd19db949506b7dd0128509e5078930dce28d477f8f6adb69f79511 WHIRLPOOL cf545f21bc5b7abdea79ce9ed5fda9d394aaf30d3f548a9b981304b575d7b01c489225b5eb5a06aa18ea811599d90f66d325b736fc347af750edd0b1e64fa6ee
 AUX mixxx-1.12.9999-system-libs.patch 5847 SHA256 0b5cb0db508eb921f9461e20a490afd729a332d11624d192738b19f5cb34a010 SHA512 5caf650bf917cb36605ef8b04a8fdc4715772f6801ebdf25b1bd36d7293c996e0af4dae473cc0a6a72fdb9b93430c24ba50e78fe97503d20c3b5532c4e9d0c65 WHIRLPOOL 4eab9f4038fdc40cc9a8f92a161ab6990df21c51a4cf3b4b7dc990bae3923280d9798c968738de0d70180b5d0fb1163ff17d6cce715e1e04b6431674e25b8c6e
 DIST mixxx-1.12.0_beta1.tar.gz 24780154 SHA256 1204b04044b090b297c2863118dde4f2962d557f9bf606b1069efe824e18616f SHA512 1fe6ca8c876b2a33c3e0a329ddf53856e037f2e8e6574dae86c46a364cf604f124d0f8e2f5abd150307c4baeeeb7cf9c516d681989d2f7cf54c421ce7ddb76bb WHIRLPOOL e4e970e301509d36d555d07b317828f81734509f739bebeac174007048a800910eecd546c8e1beacb2baec7a96220a35012abdde4703b7c67e497843d915bb53
 EBUILD mixxx-1.12.0_beta1.ebuild 2964 SHA256 24231b48448545403b589da5d9034cb10d2aa559a715e9965879015ddb81c9ce SHA512 f900bd7e07ed85632caef5eb06ed2391bdbb295f476dc2316861f2f840b0e6cb4335dea5c3466e40c665a001775f13456b571ca8b2bac774b009dda02b767fab WHIRLPOOL 9ce6e14c19c1adf46fce9a2b6667a93ada7c66d7dc221f31627a4154d3aefdca555a53e222dd998fe0fb37a7e0fe3e3bfbacf7a4c407776723b5e1753edb4ef1
-EBUILD mixxx-1.12.9999.ebuild 2751 SHA256 b4e7febc42250b384e984c4fe67243d31d1f03c66e7ee165d275c40dfc53e9d3 SHA512 073f3e5a42df2e9590a2044f053b5ee90da08ede4b32b44ba7901071228ac7ac0cca8da5f15fe2fdc3f1650002a6a6e9d245064d0ef29fff2a0389be06fbe2a4 WHIRLPOOL 96395943bd165dfd0f179b46c02c0b9f3a798e1833416ceca12095503dae6a18f6f82cc9eb0289e9e0b6d3c970d4f02aef8d8e6414d40c7c69438da981b1371c
+EBUILD mixxx-1.12.9999.ebuild 2679 SHA256 cbc078e3536fb0a3b1ce02fa478b99aaafb2ffd666c8cbe38ff99333fdd4f7fc SHA512 485cfde679e9501a2f7a1467bf76ed9c1ba408fdc40e6ec8f55517f41ae7d970255a25954b5a992c7eb3b5fab8b1a69d195cead73726190b104618d8cc7d6202 WHIRLPOOL 4ea86a7690d5cb0ec9334f51d05cea0bf317e0f7e1589fc2ea348d2ba8b49682820024328db3031372d075cc5eb15de0b2f4e7b6835cbba876ed78a30a6a2e44
diff --git a/media-sound/mixxx/files/mixxx-1.12.9999-fix-soundsourceffmpeg-build.patch b/media-sound/mixxx/files/mixxx-1.12.9999-fix-soundsourceffmpeg-build.patch
deleted file mode 100644
index ed9c394..0000000
--- a/media-sound/mixxx/files/mixxx-1.12.9999-fix-soundsourceffmpeg-build.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -dNur a/src/soundsourceffmpeg.cpp b/src/soundsourceffmpeg.cpp
---- a/src/soundsourceffmpeg.cpp	2015-10-13 10:15:03.278934515 +0000
-+++ b/src/soundsourceffmpeg.cpp	2015-10-13 10:16:15.951184299 +0000
-@@ -391,10 +391,10 @@
- #if defined(_WIN32) && !defined(__MINGW32CE__)
-     const QByteArray qBAFilename(
-             avformat_version() >= ((52<<16)+(0<<8)+0) ?
--            getLocalFileName().toUtf8() :
--            getLocalFileName().toLocal8Bit());
-+            getFilename().toUtf8() :
-+            getFilename().toLocal8Bit());
- #else
--    const QByteArray qBAFilename(getLocalFileName().toLocal8Bit());
-+    const QByteArray qBAFilename(getFilename().toLocal8Bit());
- #endif
- 
-     // Open file and make m_pFormatCtx
-@@ -566,7 +566,7 @@
-     bool is_aiff = location.endsWith("aiff", Qt::CaseInsensitive);
- 
-     if (is_flac) {
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::FLAC::File f(getFilename().toStdWString().data());
- #else
-         TagLib::FLAC::File f(qBAFilename.constData());
-@@ -593,7 +593,7 @@
-             }
-         }
-     } else if (is_wav) {
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::RIFF::WAV::File f(getFilename().toStdWString().data());
- #else
-         TagLib::RIFF::WAV::File f(qBAFilename.constData());
-@@ -625,7 +625,7 @@
- 
-     } else if (is_aiff) {
-         // Try AIFF
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::RIFF::AIFF::File f(getFilename().toStdWString().data());
- #else
-         TagLib::RIFF::AIFF::File f(qBAFilename.constData());
-@@ -640,7 +640,7 @@
-             return ERR;
-         }
-     } else if (is_mp3) {
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::MPEG::File f(getFilename().toStdWString().data());
- #else
-         TagLib::MPEG::File f(qBAFilename.constData());
-@@ -668,7 +668,7 @@
-             }
-         }
-     } else if (is_ogg) {
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::Ogg::Vorbis::File f(getFilename().toStdWString().data());
- #else
-         TagLib::Ogg::Vorbis::File f(qBAFilename.constData());
-@@ -690,7 +690,7 @@
-             }
-         }
-     } else if (is_mp4) {
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::MP4::File f(getFilename().toStdWString().data());
- #else
-         TagLib::MP4::File f(qBAFilename.constData());
-@@ -714,7 +714,7 @@
-         }
-     } else if (is_opus) {
-         // If some have too old Taglib it's his own pain
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::Ogg::Opus::File f(getFilename().toStdWString().data());
- #else
-         TagLib::Ogg::Opus::File f(qBAFilename.constData());
-@@ -749,7 +749,7 @@
-     QImage coverArt;
- 
-     if (getType() == "flac") {
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::FLAC::File f(getFilename().toStdWString().data());
- #else
-         TagLib::FLAC::File f(qBAFilename.constData());
-@@ -774,7 +774,7 @@
-             }
-         }
-     } else if (getType() == "wav") {
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::RIFF::WAV::File f(getFilename().toStdWString().data());
- #else
-         TagLib::RIFF::WAV::File f(qBAFilename.constData());
-@@ -785,7 +785,7 @@
-         }
-     } else if (getType() == "aiff") {
-         // Try AIFF
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::RIFF::AIFF::File f(getFilename().toStdWString().data());
- #else
-         TagLib::RIFF::AIFF::File f(qBAFilename.constData());
-@@ -795,12 +795,11 @@
-             coverArt = Mixxx::getCoverInID3v2Tag(*id3v2);
-         }
-     } else if (getType() == "mp3") {
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::MPEG::File f(getFilename().toStdWString().data());
- #else
-         TagLib::MPEG::File f(qBAFilename.constData());
- #endif
--        TagLib::MPEG::File f(getFilename().toLocal8Bit().constData());
-         TagLib::ID3v2::Tag* id3v2 = f.ID3v2Tag();
-         if (id3v2) {
-             coverArt = Mixxx::getCoverInID3v2Tag(*id3v2);
-@@ -812,7 +811,7 @@
-             }
-         }
-     } else if (getType() == "ogg" || getType() == "opus") {
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::Ogg::Vorbis::File f(getFilename().toStdWString().data());
- #else
-         TagLib::Ogg::Vorbis::File f(qBAFilename.constData());
-@@ -822,7 +821,7 @@
-             coverArt = Mixxx::getCoverInXiphComment(*xiph);
-         }
-    } else if (getType() == "mp4" || getType() == "m4a") {
--#ifdef _WIN32
-+#if defined(_WIN32)
-         TagLib::MP4::File f(getFilename().toStdWString().data());
- #else
-         TagLib::MP4::File f(qBAFilename.constData());
diff --git a/media-sound/mixxx/mixxx-1.12.9999.ebuild b/media-sound/mixxx/mixxx-1.12.9999.ebuild
index 71cec90..e095874 100644
--- a/media-sound/mixxx/mixxx-1.12.9999.ebuild
+++ b/media-sound/mixxx/mixxx-1.12.9999.ebuild
@@ -73,7 +73,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.12.9999-system-libs.patch
 	epatch "${FILESDIR}"/${PN}-1.12.9999-docs.patch
-	epatch "${FILESDIR}"/${PN}-1.12.9999-fix-soundsourceffmpeg-build.patch
 
 	# use multilib compatible directory for plugins
 	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die