pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/cinepaint Added lots of patches to build cine...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b297bb855a93
branches: trunk
changeset: 490633:b297bb855a93
user: rillig <rillig%pkgsrc.org@localhost>
date: Wed Mar 16 18:32:50 2005 +0000
description:
Added lots of patches to build cinepaint on NetBSD-1.6.2 using gcc-2.95.3.
These patches have been submitted to the upstream authors. Approved by wiz.
diffstat:
graphics/cinepaint/distinfo | 16 +-
graphics/cinepaint/patches/patch-ac | 58 +++++
graphics/cinepaint/patches/patch-ad | 353 ++++++++++++++++++++++++++++++++++++
graphics/cinepaint/patches/patch-ae | 73 +++++++
graphics/cinepaint/patches/patch-af | 250 +++++++++++++++++++++++++
graphics/cinepaint/patches/patch-ag | 38 +++
graphics/cinepaint/patches/patch-ah | 42 ++++
graphics/cinepaint/patches/patch-ai | 22 ++
graphics/cinepaint/patches/patch-aj | 22 ++
graphics/cinepaint/patches/patch-ak | 25 ++
graphics/cinepaint/patches/patch-al | 121 ++++++++++++
graphics/cinepaint/patches/patch-am | 43 ++++
graphics/cinepaint/patches/patch-an | 337 ++++++++++++++++++++++++++++++++++
graphics/cinepaint/patches/patch-ao | 34 +++
graphics/cinepaint/patches/patch-ap | 21 ++
15 files changed, 1454 insertions(+), 1 deletions(-)
diffs (truncated from 1521 to 300 lines):
diff -r de044615ac26 -r b297bb855a93 graphics/cinepaint/distinfo
--- a/graphics/cinepaint/distinfo Wed Mar 16 17:58:03 2005 +0000
+++ b/graphics/cinepaint/distinfo Wed Mar 16 18:32:50 2005 +0000
@@ -1,7 +1,21 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 08:45:03 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/03/16 18:32:50 rillig Exp $
SHA1 (cinepaint-0.19-0.tar.gz) = ce3f3cb9cc26bacd8a9b99b6059caad967e59297
RMD160 (cinepaint-0.19-0.tar.gz) = eec10941ae75c6ef7213ea4f5649bbb6937f4bcc
Size (cinepaint-0.19-0.tar.gz) = 7218293 bytes
SHA1 (patch-aa) = 2259896756f3371589b4a83655e4c118d0247302
SHA1 (patch-ab) = 1e03ffb0deab12b229f2604083bd3515a80747ac
+SHA1 (patch-ac) = 106b4569e627692566abc1f2d2175df01ae76fea
+SHA1 (patch-ad) = 86e3677cea5bf24c749f1771943ef18808eb1d14
+SHA1 (patch-ae) = 188e453a0a2b5fdf7ce3ec7db889d08071a57bd3
+SHA1 (patch-af) = 313f9fe908217de89ba9b02bd98cb28761d188ba
+SHA1 (patch-ag) = 25dff8ba05f414d4dde3356dfc71624f6fdb8a60
+SHA1 (patch-ah) = b2f750fa1adf9c09af13e8b0fa172be90e7802d4
+SHA1 (patch-ai) = e7979dec50e3402927a5442cb69e5771b03362db
+SHA1 (patch-aj) = 06ca475fdb0ea0e49e89c91cdb164d001a6a1937
+SHA1 (patch-ak) = e63c101cdc372ec8680ccf22bae99099fdb641af
+SHA1 (patch-al) = 2e456b752b363191c0f6ddcff9904b434ddf81ea
+SHA1 (patch-am) = 9bdb163ddc08bb526be842a3c3ef719426dc257f
+SHA1 (patch-an) = 8ef057f80c9586e26e66a28e8b402147e6d98faa
+SHA1 (patch-ao) = 564d69b66582f3db696063b64f329d78b4f4836f
+SHA1 (patch-ap) = 04dd321313b21acc76f84cc62cb6c6e28306f6f1
diff -r de044615ac26 -r b297bb855a93 graphics/cinepaint/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cinepaint/patches/patch-ac Wed Mar 16 18:32:50 2005 +0000
@@ -0,0 +1,58 @@
+$NetBSD: patch-ac,v 1.1 2005/03/16 18:32:50 rillig Exp $
+
+Copy and paste bug.
+
+--- app/store_frame_manager.c.orig Tue Dec 28 17:22:02 2004
++++ app/store_frame_manager.c Sat Mar 12 14:36:11 2005
+@@ -2153,51 +2153,6 @@ sfm_store_change_frame_to (GDisplay* dis
+ disp->ID = disp->gimage->ID;
+ item->gimage = disp->gimage;
+ sfm_store_make_cur (disp, fm->fg);
+-void
+-sfm_slide_show (GtkWidget *w, gpointer data)
+-{
+- GDisplay *display=NULL;
+- GtkWidget *window;
+- static gint win_x, win_y, win_w, win_h, win_d;
+-
+- display = gdisplay_active();
+- window = display->shell;
+-
+- if(display)
+- {
+- display->slide_show = display->slide_show ? 0 : 1;
+- if(display->slide_show)
+- {
+- gdk_window_get_geometry(window->window, &win_x, &win_y, &win_w, &win_h, &win_d);
+-
+- gtk_widget_hide(display->menubar);
+- gtk_widget_hide(display->hsb);
+- gtk_widget_hide(display->vsb);
+- gtk_widget_hide(display->hrule);
+- gtk_widget_hide(display->vrule);
+-
+- gdk_window_move_resize (window->window, -50, -75, gdk_screen_width()+92,
+- gdk_screen_height()+105);
+- gtk_window_set_default_size (GTK_WINDOW (window), gdk_screen_width()+92,
+- gdk_screen_height()+105);
+- gtk_widget_set_usize (GTK_WIDGET(window), gdk_screen_width()+92,
+- gdk_screen_height()+105);
+- }
+- else
+- {
+- gdk_window_move_resize (window->window, win_x, win_y, win_w, win_h);
+- gtk_window_set_default_size (GTK_WINDOW (window), win_w, win_h);
+- gtk_widget_set_usize (GTK_WIDGET(window), win_w, win_h);
+-
+- gtk_widget_show(display->menubar);
+- gtk_widget_show(display->hsb);
+- gtk_widget_show(display->vsb);
+- gtk_widget_show(display->hrule);
+- gtk_widget_show(display->vrule);
+- }
+- gdisplays_flush();
+- }
+-}
+ gtk_clist_set_text (GTK_CLIST (disp->bfm->sfm->store_list), disp->bfm->sfm->fg,
+ 5, temp_name);
+
diff -r de044615ac26 -r b297bb855a93 graphics/cinepaint/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cinepaint/patches/patch-ad Wed Mar 16 18:32:50 2005 +0000
@@ -0,0 +1,353 @@
+$NetBSD: patch-ad,v 1.1 2005/03/16 18:32:50 rillig Exp $
+
+gcc-2.95.3 cannot handle declarations intermixed with code.
+
+--- app/cms.c.orig Tue Nov 23 12:58:15 2004
++++ app/cms.c Wed Mar 16 18:11:19 2005
+@@ -202,7 +202,12 @@ erase_alpha_from_4th_color (CMSTransform
+ * called from app_procs.c:app_init()
+ */
+ void cms_init()
+-{ profile_cache = g_hash_table_new(g_str_hash, g_str_equal);
++{
++ GList *remove_settings = NULL;
++ GList *update_settings = NULL;
++ cmsHPROFILE test = NULL;
++
++ profile_cache = g_hash_table_new(g_str_hash, g_str_equal);
+ transform_cache = g_hash_table_new(g_str_hash, g_str_equal);
+ profile_info_buffer = g_new(CMSProfileInfo, 1);
+ profile_info_buffer->manufacturer = NULL;
+@@ -216,9 +221,6 @@ void cms_init()
+ /* suppress lcms errors while checking */
+ cmsErrorAction(LCMS_ERROR_IGNORE);
+
+- GList *remove_settings = NULL;
+- GList *update_settings = NULL;
+- cmsHPROFILE test = NULL;
+
+ /* 1. image profile */
+ if (cms_default_image_profile_name != NULL)
+@@ -476,11 +478,12 @@ cms_read_icc_profile_dir(gchar *path, ic
+ while ((entry = readdir (dir)))
+ { char *file_name = entry->d_name;
+ cmsHPROFILE profile;
++ GString *file_path;
+ if ((strcmp (file_name, "..") == 0) || (strcmp (file_name, ".") == 0))
+ { continue;
+ }
+
+- GString *file_path = g_string_new(NULL);
++ file_path = g_string_new(NULL);
+ g_string_sprintf (file_path, "%s/%s", path, file_name);
+
+ /* Open the file and try to read it using the lcms library
+@@ -517,6 +520,7 @@ cms_read_standard_profile_dirs(icProfile
+ const char *home = GetDirHome();
+ char *directories = g_strdup(cms_profile_path);
+ GString *file_path = g_string_new(NULL);
++ GSList *sub_list;
+
+ /* process path by path, paths are separated by : */
+ char *remaining_directories = directories;
+@@ -531,7 +535,7 @@ cms_read_standard_profile_dirs(icProfile
+ { path = strdup(token);
+ }
+
+- GSList *sub_list = cms_read_icc_profile_dir(path, class);
++ sub_list = cms_read_icc_profile_dir(path, class);
+ return_list = g_slist_concat(return_list, sub_list);
+
+ g_free(path);
+@@ -673,6 +677,7 @@ cms_load_profile_to_mem (char* filename,
+ CMSProfile *
+ cms_get_profile_from_file(char *file_name)
+ { CMSProfile *return_value;
++ ProfileCacheEntry *cache_entry;
+
+ /* get profile information */
+ cmsHPROFILE profile = cmsOpenProfileFromFile (file_name, "r");
+@@ -682,7 +687,7 @@ cms_get_profile_from_file(char *file_nam
+ }
+
+ /* check hash table for profile */
+- ProfileCacheEntry *cache_entry = g_hash_table_lookup(profile_cache,
++ cache_entry = g_hash_table_lookup(profile_cache,
+ (gpointer) cms_get_long_profile_info(profile));
+ if (cache_entry != NULL)
+ { cache_entry->ref_count ++;
+@@ -719,7 +724,8 @@ cms_get_profile_from_file(char *file_nam
+ CMSProfile *
+ cms_get_profile_from_mem(void *mem_pointer, DWORD size)
+ { CMSProfile *return_value;
+-
++ ProfileCacheEntry *cache_entry;
++
+ /* get profile information */
+ cmsHPROFILE profile = cmsOpenProfileFromMem (mem_pointer, size);
+ if (profile == NULL)
+@@ -728,7 +734,7 @@ cms_get_profile_from_mem(void *mem_point
+ }
+
+ /* check hash table for profile */
+- ProfileCacheEntry *cache_entry = g_hash_table_lookup(profile_cache,
++ cache_entry = g_hash_table_lookup(profile_cache,
+ (gpointer) cms_get_long_profile_info(profile));
+ if (cache_entry != NULL)
+ { cache_entry->ref_count ++;
+@@ -788,6 +794,7 @@ cms_get_profile_data(CMSProfile *profile
+ CMSProfile *
+ cms_get_lab_profile(LPcmsCIExyY white_point)
+ { CMSProfile *return_value;
++ ProfileCacheEntry *cache_entry;
+
+ GString *hash_key = g_string_new(NULL);
+ if (white_point)
+@@ -797,7 +804,7 @@ cms_get_lab_profile(LPcmsCIExyY white_po
+ { g_string_sprintf(hash_key, "###LAB###");
+ }
+
+- ProfileCacheEntry *cache_entry = g_hash_table_lookup(profile_cache, (gpointer) hash_key);
++ cache_entry = g_hash_table_lookup(profile_cache, (gpointer) hash_key);
+ if (cache_entry != NULL)
+ { cache_entry->ref_count ++;
+ return_value = cache_entry->profile;
+@@ -970,12 +977,13 @@ cms_return_profile(CMSProfile *profile)
+ { /* search the cache for the profile
+ * decreate ref_counter + possibly close profile
+ */
++ ProfileCacheEntry *entry;
+ if (profile == NULL)
+ { g_warning("cms_return_profile: profile is NULL");
+ return FALSE;
+ }
+
+- ProfileCacheEntry *entry = g_hash_table_lookup(profile_cache, (gpointer)profile->cache_key);
++ entry = g_hash_table_lookup(profile_cache, (gpointer)profile->cache_key);
+ if (entry == NULL)
+ { g_warning("cms_return_profile: profile not found in cache");
+ return FALSE;
+@@ -1008,7 +1016,18 @@ cms_get_transform(GSList *profiles,
+ { /* turn profiles into an array as needed by lcms +
+ check all profiles are registered with the profile cache +
+ create hash key to check transform cache */
++
++ int i;
++ GString *hash_key;
++ CMSProfile *current_profile;
++ GSList *iterator;
++ TransformCacheEntry *cache_entry;
++ cmsHTRANSFORM transform;
++ cmsHPROFILE devicelink;
++ char *file_name;
++
+ int num_profiles = g_slist_length(profiles);
++ cmsHPROFILE profile_array[num_profiles];
+ if (num_profiles == 0)
+ { g_warning("cms_get_transform: profile list is empty, cannot create transfrom");
+ return NULL;
+@@ -1028,12 +1047,9 @@ cms_get_transform(GSList *profiles,
+ return NULL;
+ }
+
+- cmsHPROFILE profile_array[num_profiles];
+- GString *hash_key = g_string_new(NULL);
++ hash_key = g_string_new(NULL);
+
+- int i;
+- CMSProfile *current_profile;
+- GSList *iterator = profiles;
++ iterator = profiles;
+ for (i=0; ((i<num_profiles) && (iterator !=NULL)); i++)
+ { current_profile = (CMSProfile *)iterator->data;
+ if (g_hash_table_lookup(profile_cache, (gpointer)current_profile->cache_key) == NULL)
+@@ -1050,7 +1066,7 @@ cms_get_transform(GSList *profiles,
+ lcms_intent, lcms_flags);
+
+ /* now check the cache */
+- TransformCacheEntry *cache_entry = g_hash_table_lookup(transform_cache, (gpointer) hash_key->str);
++ cache_entry = g_hash_table_lookup(transform_cache, (gpointer) hash_key->str);
+
+ /* if it was in the disc cache */
+ if (cache_entry != NULL)
+@@ -1079,7 +1095,6 @@ cms_get_transform(GSList *profiles,
+ }
+
+ /* if no cache hit, create transform */
+- cmsHTRANSFORM transform;
+ transform = cmsCreateMultiprofileTransform (profile_array,
+ num_profiles,
+ lcms_input_format,
+@@ -1093,8 +1108,8 @@ cms_get_transform(GSList *profiles,
+ }
+
+ /* save it to disk */
+- cmsHPROFILE devicelink = cmsTransform2DeviceLink(transform,0);
+- char *file_name = file_temp_name("icc");
++ devicelink = cmsTransform2DeviceLink(transform,0);
++ file_name = file_temp_name("icc");
+ _cmsSaveProfile(devicelink, file_name);
+ cmsCloseProfile(devicelink);
+
+@@ -1218,6 +1233,12 @@ cms_set_display_profile(CMSProfile *prof
+ void
+ cms_transform_area(CMSTransform *transform, PixelArea *src_area, PixelArea *dest_area)
+ { TransformFunc transform_func;
++ PixelRow src_row_buffer, dest_row_buffer;
++ guint h;
++ void *src_data, *dest_data;
++ guint num_pixels;
++ void *pag;
++
+ Tag src_tag = pixelarea_tag(src_area);
+ Tag dest_tag = pixelarea_tag(dest_area);
+ if (tag_precision(src_tag) != tag_precision(dest_tag))
+@@ -1245,12 +1266,6 @@ cms_transform_area(CMSTransform *transfo
+ }
+
+
Home |
Main Index |
Thread Index |
Old Index