moc -> moc-nosort

3 files changed, 103 insertions, 0 deletions

diff --git a/moc-nosort/PKGBUILD b/moc-nosort/PKGBUILD
new file mode 100644
index 000000000..125eb9c41
--- /dev/null
+++ b/moc-nosort/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Erich Eckner <arch at eckner dot net>
+# Contributor: Eric Bélanger <eric@archlinux.org>
+
+pkgname=moc-nosort
+pkgver=2.5.2
+provides=("moc=${pkgver}")
+conflicts=('moc')
+pkgrel=1
+epoch=1
+pkgdesc="An ncurses console audio player designed to be powerful and easy to use"
+arch=('i686' '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%-nosort}-${pkgver}.tar.bz2{,.sig}
+        disable-sort.patch
+	moc-ffmpeg4.patch)
+sha512sums=('992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f'
+            'SKIP'
+            '7a760eebf22d84f1ac21e3b429c10f7fb77bc8c7642adb57c57c1b6dfb9d2fa464398475778813a803738ec7a6ffee2c3da857bd36a6b89eaf3345ae419dc7ab'
+	    '270308ad7d2b300553a6cc0ddb9ef90441e32a20a3405ebcb710ff8f0a2cc036e0b59d01bf34f49144f22de5d24e25f9a66dd452a76b6a8994f2d8d75cd9795e')
+validpgpkeys=('59359B80406D9E73E80599BEF3121E4F2885A7AA')
+
+prepare() {
+  cd "${pkgname%-nosort}-${pkgver}"
+  patch -p0 -i ../moc-ffmpeg4.patch # Fix build with ffmpeg 4
+  patch -p0 -i ../disable-sort.patch
+}
+
+build() {
+  cd "${pkgname%-nosort}-${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%-nosort}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/moc-nosort/disable-sort.patch b/moc-nosort/disable-sort.patch
new file mode 100644
index 000000000..2d7dfd29a
--- /dev/null
+++ b/moc-nosort/disable-sort.patch
@@ -0,0 +1,18 @@
+--- interface.c	2016-04-24 06:23:30.000000000 +0200
++++ interface.c	2016-09-04 20:09:46.046376708 +0200
+@@ -3788,7 +3788,6 @@
+ 
+ 		if (recv_server_plist(&clients_plist)) {
+ 			add_recursively (&new, args);
+-			plist_sort_fname (&new);
+ 
+ 			send_int_to_srv (CMD_LOCK);
+ 
+@@ -3812,7 +3811,6 @@
+ 						create_file_name (PLAYLIST_FILE),
+ 						cwd, 1);
+ 			add_recursively (&new, args);
+-			plist_sort_fname (&new);
+ 
+ 			send_int_to_srv (CMD_LOCK);
+ 			plist_remove_common_items (&new, &saved_plist);
diff --git a/moc-nosort/moc-ffmpeg4.patch b/moc-nosort/moc-ffmpeg4.patch
new file mode 100644
index 000000000..c1e43a7c2
--- /dev/null
+++ b/moc-nosort/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);