Date: Sunday, March 8, 2020 @ 09:46:32
Author: felixonmars
Revision: 377133
archrelease: copy trunk to extra-x86_64
Added:
moc/repos/extra-x86_64/PKGBUILD
(from rev 377132, moc/trunk/PKGBUILD)
moc/repos/extra-x86_64/moc-ffmpeg4.patch
(from rev 377132, moc/trunk/moc-ffmpeg4.patch)
moc/repos/extra-x86_64/moc-https.patch
(from rev 377132, moc/trunk/moc-https.patch)
Deleted:
moc/repos/extra-x86_64/PKGBUILD
moc/repos/extra-x86_64/moc-ffmpeg4.patch
-------------------+
PKGBUILD | 94 ++++++++++++++++++++++++++--------------------------
moc-ffmpeg4.patch | 66 ++++++++++++++++++------------------
moc-https.patch | 10 +++++
3 files changed, 91 insertions(+), 79 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-08 09:46:21 UTC (rev 377132)
+++ PKGBUILD 2020-03-08 09:46:32 UTC (rev 377133)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <[email protected]>
-
-pkgname=moc
-pkgver=2.5.2
-pkgrel=2
-epoch=1
-pkgdesc="An ncurses console audio player designed to be powerful and easy to
use"
-arch=('x86_64')
-url="http://moc.daper.net/";
-license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
-makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug'
'faad2')
-optdepends=('speex: for using the speex plugin'
- 'ffmpeg: 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)
-sha1sums=('9d27a929b63099416263471c16367997c0ae6dba'
- '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 \
- --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/extra-x86_64/PKGBUILD (from rev 377132, moc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-08 09:46:32 UTC (rev 377133)
@@ -0,0 +1,48 @@
+# Maintainer: Eric Bélanger <[email protected]>
+
+pkgname=moc
+pkgver=2.5.2
+pkgrel=3
+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' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug'
'faad2')
+optdepends=('speex: for using the speex plugin'
+ 'ffmpeg: 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}
+ ./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
+}
Deleted: moc-ffmpeg4.patch
===================================================================
--- moc-ffmpeg4.patch 2020-03-08 09:46:21 UTC (rev 377132)
+++ moc-ffmpeg4.patch 2020-03-08 09:46:32 UTC (rev 377133)
@@ -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);
Copied: moc/repos/extra-x86_64/moc-ffmpeg4.patch (from rev 377132,
moc/trunk/moc-ffmpeg4.patch)
===================================================================
--- moc-ffmpeg4.patch (rev 0)
+++ moc-ffmpeg4.patch 2020-03-08 09:46:32 UTC (rev 377133)
@@ -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/extra-x86_64/moc-https.patch (from rev 377132,
moc/trunk/moc-https.patch)
===================================================================
--- moc-https.patch (rev 0)
+++ moc-https.patch 2020-03-08 09:46:32 UTC (rev 377133)
@@ -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);
+ }
+
