diff --git a/mingw-w64-libaec/0001-build-tests-off.patch b/mingw-w64-libaec/0002-build-tests-off.patch similarity index 97% rename from mingw-w64-libaec/0001-build-tests-off.patch rename to mingw-w64-libaec/0002-build-tests-off.patch index bcce8b44ce..158d443c2e 100644 --- a/mingw-w64-libaec/0001-build-tests-off.patch +++ b/mingw-w64-libaec/0002-build-tests-off.patch @@ -10,7 +10,7 @@ diff -Naur libaec-1.0.4_orig/CMakeLists.txt libaec-1.0.4/CMakeLists.txt check_include_files(malloc.h HAVE_MALLOC_H) test_big_endian(WORDS_BIGENDIAN) -@@ -58,7 +58,7 @@ +@@ -55,7 +55,7 @@ include_directories("${PROJECT_SOURCE_DIR}/src") add_subdirectory(src) diff --git a/mingw-w64-libaec/0003-build-szip-remove.patch b/mingw-w64-libaec/0003-build-szip-remove.patch new file mode 100644 index 0000000000..a31511493f --- /dev/null +++ b/mingw-w64-libaec/0003-build-szip-remove.patch @@ -0,0 +1,49 @@ +diff -Naur libaec-1.0.4_orig/src/CMakeLists.txt libaec-1.0.4/src/CMakeLists.txt +--- libaec-1.0.4_orig/src/CMakeLists.txt 2020-10-09 14:15:58.172862100 +0200 ++++ libaec-1.0.4/src/CMakeLists.txt 2020-10-09 14:17:12.030198700 +0200 +@@ -8,14 +8,14 @@ + STATIC_DEFINE libaec_BUILT_AS_STATIC + ) + +-add_library(sz ${LIB_TYPE} sz_compat.c) +-set_target_properties(sz PROPERTIES VERSION 2.0.1 SOVERSION 2) ++# add_library(sz ${LIB_TYPE} sz_compat.c) ++# set_target_properties(sz PROPERTIES VERSION 2.0.1 SOVERSION 2) + +-target_link_libraries(sz aec) ++target_link_libraries(aec) #sz) + if(WIN32 AND BUILD_SHARED_LIBS) + set_target_properties (aec PROPERTIES DEFINE_SYMBOL "BUILDING_LIBAEC") +- set_target_properties (sz PROPERTIES DEFINE_SYMBOL "BUILDING_LIBAEC") +- set_target_properties(sz PROPERTIES OUTPUT_NAME "szip") ++ # set_target_properties (sz PROPERTIES DEFINE_SYMBOL "BUILDING_LIBAEC") ++ # set_target_properties(sz PROPERTIES OUTPUT_NAME "szip") + endif(WIN32 AND BUILD_SHARED_LIBS) + + add_executable(aec_client aec.c) +@@ -32,14 +32,14 @@ + + include(GNUInstallDirs) + if(WIN32) +- install(TARGETS aec sz ++ install(TARGETS aec #sz + RUNTIME + DESTINATION bin + ARCHIVE + DESTINATION lib + COMPONENT libraries) + else(WIN32) +- install(TARGETS aec sz ++ install(TARGETS aec #sz + LIBRARY + DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE +@@ -49,7 +49,7 @@ + DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1 COMPONENT doc) + endif(WIN32) + +-install(FILES libaec.h szlib.h ${PROJECT_BINARY_DIR}/libaec_Export.h ++install(FILES libaec.h ${PROJECT_BINARY_DIR}/libaec_Export.h #szlib.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT headers) + install(TARGETS aec_client diff --git a/mingw-w64-libaec/PKGBUILD b/mingw-w64-libaec/PKGBUILD index 6621e98591..ac7a0b575b 100644 --- a/mingw-w64-libaec/PKGBUILD +++ b/mingw-w64-libaec/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Milos Komarcevic +# Maintainer: Miloš Komarčević _realname=libaec pkgbase=mingw-w64-${_realname} @@ -11,22 +11,22 @@ url="https://gitlab.dkrz.de/k202009/libaec" license=('BSD-2-Clause') depends=("${MINGW_PACKAGE_PREFIX}-crt") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") -provides=("${MINGW_PACKAGE_PREFIX}-szip") -conflicts=("${MINGW_PACKAGE_PREFIX}-szip") -replaces=("${MINGW_PACKAGE_PREFIX}-szip") options=('staticlibs' 'strip') _md5=ea0b7d197a950b0c110da8dfdecbb71f source=("${url}/uploads/${_md5}/${_realname}-${pkgver}.tar.gz" - "0001-build-tests-off.patch" - "0002-fix-static-build.patch"::"${url}/-/commit/0c7c88e63771d7d7286b5dd7d027160140df012f.diff") + "0001-fix-static-build.patch"::"${url}/-/commit/0c7c88e63771d7d7286b5dd7d027160140df012f.patch" + "0002-build-tests-off.patch" + "0003-build-szip-remove.patch") sha256sums=('f2b1b232083bd8beaf8a54a024225de3dd72a673a9bcdf8c3ba96c39483f4309' - 'eb6193e1b717d480d9dfbaa116afdad57640386734dc41fda6c9a2053540e02b' - 'b72f577427442b7bfc443ee9fcda1e4fd07a61be8b15d8cc13def0037d01a7e5') + 'b72f577427442b7bfc443ee9fcda1e4fd07a61be8b15d8cc13def0037d01a7e5' + '5673b920e057f657e1a3cd6fc693b31feeda1ea4c5d871ffd60939a336053522' + 'abedcc750e2742cfdc2bfefc09d0d37db06e12f58ee136da0eb8905ea8febd1e') prepare() { cd "${srcdir}/${_realname}-${pkgver}" - patch -p1 -i ${srcdir}/0001-build-tests-off.patch - patch -p1 -i ${srcdir}/0002-fix-static-build.patch + patch -p1 -i ${srcdir}/0001-fix-static-build.patch + patch -p1 -i ${srcdir}/0002-build-tests-off.patch + patch -p1 -i ${srcdir}/0003-build-szip-remove.patch } build() {