commit 00f25effdaf9e0253ebb579c2ae769d481bc3304 Author: Danny Rawlins <monster.romster@gmail.com> Date: Thu Nov 21 12:41:31 2019 +1100 moc: patch for ffmpeg diff --git a/moc/.signature b/moc/.signature index 3336e998f..f57cd04b2 100644 --- a/moc/.signature +++ b/moc/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zfDbdqR0B3IucOgfScc0sZJ/iJyeL+rUrwrJ6at6mT2dO4RmzSWHQBRKsbQ5B4P3qO5SyJcothalFn0H6eykgY= -SHA256 (Pkgfile) = 9ed6040dc3c95384e2d0e4083c9d5924bb4231db02e2fa26549fb43e95759a81 +RWSagIOpLGJF39i239hg229+2ohMpzMGCiB7qTBFNymFRbwoaBzhdlLoCeXs4cgjwqKegKJV972ILLCPf0EwFt6NXcOyMuF9Rw4= +SHA256 (Pkgfile) = d0c5ea5a79b438610d66e46b52e7951f5307c90b9f0ff50b7620706108864ff7 SHA256 (.footprint) = f23b8f049e77b4cb7f95144116ae3c29c790199e1459ff3017dabae044f1b0b2 SHA256 (moc-2.5.2.tar.bz2) = f3a68115602a4788b7cfa9bbe9397a9d5e24c68cb61a57695d1c2c3ecf49db08 +SHA256 (moc-ffmpeg4.patch) = f1a12d7d2e8269974487a2ffb011e87d9a6c5c06e2a47d1312d5965c98f050ea diff --git a/moc/Pkgfile b/moc/Pkgfile index 37c798f01..793b62965 100644 --- a/moc/Pkgfile +++ b/moc/Pkgfile @@ -2,16 +2,20 @@ # URL: http://moc.daper.net/ # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: curl libid3tag libmad libsndfile popt +# Optional: ffmpeg name=moc version=2.5.2 -release=1 -source=(http://ftp.daper.net/pub/soft/moc/stable/$name-$version.tar.bz2) +release=2 +source=(http://ftp.daper.net/pub/soft/moc/stable/$name-$version.tar.bz2 + moc-ffmpeg4.patch) build() { cd $name-$version + patch -p0 -i $SRC/moc-ffmpeg4.patch + ./configure \ --prefix=/usr \ --disable-nls \ diff --git a/moc/moc-ffmpeg4.patch b/moc/moc-ffmpeg4.patch new file mode 100644 index 000000000..c1e43a7c2 --- /dev/null +++ b/moc/moc-ffmpeg4.patch @@ -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);