Date: Monday, January 31, 2022 @ 14:49:50
Author: alucryd
Revision: 435618
archrelease: copy trunk to staging-x86_64
Added:
moc/repos/staging-x86_64/
moc/repos/staging-x86_64/PKGBUILD
(from rev 435617, moc/trunk/PKGBUILD)
moc/repos/staging-x86_64/moc-ffmpeg4.patch
(from rev 435617, moc/trunk/moc-ffmpeg4.patch)
moc/repos/staging-x86_64/moc-https.patch
(from rev 435617, moc/trunk/moc-https.patch)
-------------------+
PKGBUILD | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
moc-ffmpeg4.patch | 33 +++++++++++++++++++++++++++++++++
moc-https.patch | 10 ++++++++++
3 files changed, 92 insertions(+)
Copied: moc/repos/staging-x86_64/PKGBUILD (from rev 435617, moc/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2022-01-31 14:49:50 UTC (rev 435618)
@@ -0,0 +1,49 @@
+# Maintainer: Eric Bélanger <e...@archlinux.org>
+
+pkgname=moc
+pkgver=2.5.2
+pkgrel=4
+epoch=1
+pkgdesc="An ncurses console audio player designed to be powerful and easy to
use"
+arch=('x86_64')
+url="https://moc.daper.net/";
+license=('GPL')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
+makedepends=('speex' 'ffmpeg4.4' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug'
'faad2')
+optdepends=('speex: for using the speex plugin'
+ 'ffmpeg4.4: for using the ffmpeg plugin'
+ 'taglib: for using the musepack plugin'
+ 'libmpcdec: for using the musepack plugin'
+ '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}
+ moc-ffmpeg4.patch
+ moc-https.patch)
+sha1sums=('9d27a929b63099416263471c16367997c0ae6dba'
+ 'SKIP'
+ '007a0580ac754e1c318a0d0b6f0d403883797eaf'
+ 'e3362ddd41126e2be874cd372a053fdaccf0f616')
+validpgpkeys=('59359B80406D9E73E80599BEF3121E4F2885A7AA')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p0 -i ../moc-ffmpeg4.patch # Fix build with ffmpeg 4
+ patch -p0 -i ../moc-https.patch # Allow https for urls
https://moc.daper.net/node/1872
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
+ ./configure --prefix=/usr --without-rcc \
+ --with-oss --with-alsa --with-jack --with-aac --with-mp3 \
+ --with-musepack --with-vorbis --with-flac --with-wavpack \
+ --with-sndfile --with-modplug --with-ffmpeg --with-speex \
+ --with-samplerate --with-curl --disable-cache --disable-debug
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Copied: moc/repos/staging-x86_64/moc-ffmpeg4.patch (from rev 435617,
moc/trunk/moc-ffmpeg4.patch)
===================================================================
--- staging-x86_64/moc-ffmpeg4.patch (rev 0)
+++ staging-x86_64/moc-ffmpeg4.patch 2022-01-31 14:49:50 UTC (rev 435618)
@@ -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);
Copied: moc/repos/staging-x86_64/moc-https.patch (from rev 435617,
moc/trunk/moc-https.patch)
===================================================================
--- staging-x86_64/moc-https.patch (rev 0)
+++ staging-x86_64/moc-https.patch 2022-01-31 14:49:50 UTC (rev 435618)
@@ -0,0 +1,10 @@
+--- files.c.orig
++++ files.c
+@@ -93,6 +93,7 @@
+ inline int is_url (const char *str)
+ {
+ return !strncasecmp (str, "http://";, sizeof ("http://";) - 1)
++ || !strncasecmp (str, "https://";, sizeof ("https://";) - 1)
+ || !strncasecmp (str, "ftp://";, sizeof ("ftp://";) - 1);
+ }
+
