diff options
author | Didier Raboud <odyx@debian.org> | 2020-07-27 08:51:16 +0200 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2020-07-24 15:55:27 +0200 |
commit | a4368ad89b582575ec06e073e202fb5a07f8921f (patch) | |
tree | e30c9d9d405fccbcd6852358dab9c70a76fc9f48 | |
parent | e52e28effbd7bc93f71f72ec058413f046880b4d (diff) |
Commit patch queue (exported by git-debrebase)
[git-debrebase make-patches: export and commit patches]
-rw-r--r-- | debian/patches/0001-63-Work-on-GCC-10-problems.patch | 82 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 83 insertions, 0 deletions
diff --git a/debian/patches/0001-63-Work-on-GCC-10-problems.patch b/debian/patches/0001-63-Work-on-GCC-10-problems.patch new file mode 100644 index 0000000..ea86932 --- /dev/null +++ b/debian/patches/0001-63-Work-on-GCC-10-problems.patch @@ -0,0 +1,82 @@ +From: Tuomas Virtanen <katajakasa@gmail.com> +Date: Sat, 25 Jul 2020 01:42:22 +0300 +Subject: #63: Work on GCC 10 problems + +--- + include/kitchensink/internal/libass.h | 32 ++++++++++++++++---------------- + src/internal/libass.c | 19 +++++++++++++++++++ + 2 files changed, 35 insertions(+), 16 deletions(-) + +diff --git a/include/kitchensink/internal/libass.h b/include/kitchensink/internal/libass.h +index 0f91d95..0b302d9 100644 +--- a/include/kitchensink/internal/libass.h ++++ b/include/kitchensink/internal/libass.h +@@ -37,22 +37,22 @@ typedef enum { + ASS_HINTING_NATIVE
+ } ASS_Hinting;
+
+-KIT_LOCAL ASS_Library* (*ass_library_init)(void);
+-KIT_LOCAL void (*ass_library_done)(ASS_Library *priv);
+-KIT_LOCAL void (*ass_process_codec_private)(ASS_Track *track, char *data, int size);
+-KIT_LOCAL void (*ass_set_message_cb)(ASS_Library *priv, void (*msg_cb)(int level, const char *fmt, va_list args, void *data), void *data);
+-KIT_LOCAL ASS_Renderer* (*ass_renderer_init)(ASS_Library *);
+-KIT_LOCAL void (*ass_renderer_done)(ASS_Renderer *priv);
+-KIT_LOCAL void (*ass_set_frame_size)(ASS_Renderer *priv, int w, int h);
+-KIT_LOCAL void (*ass_set_hinting)(ASS_Renderer *priv, ASS_Hinting ht);
+-KIT_LOCAL void (*ass_set_fonts)(ASS_Renderer *priv, const char *default_font, const char *default_family, int dfp, const char *config, int update);
+-KIT_LOCAL ASS_Image* (*ass_render_frame)(ASS_Renderer *priv, ASS_Track *track, long long now, int *detect_change);
+-KIT_LOCAL ASS_Track* (*ass_new_track)(ASS_Library *);
+-KIT_LOCAL void (*ass_free_track)(ASS_Track *track);
+-KIT_LOCAL void (*ass_process_data)(ASS_Track *track, char *data, int size);
+-KIT_LOCAL void (*ass_process_chunk)(ASS_Track *track, char *data, int size, long long timecode, long long duration);
+-KIT_LOCAL void (*ass_add_font)(ASS_Library *library, char *name, char *data, int data_size);
+-KIT_LOCAL void (*ass_set_storage_size)(ASS_Renderer *priv, int w, int h);
++extern KIT_LOCAL ASS_Library* (*ass_library_init)(void);
++extern KIT_LOCAL void (*ass_library_done)(ASS_Library *priv);
++extern KIT_LOCAL void (*ass_process_codec_private)(ASS_Track *track, char *data, int size);
++extern KIT_LOCAL void (*ass_set_message_cb)(ASS_Library *priv, void (*msg_cb)(int level, const char *fmt, va_list args, void *data), void *data);
++extern KIT_LOCAL ASS_Renderer* (*ass_renderer_init)(ASS_Library *);
++extern KIT_LOCAL void (*ass_renderer_done)(ASS_Renderer *priv);
++extern KIT_LOCAL void (*ass_set_frame_size)(ASS_Renderer *priv, int w, int h);
++extern KIT_LOCAL void (*ass_set_hinting)(ASS_Renderer *priv, ASS_Hinting ht);
++extern KIT_LOCAL void (*ass_set_fonts)(ASS_Renderer *priv, const char *default_font, const char *default_family, int dfp, const char *config, int update);
++extern KIT_LOCAL ASS_Image* (*ass_render_frame)(ASS_Renderer *priv, ASS_Track *track, long long now, int *detect_change);
++extern KIT_LOCAL ASS_Track* (*ass_new_track)(ASS_Library *);
++extern KIT_LOCAL void (*ass_free_track)(ASS_Track *track);
++extern KIT_LOCAL void (*ass_process_data)(ASS_Track *track, char *data, int size);
++extern KIT_LOCAL void (*ass_process_chunk)(ASS_Track *track, char *data, int size, long long timecode, long long duration);
++extern KIT_LOCAL void (*ass_add_font)(ASS_Library *library, char *name, char *data, int data_size);
++extern KIT_LOCAL void (*ass_set_storage_size)(ASS_Renderer *priv, int w, int h);
+
+ KIT_LOCAL int load_libass(void *handle);
+
+diff --git a/src/internal/libass.c b/src/internal/libass.c +index 4a43e86..df6de33 100644 +--- a/src/internal/libass.c ++++ b/src/internal/libass.c +@@ -3,6 +3,25 @@ + #include <SDL_loadso.h>
+ #include "kitchensink/internal/libass.h"
+
++
++ASS_Library* (*ass_library_init)(void);
++void (*ass_library_done)(ASS_Library *priv);
++void (*ass_process_codec_private)(ASS_Track *track, char *data, int size);
++void (*ass_set_message_cb)(ASS_Library *priv, void (*msg_cb)(int level, const char *fmt, va_list args, void *data), void *data);
++ASS_Renderer* (*ass_renderer_init)(ASS_Library *);
++void (*ass_renderer_done)(ASS_Renderer *priv);
++void (*ass_set_frame_size)(ASS_Renderer *priv, int w, int h);
++void (*ass_set_hinting)(ASS_Renderer *priv, ASS_Hinting ht);
++void (*ass_set_fonts)(ASS_Renderer *priv, const char *default_font, const char *default_family, int dfp, const char *config, int update);
++ASS_Image* (*ass_render_frame)(ASS_Renderer *priv, ASS_Track *track, long long now, int *detect_change);
++ASS_Track* (*ass_new_track)(ASS_Library *);
++void (*ass_free_track)(ASS_Track *track);
++void (*ass_process_data)(ASS_Track *track, char *data, int size);
++void (*ass_process_chunk)(ASS_Track *track, char *data, int size, long long timecode, long long duration);
++void (*ass_add_font)(ASS_Library *library, char *name, char *data, int data_size);
++void (*ass_set_storage_size)(ASS_Renderer *priv, int w, int h);
++
++
+ int load_libass(void *handle) {
+ ass_library_init = SDL_LoadFunction(handle, "ass_library_init");
+ ass_library_done = SDL_LoadFunction(handle, "ass_library_done");
diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..6d219ae --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-63-Work-on-GCC-10-problems.patch |