diff options
| author | tron <tron@pkgsrc.org> | 2000-04-05 20:46:13 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2000-04-05 20:46:13 +0000 |
| commit | dbe4b20b73c14123cd7ff02b12c46a6b95570679 (patch) | |
| tree | f9a63b77c8f37c89354cc3631d1768472d5a71d7 /x11/gtkglarea | |
| parent | 92b0ebfb310b2fdac4d900618246a0b7bdf3e2f8 (diff) | |
| download | pkgsrc-dbe4b20b73c14123cd7ff02b12c46a6b95570679.tar.gz | |
Make this work with Mesa 3.1 or newer.
Diffstat (limited to 'x11/gtkglarea')
| -rw-r--r-- | x11/gtkglarea/files/patch-sum | 4 | ||||
| -rw-r--r-- | x11/gtkglarea/patches/patch-aa | 56 |
2 files changed, 53 insertions, 7 deletions
diff --git a/x11/gtkglarea/files/patch-sum b/x11/gtkglarea/files/patch-sum index d5fcb1ef0ed..bfac2ec17a7 100644 --- a/x11/gtkglarea/files/patch-sum +++ b/x11/gtkglarea/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.2 1999/07/22 23:44:36 sakamoto Exp $ +$NetBSD: patch-sum,v 1.3 2000/04/05 20:46:13 tron Exp $ -MD5 (patch-aa) = c545c8e1e741987ee1990d3669bcbb6d +MD5 (patch-aa) = c03b99e68f99994a421911a364843731 diff --git a/x11/gtkglarea/patches/patch-aa b/x11/gtkglarea/patches/patch-aa index 3d329a6f6f1..5ec84418155 100644 --- a/x11/gtkglarea/patches/patch-aa +++ b/x11/gtkglarea/patches/patch-aa @@ -1,16 +1,62 @@ -$NetBSD: patch-aa,v 1.2 1999/07/22 23:44:36 sakamoto Exp $ +$NetBSD: patch-aa,v 1.3 2000/04/05 20:46:14 tron Exp $ ---- ./configure.orig Fri Feb 26 04:29:00 1999 -+++ ./configure Fri Jul 23 08:33:56 1999 -@@ -1621,4 +1621,5 @@ +--- configure.orig Thu Feb 25 20:29:00 1999 ++++ configure Wed Apr 5 22:43:57 2000 +@@ -1620,6 +1620,7 @@ + fi # Always use our own libtool. +if false; then LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -1852,4 +1853,5 @@ + # Check for any special flags to pass to ltconfig. +@@ -1851,6 +1852,7 @@ + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } +fi # Redirect the config.log output again, so that the ltconfig log is not + # clobbered by the next message. +@@ -2241,7 +2243,7 @@ + + echo $ac_n "checking Mesa""... $ac_c" 1>&6 + echo "configure:2244: checking Mesa" >&5 +-LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lMesaGL" ++LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lGL" + cat > conftest.$ac_ext <<EOF + #line 2247 "configure" + #include "confdefs.h" +@@ -2265,7 +2267,7 @@ + if test "x$have_MesaGL" = "xno"; then + echo $ac_n "checking Mesa with pthreads""... $ac_c" 1>&6 + echo "configure:2268: checking Mesa with pthreads" >&5 +- LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lMesaGL -lpthread" ++ LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lGL -lpthread" + cat > conftest.$ac_ext <<EOF + #line 2271 "configure" + #include "confdefs.h" +@@ -2301,9 +2303,9 @@ + elif test "x$with_lib_MesaGL" = "xyes"; then + + if test "x$have_MesaGL" = "xyes"; then +- GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL" ++ GL_LIBS="$GL_LDOPTS -lGLU -lGL" + elif test "x$have_MesaGL_pthread" = "xyes"; then +- GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL -lpthread" ++ GL_LIBS="$GL_LDOPTS -lGLU -lGL -lpthread" + else + { echo "configure: error: Missing MesaGL library" 1>&2; exit 1; } + fi +@@ -2313,9 +2315,9 @@ + if test "x$have_GL" = "xyes"; then + GL_LIBS="$GL_LDOPTS -lGLU -lGL" + elif test "x$have_MesaGL" = "xyes"; then +- GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL" ++ GL_LIBS="$GL_LDOPTS -lGLU -lGL" + elif test "x$have_MesaGL_pthread" = "xyes"; then +- GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL -lpthread" ++ GL_LIBS="$GL_LDOPTS -lGLU -lGL -lpthread" + else + { echo "configure: error: You need GL or MesaGL libraries" 1>&2; exit 1; } + fi |