On Wed, 2006-01-25 at 16:49 +0100, Amaya wrote:
> Regis Boudin wrote:
> > It looks like the problem is due to the Mesa part. Applying the
> > attached patch, amaya was linked against the Xorg shared library
> > during the build instead of the internally provided one.
>
> Forgot to attach the patch maybe? :)
Oups :P
Well, it doesn't matter much, it was not the best way... Attached this
time is one passing the --with-gl flag to configure, so it links against
the system-provided libGLU instead of the included source.
Also attached, a cumulative patch, which should close #341424, #348706,
#336014, #346632, #340289, and #348705. (is that enough ?)
> Thanks for everything, you rock!
Thank you for your work, too.
By the way, for information, my mail server rejected your mail, it looks
like there is no reverse DNS entry for our IP adress.
Thanks
Regis
--
"While a monkey can be a manager, it takes a human to be an engineer"
Erik Zapletal
diff -urN amaya-9.2.1/debian/rules amaya-9.2.1.gl/debian/rules
--- amaya-9.2.1/debian/rules 2006-01-25 18:57:16.476609560 +0000
+++ amaya-9.2.1.gl/debian/rules 2006-01-25 18:59:52.628870808 +0000
@@ -40,7 +40,7 @@
# Add here commands to configure the package.
mkdir -p Amaya/WX
cd Amaya/WX && \
- ../configure --prefix=/usr --with-wx --with-dav \
+ ../configure --prefix=/usr --with-wx --with-gl --with-dav \
--enable-offical-build && \
cd ../..
# --libpng, libjpeg, libtiff (currently builtin)
diff -urN amaya-9.2.1/Amaya/configure amaya-9.2.1.gl/Amaya/configure
--- amaya-9.2.1/Amaya/configure 2005-08-13 01:29:25.000000000 +0100
+++ amaya-9.2.1.gl/Amaya/configure 2006-01-25 19:01:07.001564440 +0000
@@ -13642,7 +13642,7 @@
# this is the flags used to build amaya with OpenGL
GL_OPTIONS="-D_GL"
GL_INCLUDES="-I${GL_BUILDDIR}/include"
- GL_LIBRARIES="-Wl,-rpath,${GL_BUILDDIR}/lib -L${GL_BUILDDIR}/lib -lGL -lGLU"
+ GL_LIBRARIES="-L${GL_BUILDDIR}/lib -lGL -lGLU"
@@ -13703,7 +13703,7 @@
# --enable-unicode compile wxString with Unicode support
# --with-gtk use GTK+
# --with-opengl use OpenGL (or Mesa)
- WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --disable-shared --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin $WXCONFIGURE_TUNNING_OPTION"
+ WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --disable-shared --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin $WXCONFIGURE_TUNNING_OPTION --disable-rpath"
fi
if test "$AMAYAOS" = "MACOSX" ; then
# MACOSX
diff -urN amaya-9.2.1/debian/control amaya-9.2.1.gl/debian/control
--- amaya-9.2.1/debian/control 2006-01-25 18:57:16.470610472 +0000
+++ amaya-9.2.1.gl/debian/control 2006-01-25 19:01:19.517661704 +0000
@@ -2,7 +2,7 @@
Section: web
Priority: optional
Maintainer: Anand Kumria <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), automake1.7, libgtk2.0-dev, libpng12-dev, libjpeg62-dev, xlibs-dev (>> 4.1.0), libglu1-xorg-dev, xutils
+Build-Depends: debhelper (>= 4.0.0), automake1.7, libgtk2.0-dev, libpng12-dev, libjpeg62-dev, libglu1-xorg-dev, libxt-dev, libxxf86vm-dev, libfreetype6-dev, xutils
Standards-Version: 3.6.2.1
Package: amaya
diff -urN amaya-9.2.1/debian/rules amaya-9.2.1.gl/debian/rules
--- amaya-9.2.1/debian/rules 2006-01-25 18:57:16.476609560 +0000
+++ amaya-9.2.1.gl/debian/rules 2006-01-25 19:01:03.005171984 +0000
@@ -40,7 +40,7 @@
# Add here commands to configure the package.
mkdir -p Amaya/WX
cd Amaya/WX && \
- ../configure --prefix=/usr --with-wx --with-dav \
+ ../configure --prefix=/usr --with-wx --with-gl --with-dav \
--enable-offical-build && \
cd ../..
# --libpng, libjpeg, libtiff (currently builtin)
@@ -58,7 +58,7 @@
# Add here commands to compile the arch part of the package.
cd Amaya/WX && \
- $(MAKE) CFLAGS="$(CFLAGS)" && \
+ HOME="$(CURDIR)/Amaya/WX" $(MAKE) CFLAGS="$(CFLAGS)" && \
cd ../..
touch build-arch-stamp
diff -urN amaya-9.2.1/wxWidgets/src/gtk/window.cpp amaya-9.2.1.gl/wxWidgets/src/gtk/window.cpp
--- amaya-9.2.1/wxWidgets/src/gtk/window.cpp 2005-08-13 01:29:47.000000000 +0100
+++ amaya-9.2.1.gl/wxWidgets/src/gtk/window.cpp 2006-01-25 19:01:15.519269552 +0000
@@ -4280,12 +4280,10 @@
return gtk_widget_get_pango_context( m_widget );
}
+// MR: Returns the same as GtkGetPangoDefaultContext until the symbol can be removed in 2.7.x
PangoContext *wxWindowGTK::GtkGetPangoX11Context()
{
- if (!m_x11Context)
- m_x11Context = pango_x_get_context( gdk_display );
-
- return m_x11Context;
+ return gtk_widget_get_pango_context( m_widget );
}
#endif
