diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 010-astc-encoder-fix-install.patch | 14 | ||||
| -rw-r--r-- | 020-astc-encoder-use-shared-library.patch | 71 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
4 files changed, 91 insertions, 13 deletions
@@ -1,6 +1,6 @@ pkgbase = astc-encoder pkgdesc = A tool for compressing and decompressing images using the ASTC texture compression standard - pkgver = 3.0 + pkgver = 3.1 pkgrel = 1 url = https://github.com/ARM-software/astc-encoder/ arch = x86_64 @@ -9,11 +9,13 @@ pkgbase = astc-encoder makedepends = cmake makedepends = python depends = gcc-libs - source = git+https://github.com/ARM-software/astc-encoder.git#tag=3.0 + source = git+https://github.com/ARM-software/astc-encoder.git#tag=3.1 source = git+https://github.com/google/googletest.git source = 010-astc-encoder-fix-install.patch + source = 020-astc-encoder-use-shared-library.patch sha256sums = SKIP sha256sums = SKIP - sha256sums = 32cb972d67318166273e6ca508270630bf329f5e1855502f6a493cd803ab2447 + sha256sums = 9c29ba69d8e9e10683ba965d2e13cdd939e477dcbef6e8d7700dc13d50cc9974 + sha256sums = df157a7b4041da008ca6ebeb7fbe7263ada7298e4e2190ba7f42b7871f881581 pkgname = astc-encoder diff --git a/010-astc-encoder-fix-install.patch b/010-astc-encoder-fix-install.patch index 32ee55f35a39..1c5f8dea1dad 100644 --- a/010-astc-encoder-fix-install.patch +++ b/010-astc-encoder-fix-install.patch @@ -1,19 +1,19 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -146,7 +146,7 @@ set(CMAKE_CXX_STANDARD 14) +@@ -30,7 +30,7 @@ set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_EXPORT_COMPILE_COMMANDS 1) -set(PACKAGE_ROOT astcenc) +set(PACKAGE_ROOT bin) + include(CTest) - # Subcomponents --- a/Source/UnitTest/cmake_core.cmake +++ b/Source/UnitTest/cmake_core.cmake -@@ -114,5 +114,3 @@ target_link_libraries(test-simd-${ISA_SIMD} +@@ -126,4 +126,4 @@ target_link_libraries(${ASTC_TEST} + add_test(NAME ${ASTC_TEST} + COMMAND ${ASTC_TEST}) - add_test(NAME test-simd-${ISA_SIMD} - COMMAND test-simd-${ISA_SIMD}) -- --install(TARGETS test-simd-${ISA_SIMD} DESTINATION ${PACKAGE_ROOT}) +-install(TARGETS ${ASTC_TEST} DESTINATION ${PACKAGE_ROOT}) ++ diff --git a/020-astc-encoder-use-shared-library.patch b/020-astc-encoder-use-shared-library.patch new file mode 100644 index 000000000000..20786d37f001 --- /dev/null +++ b/020-astc-encoder-use-shared-library.patch @@ -0,0 +1,71 @@ +--- a/Source/cmake_core.cmake ++++ b/Source/cmake_core.cmake +@@ -26,8 +26,8 @@ project(${ASTC_TARGET}) + set(GNU_LIKE "GNU,Clang,AppleClang") + set(CLANG_LIKE "Clang,AppleClang") + +-add_library(${ASTC_TARGET}-static +- STATIC ++add_library(${ASTC_TARGET} ++ SHARED + astcenc_averages_and_directions.cpp + astcenc_block_sizes.cpp + astcenc_color_quantize.cpp +@@ -52,13 +52,13 @@ add_library(${ASTC_TARGET}-static + astcenc_weight_align.cpp + astcenc_weight_quant_xfer_tables.cpp) + +-target_include_directories(${ASTC_TARGET}-static ++target_include_directories(${ASTC_TARGET} + PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> + $<INSTALL_INTERFACE:.>) + + if(${CLI}) +- add_executable(${ASTC_TARGET} ++ add_executable(${ASTC_TARGET}-bin + astcenccli_error_metrics.cpp + astcenccli_image.cpp + astcenccli_image_external.cpp +@@ -67,9 +67,13 @@ if(${CLI}) + astcenccli_toplevel.cpp + astcenccli_toplevel_help.cpp) + +- target_link_libraries(${ASTC_TARGET} ++ target_link_libraries(${ASTC_TARGET}-bin + PRIVATE +- ${ASTC_TARGET}-static) ++ ${ASTC_TARGET}) ++ ++ set_target_properties(${ASTC_TARGET}-bin ++ PROPERTIES ++ OUTPUT_NAME ${ASTC_TARGET}) + endif() + + macro(astcenc_set_properties NAME) +@@ -247,10 +251,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + COMPILE_FLAGS ${EXTERNAL_CXX_FLAGS}) + endif() + +-astcenc_set_properties(${ASTC_TARGET}-static) ++astcenc_set_properties(${ASTC_TARGET}) + + if(${CLI}) +- astcenc_set_properties(${ASTC_TARGET}) ++ astcenc_set_properties(${ASTC_TARGET}-bin) + + string(TIMESTAMP astcencoder_YEAR "%Y") + +@@ -259,9 +263,10 @@ if(${CLI}) + astcenccli_version.h + ESCAPE_QUOTES @ONLY) + +- target_include_directories(${ASTC_TARGET} ++ target_include_directories(${ASTC_TARGET}-bin + PRIVATE + ${CMAKE_CURRENT_BINARY_DIR}) + +- install(TARGETS ${ASTC_TARGET} DESTINATION ${PACKAGE_ROOT}) ++ install(TARGETS ${ASTC_TARGET}-bin DESTINATION ${PACKAGE_ROOT}) ++ install(TARGETS ${ASTC_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() @@ -1,7 +1,7 @@ # Maintainer: Daniel Bermond <dbermond@archlinux.org> pkgname=astc-encoder -pkgver=3.0 +pkgver=3.1 pkgrel=1 pkgdesc='A tool for compressing and decompressing images using the ASTC texture compression standard' arch=('x86_64') @@ -11,16 +11,19 @@ depends=('gcc-libs') makedepends=('git' 'cmake' 'python') source=("git+https://github.com/ARM-software/astc-encoder.git#tag=${pkgver}" 'git+https://github.com/google/googletest.git' - '010-astc-encoder-fix-install.patch') + '010-astc-encoder-fix-install.patch' + '020-astc-encoder-use-shared-library.patch') sha256sums=('SKIP' 'SKIP' - '32cb972d67318166273e6ca508270630bf329f5e1855502f6a493cd803ab2447') + '9c29ba69d8e9e10683ba965d2e13cdd939e477dcbef6e8d7700dc13d50cc9974' + 'df157a7b4041da008ca6ebeb7fbe7263ada7298e4e2190ba7f42b7871f881581') prepare() { git -C astc-encoder submodule init git -C astc-encoder config --local submodule.Source/GoogleTest.url "${srcdir}/googletest" git -C astc-encoder submodule update patch -d astc-encoder -Np1 -i "${srcdir}/010-astc-encoder-fix-install.patch" + patch -d astc-encoder -Np1 -i "${srcdir}/020-astc-encoder-use-shared-library.patch" } build() { @@ -41,5 +44,7 @@ check() { package() { make -C build DESTDIR="$pkgdir" install + install -D -m644 astc-encoder/Source/astcenc.h -t "${pkgdir}/usr/include" ln -s astcenc-sse2 "${pkgdir}/usr/bin/astcenc" + ln -s libastcenc-sse2.so "${pkgdir}/usr/lib/libastcenc.so" } |