From 9e0c06f612f7ed248ad0024f53761cd291f260e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 26 Dec 2022 21:02:50 +0700 Subject: [PATCH] mpg123: split sdl plugins Close #41290 --- srcpkgs/mpg123-sdl | 1 - srcpkgs/mpg123-sdl/template | 28 ++++++++++++++++++++++++++++ srcpkgs/mpg123/template | 25 +++++++++++-------------- 3 files changed, 39 insertions(+), 15 deletions(-) delete mode 120000 srcpkgs/mpg123-sdl create mode 100644 srcpkgs/mpg123-sdl/template diff --git a/srcpkgs/mpg123-sdl b/srcpkgs/mpg123-sdl deleted file mode 120000 index 9e68ce8491a..00000000000 --- a/srcpkgs/mpg123-sdl +++ /dev/null @@ -1 +0,0 @@ -mpg123 \ No newline at end of file diff --git a/srcpkgs/mpg123-sdl/template b/srcpkgs/mpg123-sdl/template new file mode 100644 index 00000000000..02803f59109 --- /dev/null +++ b/srcpkgs/mpg123-sdl/template @@ -0,0 +1,28 @@ +# Template file for 'mpg123-sdl' +# Sync with mpg123 +pkgname=mpg123-sdl +version=1.31.1 +revision=2 +build_style=gnu-configure +# --with-cpu not necessary, upstream detects features correctly +configure_args="--with-optimization=0 --with-default-audio=alsa" +hostmakedepends="pkg-config" +makedepends="alsa-lib-devel SDL2-devel" +depends="libmpg123>=${version}<=${version}_9999" +short_desc="Fast console MPEG audio decoder/player - SDL output plugin" +maintainer="Orphaned " +license="LGPL-2.1-only" +homepage="https://www.mpg123.org/" +changelog="https://www.mpg123.org/cgi-bin/scm/mpg123/trunk/NEWS" +distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2 + https://www.mpg123.org/download/mpg123-${version}.tar.bz2" +checksum="5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a + 5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a" + +if [ "$XBPS_TARGET_LIBC" = musl ]; then + configure_args+=" --disable-lfs-alias" +fi + +post_install() { + find ${DESTDIR} -name output_sdl.so -o '(' -not -type d -delete ')' +} diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template index 65e15b42b10..d17147a85d5 100644 --- a/srcpkgs/mpg123/template +++ b/srcpkgs/mpg123/template @@ -1,24 +1,27 @@ # Template file for 'mpg123' +# Sync with mpg123-sdl pkgname=mpg123 version=1.31.1 -revision=1 +revision=2 build_style=gnu-configure # --with-cpu not necessary, upstream detects features correctly configure_args="--with-optimization=0 --with-default-audio=alsa" hostmakedepends="pkg-config" -makedepends="alsa-lib-devel jack-devel pulseaudio-devel sndio-devel SDL2-devel" +makedepends="alsa-lib-devel jack-devel pulseaudio-devel sndio-devel" short_desc="Fast console MPEG audio decoder/player" maintainer="Orphaned " license="LGPL-2.1-only" homepage="https://www.mpg123.org/" changelog="https://www.mpg123.org/cgi-bin/scm/mpg123/trunk/NEWS" -distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2" -checksum=5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a +distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2 + https://www.mpg123.org/download/mpg123-${version}.tar.bz2" +checksum="5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a + 5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a" -case "$XBPS_TARGET_MACHINE" in +if [ "$XBPS_TARGET_LIBC" = musl ]; then # No LFS required with musl - *-musl) configure_args+=" --disable-lfs-alias";; -esac + configure_args+=" --disable-lfs-alias" +fi mpg123-jack_package() { depends="libmpg123-${version}_${revision}" @@ -34,13 +37,7 @@ mpg123-pulseaudio_package() { vmove usr/lib/mpg123/output_pulse.so } } -mpg123-sdl_package() { - depends="libmpg123-${version}_${revision}" - short_desc+=" - SDL output plugin" - pkg_install() { - vmove usr/lib/mpg123/output_sdl.so - } -} + mpg123-sndio_package() { depends="libmpg123-${version}_${revision}" short_desc+=" - sndio output plugin"