diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /meta-openembedded/meta-oe/recipes-graphics/libsdl | |
parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/libsdl')
7 files changed, 9 insertions, 9 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb index ea8e9eaa3..14f30e097 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb @@ -20,7 +20,7 @@ export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" # Disable the run-time loading of the libs and bring back the soname dependencies. EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" -do_configure_prepend() { +do_configure:prepend() { # Removing these files fixes a libtool version mismatch. rm -f ${S}/acinclude/libtool.m4 rm -f ${S}/acinclude/sdl.m4 diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb index d8b378f2c..6673ba3d4 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb @@ -16,7 +16,7 @@ inherit autotools pkgconfig LDFLAGS += "-lm" -do_configure_prepend() { +do_configure:prepend() { # make autoreconf happy touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb index 0a346bd9e..1218b6880 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb @@ -17,7 +17,7 @@ inherit autotools pkgconfig # Disable the run-time loading of the libs and bring back the soname dependencies. EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" -do_configure_prepend() { +do_configure:prepend() { # make autoreconf happy touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog # Removing these files fixes a libtool version mismatch. diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb index 6b6a531d3..897a33f08 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb @@ -18,7 +18,7 @@ EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --disable-music-ogg-share PACKAGECONFIG ??= "" PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" -do_configure_prepend () { +do_configure:prepend () { # Remove old libtool macros. MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" for i in ${MACROS}; do diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb index 0ea96fe1b..f09dc5efb 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb @@ -15,7 +15,7 @@ DEPENDS = "virtual/libsdl2" SRC_URI[md5sum] = "5c1d9d1cfa63301b141cb5c0de2ea7c4" SRC_URI[sha256sum] = "15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21" -do_configure_prepend() { +do_configure:prepend() { # create dummy files which autotools consider as mandatory touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.15.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.15.bb index 7d896cf00..5787e988d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.15.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.15.bb @@ -18,7 +18,7 @@ inherit autotools pkgconfig features_check # links to libGL.so REQUIRED_DISTRO_FEATURES += "x11 opengl" -do_configure_prepend() { +do_configure:prepend() { # Removing these files fixes a libtool version mismatch. MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb index d91a1856b..785ce6c8a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -56,8 +56,8 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}" -PACKAGECONFIG_class-native = "x11" -PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG:class-native = "x11" +PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib" PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" @@ -72,7 +72,7 @@ PACKAGECONFIG[directx] = "--enable-directx,--disable-directx" EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" -do_configure_prepend() { +do_configure:prepend() { # Remove old libtool macros. MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" for i in ${MACROS}; do |