libmypaint DLL update (update provided by @blackwarthog)

This commit is contained in:
manongjohn 2019-09-12 19:26:16 -04:00
parent 1e87ca33b0
commit df2bb23d9e
17 changed files with 69 additions and 54 deletions

View file

@ -1,4 +1,4 @@
Scripts for cross-build libmypaint for Windows (MinGW) under Debian 8 Jessie
Scripts for cross-build libmypaint for Windows (MinGW) under Debian 8 Jessie and Debian 9 Stretch
1. install mingw toolchain (via apt-get for ex)

View file

@ -7,8 +7,13 @@ typedef enum {
MYPAINT_BRUSH_INPUT_RANDOM,
MYPAINT_BRUSH_INPUT_STROKE,
MYPAINT_BRUSH_INPUT_DIRECTION,
MYPAINT_BRUSH_INPUT_DIRECTION_ANGLE,
MYPAINT_BRUSH_INPUT_ATTACK_ANGLE,
MYPAINT_BRUSH_INPUT_TILT_DECLINATION,
MYPAINT_BRUSH_INPUT_TILT_ASCENSION,
MYPAINT_BRUSH_INPUT_GRIDMAP_X,
MYPAINT_BRUSH_INPUT_GRIDMAP_Y,
MYPAINT_BRUSH_INPUT_BRUSH_RADIUS,
MYPAINT_BRUSH_INPUT_CUSTOM,
MYPAINT_BRUSH_INPUTS_COUNT
} MyPaintBrushInput;
@ -23,12 +28,23 @@ typedef enum {
MYPAINT_BRUSH_SETTING_DABS_PER_BASIC_RADIUS,
MYPAINT_BRUSH_SETTING_DABS_PER_ACTUAL_RADIUS,
MYPAINT_BRUSH_SETTING_DABS_PER_SECOND,
MYPAINT_BRUSH_SETTING_GRIDMAP_SCALE,
MYPAINT_BRUSH_SETTING_GRIDMAP_SCALE_X,
MYPAINT_BRUSH_SETTING_GRIDMAP_SCALE_Y,
MYPAINT_BRUSH_SETTING_RADIUS_BY_RANDOM,
MYPAINT_BRUSH_SETTING_SPEED1_SLOWNESS,
MYPAINT_BRUSH_SETTING_SPEED2_SLOWNESS,
MYPAINT_BRUSH_SETTING_SPEED1_GAMMA,
MYPAINT_BRUSH_SETTING_SPEED2_GAMMA,
MYPAINT_BRUSH_SETTING_OFFSET_BY_RANDOM,
MYPAINT_BRUSH_SETTING_OFFSET_Y,
MYPAINT_BRUSH_SETTING_OFFSET_X,
MYPAINT_BRUSH_SETTING_OFFSET_ANGLE,
MYPAINT_BRUSH_SETTING_OFFSET_ANGLE_ASC,
MYPAINT_BRUSH_SETTING_OFFSET_ANGLE_2,
MYPAINT_BRUSH_SETTING_OFFSET_ANGLE_2_ASC,
MYPAINT_BRUSH_SETTING_OFFSET_ANGLE_ADJ,
MYPAINT_BRUSH_SETTING_OFFSET_MULTIPLIER,
MYPAINT_BRUSH_SETTING_OFFSET_BY_SPEED,
MYPAINT_BRUSH_SETTING_OFFSET_BY_SPEED_SLOWNESS,
MYPAINT_BRUSH_SETTING_SLOW_TRACKING,
@ -93,6 +109,12 @@ typedef enum {
MYPAINT_BRUSH_STATE_DIRECTION_DY,
MYPAINT_BRUSH_STATE_DECLINATION,
MYPAINT_BRUSH_STATE_ASCENSION,
MYPAINT_BRUSH_STATE_DIRECTION_ANGLE_DX,
MYPAINT_BRUSH_STATE_DIRECTION_ANGLE_DY,
MYPAINT_BRUSH_STATE_ATTACK_ANGLE,
MYPAINT_BRUSH_STATE_FLIP,
MYPAINT_BRUSH_STATE_GRIDMAP_X,
MYPAINT_BRUSH_STATE_GRIDMAP_Y,
MYPAINT_BRUSH_STATES_COUNT
} MyPaintBrushState;

View file

@ -5,15 +5,6 @@
#include <mypaint-surface.h>
#include <mypaint-config.h>
typedef enum {
MYPAINT_SYMMETRY_TYPE_VERTICAL,
MYPAINT_SYMMETRY_TYPE_HORIZONTAL,
MYPAINT_SYMMETRY_TYPE_VERTHORZ,
MYPAINT_SYMMETRY_TYPE_ROTATIONAL,
MYPAINT_SYMMETRY_TYPE_SNOWFLAKE,
MYPAINT_SYMMETRY_TYPES_COUNT
} MyPaintSymmetryType;
G_BEGIN_DECLS
typedef struct MyPaintTiledSurface MyPaintTiledSurface;
@ -49,10 +40,7 @@ struct MyPaintTiledSurface {
MyPaintTileRequestStartFunction tile_request_start;
MyPaintTileRequestEndFunction tile_request_end;
gboolean surface_do_symmetry;
MyPaintSymmetryType symmetry_type;
float surface_center_x;
float surface_center_y;
int rot_symmetry_lines;
struct OperationQueue *operation_queue;
MyPaintRectangle dirty_bbox;
gboolean threadsafe_tile_requests;
@ -68,10 +56,7 @@ void
mypaint_tiled_surface_destroy(MyPaintTiledSurface *self);
void
mypaint_tiled_surface_set_symmetry_state(MyPaintTiledSurface *self, gboolean active,
float center_x, float center_y,
MyPaintSymmetryType symmetry_type,
int rot_symmetry_lines);
mypaint_tiled_surface_set_symmetry_state(MyPaintTiledSurface *self, gboolean active, float center_x);
float
mypaint_tiled_surface_get_alpha (MyPaintTiledSurface *self, float x, float y, float radius);

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3078c54ef5c185ca5fe25d9dddc15a258bf46357b1951132b042ef661b2bc936
size 1101423
oid sha256:78ce0b0eebff5c7f704ae64523409cf86a2469611ca7b0c55ab3310ef6cae73c
size 1309935

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb73cf22089da6390c1def079b58e7b73cb27ce7902e48883f5becae20df97b2
size 333677
oid sha256:3e1e9a9bac8527f5db77898b2f72c44c3a61f1918e37434cd47c192d726e3219
size 603361

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:03e90abbbc0c72b3832b7cb1fb62df3bc41d9fc170caf1eec777a69857dffd29
size 216247
oid sha256:abd13e4ed73e2fc3939e3517b3f9805c02a1fb9bb54189d8f89a1358aa2fd984
size 428011

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:426748f0de42310541d59537396caf7f6e8c194b1c4481e29f5522407c4e0d32
size 306114
oid sha256:5b3daa24ead0959d6e9131abface32560b27d58031cc472b5183cc45fa5eaea3
size 637598

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c2ce3325bab78ac76de865e39276ccc35b16b053224d5d651e007a8672c59de
oid sha256:8109a31daae0d3a55d9c64ebaa9170792f29bc7823cea6d8f9d3db130180fd60
size 86606

View file

@ -7,8 +7,13 @@ typedef enum {
MYPAINT_BRUSH_INPUT_RANDOM,
MYPAINT_BRUSH_INPUT_STROKE,
MYPAINT_BRUSH_INPUT_DIRECTION,
MYPAINT_BRUSH_INPUT_DIRECTION_ANGLE,
MYPAINT_BRUSH_INPUT_ATTACK_ANGLE,
MYPAINT_BRUSH_INPUT_TILT_DECLINATION,
MYPAINT_BRUSH_INPUT_TILT_ASCENSION,
MYPAINT_BRUSH_INPUT_GRIDMAP_X,
MYPAINT_BRUSH_INPUT_GRIDMAP_Y,
MYPAINT_BRUSH_INPUT_BRUSH_RADIUS,
MYPAINT_BRUSH_INPUT_CUSTOM,
MYPAINT_BRUSH_INPUTS_COUNT
} MyPaintBrushInput;
@ -23,12 +28,23 @@ typedef enum {
MYPAINT_BRUSH_SETTING_DABS_PER_BASIC_RADIUS,
MYPAINT_BRUSH_SETTING_DABS_PER_ACTUAL_RADIUS,
MYPAINT_BRUSH_SETTING_DABS_PER_SECOND,
MYPAINT_BRUSH_SETTING_GRIDMAP_SCALE,
MYPAINT_BRUSH_SETTING_GRIDMAP_SCALE_X,
MYPAINT_BRUSH_SETTING_GRIDMAP_SCALE_Y,
MYPAINT_BRUSH_SETTING_RADIUS_BY_RANDOM,
MYPAINT_BRUSH_SETTING_SPEED1_SLOWNESS,
MYPAINT_BRUSH_SETTING_SPEED2_SLOWNESS,
MYPAINT_BRUSH_SETTING_SPEED1_GAMMA,
MYPAINT_BRUSH_SETTING_SPEED2_GAMMA,
MYPAINT_BRUSH_SETTING_OFFSET_BY_RANDOM,
MYPAINT_BRUSH_SETTING_OFFSET_Y,
MYPAINT_BRUSH_SETTING_OFFSET_X,
MYPAINT_BRUSH_SETTING_OFFSET_ANGLE,
MYPAINT_BRUSH_SETTING_OFFSET_ANGLE_ASC,
MYPAINT_BRUSH_SETTING_OFFSET_ANGLE_2,
MYPAINT_BRUSH_SETTING_OFFSET_ANGLE_2_ASC,
MYPAINT_BRUSH_SETTING_OFFSET_ANGLE_ADJ,
MYPAINT_BRUSH_SETTING_OFFSET_MULTIPLIER,
MYPAINT_BRUSH_SETTING_OFFSET_BY_SPEED,
MYPAINT_BRUSH_SETTING_OFFSET_BY_SPEED_SLOWNESS,
MYPAINT_BRUSH_SETTING_SLOW_TRACKING,
@ -93,6 +109,12 @@ typedef enum {
MYPAINT_BRUSH_STATE_DIRECTION_DY,
MYPAINT_BRUSH_STATE_DECLINATION,
MYPAINT_BRUSH_STATE_ASCENSION,
MYPAINT_BRUSH_STATE_DIRECTION_ANGLE_DX,
MYPAINT_BRUSH_STATE_DIRECTION_ANGLE_DY,
MYPAINT_BRUSH_STATE_ATTACK_ANGLE,
MYPAINT_BRUSH_STATE_FLIP,
MYPAINT_BRUSH_STATE_GRIDMAP_X,
MYPAINT_BRUSH_STATE_GRIDMAP_Y,
MYPAINT_BRUSH_STATES_COUNT
} MyPaintBrushState;

View file

@ -5,15 +5,6 @@
#include <mypaint-surface.h>
#include <mypaint-config.h>
typedef enum {
MYPAINT_SYMMETRY_TYPE_VERTICAL,
MYPAINT_SYMMETRY_TYPE_HORIZONTAL,
MYPAINT_SYMMETRY_TYPE_VERTHORZ,
MYPAINT_SYMMETRY_TYPE_ROTATIONAL,
MYPAINT_SYMMETRY_TYPE_SNOWFLAKE,
MYPAINT_SYMMETRY_TYPES_COUNT
} MyPaintSymmetryType;
G_BEGIN_DECLS
typedef struct MyPaintTiledSurface MyPaintTiledSurface;
@ -49,10 +40,7 @@ struct MyPaintTiledSurface {
MyPaintTileRequestStartFunction tile_request_start;
MyPaintTileRequestEndFunction tile_request_end;
gboolean surface_do_symmetry;
MyPaintSymmetryType symmetry_type;
float surface_center_x;
float surface_center_y;
int rot_symmetry_lines;
struct OperationQueue *operation_queue;
MyPaintRectangle dirty_bbox;
gboolean threadsafe_tile_requests;
@ -68,10 +56,7 @@ void
mypaint_tiled_surface_destroy(MyPaintTiledSurface *self);
void
mypaint_tiled_surface_set_symmetry_state(MyPaintTiledSurface *self, gboolean active,
float center_x, float center_y,
MyPaintSymmetryType symmetry_type,
int rot_symmetry_lines);
mypaint_tiled_surface_set_symmetry_state(MyPaintTiledSurface *self, gboolean active, float center_x);
float
mypaint_tiled_surface_get_alpha (MyPaintTiledSurface *self, float x, float y, float radius);

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4093b53b91565729564d539403aca91737ee094f902be60b6e261d78a67f0fae
size 1157325
oid sha256:3b94187cac17bd48b4f144d9bba611755998d9bdfcd1078a823c0010e3c8560a
size 1362892

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8eb37af030cff310ff94a43b68a16e0336af0828b62d1bd35e9e26bb2d2aad69
size 404063
oid sha256:2a45496ef731b54d588ec162359e5e15d408e3b1a6cd1615178c83b0baf126d2
size 671955

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d8e9efd3f204804c88f362d20b182e3c222a025b28a811b8dc3abf627f6fd36
size 276980
oid sha256:01d84e22de39f5422aa41aa4e3d68b4474cfd47954209cb4bd004a55b180c57c
size 505255

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2747ff3cd4d107bcc7ddbd73099aac91b2b5bbcd69f1839f4d79418356d667b1
size 392455
oid sha256:b5573a9acc5735e33ee458d575bc8d37a1e441eaeeae0d73553d6d39d854a2ae
size 728685

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:704fc5310b5a3f0b7b77ce530f39a04b0d1c07d0cdfe26dad79159cf01f4a2a6
oid sha256:e037b8df494cdac7850aef76632d0fe91ec2583233ca25a2394433c99ec9db98
size 84848

View file

@ -31,11 +31,11 @@ echo ""
echo "checkout libmypaint"
echo ""
BRANCH="testing"
BRANCH="libmypaint-v1"
if [ -d "libmypaint/.git" ]; then
cd libmypaint && git fetch && git reset --hard "origin/$BRANCH" && cd ..
else
git clone https://github.com/blackwarthog/libmypaint.git --branch $BRANCH
git clone https://github.com/mypaint/libmypaint.git --branch $BRANCH
fi
cd ..

View file

@ -64,7 +64,8 @@ export LDFLAGS="-L$PREFIX/lib $LDFLAGS"
export CFLAGS="-I$PREFIX/include $CFLAGS"
export CPPFLAGS="-I$PREFIX/include $CPPFLAGS"
export CXXFLAGS="-I$PREFIX/include $CXXFLAGS"
export PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig:$PREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
export PKG_CONFIG="/usr/bin/pkg-config"
export PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig:$PREFIX/share/pkgconfig"
export PKG_CONFIG_LIBDIR="$PREFIX/lib:$PKG_CONFIG_LIBDIR"
export PKG_CONFIG_SYSROOT_DIR="/"
export XDG_DATA_DIRS="$PREFIX/share:$XDG_DATA_DIRS"