diff options
| author | Michael Forney <mforney@mforney.org> | 2016-07-10 02:06:04 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-07-10 02:09:48 -0700 |
| commit | aff6246b52d3a56e10b84eab8a4c1ea18ad60ee0 (patch) | |
| tree | de4f33acba47ab2994c0207b896f3b4f764b8b63 | |
| parent | 8bc6f7729b2fde22d67c28a9ee104858864f568c (diff) | |
Add fribidi 0.19.7
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | extra/fribidi/.gitignore | 1 | ||||
| -rw-r--r-- | extra/fribidi/.rev | 1 | ||||
| -rw-r--r-- | extra/fribidi/config.h | 19 | ||||
| -rw-r--r-- | extra/fribidi/fribidi-config.h | 26 | ||||
| -rw-r--r-- | extra/fribidi/gen.rc | 63 | ||||
| m--------- | extra/fribidi/src | 0 | ||||
| -rw-r--r-- | extra/gen.rc | 1 |
8 files changed, 114 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 35894379..91f4185c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -111,6 +111,9 @@ path = extra/efivar/src url = https://github.com/rhinstaller/efivar ignore = all +[submodule "extra/fribidi/src"] + path = extra/fribidi/src + url = https://anongit.freedesktop.org/git/fribidi/fribidi.git [submodule "extra/hostap/src"] path = extra/hostap/src url = git://w1.fi/hostap.git diff --git a/extra/fribidi/.gitignore b/extra/fribidi/.gitignore new file mode 100644 index 00000000..012dc66e --- /dev/null +++ b/extra/fribidi/.gitignore @@ -0,0 +1 @@ +/tools.ninja diff --git a/extra/fribidi/.rev b/extra/fribidi/.rev new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/extra/fribidi/.rev @@ -0,0 +1 @@ +1 diff --git a/extra/fribidi/config.h b/extra/fribidi/config.h new file mode 100644 index 00000000..60024eab --- /dev/null +++ b/extra/fribidi/config.h @@ -0,0 +1,19 @@ +#include <config-posix.h> + +/* #undef DEBUG */ +/* #undef HAVE_ASM_PAGE_H */ +#define HAVE_MEMORY_H 1 +#define HAVE_STRINGIZE 1 +#define LT_OBJDIR ".libs/" +#define PACKAGE_BUGREPORT "http://bugs.freedesktop.org/enter_bug.cgi?product=fribidi" +#define PACKAGE_NAME "GNU FriBidi" +#define PACKAGE_STRING "GNU FriBidi 0.19.7" +#define PACKAGE_TARNAME "fribidi" +#define PACKAGE_URL "http://fribidi.org/" +#define PACKAGE_VERSION "0.19.7" +#define SIZEOF_INT 4 +#define SIZEOF_SHORT 2 +#define SIZEOF_VOID_P 8 +#define SIZEOF_WCHAR_T 4 +#define USE_SIMPLE_MALLOC 1 +/* #undef const */ diff --git a/extra/fribidi/fribidi-config.h b/extra/fribidi/fribidi-config.h new file mode 100644 index 00000000..d7791240 --- /dev/null +++ b/extra/fribidi/fribidi-config.h @@ -0,0 +1,26 @@ +/* lib/fribidi-config.h. Generated from fribidi-config.h.in by configure. */ +/* Not copyrighted, in public domain. */ +#ifndef FRIBIDI_CONFIG_H +#define FRIBIDI_CONFIG_H + +#define FRIBIDI "fribidi" +#define FRIBIDI_NAME "GNU FriBidi" +#define FRIBIDI_BUGREPORT "http://bugs.freedesktop.org/enter_bug.cgi?product=fribidi" + +#define FRIBIDI_VERSION "0.19.7" +#define FRIBIDI_MAJOR_VERSION 0 +#define FRIBIDI_MINOR_VERSION 19 +#define FRIBIDI_MICRO_VERSION 7 +#define FRIBIDI_INTERFACE_VERSION 3 +#define FRIBIDI_INTERFACE_VERSION_STRING "3" + +/* Define to 1 if you want charset conversion codes in the library */ +#define FRIBIDI_CHARSETS 0 + +/* Define to 1 if you want to use glib */ +#define FRIBIDI_USE_GLIB 0 + +/* The size of a `int', as computed by sizeof. */ +#define FRIBIDI_SIZEOF_INT 4 + +#endif /* FRIBIDI_CONFIG_H */ diff --git a/extra/fribidi/gen.rc b/extra/fribidi/gen.rc new file mode 100644 index 00000000..7608b543 --- /dev/null +++ b/extra/fribidi/gen.rc @@ -0,0 +1,63 @@ +cflags\ + -D HAVE_CONFIG_H\ + -I include\ + -I '$dir' \ + -I '$outdir' \ + -I '$outdir'/include\ + -I '$srcdir'/lib + +{ + cc gen.tab/packtab.c + exe gen-unicode-version gen.tab/gen-unicode-version.c + for(t in bidi-type joining-type arabic-shaping mirroring) + exe gen-$t-tab -d 'phony/$dir/headers' gen.tab/^(gen-$t-tab.c packtab.c.o) +} | sub tools.ninja + +set compression 2 + +rule gentool '$outdir/$tool $args $in >$out.tmp && mv $out.tmp $out' +fn gentool { + tool=$1 + out=$2 + shift 2 + build '$outdir'/$out gentool '$srcdir'/gen.tab/unidata/$* '|' '$outdir'/gen-$tool + with tool gen-$tool +} + +gentool unicode-version include/fribidi-unicode-version.h BidiMirroring.txt +gentool bidi-type-tab bidi-type.tab.i UnicodeData.txt ; with args '$compression' +gentool joining-type-tab joining-type.tab.i UnicodeData.txt ArabicShaping.txt ; with args '$compression' +gentool arabic-shaping-tab arabic-shaping.tab.i UnicodeData.txt ; with args '$compression' +gentool mirroring-tab mirroring.tab.i BidiMirroring.txt ; with args '$compression' + +hdrs=(\ + fribidi.h fribidi-arabic.h fribidi-begindecls.h\ + fribidi-bidi.h fribidi-bidi-types.h fribidi-bidi-types-list.h\ + fribidi-common.h fribidi-deprecated.h fribidi-enddecls.h fribidi-flags.h\ + fribidi-joining.h fribidi-joining-types.h fribidi-joining-types-list.h\ + fribidi-mirroring.h fribidi-shape.h fribidi-types.h fribidi-unicode.h\ +) +for(hdr in $hdrs) + build '$outdir'/include/$hdr copy '$srcdir'/lib/$hdr +build '$outdir'/include/fribidi-config.h copy '$dir'/fribidi-config.h +phony headers include/^($hdrs fribidi-config.h fribidi-unicode-version.h) + +phony internal\ + (bidi-type joining-type arabic-shaping mirroring)^.tab.i\ + 'phony/$dir/headers' + +lib libfribidi.a -d 'phony/$dir/internal' lib/^(\ + fribidi.c\ + fribidi-arabic.c\ + fribidi-bidi.c\ + fribidi-bidi-types.c\ + fribidi-deprecated.c\ + fribidi-joining.c\ + fribidi-joining-types.c\ + fribidi-mem.c\ + fribidi-mirroring.c\ + fribidi-run.c\ + fribidi-shape.c\ +) + +fetch git diff --git a/extra/fribidi/src b/extra/fribidi/src new file mode 160000 +Subproject 1a6935cd8cd7d907fb3c5f3bcae174bee727c83 diff --git a/extra/gen.rc b/extra/gen.rc index 9b727870..57165310 100644 --- a/extra/gen.rc +++ b/extra/gen.rc @@ -1,6 +1,7 @@ subgen ccid subgen efibootmgr subgen efivar +subgen fribidi subgen hostap subgen libevent subgen libfuse |
