diff options
| author | Eric Bavier <bavier@member.fsf.org> | 2016-04-02 01:50:14 -0500 |
|---|---|---|
| committer | Eric Bavier <bavier@member.fsf.org> | 2016-04-15 00:23:29 -0500 |
| commit | 579760d06e11d24ef280e5af16a2e02a98c1d77d (patch) | |
| tree | 137d23aa13e9ff370114119c2bbeb1c5eb5aed38 /gnu/packages/patches | |
| parent | 69d9792a94c443069e1580497dd10d4a8213eee2 (diff) | |
| download | guix-579760d06e11d24ef280e5af16a2e02a98c1d77d.tar guix-579760d06e11d24ef280e5af16a2e02a98c1d77d.tar.gz | |
gnu: Add woff2.
* gnu/packages/fontutils.scm (woff2): New variable.
* gnu/packages/patches/woff2-libbrotli.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/woff2-libbrotli.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/gnu/packages/patches/woff2-libbrotli.patch b/gnu/packages/patches/woff2-libbrotli.patch new file mode 100644 index 0000000000..47539c8070 --- /dev/null +++ b/gnu/packages/patches/woff2-libbrotli.patch @@ -0,0 +1,84 @@ +From: Eric Bavier <bavier@member.fsf.org> +Date: Sat, 2 Apr 2016 01:31:03 -0500 +Subject: [PATCH] Build against external libbrotli. + +--- + Makefile | 20 ++++---------------- + src/woff2_dec.cc | 2 +- + src/woff2_enc.cc | 2 +- + 3 files changed, 6 insertions(+), 18 deletions(-) + +diff --git a/Makefile b/Makefile +index 92b8d54..618a751 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + OS := $(shell uname) + +-CPPFLAGS = -I./brotli/dec/ -I./brotli/enc/ -I./src ++CPPFLAGS := -I./src $(shell pkg-config --cflags libbrotlienc libbrotlidec) + + CC ?= gcc + CXX ?= g++ +@@ -22,29 +22,17 @@ OUROBJ = font.o glyph.o normalize.o table_tags.o transform.o \ + woff2_dec.o woff2_enc.o woff2_common.o woff2_out.o \ + variable_length.o + +-BROTLI = brotli +-ENCOBJ = $(BROTLI)/enc/*.o +-DECOBJ = $(BROTLI)/dec/*.o ++BROTLI_LIBS := $(shell pkg-config --libs libbrotlienc libbrotlidec) + + OBJS = $(patsubst %, $(SRCDIR)/%, $(OUROBJ)) + EXECUTABLES=woff2_compress woff2_decompress + + EXE_OBJS=$(patsubst %, $(SRCDIR)/%.o, $(EXECUTABLES)) + +-ifeq (,$(wildcard $(BROTLI)/*)) +- $(error Brotli dependency not found : you must initialize the Git submodule) +-endif +- + all : $(OBJS) $(EXECUTABLES) + +-$(EXECUTABLES) : $(EXE_OBJS) deps +- $(CXX) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@ +- +-deps : +- $(MAKE) -C $(BROTLI)/dec +- $(MAKE) -C $(BROTLI)/enc ++$(EXECUTABLES) : $(EXE_OBJS) ++ $(CXX) $(LDFLAGS) $(OBJS) $(SRCDIR)/$@.o -o $@ $(BROTLI_LIBS) $(LIBS) + + clean : + rm -f $(OBJS) $(EXE_OBJS) $(EXECUTABLES) +- $(MAKE) -C $(BROTLI)/dec clean +- $(MAKE) -C $(BROTLI)/enc clean +diff --git a/src/woff2_dec.cc b/src/woff2_dec.cc +index 837eede..98c01ce 100644 +--- a/src/woff2_dec.cc ++++ b/src/woff2_dec.cc +@@ -27,7 +27,7 @@ + #include <memory> + #include <utility> + +-#include "./decode.h" ++#include "brotli/dec/decode.h" + #include "./buffer.h" + #include "./port.h" + #include "./round.h" +diff --git a/src/woff2_enc.cc b/src/woff2_enc.cc +index 920c614..00d74da 100644 +--- a/src/woff2_enc.cc ++++ b/src/woff2_enc.cc +@@ -23,7 +23,7 @@ + #include <string> + #include <vector> + +-#include "./encode.h" ++#include "brotli/enc/encode.h" + #include "./buffer.h" + #include "./font.h" + #include "./normalize.h" +-- +2.7.3 + |