mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

vala: move GLibMainLoop class into separate file to fix linker errors

Browse source 
Vala uses the name of the *.vapi file to determine the libraries to link
against. Since the pa_glib_mainloop_*() functions are in a separate
library (libpulse-mainloop-glib.so) the corresponding objects in the
Vala bindings have to be in a separate *.vapi file.

If you are compiling an app without the GLib integration you could use:
 $ valac --pkg=libpulse test.vala
but if you do use GLib you can use:
 $ valac --pkg=libpulse-mainloop-glib test.vala
(libpulse is a dep of the libpulse-mainloop-glib so no need to specify
it explicitly)
This commit is contained in:
Alexander Kurtz 2011-03-26 11:26:46 +00:00 • committed by Colin Guthrie
parent 8dc0df0538
commit 9defe846e7
4 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile.am
View file

@ -29,7 +29,9 @@ EXTRA_DIST = \
README \ README \
todo \ todo \
vala/libpulse.deps \ vala/libpulse.deps \
vala/libpulse.vapi vala/libpulse.vapi \
vala/libpulse-mainloop-glib.deps \
vala/libpulse-mainloop-glib.vapi
SUBDIRS = src doxygen man po SUBDIRS = src doxygen man po
@ -37,7 +39,9 @@ MAINTAINERCLEANFILES =
noinst_DATA = noinst_DATA =
vapidir = $(datadir)/vala/vapi vapidir = $(datadir)/vala/vapi
vapi_DATA = vala/libpulse.deps vala/libpulse.vapi vapi_DATA = \
vala/libpulse.deps vala/libpulse.vapi \
libpulse-mainloop-glib.deps libpulse-mainloop-glib.vapi
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libpulse.pc libpulse-simple.pc pkgconfig_DATA = libpulse.pc libpulse-simple.pc

1
vala/libpulse-mainloop-glib.deps Normal file
View file

@ -0,0 +1 @@
libpulse

13
vala/libpulse-mainloop-glib.vapi Normal file
View file

@ -0,0 +1,13 @@
using GLib;
namespace PulseAudio {
[Compact]
[CCode (cheader_filename="pulse/glib-mainloop.h", cname="pa_glib_mainloop", cprefix="pa_glib_mainloop_", free_function="pa_glib_mainloop_free")]
public class GLibMainLoop {
[CCode (cname="pa_glib_mainloop_new")]
public GLibMainLoop(MainContext? c = null);
public unowned MainLoopApi get_api();
}
}

10
vala/libpulse.vapi
View file

@ -878,16 +878,6 @@ namespace PulseAudio {
public bool in_thread(); public bool in_thread();
} }
[Compact]
[CCode (cheader_filename="pulse/glib-mainloop.h", cname="pa_glib_mainloop", cprefix="pa_glib_mainloop_", free_function="pa_glib_mainloop_free")]
public class GLibMainLoop {
[CCode (cname="pa_glib_mainloop_new")]
public GLibMainLoop(MainContext? c = null);
public unowned MainLoopApi get_api();
}
[Compact] [Compact]
[CCode (cname="pa_operation", cprefix="pa_operation_", unref_function="pa_operation_unref", ref_function="pa_operation_ref")] [CCode (cname="pa_operation", cprefix="pa_operation_", unref_function="pa_operation_unref", ref_function="pa_operation_ref")]
public class Operation { public class Operation {