[gnome-continuous] Add brotli and woff2 modules

From: Emmanuele Bassi <ebassi src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-continuous] Add brotli and woff2 modules
Date: Mon, 4 Dec 2017 20:06:27 +0000 (UTC)
commit b5ce0f5dcf561f11495df681724c825d4453ba88
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Dec 4 20:06:00 2017 +0000

    Add brotli and woff2 modules
    
    New dependencies for WebKitGTK 2.19.

 manifest.json                        |   10 +
 patches/brotli-cmake-build-api.patch |  671 ++++++++++++++++++++++++++++++++++
 patches/woff2-cmake-build-api.patch  |  112 ++++++
 3 files changed, 793 insertions(+), 0 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index f87a4f3..8215b76 100644
--- a/manifest.json
+++ b/manifest.json
@@ -837,6 +837,16 @@
                 "name": "enchant",
                 "checksum": "2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f"},
 
+                {"src": "git:https://github.com/google/brotli.git";,
+                 "tag": "0ad94eed00420bf1154cb16a289aa27efbb30c01",
+                 "tag-reason": "v1.0.2",
+                 "patches": ["brotli-cmake-build-api.patch"]},
+
+                {"src": "git:https://github.com/google/woff2.git";,
+                 "tag": "1bccf208bca986e53a647dfe4811322adb06ecf8",
+                 "tag-reason": "v1.0.2",
+                 "patches": ["woff2-cmake-build-api.patch"]},
+
                {"src": "tarball:https://www.webkitgtk.org/releases/webkitgtk-2.19.2.tar.xz";,
                 "name": "webkitgtk",
                 "checksum": "439e88894accd4849d218b29a0755d25aa6c79224fc700206c860108d223d4c3",
diff --git a/patches/brotli-cmake-build-api.patch b/patches/brotli-cmake-build-api.patch
new file mode 100644
index 0000000..d7210cf
--- /dev/null
+++ b/patches/brotli-cmake-build-api.patch
@@ -0,0 +1,671 @@
+From 7620e444ae39c664fae2ef702a23c8aa3dba6980 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Mon, 4 Dec 2017 19:58:16 +0000
+Subject: [PATCH] Conform to the build-api
+
+Brotli already has a wrapper for CMake and it follows the GNU/Autotools
+standard directories. The problem is that, for some reason clearly
+involving bonghits, they decided to make `configure` not do anything.
+---
+ configure       | 324 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ configure-cmake | 318 ------------------------------------------------------
+ 2 files changed, 317 insertions(+), 325 deletions(-)
+ delete mode 100755 configure-cmake
+
+diff --git a/configure b/configure
+index d96129a..6dfb92c 100755
+--- a/configure
++++ b/configure
+@@ -1,8 +1,318 @@
+ #!/usr/bin/env bash
+-echo "Use Autotools, Bazel, CMake or Premake5 to generate projects / build files."
+-echo "  Bazel: http://www.bazel.build/";
+-echo "  CMake: https://cmake.org/";
+-echo "  Premake5: https://premake.github.io/";
+-echo "To generate Autotools 'configure' file run './bootstrap'."
+-echo "Run './configure-cmake' for Autotools-like CMake configuration."
+-echo "Or simply run 'make' to build and test command line tool."
++
++# Autotools-style (./configure) wrapper for CMake
++# <https://github.com/nemequ/configure-cmake>
++#
++#   *** IMPORTANT ***
++#
++#   You must include the GNUInstallDirs module (which comes with
++#   CMake) in your project.  Just put "include (GNUInstallDirs)" in
++#   you CMakeLists.txt and you should be good.
++#
++# This script was originally written for Squash
++# <https://quixdb.github.io/squash/> by Evan Nemerson
++# <evan nemerson com>, but has been spun off into a separate
++# repository.  Please feel free to copy it into your own repository,
++# though I would appreciate it if you would post improvements, bugs,
++# feature requests, etc. to the issue tracker at
++# <https://github.com/nemequ/configure-cmake/issues>.
++#
++# To the extent possible under law, the author(s) hereby waive all
++# copyright and related or neighboring rights to this work.  For
++# details, see <https://creativecommons.org/publicdomain/zero/1.0/>
++
++TOP_SRCDIR="$(dirname $0)"
++
++if [ "${CMAKE_CMD}" = "" ]; then
++    CMAKE_CMD="cmake"
++fi
++
++BUILD_TYPE="Debug"
++PREFIX=/usr/local
++LIBDIR=
++CMAKE_ARGS=
++
++if [ -e "${TOP_SRCDIR}/scripts/.configure-custom.sh" ]; then
++    . "${TOP_SRCDIR}/scripts/.configure-custom.sh"
++fi
++
++quote() {
++    echo "$1" | sed -e "s|'|'\\\\''|g; 1s/^/'/; \$s/\$/'/"
++}
++
++extract_var_string() {
++    VAR_NAME=$1
++    VAR_NAME=$(echo $1 | sed -e 's/[ \t]*$//')
++    if [ "x$2" != "x" ]; then
++        VAR_VALUE=$2
++    else
++        VAR_VALUE=yes
++    fi
++
++    if [ "x$3" != "x" ]; then
++        VAR_UC_NAME=$3
++    else
++        VAR_UC_NAME=$(echo "$1" | tr '[:lower:]' '[:upper:]' | tr -c '[:alnum:]' '_' | sed 's/_$//g')
++    fi
++}
++
++set_config_var() {
++    is_with=n
++    case "$1" in
++        "--enable-"*)
++            name="${1#--enable-}"
++            cfg="${ENABLE_VARS}"
++            ;;
++        "--disable-"*)
++            name="${1#--disable-}";
++            cfg="${DISABLE_VARS}";
++            ;;
++        "--with-"*)
++            # IFS="=" read -ra WITHARGS <<< "${1}"
++            name="${1#--with-}"
++            cfg="${WITH_VARS}"
++            is_with=y
++            ;;
++    esac
++
++    found=n
++    for varstring in $cfg; do
++        extract_var_string $(echo "${varstring}" | tr '|' ' ')
++        if [ "x$VAR_NAME" = "x$name" ]; then
++            found=y
++            break;
++        fi
++    done
++
++    if [ "$found" = "y" ]; then
++        if [ "x$is_with" = "xy" ]; then
++            CMAKE_ARGS="$CMAKE_ARGS -D${VAR_UC_NAME}=$(quote "$2")"
++        else
++            CMAKE_ARGS="$CMAKE_ARGS -D${VAR_UC_NAME}=$(quote "${VAR_VALUE}")"
++        fi
++    else
++        echo "Unknown parameter: ${1}"
++        exit 1
++    fi
++}
++
++prefix_to_offset() {
++    expr $(echo "${1}" | awk '{ print length }') + 1
++}
++
++print_help() {
++    cat <<EOF >&2
++  -h, --help              display this help and exit
++  --disable-debug         disable debugging mode
++  --pass-thru             pass remaining arguments through to CMake
++
++  --prefix=PREFIX         install architecture-independent files in PREFIX
++                          [$PREFIX]
++  --bindir=DIR            user executables [PREFIX/bin]
++  --sbindir=DIR           system admin executables [PREFIX/sbin]
++  --libexecdir=DIR        program executables [PREFIX/libexec]
++  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
++  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
++  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --libdir=DIR            object code libraries [PREFIX/lib]
++  --includedir=DIR        C header files [PREFIX/include]
++  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
++  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
++  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
++  --infodir=DIR           info documentation [DATAROOTDIR/info]
++  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
++  --mandir=DIR            man documentation [DATAROOTDIR/man]
++  --docdir=DIR            documentation root [DATAROOTDIR/doc/PROJECT_NAME]
++EOF
++
++    first=y
++    for varstring in ${ENABLE_VARS}; do
++        if [ $first = 'y' ]; then
++            echo ""
++            first=n
++        fi
++        extract_var_string $(echo "${varstring}" | tr '|' ' ')
++        var_doc_name="ENABLE_${VAR_UC_NAME}_DOC"
++        eval "docstring=\$$var_doc_name"
++        if [ "x${docstring}" = "x" ]; then
++            printf "  --enable-%-14s enable %s support\n" "${VAR_NAME}" "$(echo -n "${VAR_NAME}" | tr '-' ' 
')"
++        else
++            printf "  --enable-%-14s %s\n" "${VAR_NAME}" "$docstring"
++        fi
++    done
++
++    first=y
++    for varstring in ${DISABLE_VARS}; do
++        if [ $first = 'y' ]; then
++            echo ""
++            first=n
++        fi
++        extract_var_string $(echo "${varstring}" | tr '|' ' ')
++        var_doc_name="DISABLE_${VAR_UC_NAME}_DOC"
++        eval "docstring=\$$var_doc_name"
++        if [ "x${docstring}" = "x" ]; then
++            printf "  --disable-%-13s disable %s support\n" "${VAR_NAME}" "$(echo -n "${VAR_NAME}" | tr '-' 
' ')"
++        else
++            printf "  --disable-%-13s %s\n" "${VAR_NAME}" "$docstring"
++        fi
++    done
++
++    first=y
++    for varstring in ${WITH_VARS}; do
++        if [ $first = 'y' ]; then
++            echo ""
++            first=n
++        fi
++        extract_var_string $(echo "${varstring}" | tr '|' ' ')
++        var_doc_name="WITH_${VAR_UC_NAME}_DOC"
++        eval "docstring=\$$var_doc_name"
++        paraminfo="${VAR_NAME}=${VAR_VALUE}"
++        if [ "x${docstring}" = "x" ]; then
++            printf "  --with-%-16s enable %s support\n" "$paraminfo" "$(echo -n "${VAR_NAME}" | tr '-' ' ')"
++        else
++            printf "  --with-%-16s %s\n" "$paraminfo" "$docstring"
++        fi
++    done
++
++    exit 0
++}
++
++while [ $# != 0 ]; do
++    case "$1" in
++        "--prefix="*)
++            PREFIX="${1#*=}";;
++        "--prefix")
++            PREFIX="${2}"; shift;;
++        "--bindir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_BINDIR=$(quote "${1#*=}")";;
++        "--bindir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_BINDIR=$(quote "$2")"; shift;;
++        "--sbindir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SBINDIR=$(quote "${1#*=}")";;
++        "--sbindir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SBINDIR=$(quote "$2")"; shift;;
++        "--libexecdir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LIBEXECDIR=$(quote "${1#*=}")";;
++        "--libexecdir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LIBEXECDIR=$(quote "$2")"; shift;;
++        "--sysconfdir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SYSCONFDIR=$(quote "${1#*=}")";;
++        "--sysconfdir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SYSCONFDIR=$(quote "$2")"; shift;;
++        "--sharedstatedir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SHAREDSTATEDIR=$(quote "${1#*=}")";;
++        "--sharedstatedir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SHAREDSTATEDIR=$(quote "$2")"; shift;;
++        "--localstatedir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LOCALSTATEDIR=$(quote "${1#*=}")";;
++        "--localstatedir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LOCALSTATEDIR=$(quote "$2")"; shift;;
++        "--libdir="*)
++            LIBDIR="${1#*=}";;
++        "--libdir")
++            LIBDIR="${2}"; shift;;
++        "--includedir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_INCLUDEDIR=$(quote "${1#*=}")";;
++        "--includedir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_INCLUDEDIR=$(quote "$2")"; shift;;
++        "--oldincludedir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_OLDINCLUDEDIR=$(quote "${1#*=}")";;
++        "--oldincludedir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_OLDINCLUDEDIR=$(quote "$2")"; shift;;
++        "--datarootdir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DATAROOTDIR=$(quote "${1#*=}")";;
++        "--datarootdir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DATAROOTDIR=$(quote "$2")"; shift;;
++        "--datadir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DATADIR=$(quote "${1#*=}")";;
++        "--datadir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DATADIR=$(quote "$2")"; shift;;
++        "--infodir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_INFODIR=$(quote "${1#*=}")";;
++        "--infodir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_INFODIR=$(quote "$2")"; shift;;
++        "--localedir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LOCALEDIR=$(quote "${1#*=}")";;
++        "--localedir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LOCALEDIR=$(quote "$2")"; shift;;
++        "--mandir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_MANDIR=$(quote "${1#*=}")";;
++        "--mandir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_MANDIR=$(quote "$2")"; shift;;
++        "--docdir="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DOCDIR=$(quote "${1#*=}")";;
++        "--docdir")
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DOCDIR=$(quote "$2")"; shift;;
++
++        "CC="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_C_COMPILER=$(quote "${1#*=}")";;
++        "CXX="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_CXX_COMPILER=$(quote "${1#*=}")";;
++        "CFLAGS="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_C_FLAGS=$(quote "${1#*=}")";;
++        "CXXFLAGS="*)
++            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_CXX_FLAGS=$(quote "${1#*=}")";;
++        "LDFLAGS="*)
++            LDFLAGS="$LDFLAGS ${1#*=}";;
++
++        "--help")
++            print_help;;
++        "-h")
++            print_help;;
++
++        # This flag is the only one which may be a bit surprising to
++        # people.  Autotools always builds with debugging symbols enabled
++        # (AFAIK), but for cmake you have to do -DCMAKE_BUILD_TYPE=Debug.
++        # Unfortunately this can change other things as well, so although
++        # I realize there is no --disable-debug flag I thought it would be
++        # prudent to support one here.
++        "--disable-debug")
++            BUILD_TYPE="Release";;
++
++        "--pass-thru")
++            shift;
++            while [ $# != 0 ]; do
++                CMAKE_ARGS="$CMAKE_ARGS $(quote "${1}")";
++                shift;
++            done;;
++
++        "--enable-"*)
++            set_config_var "$1"
++            ;;
++
++        "--disable-"*)
++            set_config_var "$1"
++            ;;
++
++        "--with-"*)
++            name=$(echo "${1#--with-}" | awk '{split($1,v,"="); print v[1]}')
++            case "${1}" in
++                "--with-${name}="*)
++                    set_config_var "--with-${name}" "${1#--with-${name}=}";;
++                "--with-${name}")
++                    set_config_var "$1" "$2";
++                    shift;;
++            esac
++            ;;
++
++        *)
++            echo "$0: error: unrecognized option: \`$1'" >&2
++            echo "Try \`$0 --help' for more information" >&2
++            exit -1
++    esac;
++    shift
++done
++
++if [ "x${LIBDIR}" = "x" ]; then
++    LIBDIR="${PREFIX}/lib"
++fi
++
++# Unlike CFLAGS/CXXFLAGS/CC/CXX, LDFLAGS isn't handled by CMake, so we
++# need to parse it here.
++if [ "x${LDFLAGS}" != "x" ]; then
++    for varname in EXE MODULE SHARED STATIC; do
++        CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_${varname}_LINKER_FLAGS=$(quote "$LDFLAGS")"
++    done
++fi
++
++eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" 
-DCMAKE_INSTALL_LIBDIR="${LIBDIR}" ${CMAKE_ARGS}
+diff --git a/configure-cmake b/configure-cmake
+deleted file mode 100755
+index 6dfb92c..0000000
+--- a/configure-cmake
++++ /dev/null
+@@ -1,318 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Autotools-style (./configure) wrapper for CMake
+-# <https://github.com/nemequ/configure-cmake>
+-#
+-#   *** IMPORTANT ***
+-#
+-#   You must include the GNUInstallDirs module (which comes with
+-#   CMake) in your project.  Just put "include (GNUInstallDirs)" in
+-#   you CMakeLists.txt and you should be good.
+-#
+-# This script was originally written for Squash
+-# <https://quixdb.github.io/squash/> by Evan Nemerson
+-# <evan nemerson com>, but has been spun off into a separate
+-# repository.  Please feel free to copy it into your own repository,
+-# though I would appreciate it if you would post improvements, bugs,
+-# feature requests, etc. to the issue tracker at
+-# <https://github.com/nemequ/configure-cmake/issues>.
+-#
+-# To the extent possible under law, the author(s) hereby waive all
+-# copyright and related or neighboring rights to this work.  For
+-# details, see <https://creativecommons.org/publicdomain/zero/1.0/>
+-
+-TOP_SRCDIR="$(dirname $0)"
+-
+-if [ "${CMAKE_CMD}" = "" ]; then
+-    CMAKE_CMD="cmake"
+-fi
+-
+-BUILD_TYPE="Debug"
+-PREFIX=/usr/local
+-LIBDIR=
+-CMAKE_ARGS=
+-
+-if [ -e "${TOP_SRCDIR}/scripts/.configure-custom.sh" ]; then
+-    . "${TOP_SRCDIR}/scripts/.configure-custom.sh"
+-fi
+-
+-quote() {
+-    echo "$1" | sed -e "s|'|'\\\\''|g; 1s/^/'/; \$s/\$/'/"
+-}
+-
+-extract_var_string() {
+-    VAR_NAME=$1
+-    VAR_NAME=$(echo $1 | sed -e 's/[ \t]*$//')
+-    if [ "x$2" != "x" ]; then
+-        VAR_VALUE=$2
+-    else
+-        VAR_VALUE=yes
+-    fi
+-
+-    if [ "x$3" != "x" ]; then
+-        VAR_UC_NAME=$3
+-    else
+-        VAR_UC_NAME=$(echo "$1" | tr '[:lower:]' '[:upper:]' | tr -c '[:alnum:]' '_' | sed 's/_$//g')
+-    fi
+-}
+-
+-set_config_var() {
+-    is_with=n
+-    case "$1" in
+-        "--enable-"*)
+-            name="${1#--enable-}"
+-            cfg="${ENABLE_VARS}"
+-            ;;
+-        "--disable-"*)
+-            name="${1#--disable-}";
+-            cfg="${DISABLE_VARS}";
+-            ;;
+-        "--with-"*)
+-            # IFS="=" read -ra WITHARGS <<< "${1}"
+-            name="${1#--with-}"
+-            cfg="${WITH_VARS}"
+-            is_with=y
+-            ;;
+-    esac
+-
+-    found=n
+-    for varstring in $cfg; do
+-        extract_var_string $(echo "${varstring}" | tr '|' ' ')
+-        if [ "x$VAR_NAME" = "x$name" ]; then
+-            found=y
+-            break;
+-        fi
+-    done
+-
+-    if [ "$found" = "y" ]; then
+-        if [ "x$is_with" = "xy" ]; then
+-            CMAKE_ARGS="$CMAKE_ARGS -D${VAR_UC_NAME}=$(quote "$2")"
+-        else
+-            CMAKE_ARGS="$CMAKE_ARGS -D${VAR_UC_NAME}=$(quote "${VAR_VALUE}")"
+-        fi
+-    else
+-        echo "Unknown parameter: ${1}"
+-        exit 1
+-    fi
+-}
+-
+-prefix_to_offset() {
+-    expr $(echo "${1}" | awk '{ print length }') + 1
+-}
+-
+-print_help() {
+-    cat <<EOF >&2
+-  -h, --help              display this help and exit
+-  --disable-debug         disable debugging mode
+-  --pass-thru             pass remaining arguments through to CMake
+-
+-  --prefix=PREFIX         install architecture-independent files in PREFIX
+-                          [$PREFIX]
+-  --bindir=DIR            user executables [PREFIX/bin]
+-  --sbindir=DIR           system admin executables [PREFIX/sbin]
+-  --libexecdir=DIR        program executables [PREFIX/libexec]
+-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+-  --libdir=DIR            object code libraries [PREFIX/lib]
+-  --includedir=DIR        C header files [PREFIX/include]
+-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+-  --infodir=DIR           info documentation [DATAROOTDIR/info]
+-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+-  --mandir=DIR            man documentation [DATAROOTDIR/man]
+-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PROJECT_NAME]
+-EOF
+-
+-    first=y
+-    for varstring in ${ENABLE_VARS}; do
+-        if [ $first = 'y' ]; then
+-            echo ""
+-            first=n
+-        fi
+-        extract_var_string $(echo "${varstring}" | tr '|' ' ')
+-        var_doc_name="ENABLE_${VAR_UC_NAME}_DOC"
+-        eval "docstring=\$$var_doc_name"
+-        if [ "x${docstring}" = "x" ]; then
+-            printf "  --enable-%-14s enable %s support\n" "${VAR_NAME}" "$(echo -n "${VAR_NAME}" | tr '-' ' 
')"
+-        else
+-            printf "  --enable-%-14s %s\n" "${VAR_NAME}" "$docstring"
+-        fi
+-    done
+-
+-    first=y
+-    for varstring in ${DISABLE_VARS}; do
+-        if [ $first = 'y' ]; then
+-            echo ""
+-            first=n
+-        fi
+-        extract_var_string $(echo "${varstring}" | tr '|' ' ')
+-        var_doc_name="DISABLE_${VAR_UC_NAME}_DOC"
+-        eval "docstring=\$$var_doc_name"
+-        if [ "x${docstring}" = "x" ]; then
+-            printf "  --disable-%-13s disable %s support\n" "${VAR_NAME}" "$(echo -n "${VAR_NAME}" | tr '-' 
' ')"
+-        else
+-            printf "  --disable-%-13s %s\n" "${VAR_NAME}" "$docstring"
+-        fi
+-    done
+-
+-    first=y
+-    for varstring in ${WITH_VARS}; do
+-        if [ $first = 'y' ]; then
+-            echo ""
+-            first=n
+-        fi
+-        extract_var_string $(echo "${varstring}" | tr '|' ' ')
+-        var_doc_name="WITH_${VAR_UC_NAME}_DOC"
+-        eval "docstring=\$$var_doc_name"
+-        paraminfo="${VAR_NAME}=${VAR_VALUE}"
+-        if [ "x${docstring}" = "x" ]; then
+-            printf "  --with-%-16s enable %s support\n" "$paraminfo" "$(echo -n "${VAR_NAME}" | tr '-' ' ')"
+-        else
+-            printf "  --with-%-16s %s\n" "$paraminfo" "$docstring"
+-        fi
+-    done
+-
+-    exit 0
+-}
+-
+-while [ $# != 0 ]; do
+-    case "$1" in
+-        "--prefix="*)
+-            PREFIX="${1#*=}";;
+-        "--prefix")
+-            PREFIX="${2}"; shift;;
+-        "--bindir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_BINDIR=$(quote "${1#*=}")";;
+-        "--bindir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_BINDIR=$(quote "$2")"; shift;;
+-        "--sbindir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SBINDIR=$(quote "${1#*=}")";;
+-        "--sbindir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SBINDIR=$(quote "$2")"; shift;;
+-        "--libexecdir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LIBEXECDIR=$(quote "${1#*=}")";;
+-        "--libexecdir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LIBEXECDIR=$(quote "$2")"; shift;;
+-        "--sysconfdir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SYSCONFDIR=$(quote "${1#*=}")";;
+-        "--sysconfdir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SYSCONFDIR=$(quote "$2")"; shift;;
+-        "--sharedstatedir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SHAREDSTATEDIR=$(quote "${1#*=}")";;
+-        "--sharedstatedir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SHAREDSTATEDIR=$(quote "$2")"; shift;;
+-        "--localstatedir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LOCALSTATEDIR=$(quote "${1#*=}")";;
+-        "--localstatedir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LOCALSTATEDIR=$(quote "$2")"; shift;;
+-        "--libdir="*)
+-            LIBDIR="${1#*=}";;
+-        "--libdir")
+-            LIBDIR="${2}"; shift;;
+-        "--includedir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_INCLUDEDIR=$(quote "${1#*=}")";;
+-        "--includedir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_INCLUDEDIR=$(quote "$2")"; shift;;
+-        "--oldincludedir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_OLDINCLUDEDIR=$(quote "${1#*=}")";;
+-        "--oldincludedir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_OLDINCLUDEDIR=$(quote "$2")"; shift;;
+-        "--datarootdir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DATAROOTDIR=$(quote "${1#*=}")";;
+-        "--datarootdir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DATAROOTDIR=$(quote "$2")"; shift;;
+-        "--datadir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DATADIR=$(quote "${1#*=}")";;
+-        "--datadir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DATADIR=$(quote "$2")"; shift;;
+-        "--infodir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_INFODIR=$(quote "${1#*=}")";;
+-        "--infodir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_INFODIR=$(quote "$2")"; shift;;
+-        "--localedir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LOCALEDIR=$(quote "${1#*=}")";;
+-        "--localedir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LOCALEDIR=$(quote "$2")"; shift;;
+-        "--mandir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_MANDIR=$(quote "${1#*=}")";;
+-        "--mandir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_MANDIR=$(quote "$2")"; shift;;
+-        "--docdir="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DOCDIR=$(quote "${1#*=}")";;
+-        "--docdir")
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DOCDIR=$(quote "$2")"; shift;;
+-
+-        "CC="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_C_COMPILER=$(quote "${1#*=}")";;
+-        "CXX="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_CXX_COMPILER=$(quote "${1#*=}")";;
+-        "CFLAGS="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_C_FLAGS=$(quote "${1#*=}")";;
+-        "CXXFLAGS="*)
+-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_CXX_FLAGS=$(quote "${1#*=}")";;
+-        "LDFLAGS="*)
+-            LDFLAGS="$LDFLAGS ${1#*=}";;
+-
+-        "--help")
+-            print_help;;
+-        "-h")
+-            print_help;;
+-
+-        # This flag is the only one which may be a bit surprising to
+-        # people.  Autotools always builds with debugging symbols enabled
+-        # (AFAIK), but for cmake you have to do -DCMAKE_BUILD_TYPE=Debug.
+-        # Unfortunately this can change other things as well, so although
+-        # I realize there is no --disable-debug flag I thought it would be
+-        # prudent to support one here.
+-        "--disable-debug")
+-            BUILD_TYPE="Release";;
+-
+-        "--pass-thru")
+-            shift;
+-            while [ $# != 0 ]; do
+-                CMAKE_ARGS="$CMAKE_ARGS $(quote "${1}")";
+-                shift;
+-            done;;
+-
+-        "--enable-"*)
+-            set_config_var "$1"
+-            ;;
+-
+-        "--disable-"*)
+-            set_config_var "$1"
+-            ;;
+-
+-        "--with-"*)
+-            name=$(echo "${1#--with-}" | awk '{split($1,v,"="); print v[1]}')
+-            case "${1}" in
+-                "--with-${name}="*)
+-                    set_config_var "--with-${name}" "${1#--with-${name}=}";;
+-                "--with-${name}")
+-                    set_config_var "$1" "$2";
+-                    shift;;
+-            esac
+-            ;;
+-
+-        *)
+-            echo "$0: error: unrecognized option: \`$1'" >&2
+-            echo "Try \`$0 --help' for more information" >&2
+-            exit -1
+-    esac;
+-    shift
+-done
+-
+-if [ "x${LIBDIR}" = "x" ]; then
+-    LIBDIR="${PREFIX}/lib"
+-fi
+-
+-# Unlike CFLAGS/CXXFLAGS/CC/CXX, LDFLAGS isn't handled by CMake, so we
+-# need to parse it here.
+-if [ "x${LDFLAGS}" != "x" ]; then
+-    for varname in EXE MODULE SHARED STATIC; do
+-        CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_${varname}_LINKER_FLAGS=$(quote "$LDFLAGS")"
+-    done
+-fi
+-
+-eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" 
-DCMAKE_INSTALL_LIBDIR="${LIBDIR}" ${CMAKE_ARGS}
+-- 
+2.14.3
+
diff --git a/patches/woff2-cmake-build-api.patch b/patches/woff2-cmake-build-api.patch
new file mode 100644
index 0000000..50290d1
--- /dev/null
+++ b/patches/woff2-cmake-build-api.patch
@@ -0,0 +1,112 @@
+From 818bef2bcb97648f0297aa0184434315334fbea9 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Fri, 21 Nov 2014 11:12:07 +0100
+Subject: [PATCH] Add a build API wrapper
+
+Original patch from: Debarshi Ray <debarshir gnome org>
+
+See https://github.com/cgwalters/build-api
+---
+ configure | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 90 insertions(+)
+ create mode 100755 configure
+
+diff --git a/configure b/configure
+new file mode 100755
+index 0000000..adc3562
+--- /dev/null
++++ b/configure
+@@ -0,0 +1,90 @@
++#!/bin/bash
++# configure script adapter for cmake
++# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
++# Copyright 2014 Debarshi Ray <debarshir gnome org>
++# Copyright 2017 Emmanuele Bassi <ebassi gnome org>
++# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
++
++prefix=/usr
++
++# Little helper function for reading args from the commandline.
++# it automatically handles -a b and -a=b variants, and returns 1 if
++# we need to shift $3.
++read_arg() {
++    # $1 = arg name
++    # $2 = arg value
++    # $3 = arg parameter
++    local rematch='^[^=]*=(.*)$'
++    if [[ $2 =~ $rematch ]]; then
++        read "$1" <<< "${BASH_REMATCH[1]}"
++    else
++        read "$1" <<< "$3"
++        # There is no way to shift our callers args, so
++        # return 1 to indicate they should do it instead.
++        return 1
++    fi
++}
++
++sanitycheck() {
++    # $1 = arg name
++    # $1 = arg command
++    # $2 = arg alternates
++    local cmd=$( which $2 2>/dev/null )
++    if [ -x "$cmd" ]; then
++        read "$1" <<< "$cmd"
++        return 0
++    fi
++    test -z $3 || {
++        for alt in $3; do
++            cmd=$( which $alt 2>/dev/null )
++            if [ -x "$cmd" ]; then
++                read "$1" <<< "$cmd"
++                return 0
++            fi
++        done
++    }
++    echo -e "\e[1;31mERROR\e[0m: Command '$2' not found"
++    exit 1
++}
++
++sanitycheck NINJA 'ninja' 'ninja-build'
++
++while (($# > 0)); do
++    case "${1%%=*}" in
++        --prefix) read_arg prefix "$@" || shift;;
++        --bindir) read_arg bindir "$@" || shift;;
++        --sbindir) read_arg sbindir "$@" || shift;;
++        --libexecdir) read_arg libexecdir "$@" || shift;;
++        --datarootdir) read_arg datarootdir "$@" || shift;;
++        --datadir) read_arg datadir "$@" || shift;;
++        --sysconfdir) read_arg sysconfdir "$@" || shift;;
++        --libdir) read_arg libdir "$@" || shift;;
++        --mandir) read_arg mandir "$@" || shift;;
++        *) echo "Ignoring unknown option '$1'";;
++    esac
++    shift
++done
++
++srcdir=$(dirname $0)
++
++unset CFLAGS
++unset CXXFLAGS
++
++cat > Makefile <<END
++# Generated by configure; do not edit
++
++all:
++      ${NINJA}
++
++install:
++      DESTDIR="\$(DESTDIR)" ${NINJA} install
++END
++
++exec cmake \
++     -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
++     -DCMAKE_INSTALL_LIBDIR:PATH=${libdir} \
++     -DCMAKE_INSTALL_INCLUDEDIR:PATH=${includedir} \
++     -DCMAKE_C_FLAGS="-m64 -mtune=generic -Wl,--no-keep-memory" \
++     -DCMAKE_CXX_FLAGS="-m64 -mtune=generic -Wl,--no-keep-memory" \
++     -GNinja \
++     ${srcdir}
+-- 
+2.14.3
+
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]