Skip to content

[graphicsmagick] Linux/MacOS support #6408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbezault merged 1 commit into from
May 13, 2019
Merged

[graphicsmagick] Linux/MacOS support #6408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions ports/graphicsmagick/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ cmake_minimum_required (VERSION 3.6)
project (graphicsmagick)

find_package(ZLIB REQUIRED)
find_package(Bzip2 REQUIRED)
find_package(BZip2 REQUIRED)
find_package(JPEG REQUIRED)
find_package(PNG REQUIRED)
find_package(TIFF REQUIRED)
find_package(Freetype REQUIRED)

add_definitions(-D_MAGICKLIB_ -D_WANDLIB_ -DMAGICK_IMPLEMENTATION -D_VISUALC_)
add_definitions(-D_MAGICKLIB_ -D_WANDLIB_ -DMAGICK_IMPLEMENTATION)

if (BUILD_SHARED_LIBS)
add_definitions(-D_DLL -DDLL)
endif ()

if (MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
add_definitions( -D_VISUALC_ -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
endif ()

if (WIN32)
Expand All @@ -35,11 +35,20 @@ string(REPLACE "#undef HasJPEG" "#define HasJPEG" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef HasPNG" "#define HasPNG" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef HasTIFF" "#define HasTIFF" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef HasTTF" "#define HasTTF" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef HasWINGDI32" "#define HasWINGDI32" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef HasTTF" "#define HasTTF" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef HAVE_FT2BUILD_H" "#define HAVE_FT2BUILD_H" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef HasZLIB" "#define HasZLIB" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef QuantumDepth" "#define QuantumDepth 16" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef restrict" "#define restrict" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef size_t" "/* #undef size_t */" CONFIG_H "${CONFIG_H}")
if (WIN32)
string(REPLACE "#undef HasWINGDI32" "#define HasWINGDI32" CONFIG_H "${CONFIG_H}")
else ()
string(REPLACE "#undef HAVE_VSNPRINTF" "#define HAVE_VSNPRINTF" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef MagickLibSubdir" "#define MagickLibSubdir \"magick\"" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef MagickLibConfigSubDir" "#define MagickLibConfigSubDir \"magick/config\"" CONFIG_H "${CONFIG_H}")
string(REPLACE "#undef MagickShareConfigSubDir" "#define MagickShareConfigSubDir \"magick/config\"" CONFIG_H "${CONFIG_H}")
endif ()
file(WRITE "magick/magick_config.h" "${CONFIG_H}")

file(READ "magick/magick_config_api.h.in" CONFIG_API_H)
Expand Down
2 changes: 1 addition & 1 deletion ports/graphicsmagick/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: graphicsmagick
Maintainer: josuegomes@gmail.com
Version: 1.3.31
Version: 1.3.31-1
Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff
Description: Image processing library
40 changes: 20 additions & 20 deletions ports/graphicsmagick/magick_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,33 +92,33 @@ extern "C" {
#else

/* The following typedefs are subtituted when using Unixish configure */
typedef @INT8_T@ magick_int8_t;
typedef @UINT8_T@ magick_uint8_t;
typedef signed char magick_int8_t;
typedef unsigned char magick_uint8_t;

typedef @INT16_T@ magick_int16_t;
typedef @UINT16_T@ magick_uint16_t;
typedef signed short magick_int16_t;
typedef unsigned short magick_uint16_t;

typedef @INT32_T@ magick_int32_t;
# define MAGICK_INT32_F @INT32_F@
typedef @UINT32_T@ magick_uint32_t;
# define MAGICK_UINT32_F @UINT32_F@
typedef signed int magick_int32_t;
# define MAGICK_INT32_F ""
typedef unsigned int magick_uint32_t;
# define MAGICK_UINT32_F ""

typedef @INT64_T@ magick_int64_t;
# define MAGICK_INT64_F @INT64_F@
typedef @UINT64_T@ magick_uint64_t;
# define MAGICK_UINT64_F @UINT64_F@
typedef signed long magick_int64_t;
# define MAGICK_INT64_F "l"
typedef unsigned long magick_uint64_t;
# define MAGICK_UINT64_F "l"

typedef @UINTMAX_T@ magick_uintmax_t;
# define MAGICK_UINTMAX_F @UINTMAX_F@
typedef unsigned long magick_uintmax_t;
# define MAGICK_UINTMAX_F "l"

typedef @UINTPTR_T@ magick_uintptr_t;
# define MAGICK_UINTPTR_F @UINTPTR_F@
typedef unsigned long magick_uintptr_t;
# define MAGICK_UINTPTR_F "l"

# define MAGICK_SIZE_T_F @MAGICK_SIZE_T_F@
# define MAGICK_SIZE_T @MAGICK_SIZE_T@
# define MAGICK_SIZE_T_F "l"
# define MAGICK_SIZE_T unsigned long

# define MAGICK_SSIZE_T_F @MAGICK_SSIZE_T_F@
# define MAGICK_SSIZE_T @MAGICK_SSIZE_T@
# define MAGICK_SSIZE_T_F "l"
# define MAGICK_SSIZE_T signed long

#endif

Expand Down