wok-next rev 21102
gtkglext: patch
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Jan 03 00:26:26 2019 +0200 (2019-01-03) |
| parents | 2ed19fb406c3 |
| children | 943dad97e470 |
| files | gtkglext/receipt gtkglext/stuff/patches/gtk2.20.patch gtkglext/stuff/patches/gtkglext-deprecated.patch gtkglext/stuff/patches/gtkglext-local-parm.patch gtkglext/stuff/patches/series |
line diff
1.1 --- a/gtkglext/receipt Wed Jan 02 18:49:37 2019 +0200 1.2 +++ b/gtkglext/receipt Thu Jan 03 00:26:26 2019 +0200 1.3 @@ -15,6 +15,11 @@ 1.4 util-linux-uuid-dev autoconf pangox-compat-dev expat-dev libxshmfence-dev" 1.5 SPLIT="$PACKAGE-dev" 1.6 1.7 +DEPENDS_std="gtk2 mesa glu pangox-compat" 1.8 +DEPENDS_dev="$PACKAGE pangox-compat-dev" 1.9 + 1.10 +SUGGESTED_std="nvidia" 1.11 + 1.12 compile_rules() { 1.13 autoconf --force 1.14 ./configure $CONFIGURE_ARGS && 1.15 @@ -22,17 +27,3 @@ 1.16 make && 1.17 make DESTDIR=$install install 1.18 } 1.19 - 1.20 -genpkg_rules() { 1.21 - case $PACKAGE in 1.22 - gtkglext) 1.23 - copy @std 1.24 - DEPENDS="gtk2 mesa glu pangox-compat" 1.25 - SUGGESTED="nvidia" 1.26 - ;; 1.27 - *-dev) 1.28 - copy @dev 1.29 - DEPENDS="gtkglext pangox-compat-dev" 1.30 - ;; 1.31 - esac 1.32 -}
2.1 --- a/gtkglext/stuff/patches/gtk2.20.patch Wed Jan 02 18:49:37 2019 +0200 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,77 +0,0 @@ 2.4 -diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c 2.5 ---- gtkglext-1.2.0.orig/gtk/gtkglwidget.c 2004-02-20 11:38:36.000000000 +0200 2.6 -+++ gtkglext-1.2.0/gtk/gtkglwidget.c 2010-04-20 19:29:42.941917275 +0300 2.7 -@@ -127,7 +127,7 @@ 2.8 - * Synchronize OpenGL and window resizing request streams. 2.9 - */ 2.10 - 2.11 -- if (GTK_WIDGET_REALIZED (widget) && private->is_realized) 2.12 -+ if (gtk_widget_get_realized (widget) && private->is_realized) 2.13 - { 2.14 - gldrawable = gdk_window_get_gl_drawable (widget->window); 2.15 - gdk_gl_drawable_wait_gdk (gldrawable); 2.16 -@@ -154,7 +154,7 @@ 2.17 - * Remove OpenGL-capability from widget->window. 2.18 - */ 2.19 - 2.20 -- if (GTK_WIDGET_REALIZED (widget)) 2.21 -+ if (gtk_widget_get_realized (widget)) 2.22 - gdk_window_unset_gl_capability (widget->window); 2.23 - 2.24 - private->is_realized = FALSE; 2.25 -@@ -174,7 +174,7 @@ 2.26 - */ 2.27 - 2.28 - toplevel = gtk_widget_get_toplevel (widget); 2.29 -- if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel)) 2.30 -+ if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel)) 2.31 - { 2.32 - GTK_GL_NOTE (MISC, 2.33 - g_message (" - Install colormap to the top-level window.")); 2.34 -@@ -194,7 +194,7 @@ 2.35 - * Set a background of "None" on window to avoid AIX X server crash. 2.36 - */ 2.37 - 2.38 -- if (GTK_WIDGET_REALIZED (widget)) 2.39 -+ if (gtk_widget_get_realized (widget)) 2.40 - { 2.41 - GTK_GL_NOTE (MISC, 2.42 - g_message (" - window->bg_pixmap = %p", 2.43 -@@ -250,8 +250,8 @@ 2.44 - GTK_GL_NOTE_FUNC (); 2.45 - 2.46 - g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); 2.47 -- g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE); 2.48 -- g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE); 2.49 -+ g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE); 2.50 -+ g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE); 2.51 - g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE); 2.52 - 2.53 - /* 2.54 -@@ -432,7 +432,7 @@ 2.55 - GTK_GL_NOTE_FUNC (); 2.56 - 2.57 - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); 2.58 -- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); 2.59 -+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); 2.60 - 2.61 - gldrawable = gdk_window_get_gl_drawable (widget->window); 2.62 - if (gldrawable == NULL) 2.63 -@@ -474,7 +474,7 @@ 2.64 - GLWidgetPrivate *private; 2.65 - 2.66 - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); 2.67 -- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); 2.68 -+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); 2.69 - 2.70 - private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private); 2.71 - if (private == NULL) 2.72 -@@ -501,7 +501,7 @@ 2.73 - gtk_widget_get_gl_window (GtkWidget *widget) 2.74 - { 2.75 - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); 2.76 -- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); 2.77 -+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); 2.78 - 2.79 - return gdk_window_get_gl_window (widget->window); 2.80 - }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/gtkglext/stuff/patches/gtkglext-deprecated.patch Thu Jan 03 00:26:26 2019 +0200 3.3 @@ -0,0 +1,76 @@ 3.4 +--- gtkglext-1.2.0.orig/gtk/gtkglwidget.c 3.5 ++++ gtkglext-1.2.0/gtk/gtkglwidget.c 3.6 +@@ -127,7 +127,7 @@ 3.7 + * Synchronize OpenGL and window resizing request streams. 3.8 + */ 3.9 + 3.10 +- if (GTK_WIDGET_REALIZED (widget) && private->is_realized) 3.11 ++ if (gtk_widget_get_realized (widget) && private->is_realized) 3.12 + { 3.13 + gldrawable = gdk_window_get_gl_drawable (widget->window); 3.14 + gdk_gl_drawable_wait_gdk (gldrawable); 3.15 +@@ -154,7 +154,7 @@ 3.16 + * Remove OpenGL-capability from widget->window. 3.17 + */ 3.18 + 3.19 +- if (GTK_WIDGET_REALIZED (widget)) 3.20 ++ if (gtk_widget_get_realized (widget)) 3.21 + gdk_window_unset_gl_capability (widget->window); 3.22 + 3.23 + private->is_realized = FALSE; 3.24 +@@ -174,7 +174,7 @@ 3.25 + */ 3.26 + 3.27 + toplevel = gtk_widget_get_toplevel (widget); 3.28 +- if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel)) 3.29 ++ if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel)) 3.30 + { 3.31 + GTK_GL_NOTE (MISC, 3.32 + g_message (" - Install colormap to the top-level window.")); 3.33 +@@ -194,7 +194,7 @@ 3.34 + * Set a background of "None" on window to avoid AIX X server crash. 3.35 + */ 3.36 + 3.37 +- if (GTK_WIDGET_REALIZED (widget)) 3.38 ++ if (gtk_widget_get_realized (widget)) 3.39 + { 3.40 + GTK_GL_NOTE (MISC, 3.41 + g_message (" - window->bg_pixmap = %p", 3.42 +@@ -250,8 +250,8 @@ 3.43 + GTK_GL_NOTE_FUNC (); 3.44 + 3.45 + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); 3.46 +- g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE); 3.47 +- g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE); 3.48 ++ g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE); 3.49 ++ g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE); 3.50 + g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE); 3.51 + 3.52 + /* 3.53 +@@ -432,7 +432,7 @@ 3.54 + GTK_GL_NOTE_FUNC (); 3.55 + 3.56 + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); 3.57 +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); 3.58 ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); 3.59 + 3.60 + gldrawable = gdk_window_get_gl_drawable (widget->window); 3.61 + if (gldrawable == NULL) 3.62 +@@ -474,7 +474,7 @@ 3.63 + GLWidgetPrivate *private; 3.64 + 3.65 + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); 3.66 +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); 3.67 ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); 3.68 + 3.69 + private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private); 3.70 + if (private == NULL) 3.71 +@@ -501,7 +501,7 @@ 3.72 + gtk_widget_get_gl_window (GtkWidget *widget) 3.73 + { 3.74 + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); 3.75 +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); 3.76 ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); 3.77 + 3.78 + return gdk_window_get_gl_window (widget->window); 3.79 + }
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/gtkglext/stuff/patches/gtkglext-local-parm.patch Thu Jan 03 00:26:26 2019 +0200 4.3 @@ -0,0 +1,20 @@ 4.4 +--- a/gdk/gdkglshapes.c 4.5 ++++ b/gdk/gdkglshapes.c 4.6 +@@ -544,7 +544,7 @@ 4.7 + {-Z, -X, 0} 4.8 + }; 4.9 + 4.10 +-static int index[20][3] = 4.11 ++static int loc_index[20][3] = 4.12 + { 4.13 + {0, 4, 1}, 4.14 + {0, 9, 4}, 4.15 +@@ -574,7 +574,7 @@ 4.16 + int i; 4.17 + 4.18 + for (i = 19; i >= 0; i--) { 4.19 +- drawtriangle(i, idata, index, shadeType); 4.20 ++ drawtriangle(i, idata, loc_index, shadeType); 4.21 + } 4.22 + } 4.23 +
5.1 --- a/gtkglext/stuff/patches/series Wed Jan 02 18:49:37 2019 +0200 5.2 +++ b/gtkglext/stuff/patches/series Thu Jan 03 00:26:26 2019 +0200 5.3 @@ -1,1 +1,4 @@ 5.4 -gtk2.20.patch 5.5 +# from Alpine Linux 5.6 +# https://git.alpinelinux.org/cgit/aports/tree/main/gtkglext 5.7 +gtkglext-local-parm.patch 5.8 +gtkglext-deprecated.patch