[arch-commits] Commit in xmms2/trunk (PKGBUILD ffmpeg5.patch)

[Antonio Rojas]

    Date: Thursday, May 5, 2022 @ 16:41:56
  Author: arojas
Revision: 1195508

Update to 0.9.1

Modified:
  xmms2/trunk/PKGBUILD
Deleted:
  xmms2/trunk/ffmpeg5.patch

---------------+
 PKGBUILD      |   41 ++++++++---------------------------------
 ffmpeg5.patch |   37 -------------------------------------
 2 files changed, 8 insertions(+), 70 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-05 16:16:45 UTC (rev 1195507)
+++ PKGBUILD	2022-05-05 16:41:56 UTC (rev 1195508)
@@ -8,8 +8,8 @@
 # Contributor: Xilon <xilon at gmail.com>
 
 pkgname=xmms2
-pkgver=0.8DrO_o.7391.dedc33d7
-pkgrel=7
+pkgver=0.9.1
+pkgrel=1
 pkgdesc='X-platform Music Multiplexing System 2'
 arch=(x86_64)
 url='https://xmms2.org/'
@@ -49,41 +49,19 @@
           'wavpack: WavPack support')
 makedepends=("${_depends[@]%%:*}" git libpulse perl-pod-parser waf)
 optdepends=("${_depends[@]}" 'pulseaudio: PulseAudio output')
-source=('git+https://github.com/xmms2/xmms2-devel#commit=dedc33d7408e140bce714c2c3eb5bcc793f1af6c'
-        'git+https://github.com/xmms2/xmms2-tutorial#commit=8ff8c66'
-        'git+https://github.com/xmms2/s4#commit=b46e597'
+source=(https://github.com/xmms2/xmms2-devel/releases/download/$pkgver/$pkgname-$pkgver.tar.bz2
         tmpfiles.conf
         sysusers.conf
         system.service
-        user.service
-        ffmpeg5.patch)
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
+        user.service)
+sha256sums=('3b9d99be5dbe7d2c434c4b27cd7c1cc3c3dd7544a673705c3f0674b348eb28a3'
             '13e3e2720e21d048d776156f8ab17c40d05b70437823da00b3c4cc2e7f7ecf7f'
             'a37e35dedd48fb8fbc2c97d79be8a3d3c3b00191826f6046f730f649cd67812a'
             'a159b18c5959cfe76ca87990ff6879d082bfe9a4c6d674c493461f7f2781f348'
-            '76f1a06b81cec0f5942430401998f6c8cd9cb95d798f97b854f88afd73ffe61d'
-            '4a0deb25c83b43f14db8bfe4877f9352b9360239176da3c91824775ea7aff3ef')
+            '76f1a06b81cec0f5942430401998f6c8cd9cb95d798f97b854f88afd73ffe61d')
 
-prepare() {
-  cd xmms2-devel
-  git submodule init
-  git config submodule.doc/tutorial.url "$srcdir"/xmms2-tutorial
-  git config submodule.src/lib/s4.url "$srcdir"/s4
-  git submodule update
-  sed -i '$a#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 /* 1 second of 48kHz 32bit audio */' \
-    src/plugins/avcodec/avcodec_compat.h
-  sed -i 's,#include <cdio/cdda.h>,#include <cdio/paranoia/cdda.h>,' src/plugins/cdda/cdda.c
-  sed -i 's,libsmbclient.h,samba-4.0/libsmbclient.h,' src/plugins/samba/{samba.c,wscript}
-  sed -i 's|Werror|Wno-error|g' waftools/*.py
-
-# Fix build with FFmpeg 5
-  patch -p1 -i ../ffmpeg5.patch
-}
-
 build() {
-  cd xmms2-devel
+  cd xmms2-$pkgver
   export LINKFLAGS="$LDFLAGS"
   waf configure --prefix=/usr --sbindir=/usr/bin --without-ldconfig \
     --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \
@@ -95,7 +73,7 @@
 }
 
 package() {
-  cd xmms2-devel
+  cd xmms2-$pkgver
   waf --destdir="$pkgdir" install
 
   cd "$srcdir"
@@ -103,7 +81,4 @@
   install -Dm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/xmms2.conf"
   install -Dm644 system.service "$pkgdir/usr/lib/systemd/system/xmms2d.service"
   install -Dm644 user.service "$pkgdir/usr/lib/systemd/user/xmms2d.service"
-
-  [ -d "$pkgdir"/usr/lib64 ] && \
-    { mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/; rmdir "$pkgdir"/usr/lib64; } || true
 }

Deleted: ffmpeg5.patch
===================================================================
--- ffmpeg5.patch	2022-05-05 16:16:45 UTC (rev 1195507)
+++ ffmpeg5.patch	2022-05-05 16:41:56 UTC (rev 1195508)
@@ -1,37 +0,0 @@
-diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
-index 23fd4615..506d7cd5 100644
---- a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -477,8 +477,12 @@ xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
- 	/* clear buffers and reset fields to defaults */
- 	av_frame_unref (data->read_out_frame);
- 
--	bytes_read = avcodec_decode_audio4 (
--		data->codecctx, data->read_out_frame, &got_frame, &packet);
-+        bytes_read = avcodec_send_packet(data->codecctx, &packet);
-+        if (bytes_read >= 0 || bytes_read == AVERROR_EOF) {
-+            bytes_read = avcodec_receive_frame(data->codecctx, data->read_out_frame);
-+            if (bytes_read >= 0 || bytes_read == AVERROR(EAGAIN) || bytes_read == AVERROR_EOF)
-+                got_frame = 1;
-+        }
- 
- 	/* The DTS decoder of ffmpeg is buggy and always returns
- 	 * the input buffer length, get frame length from header */
-diff --git a/src/plugins/avcodec/wscript b/src/plugins/avcodec/wscript
-index 00b182b2..f204fcf3 100644
---- a/src/plugins/avcodec/wscript
-+++ b/src/plugins/avcodec/wscript
-@@ -40,13 +40,6 @@ def plugin_configure(conf):
-     conf.check_cc(header_name="avcodec.h", uselib="avcodec", type="cshlib", mandatory=False)
-     conf.check_cc(header_name="libavcodec/avcodec.h", uselib="avcodec", type="cshlib", mandatory=False)
- 
--    # mandatory function avcodec_decode_audio4 available since
--    # * ffmpeg: commit e4de716, lavc 53.40.0, release 0.9
--    # * libav: commit 0eea212, lavc 53.25.0, release 0.8
--    conf.check_cc(fragment=avcodec_decode_audio4_fragment, uselib="avcodec",
--                  uselib_store="avcodec_decode_audio4",
--                  msg="Checking for function avcodec_decode_audio4", mandatory=True)
--
-     # non-mandatory function avcodec_free_frame since
-     # * ffmpeg: commit 46a3595, lavc 54.59.100, release 1.0
-     # * libav: commit a42aada, lavc 54.28.0, release 9