From 791cfefafb279b8b9847d84b7d112fc6aff56c98 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 13 Dec 2018 20:01:48 -0200 Subject: [PATCH] New package: woff2-1.0.2. --- common/shlibs | 3 ++ srcpkgs/libwoff2common1.0.2 | 1 + srcpkgs/libwoff2dec1.0.2 | 1 + srcpkgs/libwoff2enc1.0.2 | 1 + srcpkgs/woff2-devel | 1 + .../patches/always-install-executables.patch | 31 ++++++++++++ srcpkgs/woff2/patches/dont-set-rpath.patch | 31 ++++++++++++ srcpkgs/woff2/template | 47 +++++++++++++++++++ 8 files changed, 116 insertions(+) create mode 120000 srcpkgs/libwoff2common1.0.2 create mode 120000 srcpkgs/libwoff2dec1.0.2 create mode 120000 srcpkgs/libwoff2enc1.0.2 create mode 120000 srcpkgs/woff2-devel create mode 100644 srcpkgs/woff2/patches/always-install-executables.patch create mode 100644 srcpkgs/woff2/patches/dont-set-rpath.patch create mode 100644 srcpkgs/woff2/template diff --git a/common/shlibs b/common/shlibs index 336834d09cf..0505949ae39 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3353,3 +3353,6 @@ libcsfml-network.so.2.5 CSFML-2.5_1 libtokyocabinet.so.9 tokyocabinet-1.4.48_1 libdav1d.so.0 libdav1d0-0.1.0_1 libdqlite.so.0 dqlite-0.2.1_1 +libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1 +libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1 +libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1 diff --git a/srcpkgs/libwoff2common1.0.2 b/srcpkgs/libwoff2common1.0.2 new file mode 120000 index 00000000000..ece6e17e5d0 --- /dev/null +++ b/srcpkgs/libwoff2common1.0.2 @@ -0,0 +1 @@ +woff2 \ No newline at end of file diff --git a/srcpkgs/libwoff2dec1.0.2 b/srcpkgs/libwoff2dec1.0.2 new file mode 120000 index 00000000000..ece6e17e5d0 --- /dev/null +++ b/srcpkgs/libwoff2dec1.0.2 @@ -0,0 +1 @@ +woff2 \ No newline at end of file diff --git a/srcpkgs/libwoff2enc1.0.2 b/srcpkgs/libwoff2enc1.0.2 new file mode 120000 index 00000000000..ece6e17e5d0 --- /dev/null +++ b/srcpkgs/libwoff2enc1.0.2 @@ -0,0 +1 @@ +woff2 \ No newline at end of file diff --git a/srcpkgs/woff2-devel b/srcpkgs/woff2-devel new file mode 120000 index 00000000000..ece6e17e5d0 --- /dev/null +++ b/srcpkgs/woff2-devel @@ -0,0 +1 @@ +woff2 \ No newline at end of file diff --git a/srcpkgs/woff2/patches/always-install-executables.patch b/srcpkgs/woff2/patches/always-install-executables.patch new file mode 100644 index 00000000000..69f78fa6d6a --- /dev/null +++ b/srcpkgs/woff2/patches/always-install-executables.patch @@ -0,0 +1,31 @@ +From b64df1afa8be8bf784e970aa47973ec420ac4381 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha +Date: Thu, 7 Dec 2017 17:18:05 -0500 +Subject: [PATCH] Always install executables + +--- + CMakeLists.txt | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ecfbb83..29c45b9 100644 +--- CMakeLists.txt ++++ 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/srcpkgs/woff2/patches/dont-set-rpath.patch b/srcpkgs/woff2/patches/dont-set-rpath.patch new file mode 100644 index 00000000000..f36f1d85a2f --- /dev/null +++ b/srcpkgs/woff2/patches/dont-set-rpath.patch @@ -0,0 +1,31 @@ +From 809fe7ce81e2499d0c3b543ecd7e3c2ba7619d88 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha +Date: Thu, 7 Dec 2017 13:40:57 -0500 +Subject: [PATCH] Don't set rpath + +--- + CMakeLists.txt | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ecfbb83..da8ecf1 100644 +--- CMakeLists.txt ++++ 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/srcpkgs/woff2/template b/srcpkgs/woff2/template new file mode 100644 index 00000000000..ecf52247c43 --- /dev/null +++ b/srcpkgs/woff2/template @@ -0,0 +1,47 @@ +# Template file for 'woff2' +pkgname=woff2 +version=1.0.2 +revision=1 +build_style=cmake +hostmakedepends="pkg-config" +makedepends="brotli-devel" +short_desc="Web Open Font Format 2 reference implementaton" +maintainer="maxice8 " +license="GPL-3.0-or-later" +homepage="https://github.com/google/woff2" +distfiles="https://github.com/google/woff2/archive/v${version}.tar.gz" +checksum=add272bb09e6384a4833ffca4896350fdb16e0ca22df68c0384773c67a175594 + +libwoff2common1.0.2_package() { + short_desc+=" - common library" + pkg_install() { + vmove "usr/lib/libwoff2common.so.*" + } +} + +libwoff2enc1.0.2_package() { + short_desc+=" - encoder library" + pkg_install() { + vmove "usr/lib/libwoff2enc.so.*" + } +} + +libwoff2dec1.0.2_package() { + short_desc+=" - decoder library" + pkg_install() { + vmove "usr/lib/libwoff2dec.so.*" + } +} + +woff2-devel_package() { + depends="libwoff2common1.0.2-${version}_${revision} + libwoff2dec1.0.2-${version}_${revision} + libwoff2enc1.0.2-${version}_${revision} + brotli-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +}