diff options
| -rw-r--r-- | ports/fontconfig/CONTROL | 4 | ||||
| -rw-r--r-- | ports/fontconfig/macos_arm_fccache.patch | 34 | ||||
| -rw-r--r-- | ports/fontconfig/portfile.cmake | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/fontconfig.json | 5 |
5 files changed, 44 insertions, 4 deletions
diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL index 4b455e985..330c801e0 100644 --- a/ports/fontconfig/CONTROL +++ b/ports/fontconfig/CONTROL @@ -1,6 +1,6 @@ Source: fontconfig Version: 2.13.1 -Port-Version: 3 +Port-Version: 4 Homepage: https://www.freedesktop.org/software/fontconfig/front.html Description: Library for configuring and customizing font access. -Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, dirent, libuuid (!windows&!osx), gettext
\ No newline at end of file +Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, dirent, libuuid (!windows&!osx), gettext diff --git a/ports/fontconfig/macos_arm_fccache.patch b/ports/fontconfig/macos_arm_fccache.patch new file mode 100644 index 000000000..2cc0734fb --- /dev/null +++ b/ports/fontconfig/macos_arm_fccache.patch @@ -0,0 +1,34 @@ + src/fcatomic.h | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/src/fcatomic.h b/src/fcatomic.h +index cc28a883c13fadf2ad9900586a9cae3097354671..657a5f551adfc37415231b7002746ad6cd031c78 100644 +--- a/src/fcatomic.h ++++ b/src/fcatomic.h +@@ -70,24 +70,16 @@ typedef LONG fc_atomic_int_t; + #elif !defined(FC_NO_MT) && defined(__APPLE__) + + #include <libkern/OSAtomic.h> +-#ifdef __MAC_OS_X_MIN_REQUIRED + #include <AvailabilityMacros.h> +-#elif defined(__IPHONE_OS_MIN_REQUIRED) +-#include <Availability.h> +-#endif + + typedef int fc_atomic_int_t; + #define fc_atomic_int_add(AI, V) (OSAtomicAdd32Barrier ((V), &(AI)) - (V)) + + #define fc_atomic_ptr_get(P) (OSMemoryBarrier (), (void *) *(P)) +-#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100) ++#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 20100) + #define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P)) + #else +-#if __ppc64__ || __x86_64__ +-#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P)) +-#else +-#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P)) +-#endif ++#error "Your macOS / iOS targets are too old" + #endif + + #elif !defined(FC_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES) diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index d50ff6392..90aae8b84 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_gitlab( build.patch build2.patch disable-install-data.patch + macos_arm_fccache.patch ${PATCHES} ) @@ -86,7 +87,7 @@ endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -## Build the fontconfig cache +# Build the fontconfig cache if(NOT VCPKG_TARGET_IS_WINDOWS) set(ENV{FONTCONFIG_PATH} "${CURRENT_PACKAGES_DIR}/etc/fonts") set(ENV{FONTCONFIG_FILE} "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf") diff --git a/versions/baseline.json b/versions/baseline.json index fb99f8ffa..8a0d94c7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2018,7 +2018,7 @@ }, "fontconfig": { "baseline": "2.13.1", - "port-version": 3 + "port-version": 4 }, "foonathan-memory": { "baseline": "2019-07-21-1", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 97cf49e3d..319fc75ea 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "2b49a3ee02b25efc3101d849a0df38280a1ca299", + "version-string": "2.13.1", + "port-version": 4 + }, + { "git-tree": "e4e2d26ab9639fb737206592a04791d998461fa3", "version-string": "2.13.1", "port-version": 3 |