diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e3b5f8e6..cd5a937f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -373,7 +373,7 @@ jobs: id: pixman if: steps.vcpkg.outcome == 'success' continue-on-error: true - run: ./vcpkg.exe install pixman --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }} + run: ./vcpkg.exe install pixman --triplet ${{ matrix.triplet }} - name: Read pixman config if: steps.pixman.outcome == 'success' || steps.pixman.outcome == 'failure' continue-on-error: true diff --git a/README.md b/README.md index 9c52587b..18d0f1a6 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,5 @@ | [woff2](https://github.com/google/woff2) | 1.0.2 | 2017-11-13 | | [freetype](https://www.freetype.org) | 2.13.3 | 2024-08-12 | | [harfbuzz](https://github.com/harfbuzz/harfbuzz) | 10.1.0 | 2024-11-04 | -| [pixman](http://www.pixman.org) | 0.42.2 | 2022-11-02 | | [cairo](https://gitlab.freedesktop.org/cairo/cairo) | 1.18.0 | 2023-09-23 | | [libpsl](https://github.com/rockdaboot/libpsl) | 0.21.5 | 2024-01-13 | diff --git a/ports/pixman/build/CMakeLists.txt b/ports/pixman/build/CMakeLists.txt deleted file mode 100644 index ea164d8d..00000000 --- a/ports/pixman/build/CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ -project(pixman) -set(PACKAGE pixman) -cmake_minimum_required(VERSION 2.8.8) - -include(GNUInstallDirs) - -# detect version -file (READ configure.ac configure_ac) -string (REGEX REPLACE ".*pixman_major], ([0-9]+).*" "\\1" PIXMAN_VERSION_MAJOR ${configure_ac}) -string (REGEX REPLACE ".*pixman_minor], ([0-9]+).*" "\\1" PIXMAN_VERSION_MINOR ${configure_ac}) -string (REGEX REPLACE ".*pixman_micro], ([0-9]+).*" "\\1" PIXMAN_VERSION_MICRO ${configure_ac}) -set(PIXMAN_VERSION "${PIXMAN_VERSION_MAJOR}.${PIXMAN_VERSION_MINOR}.${PIXMAN_VERSION_MICRO}") - -if(BUILD_SHARED_LIBS) - option(BUILD_TESTS "build tests" OFF) -endif() - -set(CMAKE_DEBUG_POSTFIX "d") - -#dependencies -find_package(Threads) -if(BUILD_SHARED_LIBS AND BUILD_TESTS) - find_package(PNG) - find_package(OpenMP) -endif() - -#arch optimizations -include(${CMAKE_SOURCE_DIR}/cmake/arch_detect.cmake) -include(${CMAKE_SOURCE_DIR}/cmake/arch_configure.cmake) - -#config -include(${CMAKE_SOURCE_DIR}/cmake/config_configure.cmake) - -include_directories( - ${CMAKE_BINARY_DIR}/pixman - ${CMAKE_SOURCE_DIR}/pixman -) - -if(MSVC) - set(CMAKE_C_FLAGS "/wd4244 /wd4146 ${CMAKE_C_FLAGS}") -endif() - -add_subdirectory(pixman) - -if(BUILD_TESTS) - add_subdirectory(test) -endif() - -include(${CMAKE_SOURCE_DIR}/cmake/cmake_package.cmake) diff --git a/ports/pixman/build/cmake/PixmanConfig.cmake b/ports/pixman/build/cmake/PixmanConfig.cmake deleted file mode 100644 index 17daf5c9..00000000 --- a/ports/pixman/build/cmake/PixmanConfig.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/PixmanTargets.cmake") \ No newline at end of file diff --git a/ports/pixman/build/cmake/arch_configure.cmake b/ports/pixman/build/cmake/arch_configure.cmake deleted file mode 100644 index 2dfd1014..00000000 --- a/ports/pixman/build/cmake/arch_configure.cmake +++ /dev/null @@ -1,20 +0,0 @@ -target_architecture(ARCHITECTURE) -#options for arch -if(ARCHITECTURE STREQUAL "i386" OR ARCHITECTURE STREQUAL "x86_64") - SET(X86 1) - OPTION(X86_MMX "Enable MMX optimizations" OFF) - OPTION(X86_SSE2 "Enable SSE2 optimizations" OFF) - OPTION(X86_SSSE3 "Enable SSSE3 optimizations" OFF) -elseif(ARCHITECTURE STREQUAL "arm") - SET(ARM 1) - OPTION(ARM_IWMMXT "Enable IWMMXT compiler intrinsics" OFF) - OPTION(ARM_NEON "Enable NEON optimizations" OFF) - OPTION(ARM_SIMD "Enable SIMD optimizations" OFF) -elseif(ARCHITECTURE STREQUAL "ppc" OR ARCHITECTURE STREQUAL "ppc64") - SET(PPC 1) - OPTION(PPC_VMX "Enable VMX optimizations" OFF) -else() - SET(MIPS 1) - OPTION(MIPS_DSPR2 "Enable DSPR2 optimizations" OFF) - OPTION(MIPS_LOONGSON_MMI "Enable Loongson Multimedia Instructions" OFF) -endif(ARCHITECTURE STREQUAL "i386" OR ARCHITECTURE STREQUAL "x86_64") diff --git a/ports/pixman/build/cmake/arch_detect.cmake b/ports/pixman/build/cmake/arch_detect.cmake deleted file mode 100644 index 3761e4df..00000000 --- a/ports/pixman/build/cmake/arch_detect.cmake +++ /dev/null @@ -1,134 +0,0 @@ -# Based on the Qt 5 processor detection code, so should be very accurate -# https://qt.gitorious.org/qt/qtbase/blobs/master/src/corelib/global/qprocessordetection.h -# Currently handles arm (v5, v6, v7), x86 (32/64), ia64, and ppc (32/64) - -# Regarding POWER/PowerPC, just as is noted in the Qt source, -# "There are many more known variants/revisions that we do not handle/detect." - -set(archdetect_c_code " -#if defined(__arm__) || defined(__TARGET_ARCH_ARM) - #if defined(__ARM_ARCH_7__) \\ - || defined(__ARM_ARCH_7A__) \\ - || defined(__ARM_ARCH_7R__) \\ - || defined(__ARM_ARCH_7M__) \\ - || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 7) - #error cmake_ARCH armv7 - #elif defined(__ARM_ARCH_6__) \\ - || defined(__ARM_ARCH_6J__) \\ - || defined(__ARM_ARCH_6T2__) \\ - || defined(__ARM_ARCH_6Z__) \\ - || defined(__ARM_ARCH_6K__) \\ - || defined(__ARM_ARCH_6ZK__) \\ - || defined(__ARM_ARCH_6M__) \\ - || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 6) - #error cmake_ARCH armv6 - #elif defined(__ARM_ARCH_5TEJ__) \\ - || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 5) - #error cmake_ARCH armv5 - #else - #error cmake_ARCH arm - #endif -#elif defined(__i386) || defined(__i386__) || defined(_M_IX86) - #error cmake_ARCH i386 -#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64) - #error cmake_ARCH x86_64 -#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64) - #error cmake_ARCH ia64 -#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__) \\ - || defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC) \\ - || defined(_M_MPPC) || defined(_M_PPC) - #if defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__) - #error cmake_ARCH ppc64 - #else - #error cmake_ARCH ppc - #endif -#endif - -#error cmake_ARCH unknown -") - -# Set ppc_support to TRUE before including this file or ppc and ppc64 -# will be treated as invalid architectures since they are no longer supported by Apple - -function(target_architecture output_var) - if(APPLE AND CMAKE_OSX_ARCHITECTURES) - # On OS X we use CMAKE_OSX_ARCHITECTURES *if* it was set - # First let's normalize the order of the values - - # Note that it's not possible to compile PowerPC applications if you are using - # the OS X SDK version 10.6 or later - you'll need 10.4/10.5 for that, so we - # disable it by default - # See this page for more information: - # http://stackoverflow.com/questions/5333490/how-can-we-restore-ppc-ppc64-as-well-as-full-10-4-10-5-sdk-support-to-xcode-4 - - # Architecture defaults to i386 or ppc on OS X 10.5 and earlier, depending on the CPU type detected at runtime. - # On OS X 10.6+ the default is x86_64 if the CPU supports it, i386 otherwise. - - foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES}) - if("${osx_arch}" STREQUAL "ppc" AND ppc_support) - set(osx_arch_ppc TRUE) - elseif("${osx_arch}" STREQUAL "i386") - set(osx_arch_i386 TRUE) - elseif("${osx_arch}" STREQUAL "x86_64") - set(osx_arch_x86_64 TRUE) - elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support) - set(osx_arch_ppc64 TRUE) - else() - message(FATAL_ERROR "Invalid OS X arch name: ${osx_arch}") - endif() - endforeach() - - # Now add all the architectures in our normalized order - if(osx_arch_ppc) - list(APPEND ARCH ppc) - endif() - - if(osx_arch_i386) - list(APPEND ARCH i386) - endif() - - if(osx_arch_x86_64) - list(APPEND ARCH x86_64) - endif() - - if(osx_arch_ppc64) - list(APPEND ARCH ppc64) - endif() - else() - file(WRITE "${CMAKE_BINARY_DIR}/arch.c" "${archdetect_c_code}") - - enable_language(C) - - # Detect the architecture in a rather creative way... - # This compiles a small C program which is a series of ifdefs that selects a - # particular #error preprocessor directive whose message string contains the - # target architecture. The program will always fail to compile (both because - # file is not a valid C program, and obviously because of the presence of the - # #error preprocessor directives... but by exploiting the preprocessor in this - # way, we can detect the correct target architecture even when cross-compiling, - # since the program itself never needs to be run (only the compiler/preprocessor) - try_run( - run_result_unused - compile_result_unused - "${CMAKE_BINARY_DIR}" - "${CMAKE_BINARY_DIR}/arch.c" - COMPILE_OUTPUT_VARIABLE ARCH - CMAKE_FLAGS CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} - ) - - # Parse the architecture name from the compiler output - string(REGEX MATCH "cmake_ARCH ([a-zA-Z0-9_]+)" ARCH "${ARCH}") - - # Get rid of the value marker leaving just the architecture name - string(REPLACE "cmake_ARCH " "" ARCH "${ARCH}") - - # If we are compiling with an unknown architecture this variable should - # already be set to "unknown" but in the case that it's empty (i.e. due - # to a typo in the code), then set it to unknown - if (NOT ARCH) - set(ARCH unknown) - endif() - endif() - - set(${output_var} "${ARCH}" PARENT_SCOPE) -endfunction() diff --git a/ports/pixman/build/cmake/cmake_package.cmake b/ports/pixman/build/cmake/cmake_package.cmake deleted file mode 100644 index 2327d769..00000000 --- a/ports/pixman/build/cmake/cmake_package.cmake +++ /dev/null @@ -1,44 +0,0 @@ -include(CMakePackageConfigHelpers) - -write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/pixman/PixmanConfigVersion.cmake" - VERSION - ${PIXMAN_VERSION} - COMPATIBILITY - AnyNewerVersion -) - -export( - EXPORT - PixmanTargets - FILE - "${CMAKE_CURRENT_BINARY_DIR}/pixman/PixmanTargets.cmake" - NAMESPACE - Upstream:: -) - -configure_file(cmake/PixmanConfig.cmake - "${CMAKE_CURRENT_BINARY_DIR}/pixman/PixmanConfig.cmake" - COPYONLY -) - -install( - EXPORT - PixmanTargets - FILE - PixmanTargets.cmake - NAMESPACE - Upstream:: - DESTINATION - ${CMAKE_INSTALL_DATADIR}/pixman -) - -install( - FILES - "${CMAKE_CURRENT_BINARY_DIR}/pixman/PixmanConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/pixman/PixmanConfigVersion.cmake" - DESTINATION - ${CMAKE_INSTALL_DATADIR}/pixman - COMPONENT - Devel -) diff --git a/ports/pixman/build/cmake/config_configure.cmake b/ports/pixman/build/cmake/config_configure.cmake deleted file mode 100644 index b5094253..00000000 --- a/ports/pixman/build/cmake/config_configure.cmake +++ /dev/null @@ -1,96 +0,0 @@ -# Checking Headers and Functions for pixman -add_definitions(-DHAVE_CONFIG_H) - -include( CheckIncludeFile ) -include( CheckFunctionExists ) -include( CheckLibraryExists ) -include( CheckTypeSize) - -if(OPENMP_FOUND) - set(USE_OPENMP 1) -endif() - -if(PNG_FOUND) - set(HAVE_LIBPNG 1) -endif() - -if(CMAKE_USE_PTHREADS_INIT) - set(HAVE_PTHREADS 1) -endif() - -if(CMAKE_COMPILER_IS_GNUCC) - set(HAVE_GCC_VECTOR_EXTENSIONS 1) -endif() - -check_include_file( "dlfcn.h" HAVE_DLFCN_H ) -check_include_file( "fenv.h" HAVE_FENV_H ) -check_include_file( "inttypes.h" HAVE_INTTYPES_H ) -check_include_file( "memory.h" HAVE_MEMORY_H ) -check_include_file( "stdint.h" HAVE_STDINT_H ) -check_include_file( "stdlib.h" HAVE_STDLIB_H ) -check_include_file( "strings.h" HAVE_STRINGS_H ) -check_include_file( "string.h" HAVE_STRING_H ) -check_include_file( "sys/mman.h" HAVE_SYS_MMAN_H ) -check_include_file( "sys/stat.h" HAVE_SYS_STAT_H ) -check_include_file( "sys/types.h" HAVE_SYS_TYPES_H ) -check_include_file( "unistd.h" HAVE_UNISTD_H ) - -check_function_exists( __builtin_clz HAVE_BUILTIN_CLZ ) -check_function_exists( alarm HAVE_ALARM ) -check_function_exists( feenableexcept HAVE_FEENABLEEXCEPT ) -check_function_exists( getisax HAVE_GETISAX ) -check_function_exists( getpagesize HAVE_GETPAGESIZE ) -check_function_exists( gettimeofday HAVE_GETTIMEOFDAY ) -check_function_exists( mmap HAVE_MMAP ) -check_function_exists( mprotect HAVE_MPROTECT ) -check_function_exists( posix_memalign HAVE_POSIX_MEMALIGN ) -check_function_exists( sigaction HAVE_SIGACTION ) - -CHECK_TYPE_SIZE("long" SIZEOF_LONG) -CHECK_TYPE_SIZE("__float128" SIZEOF___FLOAT128) -if(SIZEOF___FLOAT128) - set(HAVE_FLOAT128 1) -endif() - -if (ARM_IWMMXT) - set(USE_ARM_IWMMXT 1) -endif (ARM_IWMMXT) -if (ARM_NEON) - set(USE_ARM_NEON 1) -endif (ARM_NEON) -if (ARM_SIMD) - set(USE_ARM_SIMD 1) -endif (ARM_SIMD) - -if (PPC_VMX) - set(USE_VMX 1) -endif (PPC_VMX) - -if (MIPS_LOONGSON_MMI) - set(USE_LOONGSON_MMI 1) -endif (MIPS_LOONGSON_MMI) -if (MIPS_DSPR2) - set(USE_MIPS_DSPR2 1) -endif (MIPS_DSPR2) - -if (X86_MMX) - set(USE_X86_MMX 1) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmmx") - endif() -endif (X86_MMX) -if (X86_SSE2) - set(USE_SSE2 1) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2") - endif() -endif (X86_SSE2) -if (X86_SSSE3) - set(USE_SSSE3 1) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse3 -mssse3") - endif() -endif(X86_SSSE3) - -configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/config_source.cmake ${CMAKE_CURRENT_BINARY_DIR}/pixman/config.h ) -configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/pixman/pixman-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/pixman/pixman-version.h) diff --git a/ports/pixman/build/cmake/config_source.cmake b/ports/pixman/build/cmake/config_source.cmake deleted file mode 100644 index 16aad241..00000000 --- a/ports/pixman/build/cmake/config_source.cmake +++ /dev/null @@ -1,182 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if building universal (internal helper macro) */ -#cmakedefine AC_APPLE_UNIVERSAL_BUILD - -/* Whether we have alarm() */ -#cmakedefine HAVE_ALARM @HAVE_ALARM@ - -/* Whether the compiler supports __builtin_clz */ -#cmakedefine HAVE_BUILTIN_CLZ @HAVE_BUILTIN_CLZ@ - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_DLFCN_H @HAVE_DLFCN_H@ - -/* Whether we have feenableexcept() */ -#cmakedefine HAVE_FEENABLEEXCEPT @HAVE_FEENABLEEXCEPT@ - -/* Define to 1 if we have */ -#cmakedefine HAVE_FENV_H @HAVE_FENV_H@ - -/* Whether the tool chain supports __float128 */ -#cmakedefine HAVE_FLOAT128 @HAVE_FLOAT128@ - -/* Define to 1 if you have the `getisax' function. */ -#cmakedefine HAVE_GETISAX @HAVE_GETISAX@ - -/* Whether we have getpagesize() */ -#cmakedefine HAVE_GETPAGESIZE @HAVE_GETPAGESIZE@ - -/* Whether we have gettimeofday() */ -#cmakedefine HAVE_GETTIMEOFDAY @HAVE_GETTIMEOFDAY@ - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@ - -/* Define to 1 if you have the `pixman-1' library (-lpixman-1). */ -#cmakedefine HAVE_LIBPIXMAN_1 - -/* Whether we have libpng */ -#cmakedefine HAVE_LIBPNG @HAVE_LIBPNG@ - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@ - -/* Whether we have mmap() */ -#cmakedefine HAVE_MMAP @HAVE_MMAP@ - -/* Whether we have mprotect() */ -#cmakedefine HAVE_MPROTECT @HAVE_MPROTECT@ - -/* Whether we have posix_memalign() */ -#cmakedefine HAVE_POSIX_MEMALIGN @HAVE_POSIX_MEMALIGN@ - -/* Whether pthreads is supported */ -#cmakedefine HAVE_PTHREADS @HAVE_PTHREADS@ - -/* Whether we have sigaction() */ -#cmakedefine HAVE_SIGACTION @HAVE_SIGACTION@ - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDINT_H @HAVE_STDINT_H@ - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@ - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@ - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STRING_H @HAVE_STRING_H@ - -/* Define to 1 if we have */ -#cmakedefine HAVE_SYS_MMAN_H @HAVE_SYS_MMAN_H@ - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@ - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@ - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#cmakedefine LT_OBJDIR - -/* Name of package */ -#cmakedefine PACKAGE @PACKAGE@ - -/* Define to the address where bug reports for this package should be sent. */ -#cmakedefine PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#cmakedefine PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#cmakedefine PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#cmakedefine PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#cmakedefine PACKAGE_URL - -/* Define to the version of this package. */ -#cmakedefine PACKAGE_VERSION - -/* enable TIMER_BEGIN/TIMER_END macros */ -#cmakedefine PIXMAN_TIMERS - -/* The size of `long', as computed by sizeof. */ -#cmakedefine SIZEOF_LONG @SIZEOF_LONG@ - -/* Define to 1 if you have the ANSI C header files. */ -#cmakedefine STDC_HEADERS 1 - -/* The compiler supported TLS storage class */ -#cmakedefine TLS - -/* Whether the tool chain supports __attribute__((constructor)) */ -#cmakedefine TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR - -/* use ARM IWMMXT compiler intrinsics */ -#cmakedefine USE_ARM_IWMMXT @USE_ARM_IWMMXT@ - -/* use ARM NEON assembly optimizations */ -#cmakedefine USE_ARM_NEON @USE_ARM_NEON@ - -/* use ARM SIMD assembly optimizations */ -#cmakedefine USE_ARM_SIMD @USE_ARM_SIMD@ - -/* use GNU-style inline assembler */ -#cmakedefine USE_GCC_INLINE_ASM - -/* use Loongson Multimedia Instructions */ -#cmakedefine USE_LOONGSON_MMI @USE_LOONGSON_MMI@ - -/* use MIPS DSPr2 assembly optimizations */ -#cmakedefine USE_MIPS_DSPR2 @USE_MIPS_DSPR2@ - -/* use OpenMP in the test suite */ -#cmakedefine USE_OPENMP @OPENMP_FOUND@ - -/* use SSE2 compiler intrinsics */ -#cmakedefine USE_SSE2 @USE_SSE2@ - -/* use SSSE3 compiler intrinsics */ -#cmakedefine USE_SSSE3 @USE_SSSE3@ - -/* use VMX compiler intrinsics */ -#cmakedefine USE_VMX @USE_VMX@ - -/* use x86 MMX compiler intrinsics */ -#cmakedefine USE_X86_MMX @USE_X86_MMX@ - -/* use GCC Vector Extensions */ -#cmakedefine HAVE_GCC_VECTOR_EXTENSIONS @HAVE_GCC_VECTOR_EXTENSIONS@ - -/* use OpenMP */ -#cmakedefine USE_OPENMP @USE_OPENMP@ - -/* Version number of package */ -#cmakedefine VERSION @PIXMAN_VERSION@ - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif \ No newline at end of file diff --git a/ports/pixman/build/pixman/CMakeLists.txt b/ports/pixman/build/pixman/CMakeLists.txt deleted file mode 100644 index 99a2ec56..00000000 --- a/ports/pixman/build/pixman/CMakeLists.txt +++ /dev/null @@ -1,120 +0,0 @@ -set(SOURCES - pixman.c - pixman-access.c - pixman-access-accessors.c - pixman-bits-image.c - pixman-combine32.c - pixman-combine-float.c - pixman-conical-gradient.c - pixman-filter.c - pixman-x86.c - pixman-mips.c - pixman-arm.c - pixman-ppc.c - pixman-edge.c - pixman-edge-accessors.c - pixman-fast-path.c - pixman-glyph.c - pixman-general.c - pixman-gradient-walker.c - pixman-image.c - pixman-implementation.c - pixman-linear-gradient.c - pixman-matrix.c - pixman-noop.c - pixman-radial-gradient.c - pixman-region16.c - pixman-region32.c - pixman-solid-fill.c - pixman-timer.c - pixman-trap.c - pixman-utils.c -) - -set(HEADERS - pixman.h - pixman-accessor.h - pixman-combine32.h - pixman-compiler.h - pixman-edge-imp.h - pixman-inlines.h - pixman-private.h -) - -#proccesor_optimizations -if(ARM) - if (ARM_NEON) - add_definitions(-DUSE_ARM_NEON) - list(APPEND SOURCES pixman-arm-neon.c - pixman-arm-neon-asm.S - pixman-arm-neon-asm-bilinear.S - ) - endif (ARM_NEON) - if (ARM_SIMD) - add_definitions(-DUSE_ARM_SIMD) - list(APPEND SOURCES pixman-arm-simd.c - pixman-arm-simd-asm.S - pixman-arm-simd-asm-scaled.S - ) - endif (ARM_SIMD) - if (ARM_IWMMXT) - add_definitions(-DUSE_ARM_IWMMXT) - list(APPEND SOURCES "pixman-mmx.c") - endif() -endif(ARM) - -if(MIPS) - if (MIPS_DSPR2) - add_definitions(-DUSE_MIPS_DSPR2) - list(APPEND SOURCES pixman-mips-dspr2.c - pixman-mips-dspr2-asm.S - pixman-mips-memcpy-asm.S - ) - endif (MIPS_DSPR2) - if (MIPS_LOONGSON_MMI) - add_definitions(-DUSE_LOONGSON_MMI) - list(APPEND SOURCES "pixman-mmx.c") - endif() -endif(MIPS) - -if(PPC) - if (PPC_VMX) - add_definitions(-DUSE_VMX) - list(APPEND SOURCES "pixman-vmx.c") - endif (PPC_VMX) -endif(PPC) - -if(X86) - if (X86_MMX) - add_definitions(-DUSE_X86_MMX) - list(APPEND SOURCES "pixman-mmx.c") - endif (X86_MMX) - if (X86_SSE2) - add_definitions(-DUSE_SSE2) - list(APPEND SOURCES "pixman-sse2.c") - endif (X86_SSE2) - if (X86_SSSE3) - add_definitions(-DUSE_SSSE3) - list(APPEND SOURCES "pixman-ssse3.c") - endif(X86_SSSE3) -endif(X86) - -if(UNIX) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") -endif() - -add_library(pixman-1_core OBJECT ${SOURCES} ${HEADERS}) -add_library(pixman-1 $) - -install( - TARGETS pixman-1 - EXPORT PixmanTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -) - -install( - FILES pixman.h ${CMAKE_CURRENT_BINARY_DIR}/pixman-version.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pixman-1 -) diff --git a/ports/pixman/build/test/CMakeLists.txt b/ports/pixman/build/test/CMakeLists.txt deleted file mode 100644 index 9b20737f..00000000 --- a/ports/pixman/build/test/CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ -add_library(libutils STATIC utils.c utils-prng.c) - -macro(add_test _target) - add_executable(${_target} ${_target}.c) - target_link_libraries(${_target} pixman-1 libutils) -endmacro() - -# Tests (sorted by expected completion time) -set(TESTPROGRAMS - oob-test - infinite-loop - trap-crasher - fence-image-self-test - region-translate-test - fetch-test - a1-trap-test - prng-test - radial-invalid - pdf-op-test - region-test - combiner-test - scaling-crash-test - alpha-loop - scaling-helpers-test - thread-test - rotate-test - alphamap - gradient-crash-test - pixel-test - matrix-test - composite-traps-test - region-contains-test - glyph-test - solid-test - stress-test - cover-test - blitters-test - affine-test - scaling-test - composite - tolerance-test -) - -# Other programs -set(OTHERPROGRAMS - lowlevel-blt-bench - radial-perf-test - check-formats - scaling-bench - affine-bench -) - -foreach(program IN LISTS TESTPROGRAMS) - add_test(${program}) -endforeach() - -foreach(program IN LISTS OTHERPROGRAMS) - add_test(${program}) -endforeach() diff --git a/ports/pixman/patches/0001-Add-__has_declspec_attribute.patch b/ports/pixman/patches/0001-Add-__has_declspec_attribute.patch deleted file mode 100644 index e7bbbb94..00000000 --- a/ports/pixman/patches/0001-Add-__has_declspec_attribute.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2451154ac1e66f4fc7a5a929cd1baaf6dd4b2995 Mon Sep 17 00:00:00 2001 -From: Don -Date: Thu, 22 Mar 2018 11:36:03 -0700 -Subject: [PATCH] Add __has_declspec_attribute - -Add __has_declspec_attribute around noinline. ---- - pixman/pixman-compiler.h | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h -index 2489adc..95c88eb 100644 ---- a/pixman/pixman-compiler.h -+++ b/pixman/pixman-compiler.h -@@ -71,6 +71,10 @@ - # define M_PI 3.14159265358979323846 - #endif - -+#ifndef __has_declspec_attribute -+#define __has_declspec_attribute(x) 0 -+#endif -+ - #ifdef _MSC_VER - /* 'inline' is available only in C++ in MSVC */ - # define inline __inline -@@ -79,7 +83,11 @@ - #elif defined __GNUC__ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) - # define inline __inline__ - # define force_inline __inline__ __attribute__ ((__always_inline__)) --# define noinline __attribute__((noinline)) -+# if __has_declspec_attribute(noinline) -+# define noinline __declspec(noinline) -+# else -+# define noinline __attribute__((noinline)) -+# endif - #else - # ifndef force_inline - # define force_inline inline --- -2.14.1.windows.1 - diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake deleted file mode 100644 index 915aad8c..00000000 --- a/ports/pixman/portfile.cmake +++ /dev/null @@ -1,79 +0,0 @@ -set(VERSION 0.42.2) - -set(FILENAME "pixman-${VERSION}.tar.gz") -set(URLS "https://www.cairographics.org/releases/${FILENAME}") - -# Get archive -vcpkg_download_distfile(ARCHIVE - URLS ${URLS} - FILENAME ${FILENAME} - SHA512 0a4e327aef89c25f8cb474fbd01de834fd2a1b13fdf7db11ab72072082e45881cd16060673b59d02054b1711ae69c6e2395f6ae9214225ee7153939efcd2fa5d -) - -# Patches -set(PATCHES - ${CMAKE_CURRENT_LIST_DIR}/patches/0001-Add-__has_declspec_attribute.patch -) - -# Extract archive -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} - PATCHES ${PATCHES} -) - -# Add CMake sources -file(COPY ${CMAKE_CURRENT_LIST_DIR}/build/cmake DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/build/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/build/pixman/CMakeLists.txt DESTINATION ${SOURCE_PATH}/pixman) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/build/test/CMakeLists.txt DESTINATION ${SOURCE_PATH}/test) - -# Run CMake build -if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86 OR VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - set(BUILD_OPTIONS - -DX86_MMX=OFF - -DX86_SSE2=ON - -DX86_SSSE3=ON - ) -elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") - set(BUILD_OPTIONS - -DARM_IWMMXT=OFF - -DARM_NEON=ON - -DARM_SIMD=OFF - ) -endif () - -# Check for testing feature -if (testing IN_LIST FEATURES) - message(STATUS "Enabling Tests") - set(BUILD_OPTIONS ${BUILD_OPTIONS} -DBUILD_TESTS=ON) -else () - set(BUILD_OPTIONS ${BUILD_OPTIONS} -DBUILD_TESTS=OFF) -endif () - -if (NOT VCPKG_CMAKE_SYSTEM_NAME) - set(VCPKG_CMAKE_SYSTEM_NAME Windows) -endif () - -if (VCPKG_CRT_LINKAGE STREQUAL dynamic AND VCPKG_CMAKE_SYSTEM_NAME MATCHES "^Windows") - list(APPEND BUILD_OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON) -endif () - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${BUILD_OPTIONS} - MAYBE_UNUSED_VARIABLES - CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() -vcpkg_fixup_pkgconfig() - -# Prepare distribution -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pixman RENAME copyright) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/pixman/version ${VERSION}) diff --git a/ports/pixman/vcpkg.json b/ports/pixman/vcpkg.json deleted file mode 100644 index bfc21447..00000000 --- a/ports/pixman/vcpkg.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "pixman", - "version": "0.42.2", - "description": "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.", - "homepage": "http://www.pixman.org", - "license": "MIT", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "testing": { - "description": "Enable testing of pixman.", - "dependencies": [ - "libpng" - ] - } - } -}