summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Gorodinsky2019-04-16 16:35:59 +0300
committerEugene Gorodinsky2019-04-16 16:35:59 +0300
commit4d2cdfcde569d8a66d6175530a50f0c08e66c579 (patch)
treedb518c1b4b1d2df1f00980c913dc5f14a42ad598
parenta14f78f9f04b9a0ae0256ffdb0798bd6b7593d5c (diff)
downloadaur-4d2cdfcde569d8a66d6175530a50f0c08e66c579.tar.gz
Revert "add ffmpeg patch"
This reverts commit f8e3bda07b33537f1605375b9da24a2c5ee3ea1d.
-rw-r--r--PKGBUILD4
-rw-r--r--ffmpeg.patch11
2 files changed, 3 insertions, 12 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 9be39c0025b..7287252ea82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,7 +31,6 @@ install=mpd.install
prepare() {
cd "${srcdir}/mpd-${pkgver}"
patch --input="${srcdir}/../meson.patch"
- patch -p0 -R --input="${srcdir}/../ffmpeg.patch"
install -d build
}
@@ -67,6 +66,7 @@ build() {
'-Dsmbclient=disabled'
'-Dnfs=disabled'
'-Dcdio_paranoia=disabled'
+ '-Dcurl=disabled'
'-Dmms=disabled'
# cloud
@@ -88,6 +88,7 @@ build() {
'-Dmodplug=disabled'
'-Dsidplay=disabled' # unclear why but disabled in the past
'-Dwavpack=disabled'
+ '-Dffmpeg=disabled'
'-Daudiofile=disabled'
'-Dfaad=disabled'
'-Dflac=disabled'
@@ -119,6 +120,7 @@ build() {
'-Dhttpd=false'
'-Drecorder=false'
'-Doss=disabled'
+ '-Dalsa=disabled'
'-Dopenal=disabled'
'-Dpulse=disabled'
'-Dshout=disabled'
diff --git a/ffmpeg.patch b/ffmpeg.patch
deleted file mode 100644
index 89f1865db6a..00000000000
--- a/ffmpeg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/input/plugins/FfmpegInputPlugin.cxx
-+++ src/input/plugins/FfmpegInputPlugin.cxx
-@@ -118,8 +118,6 @@ static constexpr const char *ffmpeg_prefixes[] = {
- "rtmp://",
- "rtmpt://",
- "rtmps://",
-- "http://",
-- "https://",
- nullptr
- };
-