* [gentoo-commits] repo/gentoo:master commit in: media-sound/lash/files/, media-sound/lash/
@ 2020-08-11 17:16 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2020-08-11 17:16 UTC (permalink / raw
To: gentoo-commits
commit: 3b161cf4155e13d607798fc259f5cbdc955c383b
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 17:15:12 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 17:16:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b161cf4
media-sound/lash: updated to eapi7 + python3_6+
1) eapi7
2) python 3_6+
3) organized deps
4) rebased patches
Closes: https://bugs.gentoo.org/735402
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/lash/files/lash-0.5.4-gcc47.patch | 9 +-
media-sound/lash/files/lash-0.5.4-glibc2.8.patch | 6 +-
media-sound/lash/files/lash-0.5.4-strcmp.patch | 8 +-
.../files/lash-0.5.4-swig_version_comparison.patch | 8 +-
.../lash/files/lash-0.5.4-underlinking.patch | 19 ++--
media-sound/lash/lash-0.5.4-r4.ebuild | 124 +++++++++++++++++++++
6 files changed, 151 insertions(+), 23 deletions(-)
diff --git a/media-sound/lash/files/lash-0.5.4-gcc47.patch b/media-sound/lash/files/lash-0.5.4-gcc47.patch
index c1afeda71e9..c988ba0e37c 100644
--- a/media-sound/lash/files/lash-0.5.4-gcc47.patch
+++ b/media-sound/lash/files/lash-0.5.4-gcc47.patch
@@ -1,8 +1,7 @@
-http://bugs.gentoo.org/451668
-http://pkgs.fedoraproject.org/cgit/lash.git/tree/lash-gcc47.patch
-
---- liblash/lash.c
-+++ liblash/lash.c
+diff --git a/liblash/lash.c b/liblash/lash.c
+index b47251d..f2a5095 100644
+--- a/liblash/lash.c
++++ b/liblash/lash.c
@@ -22,6 +22,7 @@
#include <string.h>
#include <strings.h>
diff --git a/media-sound/lash/files/lash-0.5.4-glibc2.8.patch b/media-sound/lash/files/lash-0.5.4-glibc2.8.patch
index 56bc89af029..578df171a46 100644
--- a/media-sound/lash/files/lash-0.5.4-glibc2.8.patch
+++ b/media-sound/lash/files/lash-0.5.4-glibc2.8.patch
@@ -1,5 +1,7 @@
---- liblash/socket.c.old 2008-06-26 15:20:44.227064193 +0200
-+++ liblash/socket.c 2008-06-26 15:21:18.245063129 +0200
+diff --git a/liblash/socket.c b/liblash/socket.c
+index b6e1b25..91caf0f 100644
+--- a/liblash/socket.c
++++ b/liblash/socket.c
@@ -20,6 +20,11 @@
#define _POSIX_SOURCE /* addrinfo */
diff --git a/media-sound/lash/files/lash-0.5.4-strcmp.patch b/media-sound/lash/files/lash-0.5.4-strcmp.patch
index ea9f7ee2fda..866b8fec569 100644
--- a/media-sound/lash/files/lash-0.5.4-strcmp.patch
+++ b/media-sound/lash/files/lash-0.5.4-strcmp.patch
@@ -1,7 +1,7 @@
-clients/synth/lash.c:85:2: warning: implicit declaration of function ‘strcmp’ [-Wimplicit-function-declaration]
-
---- clients/synth/lash.c
-+++ clients/synth/lash.c
+diff --git a/clients/synth/lash.c b/clients/synth/lash.c
+index 03717ae..5395198 100644
+--- a/clients/synth/lash.c
++++ b/clients/synth/lash.c
@@ -22,6 +22,7 @@
#include "config.h"
diff --git a/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch b/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch
index 6dcd4366da7..fe20c43b1c8 100644
--- a/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch
+++ b/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch
@@ -1,6 +1,8 @@
---- acinclude.m4
-+++ acinclude.m4
-@@ -40,9 +40,9 @@
+diff --git a/acinclude.m4 b/acinclude.m4
+index 4722b53..ea37316 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -40,9 +40,9 @@ AC_DEFUN([AC_PROG_SWIG],[
if test -z "$available_patch" ; then
[available_patch=0]
fi
diff --git a/media-sound/lash/files/lash-0.5.4-underlinking.patch b/media-sound/lash/files/lash-0.5.4-underlinking.patch
index 3e52807d267..3fa552721c4 100644
--- a/media-sound/lash/files/lash-0.5.4-underlinking.patch
+++ b/media-sound/lash/files/lash-0.5.4-underlinking.patch
@@ -1,9 +1,8 @@
-http://bugs.gentoo.org/367589
-http://bugs.gentoo.org/514748
-
---- clients/control/Makefile.am
-+++ clients/control/Makefile.am
-@@ -18,6 +18,7 @@
+diff --git a/clients/control/Makefile.am b/clients/control/Makefile.am
+index d3eaab2..af91a70 100644
+--- a/clients/control/Makefile.am
++++ b/clients/control/Makefile.am
+@@ -18,6 +18,7 @@ lash_control_CFLAGS = $(LASH_CFLAGS)
lash_control_LDADD = \
$(top_builddir)/liblash/liblash.la \
@@ -12,9 +11,11 @@ http://bugs.gentoo.org/514748
+ $(UUID_LIBS)
endif
---- clients/synth/Makefile.am
-+++ clients/synth/Makefile.am
-@@ -20,4 +20,5 @@
+diff --git a/clients/synth/Makefile.am b/clients/synth/Makefile.am
+index 59437ce..fe999a0 100644
+--- a/clients/synth/Makefile.am
++++ b/clients/synth/Makefile.am
+@@ -20,4 +20,5 @@ lash_synth_LDADD = \
$(JACK_LIBS) \
$(ALSA_LIBS) \
$(GTK2_LIBS) \
diff --git a/media-sound/lash/lash-0.5.4-r4.ebuild b/media-sound/lash/lash-0.5.4-r4.ebuild
new file mode 100644
index 00000000000..8fbecd62cca
--- /dev/null
+++ b/media-sound/lash/lash-0.5.4-r4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools eutils multilib-minimal python-single-r1
+
+DESCRIPTION="LASH Audio Session Handler"
+HOMEPAGE="http://www.nongnu.org/lash/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug gtk python static-libs" # doc
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ dev-libs/libxml2
+ sys-apps/util-linux[${MULTILIB_USEDEP}]
+ virtual/jack
+ alsa? ( media-libs/alsa-lib )
+ gtk? ( x11-libs/gtk+:2 )
+ python? ( ${PYTHON_DEPS} )
+ || ( sys-libs/readline dev-libs/libedit )
+"
+DEPEND="
+ ${RDEPEND}
+ python? ( >=dev-lang/swig )
+"
+# doc? ( >=app-text/texi2html-5 )
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+HTML_DOCS=( docs/lash-manual-html-one-page/lash-manual.html )
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-glibc2.8.patch
+ "${FILESDIR}"/${P}-swig_version_comparison.patch
+ "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-underlinking.patch
+ "${FILESDIR}"/${P}-strcmp.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ sed -i \
+ -e '/texi2html/s:-number:&-sections:' \
+ docs/Makefile.am || die #422045
+
+ default
+
+ AT_M4DIR=m4 eautoreconf
+}
+
+multilib_src_configure() {
+ # 'no' could be '$(usex doc)' but we use the pregenerated lash-manual.html
+ export ac_cv_prog_lash_texi2html=no #422045
+
+ # --enable-pylash would disable it
+ local myconf=()
+ if ! multilib_is_native_abi || ! use python; then
+ myconf+=( --disable-pylash )
+ fi
+
+ if ! multilib_is_native_abi; then
+ # disable remaining configure checks
+ myconf+=(
+ JACK_CFLAGS=' '
+ JACK_LIBS=' '
+ XML2_CFLAGS=' '
+ XML2_LIBS=' '
+
+ vl_cv_lib_readline=no
+ )
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_enable alsa alsa-midi) \
+ $(multilib_native_use_enable gtk gtk2) \
+ $(multilib_native_use_enable debug) \
+ "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ default
+ else
+ emake -C liblash
+ fi
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+ else
+ # headers
+ emake -C lash DESTDIR="${D}" install
+ # library
+ emake -C liblash DESTDIR="${D}" install
+ # pkg-config
+ emake DESTDIR="${D}" install-pkgconfigDATA
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${D}" -name '*.la' -delete || die
+ use python && python_optimize
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lash/files/, media-sound/lash/
@ 2024-05-06 6:42 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-05-06 6:42 UTC (permalink / raw
To: gentoo-commits
commit: 636c3a8d7825a736967e41fce6bdef1ca12992c0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 06:40:41 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 6 06:40:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=636c3a8d
media-sound/lash: update EAPI 7 -> 8, fix bashism in configure, fix modern C
Not that I could reproduce the modern C issue but it's obvious.
Closes: https://bugs.gentoo.org/925439
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/lash/files/lash-0.5.4-autotools.patch | 32 ++++++
media-sound/lash/files/lash-0.5.4-c99.patch | 11 ++
media-sound/lash/lash-0.5.4-r6.ebuild | 126 ++++++++++++++++++++++
3 files changed, 169 insertions(+)
diff --git a/media-sound/lash/files/lash-0.5.4-autotools.patch b/media-sound/lash/files/lash-0.5.4-autotools.patch
new file mode 100644
index 000000000000..54988c70bbc7
--- /dev/null
+++ b/media-sound/lash/files/lash-0.5.4-autotools.patch
@@ -0,0 +1,32 @@
+Fix build with modern autoconf/automake and fix a bashism in configure.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,5 @@
++ACLOCAL_AMFLAGS = -I m4
++
+ SUBDIRS = m4 docs lash liblash lashd clients icons pylash
+
+ pkgconfigdir = $(libdir)/pkgconfig
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,6 @@ AC_INIT([LASH],[0.5.4])
+ AC_CONFIG_SRCDIR([lash/types.h])
+ AC_CONFIG_HEADER([config.h])
+ AM_INIT_AUTOMAKE
+-AM_ACLOCAL_INCLUDE([m4])
+
+ ### Check for programs ###
+ AC_LANG([C])
+@@ -161,10 +160,10 @@ AC_ARG_ENABLE(pylash, [AS_HELP_STRING(--disable-pylash, [Force disable pylash bu
+ if test x$build_pylash != xdisabled; then
+ AM_PATH_PYTHON(2.3, python_found=yes, python_found=no)
+
+- if test x$python_found == xyes; then
++ if test x$python_found = xyes; then
+ AM_CHECK_PYTHON_HEADERS(, python_found=no)
+
+- if test x$python_found == xyes; then
++ if test x$python_found = xyes; then
+ AC_PROG_SWIG(1.3.31)
+ if test "$SWIG_LIB" ; then
+ build_pylash=yes
diff --git a/media-sound/lash/files/lash-0.5.4-c99.patch b/media-sound/lash/files/lash-0.5.4-c99.patch
new file mode 100644
index 000000000000..31dab715db7e
--- /dev/null
+++ b/media-sound/lash/files/lash-0.5.4-c99.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/925439
+--- a/clients/synth/lash.c
++++ b/clients/synth/lash.c
+@@ -22,6 +22,7 @@
+
+ #include "config.h"
+
++#include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+
diff --git a/media-sound/lash/lash-0.5.4-r6.ebuild b/media-sound/lash/lash-0.5.4-r6.ebuild
new file mode 100644
index 000000000000..1ee913743360
--- /dev/null
+++ b/media-sound/lash/lash-0.5.4-r6.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools multilib-minimal python-single-r1
+
+DESCRIPTION="LASH Audio Session Handler"
+HOMEPAGE="http://www.nongnu.org/lash/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa debug gtk python static-libs" # doc
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ dev-libs/libxml2
+ sys-apps/util-linux[${MULTILIB_USEDEP}]
+ virtual/jack
+ alsa? ( media-libs/alsa-lib )
+ gtk? ( x11-libs/gtk+:2 )
+ python? ( ${PYTHON_DEPS} )
+ || ( sys-libs/readline dev-libs/libedit )
+"
+DEPEND="
+ ${RDEPEND}
+ python? ( dev-lang/swig )
+"
+# doc? ( >=app-text/texi2html-5 )
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+HTML_DOCS=( docs/lash-manual-html-one-page/lash-manual.html )
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-glibc2.8.patch
+ "${FILESDIR}"/${P}-swig_version_comparison.patch
+ "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-underlinking.patch
+ "${FILESDIR}"/${P}-strcmp.patch
+ "${FILESDIR}"/${P}-autotools.patch
+ "${FILESDIR}"/${P}-c99.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e '/texi2html/s:-number:&-sections:' \
+ docs/Makefile.am || die #422045
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # 'no' could be '$(usex doc)' but we use the pregenerated lash-manual.html
+ export ac_cv_prog_lash_texi2html=no #422045
+
+ # --enable-pylash would disable it
+ local myconf=()
+ if ! multilib_is_native_abi || ! use python; then
+ myconf+=( --disable-pylash )
+ fi
+
+ if ! multilib_is_native_abi; then
+ # disable remaining configure checks
+ myconf+=(
+ JACK_CFLAGS=' '
+ JACK_LIBS=' '
+ XML2_CFLAGS=' '
+ XML2_LIBS=' '
+
+ vl_cv_lib_readline=no
+ )
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_enable alsa alsa-midi) \
+ $(multilib_native_use_enable gtk gtk2) \
+ $(multilib_native_use_enable debug) \
+ "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ default
+ else
+ emake -C liblash
+ fi
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+ else
+ # headers
+ emake -C lash DESTDIR="${D}" install
+ # library
+ emake -C liblash DESTDIR="${D}" install
+ # pkg-config
+ emake DESTDIR="${D}" install-pkgconfigDATA
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${D}" -name '*.la' -delete || die
+ use python && python_optimize
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-06 6:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-06 6:42 [gentoo-commits] repo/gentoo:master commit in: media-sound/lash/files/, media-sound/lash/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-08-11 17:16 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox