diff options
Diffstat (limited to 'media-sound/snd/files')
3 files changed, 42 insertions, 70 deletions
diff --git a/media-sound/snd/files/snd-17.4-portaudio.patch b/media-sound/snd/files/snd-17.4-portaudio.patch deleted file mode 100644 index 8bdb1af01e8a..000000000000 --- a/media-sound/snd/files/snd-17.4-portaudio.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -521,8 +521,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 ---- a/makefile.in -+++ b/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@ -@@ -28,6 +29,7 @@ - WEBSERVER_FILES = @WEBSERVER_FILES@ - JACK_LIBS = @JACK_LIBS@ - GMP_LIBS = @GMP_LIBS@ -+PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ - - LDSO_FLAGS = @LDSO_FLAGS@ - SO_FLAGS = @SO_FLAGS@ -@@ -53,7 +55,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 -@@ -84,7 +86,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) $(WEBSERVER_FILES) -- $(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) $(WEBSERVER_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(WEBSERVER_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) $(WEBSERVER_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(WEBSERVER_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/files/snd-17.4-undefined-oss_sample_types.patch b/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch deleted file mode 100644 index 6199a7b183fd..000000000000 --- a/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch +++ /dev/null @@ -1,21 +0,0 @@ -Always compile the `oss_sample_types` function -Bug: https://bugs.gentoo.org/show_bug.cgi?id=621758 - ---- a/audio.c -+++ b/audio.c -@@ -743,7 +743,6 @@ - } - - --#if (!HAVE_ALSA) - static int oss_sample_types(int ur_dev, mus_sample_t *val) - { - int fd, samp_types = 0, sys, ind; -@@ -774,7 +773,6 @@ - val[0] = (mus_sample_t)(ind - 1); - return(MUS_NO_ERROR); - } --#endif - - - diff --git a/media-sound/snd/files/snd-22.8-undefined-oss_sample_types.patch b/media-sound/snd/files/snd-22.8-undefined-oss_sample_types.patch new file mode 100644 index 000000000000..f94e5b64ea53 --- /dev/null +++ b/media-sound/snd/files/snd-22.8-undefined-oss_sample_types.patch @@ -0,0 +1,42 @@ +Always compile the `oss_sample_types` function +Bug: https://bugs.gentoo.org/621758 + +Also, conditionally use pulseaudio_sample_types: +``` +audio.c: In function ‘mus_audio_device_sample_type’: +audio.c:5687:5: error: implicit declaration of function ‘pulseaudio_sample_types’; did you mean ‘alsa_sample_types’? [-Werror=implicit-function-declaration] + 5687 | pulseaudio_sample_types(dev, mixer_vals); + | ^~~~~~~~~~~~~~~~~~~~~~~ + | alsa_sample_types +``` +--- a/audio.c ++++ b/audio.c +@@ -744,7 +744,6 @@ static int oss_mus_audio_open_input(int ur_dev, int srate, int chans, mus_sample + } + + +-#if (!HAVE_ALSA) && (!HAVE_JACK_IN_LINUX) + static int oss_sample_types(int ur_dev, mus_sample_t *val) + { + int fd, samp_types = 0, sys, ind; +@@ -775,7 +774,6 @@ static int oss_sample_types(int ur_dev, mus_sample_t *val) + val[0] = (mus_sample_t)(ind - 1); + return(MUS_NO_ERROR); + } +-#endif + + + +--- a/audio.c ++++ b/audio.c +@@ -5682,7 +5682,7 @@ mus_sample_t mus_audio_device_sample_type(int dev) /* snd-dac */ + #endif + #endif + +-#if defined(MUS_PULSEAUDIO) ++#if defined(MUS_PULSEAUDIO) && (!(defined(AUDIO_OK))) + if (mixer_vals[0] == MUS_UNKNOWN_SAMPLE) + pulseaudio_sample_types(dev, mixer_vals); + #endif +-- +2.38.0 |