On Mon, 2014-01-27 at 19:10 -0500, Michael DePaulo wrote: > On Mon, Jan 27, 2014 at 2:13 PM, Tanu Kaskinen > <[email protected]> wrote: > > On Sun, 2014-01-26 at 19:32 -0500, Michael DePaulo wrote: > >> [ 52s] pulsecore/.libs/libpulsecore_4.99_la-module.o: In function > >> `pa_module_exists': > >> [ 52s] > >> /home/abuild/rpmbuild/BUILD/pulseaudio-4.99.2/src/pulsecore/module.c:70: > >> undefined reference to `rindex' > >> [ 52s] collect2: error: ld returned 1 exit status > > > > strrchr() does the same thing as rindex(), but is "more standard", so I > > changed the rindex() call in module.c to a strrchr() call. Hopefully > > mingw32 likes that function. The patch is attached (and I already > > applied it to the master branch). Could you try again with this patch? > > > > -- > > Tanu > > Success! Although ORC is still disabled, I managed to cross-compile > 4.99.2 with your 2 patches. > > The source and binaries are here on the OBS at revision 11. > https://build.opensuse.org/package/show/home:mikedep333:branches:home:mkbosmans:mingw32:pulseaudio/mingw32-pulseaudio5 > (Although the binaries are not easy to grab with all the dependency > DLL's. I will post an easy-to-use .zip of 4.99.2 binaries once we fix > the ORC issue.) > > Now I would like to address the issue I have when ORC is enabled. In > fact, I seem to get the same error even when I try a "./configure" & > "make" without using the OBS
The orc issue has been already fixed, apparently you didn't notice when that patch was sent to the list... I attached the patch to this mail. Now that Windows builds work too, I think we're ready for 4.99.3. I hope I'll get around to that today. -- Tanu
>From a360b29a0a51248e1360f9c028401224d10cfbfa Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Fri, 24 Jan 2014 21:45:52 +0100 Subject: [PATCH] build-sys: Move ORC_SOURCE definitions outside of "if HAVE_ORC" Not having ORC_SOURCE defined results in different tarballs depending on whether the dev issuing 'make dist' has orc support enabled or disabled. Specifying ORC_SOURCE unconditionally addresses that, without causing negative effects on users not having orc in the end. --- orc.mak | 2 ++ src/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/orc.mak b/orc.mak index 5a6ff96..a1069a7 100644 --- a/orc.mak +++ b/orc.mak @@ -22,6 +22,7 @@ EXTRA_DIST += $(addsuffix .orc,$(ORC_SOURCE)) +if HAVE_ORC ORC_BUILT_SOURCE = $(addsuffix -orc-gen.c,$(ORC_SOURCE)) ORC_BUILT_HEADER = $(addsuffix -orc-gen.h,$(ORC_SOURCE)) @@ -44,3 +45,4 @@ cp_v_gen_0 = @echo " CP $@"; %-orc-gen.h: %.orc @mkdir -p $(@D) $(orcc_v_gen)$(ORCC) --header -o $@ $< +endif diff --git a/src/Makefile.am b/src/Makefile.am index 0d3ab0b..857fda3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -932,8 +932,8 @@ libpulsecore_mix_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS) libpulsecore_@PA_MAJORMINOR@_la_LIBADD += libpulsecore_sconv_neon.la libpulsecore_mix_neon.la endif -if HAVE_ORC ORC_SOURCE += pulsecore/svolume +if HAVE_ORC libpulsecore_@PA_MAJORMINOR@_la_SOURCES += pulsecore/svolume_orc.c nodist_libpulsecore_@PA_MAJORMINOR@_la_SOURCES = pulsecore/svolume-orc-gen.c pulsecore/svolume-orc-gen.h libpulsecore_@PA_MAJORMINOR@_la_CFLAGS += $(ORC_CFLAGS) @@ -1950,8 +1950,8 @@ module_echo_cancel_la_SOURCES += \ modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \ modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h module_echo_cancel_la_CFLAGS += -DHAVE_ADRIAN_EC=1 -if HAVE_ORC ORC_SOURCE += modules/echo-cancel/adrian-aec +if HAVE_ORC nodist_module_echo_cancel_la_SOURCES = \ modules/echo-cancel/adrian-aec-orc-gen.c \ modules/echo-cancel/adrian-aec-orc-gen.h -- 1.8.3.1
_______________________________________________ pulseaudio-discuss mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss
