[arch-commits] Commit in moc/trunk (PKGBUILD moc-ffmpeg4.patch)

[Antonio Rojas]

    Date: Tuesday, April 24, 2018 @ 16:18:41
  Author: arojas
Revision: 322926

ffmpeg 4.0 rebuild

Added:
  moc/trunk/moc-ffmpeg4.patch
Modified:
  moc/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   13 ++++++++++---
 moc-ffmpeg4.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-24 16:10:13 UTC (rev 322925)
+++ PKGBUILD	2018-04-24 16:18:41 UTC (rev 322926)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=2.5.2
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to use"
 arch=('x86_64')
@@ -18,11 +18,18 @@
             'wavpack: for using the wavpack plugin'
             'faad2: for using the aac plugin'
 	    'libmodplug: for using the modplug plugin')
-source=(http://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2{,.sig})
+source=(http://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2{,.sig}
+        moc-ffmpeg4.patch)
 sha1sums=('9d27a929b63099416263471c16367997c0ae6dba'
-          'SKIP')
+          'SKIP'
+          '007a0580ac754e1c318a0d0b6f0d403883797eaf')
 validpgpkeys=('59359B80406D9E73E80599BEF3121E4F2885A7AA')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p0 -i ../moc-ffmpeg4.patch # Fix build with ffmpeg 4
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --without-rcc \

Added: moc-ffmpeg4.patch
===================================================================
--- moc-ffmpeg4.patch	                        (rev 0)
+++ moc-ffmpeg4.patch	2018-04-24 16:18:41 UTC (rev 322926)
@@ -0,0 +1,33 @@
+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);