commit: 8ecff1eb24b7f69c25712eeccc3bb2131dc0b7d1 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Sep 5 07:13:32 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Sep 5 07:13:32 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ecff1eb
media-sound/snd: Remove old Closes: https://bugs.gentoo.org/show_bug.cgi?id=404201 Closes: https://bugs.gentoo.org/show_bug.cgi?id=588012 Closes: https://bugs.gentoo.org/show_bug.cgi?id=591272 Closes: https://bugs.gentoo.org/show_bug.cgi?id=601960 Closes: https://bugs.gentoo.org/show_bug.cgi?id=616144 Closes: https://bugs.gentoo.org/show_bug.cgi?id=622408 Package-Manager: Portage-2.3.8, Repoman-2.3.3 media-sound/snd/Manifest | 2 - media-sound/snd/files/snd-12.6-as-needed.patch | 77 ---------------- media-sound/snd/files/snd-16.3-portaudio.patch | 49 ---------- media-sound/snd/snd-12.8.ebuild | 123 ------------------------- media-sound/snd/snd-16.3.ebuild | 120 ------------------------ 5 files changed, 371 deletions(-) diff --git a/media-sound/snd/Manifest b/media-sound/snd/Manifest index a8d65035b19..dec8b706c1a 100644 --- a/media-sound/snd/Manifest +++ b/media-sound/snd/Manifest @@ -1,3 +1 @@ -DIST snd-12.8.tar.gz 15546751 SHA256 1ff683615ec6d0c7e2c8359e921117f4fd78695675bb06eb765667edb55a1939 SHA512 99a8600a175a889ad597053e9f52af69124cab8feca693c852cb03d34df5b80bcc50994ea66d070fe61e318eca715fdfe095a458b22da80d95f88a1d695baebd WHIRLPOOL b8903b138ab31f2ee51aeabe66068943c24e15e2cd82e628bc446224ebb0e697365c0070ec99d126379a02c1ef7544a1c6195e0bb3a0c8ecb167751eb3c673ef -DIST snd-16.3.tar.gz 14824756 SHA256 7314fd8c73da9d3afa0ed2c7b5a10cda94eaf1e7fb6ab9f6ac2e085c18f50934 SHA512 b58971e95411839b2f1cafde4cdd66784f41510c67588f3816408290fc826b6c24054a03423ca3a59b11dddd45c058cb592fb97cd90d1333eeec36dd125a7821 WHIRLPOOL ad00d30d80e8dbf9b533824a382864725f14ad8a587803a8df6bedb8fe59cc36ae442e345599ebf08d67b9503d6e79e643c066b33be92d50d832d03677da8792 DIST snd-17.4.tar.gz 15096338 SHA256 efa311586661a5e73bb0fe894a366e2320a494d975424928b563dab450d0fb48 SHA512 cbbc546fe4a3ef758c5372edbdae4db29457c559eafa08854819917e153ce850f5ab302da68dee826f99c26f10769aae8c6df6ea8434614f084f21d0dbbc5c88 WHIRLPOOL ec7fc7848edf84d91312fbb7316d5f96ba8fa30d7b39bc12a0b71f5bb771cb31cacf1044401177f35ae665df59513951166b7654c955e0cf53e2ae0e5d8847e2 diff --git a/media-sound/snd/files/snd-12.6-as-needed.patch b/media-sound/snd/files/snd-12.6-as-needed.patch deleted file mode 100644 index af20208652b..00000000000 --- a/media-sound/snd/files/snd-12.6-as-needed.patch +++ /dev/null @@ -1,77 +0,0 @@ -Fix underlinking due to missing -ldl linking: -* snd-xen.o:snd-xen.c:function g_dlinit_w: error: undefined reference to 'dlsym' -* snd-xen.o:snd-xen.c:function g_dlinit_w: error: undefined reference to 'dlerror' -https://bugs.gentoo.org/show_bug.cgi?id=540594 - -Fix --as-needed issues due to linking flags in LDFLAGS - ---- snd-12.8/configure.ac -+++ snd-12.8/configure.ac -@@ -172,6 +172,13 @@ - #-------------------------------------------------------------------------------- - - LIBS="" -+AC_SEARCH_LIBS([dlopen], [dl dld], [], [ -+ AC_MSG_ERROR([unable to find the dlopen() function]) -+]) -+LIBDL_LIBS="$LIBS" -+AC_SUBST([LIBDL_LIBS]) -+ -+LIBS="" - AC_CHECK_LIB(m,main) - AC_CHECK_LIB(c,main) - # AC_CHECK_LIB(dl,main) -@@ -1469,7 +1476,7 @@ - LDSO_FLAGS="-shared" - LIBS="$LIBS -lm" - if test "$ac_cv_header_dlfcn_h" = yes ; then -- LDFLAGS="$LDFLAGS -ldl" -+ LIBS="$LIBS -ldl" - fi - if test "$GCC" = yes ; then - SO_FLAGS="-fPIC $SO_FLAGS" -@@ -1980,7 +1987,7 @@ - if test "$ac_snd_have_extension_language" = yes ; then - if test "$ac_snd_have_gui" = yes ; then - if test "$ac_cv_header_pthread_h" = yes ; then -- LDFLAGS="$LDFLAGS -lpthread" -+ LIBS="$LIBS -pthread" - fi - fi - fi -@@ -1988,14 +1995,14 @@ - if test "$ac_snd_have_extension_language" = no ; then - if test "$ac_snd_have_gui" = no ; then - if test "$ac_cv_header_dlfcn_h" = yes ; then -- LDFLAGS="$LDFLAGS -ldl" -+ LIBS="$LIBS -ldl" - fi - AC_MSG_WARN([Snd needs either an extension language (s7, Fth, or Ruby), or a graphics toolkit (Gtk or Motif), or preferably both. As currently configured, this version of Snd is useless.]) - fi - fi - - if test "$ac_snd_have_extension_language" = yes && test "$with_audio" = no && test "$ac_cv_header_dlfcn_h" = yes ; then -- LDFLAGS="$LDFLAGS -ldl" -+ LIBS="$LIBS -ldl" - fi - - ---- snd-12.8/makefile.in -+++ snd-12.8/makefile.in -@@ -20,6 +20,7 @@ - LDFLAGS = @LDFLAGS@ - - LIBS = @LIBS@ -+LIBDL_LIBS = @LIBDL_LIBS@ - XEN_LIBS = @XEN_LIBS@ - GTK_LIBS = @GTK_LIBS@ - GTK_LD_LIBS = @GTK_LD_LIBS@ -@@ -96,7 +97,7 @@ - main_target: @MAKE_TARGET@ - - snd: $(SNDLIB_HEADERS) $(SND_HEADERS) $(GX_HEADERS) $(S7_HEADERS) $(S7_O_FILES) $(SNDLIB_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -- $(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(MOTIF_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(FAM_LIB) $(GMP_LIBS) $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(MOTIF_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(FAM_LIB) $(GMP_LIBS) $(LIBDL_LIBS) $(LIBS) - - xm: xen.h mus-config.h $(S7_HEADERS) - $(CC) -c xm.c -DUSE_SND=0 $(DEFS) $(SO_FLAGS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(MOTIF_FLAGS) $(GSL_FLAGS) $(JACK_FLAGS) $(GL_FLAGS) diff --git a/media-sound/snd/files/snd-16.3-portaudio.patch b/media-sound/snd/files/snd-16.3-portaudio.patch deleted file mode 100644 index 3be684372a2..00000000000 --- a/media-sound/snd/files/snd-16.3-portaudio.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- snd-16.3/configure.ac -+++ snd-16.3/configure.ac -@@ -527,8 +527,9 @@ - - if test "$with_portaudio" = yes ; then - AC_DEFINE(MUS_PORTAUDIO) -+ PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0]) - AUDIO_SYSTEM=portaudio -- AUDIO_LIB="-lportaudio" -+ AUDIO_LIB="${PORTAUDIO_LIBS}" - fi - - if test "$with_jack" = yes ; then ---- snd-16.3/makefile.in -+++ snd-16.3/makefile.in -@@ -11,6 +11,7 @@ - GL_FLAGS = @GL_FLAGS@ - GSL_FLAGS = @GSL_CFLAGS@ - JACK_FLAGS = @JACK_FLAGS@ -+PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ - - ORIGINAL_LDFLAGS = @ORIGINAL_LDFLAGS@ - LDFLAGS = @LDFLAGS@ -@@ -26,6 +27,7 @@ - FFTW_LIBS = @FFTW_LIBS@ - JACK_LIBS = @JACK_LIBS@ - GMP_LIBS = @GMP_LIBS@ -+PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ - - LDSO_FLAGS = @LDSO_FLAGS@ - SO_FLAGS = @SO_FLAGS@ -@@ -51,7 +53,7 @@ - .SUFFIXES: .c .o - - .c.o: -- $(CC) -c $(DEFS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(GL_FLAGS) $(JACK_FLAGS) $(FFTW_CFLAGS) $< -+ $(CC) -c $(DEFS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(GL_FLAGS) $(JACK_FLAGS) $(FFTW_CFLAGS) $(PORTAUDIO_CFLAGS) $< - - SND_SCRIPTS = *.scm *.fs *.rb *.fsm - SNDLIB_HEADERS = mus-config.h sndlib.h _sndlib.h sndlib-strings.h clm.h vct.h sndlib2xen.h clm2xen.h xen.h clm-strings.h -@@ -82,7 +84,7 @@ - main_target: @MAKE_TARGET@ - - snd: $(SNDLIB_HEADERS) $(SND_HEADERS) $(GX_HEADERS) $(S7_HEADERS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -- $(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(GMP_LIBS) $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(GMP_LIBS) $(PORTAUDIO_LIBS) $(LIBS) - - xm: xen.h mus-config.h $(S7_HEADERS) - $(CC) -c xm.c -DUSE_SND=0 $(DEFS) $(SO_FLAGS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(JACK_FLAGS) $(GL_FLAGS) diff --git a/media-sound/snd/snd-12.8.ebuild b/media-sound/snd/snd-12.8.ebuild deleted file mode 100644 index 2cdfa7d0911..00000000000 --- a/media-sound/snd/snd-12.8.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit autotools eutils flag-o-matic multilib - -DESCRIPTION="Snd is a sound editor" -HOMEPAGE="http://ccrma.stanford.edu/software/snd/"; -SRC_URI="ftp://ccrma-ftp.stanford.edu/pub/Lisp/${P}.tar.gz"; - -LICENSE="Snd BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+ ruby? ( free-noncomm ) s7? ( free-noncomm )" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="alsa doc fam fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio readline ruby +s7" - -RDEPEND="media-libs/audiofile - alsa? ( media-libs/alsa-lib ) - fam? ( virtual/fam ) - fftw? ( sci-libs/fftw ) - gmp? ( dev-libs/gmp - dev-libs/mpc - dev-libs/mpfr ) - gsl? ( sci-libs/gsl ) - gtk? ( x11-libs/gtk+:3 - x11-libs/pango - x11-libs/cairo - opengl? ( x11-libs/gtkglext ) ) - jack? ( media-sound/jack-audio-connection-kit ) - ladspa? ( media-libs/ladspa-sdk ) - motif? ( >=x11-libs/motif-2.3:0 ) - opengl? ( virtual/opengl ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) - readline? ( sys-libs/readline ) - ruby? ( dev-lang/ruby )" - -REQUIRED_USE=" - portaudio? ( !pulseaudio ) - pulseaudio? ( !portaudio ) - ^^ ( - ( !ruby !s7 ) - ( ruby !s7 ) - ( !ruby s7 ) - )" - -pkg_setup() { - if ! use gtk && ! use motif ; then - ewarn "Warning: no graphic toolkit selected (gtk or motif)." - ewarn "Upstream suggests to enable one of the toolkits (or both)" - ewarn "or only the command line utilities will be helpful." - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-12.6-as-needed.patch - sed -i -e "s:-O2 ::" configure.ac || die - eautoreconf -} - -src_configure() { - # Workaround executable sections QA warning (bug #348754) - append-ldflags -Wl,-z,noexecstack - - local myconf - if use opengl ; then - myconf+=" --with-just-gl" - else - myconf+=" --without-gl" - fi - - if ! use ruby && ! use s7 ; then - myconf+=" --without-extension-language" - fi - - econf \ - $(use_with alsa) \ - $(use_with fam) \ - $(use_with fftw) \ - $(use_with gmp) \ - $(use_with gsl) \ - $(use_with gtk) \ - $(use_with jack) \ - $(use_with ladspa) \ - $(use_with motif) \ - $(use_with oss) \ - $(use_with portaudio) \ - $(use_with pulseaudio) \ - $(use_enable readline) \ - $(use_with ruby) \ - $(use_with s7) \ - --with-float-samples \ - ${myconf} - -} - -src_compile() { - emake snd - - # Do not compile ruby extensions for command line programs since they fail - sed -i -e "s:HAVE_RUBY 1:HAVE_RUBY 0:" mus-config.h || die - - for i in sndinfo audinfo sndplay ; do - emake ${i} - done -} - -src_install () { - dobin snd sndplay sndinfo audinfo - - if use ruby ; then - insinto /usr/share/snd - doins *.rb - fi - - if use s7 ; then - insinto /usr/share/snd - doins *.scm - fi - - dodoc README.Snd HISTORY.Snd NEWS - use doc && dohtml -r *.html pix/*.png tutorial -} diff --git a/media-sound/snd/snd-16.3.ebuild b/media-sound/snd/snd-16.3.ebuild deleted file mode 100644 index 9748bcf075b..00000000000 --- a/media-sound/snd/snd-16.3.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic - -DESCRIPTION="Snd is a sound editor" -HOMEPAGE="http://ccrma.stanford.edu/software/snd/"; -SRC_URI="ftp://ccrma-ftp.stanford.edu/pub/Lisp/${P}.tar.gz"; - -LICENSE="Snd BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+ ruby? ( free-noncomm ) s7? ( free-noncomm )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="alsa doc fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio readline ruby +s7" - -RDEPEND="media-libs/audiofile - alsa? ( media-libs/alsa-lib ) - fftw? ( sci-libs/fftw ) - gmp? ( dev-libs/gmp - dev-libs/mpc - dev-libs/mpfr ) - gsl? ( sci-libs/gsl ) - gtk? ( x11-libs/gtk+:3 - x11-libs/pango - x11-libs/cairo - opengl? ( x11-libs/gtkglext ) ) - jack? ( media-sound/jack-audio-connection-kit ) - ladspa? ( media-libs/ladspa-sdk ) - motif? ( >=x11-libs/motif-2.3:0 ) - opengl? ( virtual/opengl ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) - readline? ( sys-libs/readline ) - ruby? ( dev-lang/ruby )" - -REQUIRED_USE=" - portaudio? ( !pulseaudio ) - pulseaudio? ( !portaudio ) - ^^ ( - ( !ruby !s7 ) - ( ruby !s7 ) - ( !ruby s7 ) - )" -PATCHES=( - "${FILESDIR}/${P}-portaudio.patch" -) - -pkg_setup() { - if ! use gtk && ! use motif ; then - ewarn "Warning: no graphic toolkit selected (gtk or motif)." - ewarn "Upstream suggests to enable one of the toolkits (or both)" - ewarn "or only the command line utilities will be helpful." - fi -} - -src_prepare() { - default - sed -i -e "s:-O2 ::" configure.ac || die - eautoreconf -} - -src_configure() { - # Workaround executable sections QA warning (bug #348754) - append-ldflags -Wl,-z,noexecstack - - local myconf - if ! use ruby && ! use s7 ; then - myconf+=" --without-extension-language" - fi - - econf \ - $(use_with alsa) \ - $(use_with fftw) \ - $(use_with gmp) \ - $(use_with gsl) \ - $(use_with gtk) \ - $(use_with jack) \ - $(use_with ladspa) \ - $(use_with motif) \ - $(use_with oss) \ - $(use_with portaudio) \ - $(use_with pulseaudio) \ - $(use_with ruby) \ - $(use_with s7) \ - ${myconf} -} - -src_compile() { - emake snd - - # Do not compile ruby extensions for command line programs since they fail - sed -i -e "s:HAVE_RUBY 1:HAVE_RUBY 0:" mus-config.h || die - - local i - for i in sndplay sndinfo; do - emake ${i} - done -} - -src_install () { - dobin snd sndplay sndinfo - - if use ruby ; then - insinto /usr/share/snd - doins *.rb - fi - - if use s7 ; then - insinto /usr/share/snd - doins *.scm - fi - - dodoc README.Snd HISTORY.Snd NEWS - - if use doc ; then - docinto html/ - dodoc -r *.html pix/*.png tutorial - fi -}
