diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-09 20:42:03 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-11 08:22:35 +0200 |
| commit | 50ce23962d2d8507e1950adc9e460e35069de0ad (patch) | |
| tree | 91ac2d651411ca93e4ed8772c1aad83e0f4b61f5 | |
| parent | 89e69a7a573715af831411106906867dd87ac26a (diff) | |
| download | ptxdist-50ce23962d2d8507e1950adc9e460e35069de0ad.tar.gz ptxdist-50ce23962d2d8507e1950adc9e460e35069de0ad.tar.xz | |
orc: version bump 0.4.29 -> 0.4.30
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/host-orc.in | 1 | ||||
| -rw-r--r-- | rules/host-orc.make | 16 | ||||
| -rw-r--r-- | rules/orc.in | 1 | ||||
| -rw-r--r-- | rules/orc.make | 20 |
4 files changed, 23 insertions, 15 deletions
diff --git a/rules/host-orc.in b/rules/host-orc.in index 76bd8a0d8..02659811a 100644 --- a/rules/host-orc.in +++ b/rules/host-orc.in @@ -2,4 +2,5 @@ config HOST_ORC tristate + select HOST_MESON default y if ALLYES diff --git a/rules/host-orc.make b/rules/host-orc.make index af52dafb2..02a818658 100644 --- a/rules/host-orc.make +++ b/rules/host-orc.make @@ -16,13 +16,17 @@ HOST_PACKAGES-$(PTXCONF_HOST_ORC) += host-orc # ---------------------------------------------------------------------------- # -# autoconf +# meson # -HOST_ORC_CONF_TOOL := autoconf +HOST_ORC_CONF_TOOL := meson HOST_ORC_CONF_OPT := \ - $(HOST_AUTOCONF) \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf + $(HOST_MESON_OPT) \ + -Dbenchmarks=disabled \ + -Dexamples=disabled \ + -Dgtk_doc=disabled \ + -Dorc-backend=all \ + -Dorc-test=disabled \ + -Dtests=disabled \ + -Dtools=enabled # vim: syntax=make diff --git a/rules/orc.in b/rules/orc.in index 089b5bf9f..2dcdada4d 100644 --- a/rules/orc.in +++ b/rules/orc.in @@ -2,6 +2,7 @@ config ORC tristate + select HOST_MESON select LIBC_M select LIBC_RT select GCCLIBS_GCC_S diff --git a/rules/orc.make b/rules/orc.make index ba4da8b05..909ff5cb1 100644 --- a/rules/orc.make +++ b/rules/orc.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ORC) += orc # # Paths and names # -ORC_VERSION := 0.4.29 -ORC_MD5 := 25799917c7d31a891d5e32b83ad08f6d +ORC_VERSION := 0.4.30 +ORC_MD5 := 75461700db04870a7cd1d0509a7a56b1 ORC := orc-$(ORC_VERSION) ORC_SUFFIX := tar.xz ORC_URL := http://gstreamer.freedesktop.org/data/src/orc/$(ORC).$(ORC_SUFFIX) @@ -35,14 +35,16 @@ endif # # autoconf # -ORC_CONF_TOOL := autoconf +ORC_CONF_TOOL := meson ORC_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --enable-backend=$(ORC_BACKEND) \ - --$(call ptx/endis,PTXCONF_ORC_TEST)-tests + $(CROSS_MESON_USR) \ + -Dbenchmarks=disabled \ + -Dexamples=disabled \ + -Dgtk_doc=disabled \ + -Dorc-backend=$(ORC_BACKEND) \ + -Dorc-test=$(call ptx/endis,PTXCONF_ORC_TEST)d + -Dtests=disabled \ + -Dtools=disabled # ---------------------------------------------------------------------------- # Install |