Re: [PR PATCH] [Updated] Update deadbeef to 1.9.5

[Ilia1 <Ilia1@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

There is an updated pull request by Ilia1 against master on the void-packages repository

https://github.com/Ilia1/void-packages deadbeef
https://github.com/void-linux/void-packages/pull/44774

Update deadbeef to 1.9.5
#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, x86-64



A patch file from https://github.com/void-linux/void-packages/pull/44774.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deadbeef-44774.patch --]
[-- Type: text/x-diff, Size: 6356 bytes --]

From 39274a654100924946e392c507a34817de80f41f Mon Sep 17 00:00:00 2001
From: ilia <ISPonomarev@yahoo.com>
Date: Sun, 2 Jul 2023 14:57:15 +0500
Subject: [PATCH 1/2] Create template for libdispatch

---
 common/shlibs                |  2 ++
 srcpkgs/libdispatch/template | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 srcpkgs/libdispatch/template

diff --git a/common/shlibs b/common/shlibs
index 258b257a75c3..aa185f0d6a27 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4277,3 +4277,5 @@ libgsoapssl++-2.8.124.so gsoap-2.8.124_1
 libjxl.so.0.8 libjxl-0.8.2_1
 libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
+libdispatch.so libdispatch-5.5.3_1
+libBlocksRuntime.so libdispatch-5.5.3_1
diff --git a/srcpkgs/libdispatch/template b/srcpkgs/libdispatch/template
new file mode 100644
index 000000000000..4d689ea5d97e
--- /dev/null
+++ b/srcpkgs/libdispatch/template
@@ -0,0 +1,32 @@
+pkgname=libdispatch
+version=5.5.3
+revision=1
+create_wrksrc=yes
+build_style=cmake
+hostmakedepends="ninja clang git"
+short_desc="Library provides comprehensive support for concurrent code execution on multicore hardware"
+maintainer="Ilya <ISPonomarev@yahoo.com>"
+license="Apache-2.0"
+homepage="https://github.com/apple/swift-corelibs-libdispatch"
+
+do_fetch() {
+       git clone https://github.com/apple/swift-corelibs-libdispatch
+       mv swift-corelibs-libdispatch ${pkgname}-${version}
+}
+
+pre_configure() {
+       mkdir build
+}
+
+do_configure() {
+        cd build
+        cmake -G Ninja -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ ..
+}
+
+libdispatch-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+	}
+}

From 47f9e212548c2c809eaec180f1ec3b908ec72886 Mon Sep 17 00:00:00 2001
From: ilia <ISPonomarev@yahoo.com>
Date: Sun, 2 Jul 2023 15:39:02 +0500
Subject: [PATCH 2/2] Update template deadbeef

---
 srcpkgs/deadbeef/patches/libretro.patch | 10 +++++++
 srcpkgs/deadbeef/patches/pw.patch       | 11 ++++++++
 srcpkgs/deadbeef/template               | 37 ++++++++++++-------------
 3 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/deadbeef/patches/libretro.patch
 create mode 100644 srcpkgs/deadbeef/patches/pw.patch

diff --git a/srcpkgs/deadbeef/patches/libretro.patch b/srcpkgs/deadbeef/patches/libretro.patch
new file mode 100644
index 000000000000..86e13fcbbbe8
--- /dev/null
+++ b/srcpkgs/deadbeef/patches/libretro.patch
@@ -0,0 +1,10 @@
+--- a/external/ddb_dsp_libretro/libretro.cpp
++++ b/external/ddb_dsp_libretro/libretro.cpp
+@@ -22,7 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <assert.h>
+-#include <deadbeef/deadbeef.h>
++#include <deadbeef.h>
+ 
+ static DB_dsp_t *_plugin;
diff --git a/srcpkgs/deadbeef/patches/pw.patch b/srcpkgs/deadbeef/patches/pw.patch
new file mode 100644
index 000000000000..b3a1ad987519
--- /dev/null
+++ b/srcpkgs/deadbeef/patches/pw.patch
@@ -0,0 +1,11 @@
+--- a/external/ddb_output_pw/pw.c
++++ b/external/ddb_output_pw/pw.c
+@@ -23,7 +23,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <stdbool.h>
+-#include <deadbeef/deadbeef.h>
++#include <deadbeef.h>
+ 
+ #define OP_ERROR_SUCCESS 0
+ #define OP_ERROR_INTERNAL -1
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index b664bb1b9bd9..38d61a76fd67 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,31 +1,24 @@
 # Template file for 'deadbeef'
 pkgname=deadbeef
-version=1.8.8
+version=1.9.5
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
-configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2"
+configure_args="--disable-oss --disable-notify --disable-gtk2"
 hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
- yasm clang glib-devel"
+ yasm clang glib-devel libdispatch"
 makedepends="
  alsa-lib-devel dbus-devel faad2-devel ffmpeg-devel gtk+3-devel imlib2-devel
  jansson-devel libcddb-devel libcdio-devel libcurl-devel libflac-devel
  libmad-devel libpng-devel libsamplerate-devel libsndfile-devel libvorbis-devel
- libzip-devel mpg123-devel opusfile-devel pulseaudio-devel wavpack-devel"
-depends="desktop-file-utils hicolor-icon-theme"
+ libzip-devel mpg123-devel opusfile-devel pulseaudio-devel wavpack-devel pipewire-devel git patch clang"
+depends="desktop-file-utils hicolor-icon-theme libdispatch"
 short_desc="Ultimate Music Player for GNU/Linux"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>, Ilya <ISPonomarev@yahoo.com>"
 license="Zlib, GPL-2.0-or-later, LGPL-2.1-or-later"
-_apbuild_commit=c64f490e54447e3902fae54784d01ab59fa7dc95
-_mp4p_commit=77ac9f2ecaa3a2f6e232fb45cd7f8550e13cc3d3
+_release_commit=9239702a0853abd110d71f1368f7b073b232f48f
 homepage="https://deadbeef.sourceforge.io"
 changelog="https://deadbeef.sourceforge.io/news0.html"
-distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
- https://github.com/DeaDBeeF-Player/apbuild/archive/${_apbuild_commit}.tar.gz>apbuild-${_apbuild_commit}.tar.gz
- https://github.com/DeaDBeeF-Player/mp4p/archive/${_mp4p_commit}.tar.gz>mp4p-${_mp4p_commit}.tar.gz"
-checksum="a667d55b787d76bc9d3593882b57ae9a449a99e93e1c11f85ec638566e10877d
- c5eeb3fa116d51d251fe7c7e5c44798680f6478c43a1fffdcb28c4caf1c68286
- d0ba1b4ad062cb5c056c4a59ed55769d79371fc9b3bf9aaa0ca48f508e3eba75"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
 # The soundtouchup plugin was made default in 1.8.4 and fails to build on i686.
@@ -38,18 +31,22 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
-post_extract() {
-	mv deadbeef-${version}/* .
-	rm -rf external/apbuild
-	rm -rf external/mp4p
-	mv -v apbuild-${_apbuild_commit} external/apbuild
-	mv -v mp4p-${_mp4p_commit} external/mp4p
+do_fetch() {
+       rm -rf deadbeef-${version}
+       git clone --recurse-submodules https://github.com/DeaDBeeF-Player/deadbeef 
+       mv deadbeef deadbeef-${version}
+       cd deadbeef-${version}
+       git checkout ${_release_commit}
 }
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
 
+do_configure() {
+        CC=clang CXX=clang++ ./configure ${configure_args}
+}
+
 post_install() {
 	vlicense COPYING
 }