summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gssdp.inc2
-rw-r--r--meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb6
-rw-r--r--meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb2
-rw-r--r--meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb2
-rw-r--r--meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb18
-rw-r--r--meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb2
-rw-r--r--meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb4
-rw-r--r--meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb4
8 files changed, 20 insertions, 20 deletions
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc b/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc
index 5a4939cce..23f17eddf 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc
+++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc
@@ -12,7 +12,7 @@ do_configure_prepend() {
12 cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true 12 cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true
13} 13}
14 14
15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}" 15PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}"
16PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+" 16PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+"
17 17
18PACKAGES =+ "gssdp-tools" 18PACKAGES =+ "gssdp-tools"
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
index 17db7b51e..f14d4e1cf 100644
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
+++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
@@ -33,7 +33,7 @@ CACHED_CONFIGUREVARS += " \
33 ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \ 33 ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \
34" 34"
35 35
36PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', 'openglesv2', d)}" 36PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', 'openglesv2', d)}"
37PACKAGECONFIG[opengl] = "--enable-gl,--enable-gles,glew" 37PACKAGECONFIG[opengl] = "--enable-gl,--enable-gles,glew"
38PACKAGECONFIG[openglesv2] = "--enable-gles,--enable-gl," 38PACKAGECONFIG[openglesv2] = "--enable-gles,--enable-gl,"
39 39
@@ -43,7 +43,7 @@ EXTRA_OECONF = " \
43 --enable-airplay \ 43 --enable-airplay \
44 --disable-optical-drive \ 44 --disable-optical-drive \
45 --enable-external-libraries \ 45 --enable-external-libraries \
46 ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-gl', '--enable-gles', d)} \ 46 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-gl', '--enable-gles', d)} \
47" 47"
48 48
49FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" 49FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
@@ -94,6 +94,6 @@ RRECOMMENDS_${PN}_append = " libcec \
94 python-netclient \ 94 python-netclient \
95 libcurl \ 95 libcurl \
96 xdpyinfo \ 96 xdpyinfo \
97 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-demos', '', d)} \ 97 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-demos', '', d)} \
98" 98"
99RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 glibc-gconv-ibm850" 99RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 glibc-gconv-ibm850"
diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb
index b0bc824c5..66f020134 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb
@@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "50853391d9ebeda9b4db787efb23f98b1e26b7296dd2bb5d0d96b5bcce
12 12
13inherit autotools-brokensep pkgconfig lib_package 13inherit autotools-brokensep pkgconfig lib_package
14 14
15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 15PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
16PACKAGECONFIG[sndfile] = "--enable-libsndfile-support,--disable-libsndfile-support,libsndfile1" 16PACKAGECONFIG[sndfile] = "--enable-libsndfile-support,--disable-libsndfile-support,libsndfile1"
17PACKAGECONFIG[jack] = "--enable-jack-support,--disable-jack-support,jack" 17PACKAGECONFIG[jack] = "--enable-jack-support,--disable-jack-support,jack"
18PACKAGECONFIG[pulseaudio] = "--enable-pulse-support,--disable-pulse-support,pulseaudio" 18PACKAGECONFIG[pulseaudio] = "--enable-pulse-support,--disable-pulse-support,pulseaudio"
diff --git a/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb b/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb
index 3991f027c..1339df6df 100644
--- a/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb
+++ b/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb
@@ -27,7 +27,7 @@ python populate_packages_prepend () {
27 do_split_packages(d, rootdir_dbg, '^(.*)\.so$', output_pattern='${BPN}-plugin-%s-dbg', description='AO %s plugin debug data') 27 do_split_packages(d, rootdir_dbg, '^(.*)\.so$', output_pattern='${BPN}-plugin-%s-dbg', description='AO %s plugin debug data')
28} 28}
29 29
30PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 30PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
31PACKAGECONFIG[esound] = "--enable-esd,--disable-esd,esound" 31PACKAGECONFIG[esound] = "--enable-esd,--disable-esd,esound"
32PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" 32PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
33PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" 33PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
diff --git a/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb b/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb
index d11a312c0..e6a912b35 100644
--- a/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb
+++ b/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb
@@ -22,8 +22,8 @@ inherit autotools pkgconfig
22# The options should be mutually exclusive for configuration script. 22# The options should be mutually exclusive for configuration script.
23# If both alsa and pulseaudio are specified (as in the default distro features) 23# If both alsa and pulseaudio are specified (as in the default distro features)
24# pulseaudio takes precedence. 24# pulseaudio takes precedence.
25PACKAGECONFIG_ALSA = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 25PACKAGECONFIG_ALSA = "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
26PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}" 26PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}"
27 27
28PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib" 28PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib"
29PACKAGECONFIG[esd] = ",,esound" 29PACKAGECONFIG[esd] = ",,esound"
@@ -35,13 +35,13 @@ PACKAGECONFIG[sdl] = ",,libsdl"
35 35
36# Following are possible sound output modules: 36# Following are possible sound output modules:
37# alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi 37# alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi
38AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'alsa', 'alsa', '', d)}" 38AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', 'alsa', '', d)}"
39AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'esd', 'esd', '', d)}" 39AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'esd', 'esd', '', d)}"
40AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'jack', 'jack', '', d)}" 40AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'jack', 'jack', '', d)}"
41AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'openal', 'openal', '', d)}" 41AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'openal', 'openal', '', d)}"
42AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'portaudio', 'portaudio', '', d)}" 42AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'portaudio', 'portaudio', '', d)}"
43AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}" 43AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}"
44AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'sdl', 'sdl', '', d)}" 44AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'sdl', 'sdl', '', d)}"
45 45
46EXTRA_OECONF = " \ 46EXTRA_OECONF = " \
47 --enable-shared \ 47 --enable-shared \
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb
index 09caf47ec..7b124ca15 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "c386eb3d22f98dc993b5ae3c272f969aa7763713483c6800040ebf1791
15inherit autotools useradd systemd 15inherit autotools useradd systemd
16 16
17EXTRA_OECONF = "enable_bzip2=yes" 17EXTRA_OECONF = "enable_bzip2=yes"
18EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" 18EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
19 19
20PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" 20PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
21PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" 21PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag"
diff --git a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb
index ab038a71b..589523482 100644
--- a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb
+++ b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb
@@ -10,8 +10,8 @@ SRC_URI[md5sum] = "ea83dec3b9655a27d28e7bc7cae9cd71"
10SRC_URI[sha256sum] = "0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de5236eb056" 10SRC_URI[sha256sum] = "0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de5236eb056"
11 11
12PACKAGECONFIG ?= "\ 12PACKAGECONFIG ?= "\
13 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
14 ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 14 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
15" 15"
16PACKAGECONFIG[alsa] = "-DALSA=TRUE, -DALSA=FALSE, alsa-lib" 16PACKAGECONFIG[alsa] = "-DALSA=TRUE, -DALSA=FALSE, alsa-lib"
17PACKAGECONFIG[pulseaudio] = "-DPULSEAUDIO=TRUE, -DPULSEAUDIO=FALSE, pulseaudio" 17PACKAGECONFIG[pulseaudio] = "-DPULSEAUDIO=TRUE, -DPULSEAUDIO=FALSE, pulseaudio"
diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
index eb40a3eba..3c688bd7c 100644
--- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
+++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
@@ -8,8 +8,8 @@ DEPENDS = "libpng libav libsndfile1 libvorbis"
8 8
9PR = "r2" 9PR = "r2"
10 10
11PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 11PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
12 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 12 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
13 magic \ 13 magic \
14" 14"
15PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio," 15PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio,"