summaryrefslogtreecommitdiff
path: root/repo/woff2
diff options
context:
space:
mode:
Diffstat (limited to 'repo/woff2')
-rw-r--r--repo/woff2/dont-set-rpath.patch30
-rw-r--r--repo/woff2/install-executables.patch31
-rw-r--r--repo/woff2/woff2.xibuild31
3 files changed, 92 insertions, 0 deletions
diff --git a/repo/woff2/dont-set-rpath.patch b/repo/woff2/dont-set-rpath.patch
new file mode 100644
index 0000000..dbc76e1
--- /dev/null
+++ b/repo/woff2/dont-set-rpath.patch
@@ -0,0 +1,30 @@
+From: Jeremy Bicha <jeremy@bicha.net>
+Date: Thu, 7 Dec 2017 13:40:57 -0500
+Subject: [PATCH] Don't set rpath
+
+https://github.com/google/woff2/pull/106
+---
+ CMakeLists.txt | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ecfbb83..da8ecf1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,16 +21,6 @@ option(NOISY_LOGGING "Noisy logging" ON)
+ # Version information
+ set(WOFF2_VERSION 1.0.2)
+
+-# When building shared libraries it is important to set the correct rpath
+-# See https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH
+-set(CMAKE_SKIP_BUILD_RPATH FALSE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir)
+-if ("${isSystemDir}" STREQUAL "-1")
+- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
+-endif()
+-
+ # Find Brotli dependencies
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ find_package(BrotliDec)
diff --git a/repo/woff2/install-executables.patch b/repo/woff2/install-executables.patch
new file mode 100644
index 0000000..18616a0
--- /dev/null
+++ b/repo/woff2/install-executables.patch
@@ -0,0 +1,31 @@
+From b64df1afa8be8bf784e970aa47973ec420ac4381 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Thu, 7 Dec 2017 17:18:05 -0500
+Subject: [PATCH] Always install executables
+
+https://github.com/google/woff2/pull/106
+---
+ CMakeLists.txt | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ecfbb83..29c45b9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -260,12 +260,10 @@ generate_pkg_config ("${CMAKE_CURRENT_BINARY_DIR}/libwoff2enc.pc"
+ LIBRARIES woff2enc)
+
+ # Installation
+-if (NOT BUILD_SHARED_LIBS)
+- install(
+- TARGETS woff2_decompress woff2_compress woff2_info
+- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+- )
+-endif()
++install(
++ TARGETS woff2_decompress woff2_compress woff2_info
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++)
+
+ install(
+ TARGETS woff2common woff2dec woff2enc
diff --git a/repo/woff2/woff2.xibuild b/repo/woff2/woff2.xibuild
new file mode 100644
index 0000000..1a94e9b
--- /dev/null
+++ b/repo/woff2/woff2.xibuild
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+NAME="woff2"
+DESC="Web Open Font Format 2 reference implementation"
+
+MAKEDEPS="brotli cmake"
+
+PKG_VER=1.0.2
+SOURCE="https://github.com/google/woff2/archive/v$PKG_VER.tar.gz"
+
+ADDITIONAL="
+dont-set-rpath.patch
+install-executables.patch
+"
+
+prepare () {
+ apply_patches
+}
+
+build() {
+ cmake . \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_SKIP_BUILD_RPATH=ON
+ make
+}
+
+package() {
+ make DESTDIR="$PKG_DEST" PREFIX=/usr install
+}