|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos/pulseaudio.git</param>
<param name="branch">master</param>
- <param name="revision">sailfish/14.2+git7</param>
+ <param name="revision">sailfish/14.2+git8</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-14.2+git8.tar.xz/meson.build
^
|
| @@ -9,8 +9,8 @@
# split out suffixes when there are commits since the last tag
# (e.g.: v11.99.1-3-gad14bdb24 -> v11.99.1)
version_split = pa_version_str.split('-')[0].split('.')
-pa_version_major = version_split[0].split('v')[0]
-pa_version_minor = version_split[1]
+pa_version_major = version_split[0].split('v')[0].split('+')[0]
+pa_version_minor = version_split[1].split('+')[0]
if version_split.length() > 2
pa_version_micro = version_split[2]
else
@@ -699,7 +699,9 @@
# Subdirs
-subdir('doxygen')
+if get_option('doxygen')
+ subdir('doxygen')
+endif
subdir('po')
if get_option('man')
subdir('man')
@@ -719,9 +721,11 @@
pc_cdata.set('prefix', prefix)
pc_cdata.set('exec_prefix', prefix)
pc_cdata.set('libdir', libdir)
+pc_cdata.set('libexecdir', libexecdir)
pc_cdata.set('includedir', includedir)
pc_cdata.set('modlibexecdir', modlibexecdir)
pc_cdata.set('PACKAGE_VERSION', pa_version_str)
+pc_cdata.set('PA_DEFAULT_CONFIG_DIR', pulsesysconfdir)
pc_cdata.set('PA_MAJORMINOR', pa_version_major_minor)
# FIXME: the line below is wrong. Currently the meson thread dep lacks documentation,
# and doesn't allow introspection, ie. none of get_pkgconfig_variable() or
@@ -732,6 +736,7 @@
pc_files = [
'libpulse.pc',
'libpulse-simple.pc',
+ 'pulsecore.pc',
]
if glib_dep.found()
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-14.2+git8.tar.xz/meson_options.txt
^
|
| @@ -1,3 +1,6 @@
+option('doxygen',
+ type : 'boolean', value : true,
+ description : 'Enable building and installation of documentation generated with doxygen')
option('gcov',
type : 'boolean', value : false,
description : 'Enable optional gcov coverage analysis')
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-14.2+git8.tar.xz/src/meson.build
^
|
| @@ -87,6 +87,9 @@
'pulse/timeval.h',
'pulse/rtclock.h',
'pulse/volume.h',
+]
+
+libpulsecommon_pulsecore_headers = [
'pulsecore/atomic.h',
'pulsecore/authkey.h',
'pulsecore/conf-parser.h',
@@ -157,7 +160,7 @@
'pulsecore/dbus-util.c',
'pulsecore/rtkit.c',
]
- libpulsecommon_headers += [
+ libpulsecommon_pulsecore_headers += [
'pulsecore/dbus-util.h',
'pulsecore/rtkit.h',
]
@@ -170,6 +173,8 @@
]
libpulsecommon_headers += [
'pulse/client-conf-x11.h',
+ ]
+ libpulsecommon_pulsecore_headers += [
'pulsecore/x11prop.h',
]
endif
@@ -179,7 +184,7 @@
libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
libpulsecommon_sources,
- libpulsecommon_headers,
+ [libpulsecommon_headers, libpulsecommon_pulsecore_headers],
include_directories : [configinc, topinc],
c_args : [pa_c_args],
link_args : [nodelete_link_args],
@@ -193,6 +198,12 @@
libpulsecommon_dep = declare_dependency(link_with: libpulsecommon)
+
+install_headers(
+ libpulsecommon_pulsecore_headers,
+ subdir : 'pulsecore'
+)
+
subdir('pulse')
subdir('pulsecore')
subdir('daemon')
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-14.2+git8.tar.xz/src/modules/bluetooth/meson.build
^
|
| @@ -2,6 +2,7 @@
'a2dp-codec-sbc.c',
'a2dp-codec-util.c',
'bluez5-util.c',
+ 'droid-volume.c',
]
libbluez5_util_headers = [
@@ -9,11 +10,13 @@
'a2dp-codecs.h',
'a2dp-codec-util.h',
'bluez5-util.h',
+ 'droid-volume.h',
'rtp.h',
]
if get_option('bluez5-native-headset')
- libbluez5_util_sources += [ 'backend-native.c' ]
+ libbluez5_util_sources += [ 'backend-native.c', 'native-call-control.c' ]
+ libbluez5_util_headers += [ 'native-call-control.h' ]
endif
if get_option('bluez5-ofono-headset')
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-14.2+git8.tar.xz/src/modules/meson.build
^
|
| @@ -279,7 +279,7 @@
mod = shared_module(name,
sources,
headers,
- include_directories : [configinc, topinc],
+ include_directories : [configinc, topinc, include_directories('.')],
c_args : [pa_c_args, server_c_args, '-DPA_MODULE_NAME=' + name.underscorify()] + extra_flags,
install : true,
install_rpath : rpath_dirs,
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-14.2+git8.tar.xz/src/pulsecore/meson.build
^
|
| @@ -57,6 +57,17 @@
'thread-mq.c',
]
+libpulsecore_ffmpeg_headers = [
+ 'ffmpeg/avcodec.h',
+ 'ffmpeg/dsputil.h',
+]
+
+libpulsecore_filter_headers = [
+ 'filter/biquad.h',
+ 'filter/crossover.h',
+ 'filter/lfe-filter.h'
+]
+
libpulsecore_headers = [
'asyncmsgq.h',
'asyncq.h',
@@ -74,11 +85,6 @@
'cpu-x86.h',
'database.h',
'device-port.h',
- 'ffmpeg/avcodec.h',
- 'ffmpeg/dsputil.h',
- 'filter/biquad.h',
- 'filter/crossover.h',
- 'filter/lfe-filter.h',
'hook-list.h',
'ltdl-helper.h',
'message-handler.h',
@@ -91,6 +97,8 @@
'object.h',
'play-memblockq.h',
'play-memchunk.h',
+ 'poll.h',
+ 'protocol-native.h',
'remap.h',
'resampler.h',
'rtpoll.h',
@@ -190,7 +198,7 @@
#'thread-win32.c',
libpulsecore = shared_library('pulsecore-' + pa_version_major_minor,
- libpulsecore_sources, libpulsecore_headers,
+ libpulsecore_sources, [ libpulsecore_headers, libpulsecore_ffmpeg_headers, libpulsecore_headers ],
orc_sources, orc_headers,
include_directories : [configinc, topinc],
c_args : [pa_c_args, server_c_args],
@@ -204,6 +212,21 @@
libpulsecore_dep = declare_dependency(link_with: libpulsecore)
+install_headers(
+ libpulsecore_headers,
+ subdir : 'pulsecore'
+)
+
+install_headers(
+ libpulsecore_ffmpeg_headers,
+ subdir : 'pulsecore/ffmpeg'
+)
+
+install_headers(
+ libpulsecore_filter_headers,
+ subdir : 'pulsecore/filter'
+)
+
# Internal libraries for modules
# TODO: understand 'c_args' and 'dependencies' better, maybe we can remove some
|
