diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-01-29 11:52:33 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-01-29 11:52:33 +0000 |
commit | 37bbf6a1792773f11c15a4da1588a7520ee2fb4e (patch) | |
tree | 64944d4aa665a1e479cfc004e446593062254550 /lib/mesa/src/util/xmlpool | |
parent | 6b139c2063623e9310025247cd966490b9aa57ea (diff) |
Merge Mesa 18.3.2
Diffstat (limited to 'lib/mesa/src/util/xmlpool')
-rw-r--r-- | lib/mesa/src/util/xmlpool/Makefile.am | 21 | ||||
-rw-r--r-- | lib/mesa/src/util/xmlpool/Makefile.in | 92 | ||||
-rw-r--r-- | lib/mesa/src/util/xmlpool/ca/LC_MESSAGES/options.mo | bin | 8395 -> 0 bytes | |||
-rw-r--r-- | lib/mesa/src/util/xmlpool/de/LC_MESSAGES/options.mo | bin | 6385 -> 0 bytes | |||
-rw-r--r-- | lib/mesa/src/util/xmlpool/es/LC_MESSAGES/options.mo | bin | 8385 -> 0 bytes | |||
-rw-r--r-- | lib/mesa/src/util/xmlpool/fr/LC_MESSAGES/options.mo | bin | 5186 -> 0 bytes | |||
-rw-r--r-- | lib/mesa/src/util/xmlpool/nl/LC_MESSAGES/options.mo | bin | 5238 -> 0 bytes | |||
-rw-r--r-- | lib/mesa/src/util/xmlpool/sv/LC_MESSAGES/options.mo | bin | 5024 -> 0 bytes |
8 files changed, 78 insertions, 35 deletions
diff --git a/lib/mesa/src/util/xmlpool/Makefile.am b/lib/mesa/src/util/xmlpool/Makefile.am index da4463e7f..7110b45ef 100644 --- a/lib/mesa/src/util/xmlpool/Makefile.am +++ b/lib/mesa/src/util/xmlpool/Makefile.am @@ -47,10 +47,10 @@ POS=ca.po de.po es.po nl.po fr.po sv.po # Don't change anything below, unless you know what you're doing. # LANGS=$(POS:%.po=%) -MOS=$(POS:%.po=%/LC_MESSAGES/options.mo) +MOS=$(POS:%.po=%.gmo) POT=xmlpool.pot -.PHONY: all clean pot po mo +.PHONY: all clean clean-local pot po mo EXTRA_DIST = \ gen_xmlpool.py \ @@ -58,7 +58,10 @@ EXTRA_DIST = \ t_options.h \ $(POS) \ $(MOS) \ - SConscript + SConscript \ + meson.build \ + LINGUAS \ + POTFILES BUILT_SOURCES = options.h CLEANFILES = \ @@ -66,19 +69,25 @@ CLEANFILES = \ $(POS) \ $(MOS) +clean-local: + rm -f $(MOS) + # Default target options.h LOCALEDIR := . if REGEN_SOURCES options.h: t_options.h $(MOS) - $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py $(srcdir)/t_options.h $(LOCALEDIR) $(LANGS) > options.h + $(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py \ + --template $(srcdir)/t_options.h \ + --output options.h \ + --localedir $(LOCALEDIR) \ + --languages $(LANGS) endif # Update .mo files from the corresponding .po files. -%/LC_MESSAGES/options.mo: %.po +.po.gmo: @mo="$@"; \ lang=$${mo%%/*}; \ echo "Updating ($$lang) $@ from $?."; \ - $(MKDIR_P) $$lang/LC_MESSAGES; \ msgfmt -o $@ $? # Use this target to create or update .po files with new messages in diff --git a/lib/mesa/src/util/xmlpool/Makefile.in b/lib/mesa/src/util/xmlpool/Makefile.in index 64bc94d34..35bfd3378 100644 --- a/lib/mesa/src/util/xmlpool/Makefile.in +++ b/lib/mesa/src/util/xmlpool/Makefile.in @@ -143,6 +143,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKTRACE_CFLAGS = @BACKTRACE_CFLAGS@ +BACKTRACE_LIBS = @BACKTRACE_LIBS@ BSYMBOLIC = @BSYMBOLIC@ CC = @CC@ CCAS = @CCAS@ @@ -156,6 +158,7 @@ CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ +CXX11_CXXFLAGS = @CXX11_CXXFLAGS@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -189,8 +192,6 @@ EXEEXT = @EXEEXT@ EXPAT_CFLAGS = @EXPAT_CFLAGS@ EXPAT_LIBS = @EXPAT_LIBS@ FGREP = @FGREP@ -FREEDRENO_CFLAGS = @FREEDRENO_CFLAGS@ -FREEDRENO_LIBS = @FREEDRENO_LIBS@ GALLIUM_PIPE_LOADER_DEFINES = @GALLIUM_PIPE_LOADER_DEFINES@ GBM_PC_LIB_PRIV = @GBM_PC_LIB_PRIV@ GBM_PC_REQ_PRIV = @GBM_PC_REQ_PRIV@ @@ -209,8 +210,8 @@ GL_LIB_DEPS = @GL_LIB_DEPS@ GL_PC_CFLAGS = @GL_PC_CFLAGS@ GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@ GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@ +GL_PKGCONF_LIB = @GL_PKGCONF_LIB@ GREP = @GREP@ -HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@ I915_CFLAGS = @I915_CFLAGS@ I915_LIBS = @I915_LIBS@ INDENT = @INDENT@ @@ -222,6 +223,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LD_BUILD_ID = @LD_BUILD_ID@ LD_NO_UNDEFINED = @LD_NO_UNDEFINED@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -259,7 +261,7 @@ MSVC2013_COMPAT_CFLAGS = @MSVC2013_COMPAT_CFLAGS@ MSVC2013_COMPAT_CXXFLAGS = @MSVC2013_COMPAT_CXXFLAGS@ NINE_MAJOR = @NINE_MAJOR@ NINE_MINOR = @NINE_MINOR@ -NINE_TINY = @NINE_TINY@ +NINE_PATCH = @NINE_PATCH@ NINE_VERSION = @NINE_VERSION@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -272,6 +274,9 @@ OBJEXT = @OBJEXT@ OMX_BELLAGIO_CFLAGS = @OMX_BELLAGIO_CFLAGS@ OMX_BELLAGIO_LIBS = @OMX_BELLAGIO_LIBS@ OMX_BELLAGIO_LIB_INSTALL_DIR = @OMX_BELLAGIO_LIB_INSTALL_DIR@ +OMX_TIZONIA_CFLAGS = @OMX_TIZONIA_CFLAGS@ +OMX_TIZONIA_LIBS = @OMX_TIZONIA_LIBS@ +OMX_TIZONIA_LIB_INSTALL_DIR = @OMX_TIZONIA_LIB_INSTALL_DIR@ OPENCL_LIBNAME = @OPENCL_LIBNAME@ OPENCL_VERSION = @OPENCL_VERSION@ OSMESA_LIB = @OSMESA_LIB@ @@ -299,11 +304,16 @@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ PWR8_CFLAGS = @PWR8_CFLAGS@ -PYTHON2 = @PYTHON2@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RADEON_CFLAGS = @RADEON_CFLAGS@ RADEON_LIBS = @RADEON_LIBS@ RANLIB = @RANLIB@ RM = @RM@ +SCANNER_ARG = @SCANNER_ARG@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -315,9 +325,10 @@ SSE41_CFLAGS = @SSE41_CFLAGS@ STRIP = @STRIP@ SWR_AVX2_CXXFLAGS = @SWR_AVX2_CXXFLAGS@ SWR_AVX_CXXFLAGS = @SWR_AVX_CXXFLAGS@ -SWR_CXX11_CXXFLAGS = @SWR_CXX11_CXXFLAGS@ SWR_KNL_CXXFLAGS = @SWR_KNL_CXXFLAGS@ SWR_SKX_CXXFLAGS = @SWR_SKX_CXXFLAGS@ +V3D_SIMULATOR_CFLAGS = @V3D_SIMULATOR_CFLAGS@ +V3D_SIMULATOR_LIBS = @V3D_SIMULATOR_LIBS@ VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ VALGRIND_LIBS = @VALGRIND_LIBS@ VA_CFLAGS = @VA_CFLAGS@ @@ -325,8 +336,8 @@ VA_LIBS = @VA_LIBS@ VA_LIB_INSTALL_DIR = @VA_LIB_INSTALL_DIR@ VA_MAJOR = @VA_MAJOR@ VA_MINOR = @VA_MINOR@ -VC5_SIMULATOR_CFLAGS = @VC5_SIMULATOR_CFLAGS@ -VC5_SIMULATOR_LIBS = @VC5_SIMULATOR_LIBS@ +VC4_CFLAGS = @VC4_CFLAGS@ +VC4_LIBS = @VC4_LIBS@ VDPAU_CFLAGS = @VDPAU_CFLAGS@ VDPAU_LIBS = @VDPAU_LIBS@ VDPAU_LIB_INSTALL_DIR = @VDPAU_LIB_INSTALL_DIR@ @@ -340,7 +351,11 @@ VL_LIBS = @VL_LIBS@ VULKAN_ICD_INSTALL_DIR = @VULKAN_ICD_INSTALL_DIR@ WAYLAND_CLIENT_CFLAGS = @WAYLAND_CLIENT_CFLAGS@ WAYLAND_CLIENT_LIBS = @WAYLAND_CLIENT_LIBS@ +WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ +WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ +WAYLAND_PROTOCOLS_CFLAGS = @WAYLAND_PROTOCOLS_CFLAGS@ WAYLAND_PROTOCOLS_DATADIR = @WAYLAND_PROTOCOLS_DATADIR@ +WAYLAND_PROTOCOLS_LIBS = @WAYLAND_PROTOCOLS_LIBS@ WAYLAND_SCANNER = @WAYLAND_SCANNER@ WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@ WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@ @@ -350,16 +365,20 @@ WNO_OVERRIDE_INIT = @WNO_OVERRIDE_INIT@ X11_INCLUDES = @X11_INCLUDES@ XA_MAJOR = @XA_MAJOR@ XA_MINOR = @XA_MINOR@ -XA_TINY = @XA_TINY@ +XA_PATCH = @XA_PATCH@ XA_VERSION = @XA_VERSION@ XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@ XCB_DRI2_LIBS = @XCB_DRI2_LIBS@ XCB_DRI3_CFLAGS = @XCB_DRI3_CFLAGS@ XCB_DRI3_LIBS = @XCB_DRI3_LIBS@ -XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@ -XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@ +XCB_DRI3_MODIFIERS_CFLAGS = @XCB_DRI3_MODIFIERS_CFLAGS@ +XCB_DRI3_MODIFIERS_LIBS = @XCB_DRI3_MODIFIERS_LIBS@ +XCB_RANDR_CFLAGS = @XCB_RANDR_CFLAGS@ +XCB_RANDR_LIBS = @XCB_RANDR_LIBS@ XLIBGL_CFLAGS = @XLIBGL_CFLAGS@ XLIBGL_LIBS = @XLIBGL_LIBS@ +XLIB_RANDR_CFLAGS = @XLIB_RANDR_CFLAGS@ +XLIB_RANDR_LIBS = @XLIB_RANDR_LIBS@ XVMC_CFLAGS = @XVMC_CFLAGS@ XVMC_LIBS = @XVMC_LIBS@ XVMC_LIB_INSTALL_DIR = @XVMC_LIB_INSTALL_DIR@ @@ -414,9 +433,13 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -437,7 +460,7 @@ POS = ca.po de.po es.po nl.po fr.po sv.po # Don't change anything below, unless you know what you're doing. # LANGS = $(POS:%.po=%) -MOS = $(POS:%.po=%/LC_MESSAGES/options.mo) +MOS = $(POS:%.po=%.gmo) POT = xmlpool.pot EXTRA_DIST = \ gen_xmlpool.py \ @@ -445,7 +468,10 @@ EXTRA_DIST = \ t_options.h \ $(POS) \ $(MOS) \ - SConscript + SConscript \ + meson.build \ + LINGUAS \ + POTFILES BUILT_SOURCES = options.h CLEANFILES = \ @@ -458,6 +484,7 @@ all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: +.SUFFIXES: .gmo .po $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -573,7 +600,7 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-generic clean-libtool mostlyclean-am +clean-am: clean-generic clean-libtool clean-local mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -640,29 +667,36 @@ uninstall-am: .MAKE: all check install install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - -.PHONY: all clean pot po mo + clean-local distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am + + +.PHONY: all clean clean-local pot po mo $(POS) \ $(MOS) + +clean-local: + rm -f $(MOS) @REGEN_SOURCES_TRUE@options.h: t_options.h $(MOS) -@REGEN_SOURCES_TRUE@ $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py $(srcdir)/t_options.h $(LOCALEDIR) $(LANGS) > options.h +@REGEN_SOURCES_TRUE@ $(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py \ +@REGEN_SOURCES_TRUE@ --template $(srcdir)/t_options.h \ +@REGEN_SOURCES_TRUE@ --output options.h \ +@REGEN_SOURCES_TRUE@ --localedir $(LOCALEDIR) \ +@REGEN_SOURCES_TRUE@ --languages $(LANGS) # Update .mo files from the corresponding .po files. -%/LC_MESSAGES/options.mo: %.po +.po.gmo: @mo="$@"; \ lang=$${mo%%/*}; \ echo "Updating ($$lang) $@ from $?."; \ - $(MKDIR_P) $$lang/LC_MESSAGES; \ msgfmt -o $@ $? # Use this target to create or update .po files with new messages in diff --git a/lib/mesa/src/util/xmlpool/ca/LC_MESSAGES/options.mo b/lib/mesa/src/util/xmlpool/ca/LC_MESSAGES/options.mo Binary files differdeleted file mode 100644 index f2b0d5e16..000000000 --- a/lib/mesa/src/util/xmlpool/ca/LC_MESSAGES/options.mo +++ /dev/null diff --git a/lib/mesa/src/util/xmlpool/de/LC_MESSAGES/options.mo b/lib/mesa/src/util/xmlpool/de/LC_MESSAGES/options.mo Binary files differdeleted file mode 100644 index 41c2b9bed..000000000 --- a/lib/mesa/src/util/xmlpool/de/LC_MESSAGES/options.mo +++ /dev/null diff --git a/lib/mesa/src/util/xmlpool/es/LC_MESSAGES/options.mo b/lib/mesa/src/util/xmlpool/es/LC_MESSAGES/options.mo Binary files differdeleted file mode 100644 index 0145c680d..000000000 --- a/lib/mesa/src/util/xmlpool/es/LC_MESSAGES/options.mo +++ /dev/null diff --git a/lib/mesa/src/util/xmlpool/fr/LC_MESSAGES/options.mo b/lib/mesa/src/util/xmlpool/fr/LC_MESSAGES/options.mo Binary files differdeleted file mode 100644 index af05db896..000000000 --- a/lib/mesa/src/util/xmlpool/fr/LC_MESSAGES/options.mo +++ /dev/null diff --git a/lib/mesa/src/util/xmlpool/nl/LC_MESSAGES/options.mo b/lib/mesa/src/util/xmlpool/nl/LC_MESSAGES/options.mo Binary files differdeleted file mode 100644 index 7bf40f7bd..000000000 --- a/lib/mesa/src/util/xmlpool/nl/LC_MESSAGES/options.mo +++ /dev/null diff --git a/lib/mesa/src/util/xmlpool/sv/LC_MESSAGES/options.mo b/lib/mesa/src/util/xmlpool/sv/LC_MESSAGES/options.mo Binary files differdeleted file mode 100644 index 3bf610a42..000000000 --- a/lib/mesa/src/util/xmlpool/sv/LC_MESSAGES/options.mo +++ /dev/null |