From 20226ceecb8510f64d7884b36f70047bea3f4a55ea522050fff165e2a36585dd Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 12 Jun 2009 18:27:26 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp-gap?expand=0&rev=5 --- gimp-gap-2.4.0-patched.tar.bz2 | 3 - gimp-gap-2.4.0.tar.bz2 | 3 - gimp-gap-2.6.0-patched.tar.bz2 | 3 + gimp-gap-2.6.0.tar.bz2 | 3 + gimp-gap-no-gimp_proc_view_new.patch | 195 ------------ gimp-gap-no-strict-aliasing.patch | 7 + gimp-gap-patch-source.sh | 5 +- gimp-gap-patched.patch | 39 ++- gimp-gap-portability.patch | 11 - gimp-gap-warnings-orig-addon.patch | 52 ++++ gimp-gap-warnings.patch | 445 +++++++++++++++++++++++++++ gimp-gap.changes | 21 ++ gimp-gap.spec | 59 +++- 13 files changed, 604 insertions(+), 242 deletions(-) delete mode 100644 gimp-gap-2.4.0-patched.tar.bz2 delete mode 100644 gimp-gap-2.4.0.tar.bz2 create mode 100644 gimp-gap-2.6.0-patched.tar.bz2 create mode 100644 gimp-gap-2.6.0.tar.bz2 delete mode 100644 gimp-gap-no-gimp_proc_view_new.patch create mode 100644 gimp-gap-no-strict-aliasing.patch delete mode 100644 gimp-gap-portability.patch create mode 100644 gimp-gap-warnings-orig-addon.patch create mode 100644 gimp-gap-warnings.patch diff --git a/gimp-gap-2.4.0-patched.tar.bz2 b/gimp-gap-2.4.0-patched.tar.bz2 deleted file mode 100644 index cfe32a1..0000000 --- a/gimp-gap-2.4.0-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a21af6398a20a2459dccce8072cb95dbff3681cf09c05a8310a74e5318e682d -size 1968753 diff --git a/gimp-gap-2.4.0.tar.bz2 b/gimp-gap-2.4.0.tar.bz2 deleted file mode 100644 index 47563ec..0000000 --- a/gimp-gap-2.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:905dfcfd6ba78f8b25b8e0dc068a75cca3e1effc998fe50b8a7f4b65746cc653 -size 4701609 diff --git a/gimp-gap-2.6.0-patched.tar.bz2 b/gimp-gap-2.6.0-patched.tar.bz2 new file mode 100644 index 0000000..429d618 --- /dev/null +++ b/gimp-gap-2.6.0-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5a7cee243899d85d2ea76ccba38ca77f4483a7422ec5f69270f0a6afeab2478 +size 2578039 diff --git a/gimp-gap-2.6.0.tar.bz2 b/gimp-gap-2.6.0.tar.bz2 new file mode 100644 index 0000000..3c1fd4f --- /dev/null +++ b/gimp-gap-2.6.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1483f5e17ed5f9107c1702fcac3b7a66e6834061560ccb449fc4eaca7a3c2cca +size 8503561 diff --git a/gimp-gap-no-gimp_proc_view_new.patch b/gimp-gap-no-gimp_proc_view_new.patch deleted file mode 100644 index 6f53fd7..0000000 --- a/gimp-gap-no-gimp_proc_view_new.patch +++ /dev/null @@ -1,195 +0,0 @@ -Remove copy of gimp_proc_view_new(), which is available in gimp-2.6: -gap_dbbrowser_utils.c:160: error: conflicting types for 'gimp_proc_view_new' -/usr/include/gimp-2.0/libgimp/gimpprocview.h:31: error: previous declaration of 'gimp_proc_view_new' was here -================================================================================ ---- gap/gap_dbbrowser_utils.c -+++ gap/gap_dbbrowser_utils.c -@@ -151,188 +151,6 @@ - ); - - --/* ------------------------ -- * gimp_proc_view_new -- * ------------------------ -- * this procedure is a copy of gimp-2.1.7/plug-ins/dbbrowser/gimpprocbrowser.c -- */ --GtkWidget * --gimp_proc_view_new (const gchar *name, -- const gchar *menu_path, -- const gchar *blurb, -- const gchar *help, -- const gchar *author, -- const gchar *copyright, -- const gchar *date, -- GimpPDBProcType type, -- gint n_params, -- gint n_return_vals, -- GimpParamDef *params, -- GimpParamDef *return_vals) --{ -- GtkWidget *main_vbox; -- GtkWidget *frame; -- GtkWidget *vbox; -- GtkWidget *table; -- GtkWidget *label; -- GtkSizeGroup *name_group; -- GtkSizeGroup *type_group; -- GtkSizeGroup *desc_group; -- gint row; -- -- if (blurb && strlen (blurb) < 2) blurb = NULL; -- if (help && strlen (help) < 2) help = NULL; -- if (author && strlen (author) < 2) author = NULL; -- if (date && strlen (date) < 2) date = NULL; -- if (copyright && strlen (copyright) < 2) copyright = NULL; -- -- if (blurb && help && ! strcmp (blurb, help)) -- help = NULL; -- -- main_vbox = gtk_vbox_new (FALSE, 12); -- -- /* show the name */ -- -- frame = gimp_frame_new (name); -- label = gtk_frame_get_label_widget (GTK_FRAME (frame)); -- gtk_label_set_selectable (GTK_LABEL (label), TRUE); -- gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); -- gtk_widget_show (frame); -- -- vbox = gtk_vbox_new (FALSE, 8); -- gtk_container_add (GTK_CONTAINER (frame), vbox); -- gtk_widget_show (vbox); -- -- label = gtk_label_new (GimpPDBProcType_to_string (type)); -- gimp_label_set_attributes (GTK_LABEL (label), -- PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC, -- -1); -- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); -- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); -- gtk_widget_show (label); -- -- if (menu_path) -- { -- label = gtk_label_new_with_mnemonic (menu_path); -- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); -- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); -- gtk_label_set_selectable (GTK_LABEL (label), TRUE); -- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); -- gtk_widget_show (label); -- } -- -- if (blurb) -- { -- label = gtk_label_new (blurb); -- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); -- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); -- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); -- gtk_widget_show (label); -- } -- -- name_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); -- type_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); -- desc_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); -- -- /* in parameters */ -- if (n_params) -- { -- frame = gimp_frame_new (_("Parameters")); -- gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); -- gtk_widget_show (frame); -- -- table = gimp_proc_view_create_params (params, n_params, -- name_group, type_group, desc_group); -- gtk_container_add (GTK_CONTAINER (frame), table); -- gtk_widget_show (table); -- } -- -- /* out parameters */ -- if (n_return_vals) -- { -- frame = gimp_frame_new (_("Return Values")); -- gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); -- gtk_widget_show (frame); -- -- table = gimp_proc_view_create_params (return_vals, n_return_vals, -- name_group, type_group, desc_group); -- gtk_container_add (GTK_CONTAINER (frame), table); -- gtk_widget_show (table); -- } -- -- if (! help && ! author && ! date && ! copyright) -- return main_vbox; -- -- frame = gimp_frame_new (_("Additional Information")); -- gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); -- gtk_widget_show (frame); -- -- vbox = gtk_vbox_new (FALSE, 8); -- gtk_container_add (GTK_CONTAINER (frame), vbox); -- gtk_widget_show (vbox); -- -- /* show the help */ -- if (help) -- { -- label = gtk_label_new (help); -- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); -- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); -- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); -- gtk_widget_show (label); -- } -- -- /* show the author & the copyright */ -- -- if (! author && ! date && ! copyright) -- return main_vbox; -- -- table = gtk_table_new ((author != 0) + (date != 0) + (copyright != 0), 2, -- FALSE); -- gtk_table_set_col_spacings (GTK_TABLE (table), 6); -- gtk_table_set_row_spacings (GTK_TABLE (table), 4); -- gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); -- gtk_widget_show (table); -- -- row = 0; -- -- if (author) -- { -- label = gtk_label_new (author); -- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); -- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); -- -- gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, -- _("Author:"), 0.0, 0.0, -- label, 3, FALSE); -- } -- -- if (date) -- { -- label = gtk_label_new (date); -- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); -- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); -- -- gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, -- _("Date:"), 0.0, 0.0, -- label, 3, FALSE); -- } -- -- if (copyright) -- { -- label = gtk_label_new (copyright); -- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); -- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); -- -- gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, -- _("Copyright:"), 0.0, 0.0, -- label, 3, FALSE); -- } -- -- return main_vbox; --} /* end gimp_proc_view_new */ -- -- -- - static GtkWidget * - gimp_proc_view_create_params (GimpParamDef *params, - gint n_params, diff --git a/gimp-gap-no-strict-aliasing.patch b/gimp-gap-no-strict-aliasing.patch new file mode 100644 index 0000000..7364730 --- /dev/null +++ b/gimp-gap-no-strict-aliasing.patch @@ -0,0 +1,7 @@ +--- extern_libs/configure_options_ffmpeg.txt ++++ extern_libs/configure_options_ffmpeg.txt +@@ -13,3 +13,4 @@ + # + # options for the ffmpeg configure + ++--extra-cflags=-fno-strict-aliasing diff --git a/gimp-gap-patch-source.sh b/gimp-gap-patch-source.sh index 3f8d90e..434cafe 100644 --- a/gimp-gap-patch-source.sh +++ b/gimp-gap-patch-source.sh @@ -1,8 +1,9 @@ #!/bin/bash REMOVE_OBJECTS=(\ - extern_libs vid_enc_avi vid_enc_ffmpeg libgapvidapi/gap_vid_api_ffmpeg.c\ - libgapvidapi/gap_vid_api_mpeg3.c libgapvidapi/gap_vid_api_mpeg3toc.c ) + extern_libs vid_enc_avi vid_enc_ffmpeg gap/gap_mpege.c gap/gap_mpege.h\ + libgapvidapi/gap_vid_api_ffmpeg.c libgapvidapi/gap_vid_api_mpeg3.c\ + libgapvidapi/gap_vid_api_mpeg3toc.c ) set -o errexit diff --git a/gimp-gap-patched.patch b/gimp-gap-patched.patch index 9ef94fd..ee8994c 100644 --- a/gimp-gap-patched.patch +++ b/gimp-gap-patched.patch @@ -1,30 +1,34 @@ --- Makefile.am +++ Makefile.am -@@ -15,17 +15,13 @@ - if GAP_VIDEOAPI_SUPPORT - LIBGAPVIDUTIL=libgapvidutil +@@ -18,21 +18,12 @@ VID_COMMON=vid_common --VID_ENC_FFMPEG=vid_enc_ffmpeg + VID_ENC_RAWFRAMES=vid_enc_rawframes VID_ENC_SINGLE=vid_enc_single -VID_ENC_AVI=vid_enc_avi - endif + ## endif +-# the ffmpeg based video encoder depends on ENABLE_GVA_LIBAVFORMAT_SUPPORT +-# and is not bulit when disabled. +-if ENABLE_GVA_LIBAVFORMAT_SUPPORT +-VID_ENC_FFMPEG=vid_enc_ffmpeg +-endif --SUBDIRS = extern_libs images $(LIBWAVCLIENT) $(LIBGAPVIDAPI) gap po docs \ -+SUBDIRS = images $(LIBWAVCLIENT) $(LIBGAPVIDAPI) gap po docs \ +- +-SUBDIRS = libgapbase extern_libs images $(LIBWAVCLIENT) $(LIBGAPVIDAPI) gap po docs \ ++SUBDIRS = libgapbase images $(LIBWAVCLIENT) $(LIBGAPVIDAPI) gap po docs \ $(LIBGAPVIDUTIL) \ $(VID_COMMON) \ - $(VID_ENC_AVI) \ - $(VID_ENC_FFMPEG) \ + $(VID_ENC_RAWFRAMES) \ $(VID_ENC_SINGLE) - EXTRA_DIST = \ --- configure.in +++ configure.in -@@ -722,15 +722,12 @@ - +@@ -1048,15 +1048,12 @@ AC_OUTPUT([ Makefile + libgapbase/Makefile -extern_libs/Makefile images/Makefile gap/Makefile @@ -34,12 +38,23 @@ vid_common/Makefile -vid_enc_avi/Makefile -vid_enc_ffmpeg/Makefile + vid_enc_rawframes/Makefile vid_enc_single/Makefile po/Makefile.in - docs/Makefile +--- gap/Makefile.am ++++ gap/Makefile.am +@@ -226,8 +226,6 @@ + gap_decode_xanim.c \ + gap_decode_xanim.h \ + gap_frontends_main.c \ +- gap_mpege.c \ +- gap_mpege.h \ + gap_libgimpgap.h + + gap_decode_mplayer_SOURCES = \ --- libgapvidapi/Makefile.am +++ libgapvidapi/Makefile.am -@@ -24,9 +24,6 @@ +@@ -27,9 +27,6 @@ # .c sourcefiles in gap_vid_api.c (except example.c) EXTRA_DIST = \ gap_vid_api_gimp.c \ diff --git a/gimp-gap-portability.patch b/gimp-gap-portability.patch deleted file mode 100644 index 1e45286..0000000 --- a/gimp-gap-portability.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gap/gap_story_file.c -+++ gap/gap_story_file.c -@@ -2853,7 +2853,7 @@ - } - - /* print PREFERRED_DECODER */ -- if(stb->preferred_decoder > 0) -+ if(stb->preferred_decoder) - { - if(*stb->preferred_decoder != '\0') - { diff --git a/gimp-gap-warnings-orig-addon.patch b/gimp-gap-warnings-orig-addon.patch new file mode 100644 index 0000000..901c5ef --- /dev/null +++ b/gimp-gap-warnings-orig-addon.patch @@ -0,0 +1,52 @@ +--- extern_libs/Makefile.am ++++ extern_libs/Makefile.am +@@ -68,9 +68,9 @@ + endif + + install-data-hook: +- rm -f $(GAPLIBDIR)/libavformat.a \ +- rm -f $(GAPLIBDIR)/libavcodec.a \ +- rm -f $(GAPLIBDIR)/libmpeg3.a ++ rm -f $(DESTDIR)$(GAPLIBDIR)/libavformat.a \ ++ rm -f $(DESTDIR)$(GAPLIBDIR)/libavcodec.a \ ++ rm -f $(DESTDIR)$(GAPLIBDIR)/libmpeg3.a + + EXTRA_DIST = \ + README_extern_libs \ +--- libgapvidapi/gap_vid_api_ffmpeg.c ++++ libgapvidapi/gap_vid_api_ffmpeg.c +@@ -29,8 +29,9 @@ + #include "avformat.h" + #include "stdlib.h" + #include "gap_val_file.h" ++#include "gap_base.h" + #include "audioconvert.h" +- ++#include "imgconvert.h" + + #define READSTEPS_PROBE_TIMECODE 32 + +--- vid_enc_avi/gap_enc_avi_main.c ++++ vid_enc_avi/gap_enc_avi_main.c +@@ -58,6 +58,7 @@ + #include "gap_gve_story.h" /* for STORYBOARD support */ + + #include "gap_gve_jpeg.h" /* for the builtin JPEG support */ ++#include "gap_gve_png.h" /* for the builtin PNG support */ + #include "gap_gve_raw.h" /* for raw CODEC support */ + #include "gap_gve_xvid.h" /* for XVID CODEC support */ + #include "gap_enc_avi_main.h" +--- vid_enc_ffmpeg/gap_enc_ffmpeg_main.c ++++ vid_enc_ffmpeg/gap_enc_ffmpeg_main.c +@@ -76,9 +76,11 @@ + #include + #include + ++#include "imgconvert.h" + + #include "gap-intl.h" + ++#include "gap_file_util.h" + #include "gap_libgapvidutil.h" + #include "gap_libgimpgap.h" + #include "gap_enc_ffmpeg_main.h" diff --git a/gimp-gap-warnings.patch b/gimp-gap-warnings.patch new file mode 100644 index 0000000..56a546a --- /dev/null +++ b/gimp-gap-warnings.patch @@ -0,0 +1,445 @@ +--- configure.in ++++ configure.in +@@ -1035,9 +1035,10 @@ + CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED" + fi + +-if ! $PKG_CONFIG --atleast-version=2.7.0 gimp-2.0; then +- CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED" +-fi ++dnl gimp_md5_get_digest() is deprecated but it is still in use in gap_vid_api_util.c: ++dnl if ! $PKG_CONFIG --atleast-version=2.7.0 gimp-2.0; then ++dnl CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED" ++dnl fi + + + AC_SUBST(GAPLIBDIR) +--- gap/gap_pdb_calls.c ++++ gap/gap_pdb_calls.c +@@ -52,11 +52,11 @@ + extern int gap_debug; + + /* ============================================================================ +- * p_status_to_string ++ * gap_status_to_string + * ============================================================================ + */ + const char * +-p_status_to_string(int status) ++gap_status_to_string(int status) + { + switch (status) + { +@@ -73,7 +73,7 @@ + default: + return ("* unknown *"); + } +-} /* end p_status_to_string */ ++} /* end gap_status_to_string */ + + + /* check if procedure name is available in the PDB. +@@ -247,7 +247,7 @@ + printf("GAP: Error: PDB call of %s failed, d_status:%d %s\n" + , l_called_proc + , (int)return_vals[0].data.d_status +- , p_status_to_string(return_vals[0].data.d_status) ++ , gap_status_to_string(return_vals[0].data.d_status) + ); + return(FALSE); + } /* end gap_pdb_gimp_displays_reconnect */ +@@ -285,7 +285,7 @@ + printf("GAP: Error: PDB call of %s failed, d_status:%d %s\n" + , l_called_proc + , (int)return_vals[0].data.d_status +- , p_status_to_string(return_vals[0].data.d_status) ++ , gap_status_to_string(return_vals[0].data.d_status) + ); + + return(-1); +@@ -324,7 +324,7 @@ + , filename + , (int)image_id + , (int)return_vals[0].data.d_status +- , p_status_to_string(return_vals[0].data.d_status) ++ , gap_status_to_string(return_vals[0].data.d_status) + ); + return(FALSE); + } /* end gap_pdb_gimp_file_save_thumbnail */ +@@ -412,7 +412,7 @@ + printf("GAP: Error: PDB call of %s failed, d_status:%d %s\n" + , l_called_proc + , (int)return_vals[0].data.d_status +- , p_status_to_string(return_vals[0].data.d_status) ++ , gap_status_to_string(return_vals[0].data.d_status) + ); + return(FALSE); + } /* end gap_pdb_gimp_image_thumbnail */ +--- gap/gap_pdb_calls.h ++++ gap/gap_pdb_calls.h +@@ -40,6 +40,8 @@ + + #include "libgimp/gimp.h" + ++const char *gap_status_to_string(int status); ++ + gint gap_pdb_procedure_available(char *proc_name); + + gint32 gap_pdb_gimp_rotate_degree(gint32 drawable_id, gboolean interpolation, gdouble angle_deg); +--- gap/gap_split.c ++++ gap/gap_split.c +@@ -54,6 +54,7 @@ + #endif + + /* GIMP includes */ ++#include + #include "gtk/gtk.h" + #include "config.h" + #include "gap-intl.h" +--- gap/gap_story_dialog.c ++++ gap/gap_story_dialog.c +@@ -393,8 +393,6 @@ + ,gint32 mount_vs_row + ); + +-GtkWidget * p_gtk_button_new_from_stock_icon(const char *stock_id); +- + static gint32 p_get_gimprc_preview_size(const char *gimprc_option_name); + static void p_save_gimprc_preview_size(const char *gimprc_option_name, gint32 preview_size); + static void p_save_gimprc_int_value(const char *gimprc_option_name, gint32 value); +@@ -2443,7 +2441,6 @@ + { + gint32 imagewidth; + gint32 imageheight; +- long framenr; + + + +@@ -2464,8 +2461,8 @@ + ,imageheight + ,GAP_PLAYER_DONT_FORCE_ASPECT + ,sgpp->image_id +- ,framenr /* play from start */ +- ,framenr /* play until end */ ++ ,-1 /* play from start */ ++ ,-1 /* play until end */ + ,FALSE /* play all */ + ,1 /* seltrack */ + ,0.0 /* delace */ +@@ -7611,7 +7608,7 @@ + /* with_load_and_save button */ + { + /* The Load button */ +- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_OPEN ); ++ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_OPEN ); + gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (p_tabw_load_file_cb), +@@ -7631,7 +7628,7 @@ + gtk_widget_show (button); + + /* The Save button */ +- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_SAVE ); ++ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_SAVE ); + tabw->save_button = button; + gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); + if(tabw->type == GAP_STB_MASTER_TYPE_STORYBOARD) +@@ -7673,7 +7670,7 @@ + } + + /* The Section Properties button */ +- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_PROPERTIES ); ++ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_PROPERTIES ); + //tabw->edit_story_properties_button = button; + gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (button), "clicked", +@@ -7708,7 +7705,7 @@ + + + /* The Undo button */ +- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_UNDO ); ++ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_UNDO ); + tabw->undo_button = button; + gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (button), "clicked", +@@ -7718,7 +7715,7 @@ + gtk_widget_show (button); + + /* The Redo button */ +- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_REDO ); ++ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_REDO ); + tabw->redo_button = button; + gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (button), "clicked", +@@ -7729,7 +7726,7 @@ + + + /* The Cut button */ +- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_CUT ); ++ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_CUT ); + tabw->edit_cut_button = button; + gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (button), "clicked", +@@ -7741,7 +7738,7 @@ + gtk_widget_show (button); + + /* The Copy button */ +- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_COPY ); ++ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_COPY ); + tabw->edit_copy_button = button; + gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (button), "clicked", +@@ -7753,7 +7750,7 @@ + gtk_widget_show (button); + + /* The Paste button */ +- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_PASTE ); ++ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_PASTE ); + tabw->edit_paste_button = button; + gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (button), "clicked", +@@ -7765,7 +7762,7 @@ + gtk_widget_show (button); + + /* The New Clip button */ +- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_NEW ); ++ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_NEW ); + tabw->new_clip_button = button; + gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (button), "button_press_event", +@@ -7782,7 +7779,7 @@ + + + /* The Play Button */ +- button = p_gtk_button_new_from_stock_icon (GAP_STOCK_PLAY); ++ button = gap_gtk_button_new_from_stock_icon (GAP_STOCK_PLAY); + tabw->play_button = button; + gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); + gimp_help_set_help_data (button, +@@ -7885,13 +7882,13 @@ + } /* end p_create_button_bar */ + + /* -------------------------------- +- * p_gtk_button_new_from_stock_icon ++ * gap_gtk_button_new_from_stock_icon + * -------------------------------- + * create a button from stock, using only the icon + * (the text assotiated with the stock id is not rendered, + * to keep the button width small) + */ +-GtkWidget * p_gtk_button_new_from_stock_icon(const char *stock_id) ++GtkWidget * gap_gtk_button_new_from_stock_icon(const char *stock_id) + { + GtkWidget *button; + GtkWidget *image; +@@ -7903,7 +7900,7 @@ + gtk_container_add (GTK_CONTAINER (button), image); + return(button); + +-} /* end p_gtk_button_new_from_stock_icon */ ++} /* end gap_gtk_button_new_from_stock_icon */ + + + +--- gap/gap_story_dialog.h ++++ gap/gap_story_dialog.h +@@ -71,4 +71,6 @@ + , GapStbTabWidgets *tabw + ); + ++GtkWidget * gap_gtk_button_new_from_stock_icon(const char *stock_id); ++ + #endif +--- gap/gap_story_properties.c ++++ gap/gap_story_properties.c +@@ -55,6 +55,7 @@ + #include "gap_timeconv.h" + #include "gap_thumbnail.h" + #include "gap_fmac_base.h" ++#include "gap_fmac_name.h" + #include "gap_story_vthumb.h" + + +--- gap/gap_story_section_properties.c ++++ gap/gap_story_section_properties.c +@@ -866,7 +866,7 @@ + gtk_widget_show (entry); + + /* the delete button */ +- button = p_gtk_button_new_from_stock_icon (GTK_STOCK_DELETE); ++ button = gap_gtk_button_new_from_stock_icon (GTK_STOCK_DELETE); + spw->spw_delete_button = button; + gimp_help_set_help_data (button, + _("Delete storyboard section"), +--- gap/gap_story_sox.c ++++ gap/gap_story_sox.c +@@ -21,6 +21,8 @@ + + #include + ++#include ++ + #include + + #include "gap_story_sox.h" +--- gap/gap_wr_color_curve.c ++++ gap/gap_wr_color_curve.c +@@ -849,7 +849,7 @@ + + if (strcmp (buf, "# GIMP curves tool settings\n") != 0) + { +- printf("ERROR: file %s does not start with '%s'\n", "# GIMP curves tool settings"); ++ printf("ERROR: file %s does not start with '%s'\n", filename, "# GIMP curves tool settings"); + return FALSE; + } + +--- gap/gimplastvaldesc.c ++++ gap/gimplastvaldesc.c +@@ -77,7 +77,7 @@ + static void p_lastvals_register_persistent(const gchar *keyname, GimpLastvalDescType *lastval_desc_arr, gint32 argc); + + +-static GimpLastvalTokenTabType token_tab[GIMP_LASTVAL_END]; ++static GimpLastvalTokenTabType token_tab[GIMP_LASTVAL_END + 1]; + + + gboolean +--- libgapbase/gap_base.c ++++ libgapbase/gap_base.c +@@ -50,6 +50,8 @@ + /* GIMP includes */ + #include "gtk/gtk.h" + #include "libgimp/gimp.h" ++#include ++#include + + #ifdef G_OS_WIN32 + #include +--- libgapvidapi/gap_vid_api.c ++++ libgapvidapi/gap_vid_api.c +@@ -1837,6 +1837,7 @@ + threshold = CLAMP(threshold, 0.0, 1.0); + l_threshold = (gdouble)MIX_MAX_THRESHOLD * (threshold * threshold * threshold); + l_mix_threshold = CLAMP((gint32)l_threshold, 0, MIX_MAX_THRESHOLD); ++ return l_mix_threshold; + } + + +--- libgapvidapi/gap_vid_api_util.c ++++ libgapvidapi/gap_vid_api_util.c +@@ -7,6 +7,7 @@ + */ + + #include ++#include + + + /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX END fcache procedures */ +--- libgapvidapi/gap_vid_api_vidindex.c ++++ libgapvidapi/gap_vid_api_vidindex.c +@@ -15,6 +15,8 @@ + * + */ + ++#include "gap_file_util.h" ++ + static char * p_build_videoindex_filename(const char *filename, gint32 track, const char *decoder_name); + static gboolean p_equal_mtime(time_t mtime_idx, time_t mtime_file); + +--- libgapvidutil/gap_gve_misc_util.c ++++ libgapvidutil/gap_gve_misc_util.c +@@ -33,7 +33,9 @@ + #include + #include + #include ++#include + ++#include + + /* GIMP includes */ + #include "gtk/gtk.h" +@@ -41,6 +43,7 @@ + #include "libgimp/gimp.h" + + ++#include "gap_image.h" + #include "gap_libgapbase.h" + #include "gap_gve_misc_util.h" + +--- libgapvidutil/gap_gve_png.c ++++ libgapvidutil/gap_gve_png.c +@@ -40,12 +40,15 @@ + #include + #include + ++#include ++ + /* GIMP includes */ + #include "gtk/gtk.h" + #include "libgimp/gimp.h" + + /* GAP includes */ + #include "gap_libgapbase.h" ++#include "gap_pdb_calls.h" + + #include "gtk/gtk.h" + +@@ -66,7 +69,7 @@ + + if(gap_debug) + { +- printf("GAP: PNG encode via call of %s on filename: %s, image_id:%d, drawable_id:%d %s\n" ++ printf("GAP: PNG encode via call of %s on filename: %s, image_id:%d, drawable_id:%d\n" + , l_called_proc + , filename + , image_id +@@ -105,7 +108,7 @@ + , image_id + , drawable_id + , (int)return_vals[0].data.d_status +- , p_status_to_string(return_vals[0].data.d_status) ++ , gap_status_to_string(return_vals[0].data.d_status) + ); + return(FALSE); + +--- libgapvidutil/gap_gve_png.h ++++ libgapvidutil/gap_gve_png.h +@@ -23,7 +23,7 @@ + app0_length: the length of the APP0-marker. + out:PNG_size: The size of the buffer that is returned. + returns: guchar *: A buffer, allocated by this routines, which contains +- the compressed PNG, NULL on error. */ ++ the compressed PNG, NULL on error. + */ + + guchar *gap_gve_png_drawable_encode_png(GimpDrawable *drawable, gint32 png_interlaced, gint32 *PNG_size, +--- vid_common/gap_cme_callbacks.c ++++ vid_common/gap_cme_callbacks.c +@@ -45,7 +45,7 @@ + + static void p_start_encoder_status_poll_timer(GapCmeGlobalParams *gpp); + static void p_remove_encoder_status_poll_timer(GapCmeGlobalParams *gpp); +-static gint32 p_drop_chache_and_start_video_encoder(GapCmeGlobalParams *gpp); ++static void p_drop_chache_and_start_video_encoder(GapCmeGlobalParams *gpp); + static void on_encoder_status_poll_timer(gpointer user_data); + + +@@ -142,7 +142,7 @@ + * p_drop_chache_and_start_video_encoder + * ---------------------------------------- + */ +-static gint32 ++static void + p_drop_chache_and_start_video_encoder(GapCmeGlobalParams *gpp) + { + /* delete images in the cache +--- vid_common/gap_cme_gui.c ++++ vid_common/gap_cme_gui.c +@@ -53,6 +53,7 @@ + #include + #include + ++#include + #include + + #include "gap-intl.h" diff --git a/gimp-gap.changes b/gimp-gap.changes index eb188dc..326aa9c 100644 --- a/gimp-gap.changes +++ b/gimp-gap.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Jun 10 18:37:11 CEST 2009 - sbrabec@suse.cz + +- Updated to version 2.6.0: + * Storyboard undo support + * Storyboard section support + * Storyboard clips support new deinterlace modes + * Player supports extracting audio track when playing clips. + * Filtermacro processing now supports mapping to persistent + drawable id references. + * Video extract supports generating transparency. + * The master video encoder dialog now stays open. + * Lossless frame extract and videocut for MJPEG. + * Frontends for old external video encoders. + * Modify Frames now supports creation of grayscale layer from + alpha channel, or layermask or mix of both. + * Added wrapper for rotate any angle. + * Added wrapper for the resynthesizer. + * External libs for video read and wrigte access were updated. + * Bugfixes and updates for the use with GIMP-2.6.x releases. + ------------------------------------------------------------------- Wed Feb 11 01:19:57 CET 2009 - ro@suse.de diff --git a/gimp-gap.spec b/gimp-gap.spec index fb10cb2..6777040 100644 --- a/gimp-gap.spec +++ b/gimp-gap.spec @@ -1,5 +1,5 @@ # -# spec file for package gimp-gap (Version 2.4.0) +# spec file for package gimp-gap (Version 2.6.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: gimp-gap -Version: 2.4.0 -Release: 54 +Version: 2.6.0 +Release: 1 # Patched code is built by default. # Use rpmbuild -D 'BUILD_ORIG 1' to build original code. # Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to name original code as -orig. @@ -37,21 +37,23 @@ Conflicts: %{name}-orig Url: http://www.gimp.org/ License: GPL v2 only Group: Productivity/Multimedia/Video/Editors and Convertors -Requires: gimp-2.0 +Requires: gimp-2.0 >= 2.6.0 Requires: %{name}-lang = %{version} Summary: GIMP Animation Package %if 0%{?BUILD_ORIG} -Source: ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.4/gap/%{name}-%{version}.tar.bz2 +Source: ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/%{name}-%{version}.tar.bz2 %else # WARNING: This is not a comment, but the real command to repack souce: #%(bash %{_sourcedir}/%{name}-patch-source.sh %{name}-%{version}.tar.bz2) Source: %{name}-%{version}-patched.tar.bz2 %endif Patch: %{name}-patched.patch -Patch1: %{name}-no-gimp_proc_view_new.patch -# Patch %{name}-no-gimp_proc_view_new.patch makes it binary incompatible with 2.4 -Requires: gimp-2.0 >= 2.6.0 -Patch2: gimp-gap-portability.patch +# PATCH-FIX-OPENSUSE gimp-gap-no-strict-aliasing.patch sbrabec@suse.cz -- Disables strict aliasing for part of the code. +Patch1: %{name}-no-strict-aliasing.patch +# PATCH-FIX-UPSTREAM gimp-gap-warnings.patch bgo585343 sbrabec@suse.cz -- Fix of serious warnings. +Patch2: %{name}-warnings.patch +# PATCH-FIX-UPSTREAM gimp-gap-warnings-orig-addon.patch bgo585343 sbrabec@suse.cz -- Fix of serious warnings. +Patch3: %{name}-warnings-orig-addon.patch Source1: %{name}-patch-source.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -93,12 +95,17 @@ Authors: %prep %setup -q +chmod -x ChangeLog %if ! 0%{?BUILD_ORIG} %patch -%endif +%else %patch1 +%endif %patch2 -sed -i -e "s,sr@Latn,sr@latin," configure.in +%if 0%{?BUILD_ORIG} +%patch3 +%endif +sed -i -e "s,sr@Latn,sr@latin," po/LINGUAS mv po/sr@Latn.po po/sr@latin.po %build @@ -107,20 +114,22 @@ autoreconf -f -i # FIXME: Ugly work-around of: #...ld: bitstream.o: relocation R_X86_64_32 against `a local symbol' can not be used when making a shared object; recompile with -fPIC #bitstream.o: could not read symbols: Bad value -export CFLAGS="-fPIC -DPIC $RPM_OPT_FLAGS" -export LDFLAGS="-fPIC" +#export CFLAGS="-fPIC -DPIC $RPM_OPT_FLAGS" +#export LDFLAGS="-fPIC" %configure %else %configure\ --disable-libavformat %endif -make %{?jobs:-j%jobs} +# First cimpilation of ffmpeg may fail on missing documentation: +make %{?jobs:-j%jobs} STRIP=/bin/true || : +make %{?jobs:-j%jobs} STRIP=/bin/true %install %makeinstall %find_lang gimp20-gap %if 0%{?BUILD_ORIG} -rm $RPM_BUILD_ROOT%{_libdir}/gimp-gap-2.4/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/gimp-gap-2.6/*.a %endif %clean @@ -139,13 +148,31 @@ rm -rf $RPM_BUILD_ROOT %endif %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog* NEWS README -%{_libdir}/gimp-gap-2.4 +%{_libdir}/gimp-gap-2.6 %{_libdir}/gimp/2.0/plug-ins/* %{_datadir}/gimp/2.0/scripts/*.scm %files lang -f gimp20-gap.lang %changelog +* Wed Jun 10 2009 sbrabec@suse.cz +- Updated to version 2.6.0: + * Storyboard undo support + * Storyboard section support + * Storyboard clips support new deinterlace modes + * Player supports extracting audio track when playing clips. + * Filtermacro processing now supports mapping to persistent + drawable id references. + * Video extract supports generating transparency. + * The master video encoder dialog now stays open. + * Lossless frame extract and videocut for MJPEG. + * Frontends for old external video encoders. + * Modify Frames now supports creation of grayscale layer from + alpha channel, or layermask or mix of both. + * Added wrapper for rotate any angle. + * Added wrapper for the resynthesizer. + * External libs for video read and wrigte access were updated. + * Bugfixes and updates for the use with GIMP-2.6.x releases. * Wed Feb 11 2009 ro@suse.de - use sr@latin instead of sr@Latn * Thu Oct 30 2008 sbrabec@suse.cz