Skip to content

Commit

Permalink
deadbeef: update to 1.9.6
Browse files Browse the repository at this point in the history
  • Loading branch information
zlice committed Jul 22, 2024
1 parent dda5968 commit 7cbe168
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 24 deletions.
10 changes: 5 additions & 5 deletions srcpkgs/deadbeef/patches/musl_strdupa.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
musl strdupa() fails to compile in c++ due to a missing cast
use deadbeef's fallback version instead

--- a/strdupa.h
+++ b/strdupa.h
--- a/include/deadbeef/strdupa.h
+++ b/include/deadbeef/strdupa.h
@@ -26,6 +26,10 @@

#include <string.h>

+#if defined(__linux__) && !defined(__GLIBC__)
+# undef strdupa
+#endif
+
#ifndef strdupa
# define strdupa(s) \
({ \
({
46 changes: 27 additions & 19 deletions srcpkgs/deadbeef/template
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
# Template file for 'deadbeef'
pkgname=deadbeef
version=1.8.8
revision=3
version=1.9.6
revision=1
create_wrksrc=yes
build_style=gnu-configure
configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2"
configure_args="--disable-oss --disable-lfm --disable-gtk2 --disable-libretro"
hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
yasm clang glib-devel"
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"
alsa-lib-devel libdispatch-devel ffmpeg6-devel faad2-devel gtk+3-devel jansson-devel
libcurl-devel libflac-devel libmad-devel libsndfile-devel libvorbis-devel libzip-devel
libcddb-devel libcdio-devel opusfile-devel mpg123-devel dbus-devel pulseaudio-devel
pipewire-devel libsamplerate-devel wavpack-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Ultimate Music Player for GNU/Linux"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Zlib, GPL-2.0-or-later, LGPL-2.1-or-later"
_apbuild_commit=c64f490e54447e3902fae54784d01ab59fa7dc95
_mp4p_commit=77ac9f2ecaa3a2f6e232fb45cd7f8550e13cc3d3
_libretro_commit=b4d3db19566398603069d02eeacb3b06987a1b74
_output_pw_commit=0b099d13ab0e89d9934aabdeb2872f0f66ea6960
_mp4p_commit=156195ccb635f016dc34b89425bfbecf046c90d4
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/ddb_dsp_libretro/archive/${_libretro_commit}.tar.gz>libretro-${_libretro_commit}.tar.gz
https://github.com/DeaDBeeF-Player/ddb_output_pw/archive/${_output_pw_commit}.tar.gz>output_pw-${_output_pw_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"
checksum="53ed535335e637437adf77eb4bcadb781eddbf5539f74373d5a863389df5e2d0
444d4d89edbd51b9d2305c83a49e18949e0f21a42eec2a95ce03efd752a81049
59115ddcd0378aa2f5914138c5c256198d66339bfbb3d65389b9bf4fa327f9ee
3b5bdbcb2808d12b9f5af630a91e77be1036aeb487d5fa0a323ce8080918439b"

# The soundtouchup plugin was made default in 1.8.4 and fails to build on i686.
# Fixing that might be a good maintainer task.
case "$XBPS_TARGET_MACHINE" in
i686*) configure_args+=" --disable-soundtouch" ;;
i686*) configure_args+=" --disable-soundtouch --disable-ffap" ;;
esac

if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
Expand All @@ -40,14 +42,20 @@ fi

post_extract() {
mv deadbeef-${version}/* .
rm -rf external/apbuild
rm -rf external/mp4p
mv -v apbuild-${_apbuild_commit} external/apbuild
rm -rf external/ddb_dsp_libretro
rm -rf external/ddb_output_pw
mv -v ddb_dsp_libretro-${_libretro_commit} external/ddb_dsp_libretro
mv -v ddb_output_pw-${_output_pw_commit} external/ddb_output_pw
mv -v mp4p-${_mp4p_commit} external/mp4p
}

pre_configure() {
NOCONFIGURE=1 ./autogen.sh
# musl complaining about <sys/cdefs.h> deprecation
do_configure() {
export CC=clang
export CXX=clang++
./autogen.sh
CFLAGS="-Wno-error" ./configure ${configure_args}
}

post_install() {
Expand Down

0 comments on commit 7cbe168

Please sign in to comment.