moc: new optional dependencies, drop obsolete patch

moc/.footprint

@@ -4,13 +4,9 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/moc/
 drwxr-xr-x	root/root	usr/lib/moc/decoder_plugins/
--rwxr-xr-x	root/root	usr/lib/moc/decoder_plugins/libflac_decoder.la
 -rwxr-xr-x	root/root	usr/lib/moc/decoder_plugins/libflac_decoder.so
--rwxr-xr-x	root/root	usr/lib/moc/decoder_plugins/libmp3_decoder.la
 -rwxr-xr-x	root/root	usr/lib/moc/decoder_plugins/libmp3_decoder.so
--rwxr-xr-x	root/root	usr/lib/moc/decoder_plugins/libsndfile_decoder.la
 -rwxr-xr-x	root/root	usr/lib/moc/decoder_plugins/libsndfile_decoder.so
--rwxr-xr-x	root/root	usr/lib/moc/decoder_plugins/libvorbis_decoder.la
 -rwxr-xr-x	root/root	usr/lib/moc/decoder_plugins/libvorbis_decoder.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/

moc/.signature

@@ -1,7 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF337cTZ+qqVXbAxWhT6u+7gmG1ho5JoGeVdnqalhvD926B9nH+imby23RV1AWQ/CPGVziyj/85ELAycXIMtOcWQ0=
-SHA256 (Pkgfile) = 8986b003d69cbb5aedf7289c88489cc6502d9035ea9a622ef927feb29fe4980d
-SHA256 (.footprint) = f23b8f049e77b4cb7f95144116ae3c29c790199e1459ff3017dabae044f1b0b2
+RWSagIOpLGJF38Sf1pcQeWkNDXZ3Y5vwqLMDqQlfzuAiS6zEs4dII5KTHn0t9DRUsHzWEI5kcFqqJdNII+D03MCQSOprbgTXmwo=
+SHA256 (Pkgfile) = f82c62a4da0f03cca5b7fc5d1e21c48dc12146981b8e24f66970510fe9960781
+SHA256 (.footprint) = c739c03c6c90f9487c51f38a03c2cb807316a6a3bef00967c088c59252b57078
 SHA256 (moc-2.5.2.tar.bz2) = f3a68115602a4788b7cfa9bbe9397a9d5e24c68cb61a57695d1c2c3ecf49db08
-SHA256 (moc-ffmpeg4.patch) = f1a12d7d2e8269974487a2ffb011e87d9a6c5c06e2a47d1312d5965c98f050ea
 SHA256 (moc-https.patch) = d5ace9820974912e4f3d9361ad5d03d1d655348f17c9710dff527020101e98fa

moc/Pkgfile

@@ -2,30 +2,29 @@
 # URL: http://moc.daper.net/
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Depends on: curl libid3tag libmad libsndfile popt
-# Optional: ffmpeg
+# Optional: faad2 lame libmpcdec libmodplug mpg123 speex taglib wavpack
 
 name=moc
 version=2.5.2
 release=3
 source=(http://ftp.daper.net/pub/soft/moc/stable/$name-$version.tar.bz2
-	moc-ffmpeg4.patch
 	moc-https.patch)
 
 
 build() {
 	cd $name-$version
 
-	patch -p0 -i $SRC/moc-ffmpeg4.patch
 	patch -p0 -i $SRC/moc-https.patch
 
 	./configure \
 		--prefix=/usr \
-		--without-ffmpeg \
 		--disable-nls \
+		--without-ffmpeg \
 		--disable-debug
 
 	make
 	make DESTDIR=$PKG install
 	install -D -m 0644 -t $PKG/usr/share/moc/ config.example keymap.example
 	rm -rf $PKG/usr/share/doc
+	rm -f $PKG/usr/lib/moc/decoder_plugins/*.la
 }

moc/moc-ffmpeg4.patch

@@ -1,33 +0,0 @@
-Index: decoder_plugins/ffmpeg/ffmpeg.c
-===================================================================
---- decoder_plugins/ffmpeg/ffmpeg.c	(revisión: 2963)
-+++ decoder_plugins/ffmpeg/ffmpeg.c	(copia de trabajo)
-@@ -697,7 +697,7 @@
- 	 * FFmpeg/LibAV in use.  For some versions this will be caught in
- 	 * *_find_stream_info() above and misreported as an unfound codec
- 	 * parameters error. */
--	if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+	if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
- 		decoder_error (&data->error, ERROR_FATAL, 0,
- 				"The codec is experimental and may damage MOC: %s",
- 				data->codec->name);
-@@ -705,8 +705,8 @@
- 	}
- 
- 	set_downmixing (data);
--	if (data->codec->capabilities & CODEC_CAP_TRUNCATED)
--		data->enc->flags |= CODEC_FLAG_TRUNCATED;
-+	if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
-+		data->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
- 
- 	if (avcodec_open2 (data->enc, data->codec, NULL) < 0)
- 	{
-@@ -725,7 +725,7 @@
- 
- 	data->sample_width = sfmt_Bps (data->fmt);
- 
--	if (data->codec->capabilities & CODEC_CAP_DELAY)
-+	if (data->codec->capabilities & AV_CODEC_CAP_DELAY)
- 		data->delay = true;
- 	data->seek_broken = is_seek_broken (data);
- 	data->timing_broken = is_timing_broken (data->ic);