diff options
author | David Seifert <soap@gentoo.org> | 2017-09-05 09:13:32 +0200 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2017-09-05 09:13:32 +0200 |
commit | 8ecff1eb24b7f69c25712eeccc3bb2131dc0b7d1 (patch) | |
tree | 1ab88a5307d1b0a5ca2c91e86e53b96562b6deec /media-sound/snd/files | |
parent | 52a61970f1a8780db95fb89219cab66c9a05e7c0 (diff) | |
download | gentoo-8ecff1eb24b7f69c25712eeccc3bb2131dc0b7d1.tar.gz gentoo-8ecff1eb24b7f69c25712eeccc3bb2131dc0b7d1.tar.xz |
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
Diffstat (limited to 'media-sound/snd/files')
-rw-r--r-- | media-sound/snd/files/snd-12.6-as-needed.patch | 77 | ||||
-rw-r--r-- | media-sound/snd/files/snd-16.3-portaudio.patch | 49 |
2 files changed, 0 insertions, 126 deletions
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) |