diff -Naur ooo-build-3.0.1.3.old/configure ooo-build-3.0.1.3/configure --- ooo-build-3.0.1.3.old/configure 2009-03-06 14:22:41.000000000 +0000 +++ ooo-build-3.0.1.3/configure 2009-05-02 23:05:15.000000000 +0100 @@ -3523,6 +3523,7 @@ Ark*) VENDORNAME="Ark" ;; Debian*|Ubuntu*) VENDORNAME="Debian" ;; Dropline*) VENDORNAME="DroplineGNOME" ;; + GNOMESlackBuild*) VENDORNAME="GNOMESlackBuild" ;; Frugalware*) VENDORNAME="Frugalware" ;; Gentoo*) VENDORNAME="Gentoo" ;; Mandriva*) VENDORNAME="Mandriva" ;; @@ -7199,7 +7200,7 @@ ac_config_files="$ac_config_files intltool-extract intltool-merge intltool-update" -ac_config_files="$ac_config_files Makefile bin/setup bin/Makefile patches/dev300/pyuno-rpath-ooodir.diff patches/dev300/system-python-ure-bootstrap.diff bin/piece/sys-setup bin/piece/Makefile desktop/Makefile desktop/16x16/Makefile desktop/22x22/Makefile desktop/24x24/Makefile desktop/32x32/Makefile desktop/48x48/Makefile desktop/scalable/Makefile desktop/mimetypes/Makefile desktop/mimetypes/16x16/Makefile desktop/mimetypes/22x22/Makefile desktop/mimetypes/24x24/Makefile desktop/mimetypes/32x32/Makefile desktop/mimetypes/48x48/Makefile distro-configs/Makefile distro-configs/Ark.conf distro-configs/Common.conf distro-configs/CommonLinux.conf distro-configs/CommonWin32.conf distro-configs/CommonMac.conf distro-configs/GoOoWin32.conf distro-configs/GoOoMacOSX.conf distro-configs/DroplineGNOME.conf distro-configs/DroplineGNOME64.conf distro-configs/Debian.conf distro-configs/DebianEtch.conf distro-configs/DebianSarge.conf distro-configs/FSFhuLinux.conf distro-configs/FSFhuMacOSX.conf distro-configs/FSFhuWindows.conf distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWindows.conf distro-configs/Ubuntu.conf distro-configs/UbuntuL10n.conf distro-configs/Ubuntu64.conf distro-configs/UbuntuDapper.conf distro-configs/UbuntuDapper64.conf distro-configs/UbuntuGutsy.conf distro-configs/UbuntuGutsy64.conf distro-configs/UbuntuHardy.conf distro-configs/UbuntuHardy64.conf distro-configs/UbuntuIntrepid.conf distro-configs/UbuntuIntrepid64.conf distro-configs/UbuntuJaunty.conf distro-configs/UbuntuJaunty64.conf distro-configs/SUSE.conf distro-configs/SUSE-reduced.conf distro-configs/SUSE-9.1.conf distro-configs/SUSE-9.2.conf distro-configs/SUSE-9.3.conf distro-configs/SUSE-10.0.conf distro-configs/SUSE-10.1.conf distro-configs/SUSE-10.2.conf distro-configs/SUSE-10.3.conf distro-configs/SUSE-11.0.conf distro-configs/Mandriva.conf distro-configs/Mandriva64.conf distro-configs/NovellWin32.conf distro-configs/NovellWin32ISO.conf distro-configs/Gentoo.conf distro-configs/Frugalware.conf distro-configs/openmamba.conf distro-configs/translate-org-za-linux.conf distro-configs/translate-org-za-win32.conf distro-configs/rpl2.conf distro-configs/rpl2-64.conf distro-configs/Pardus2007.conf distro-configs/Pardus2008.conf distro-configs/PlainLinux.conf distro-configs/Win32.conf distro-configs/Solaris.conf distro-configs/GoOoLinux.conf etc/Makefile patches/apply.pl patches/Makefile patches/cairo/Makefile patches/dev300/Makefile patches/evo2/Makefile patches/emf+/Makefile patches/gstreamer/Makefile patches/hotfixes/Makefile patches/vba/Makefile patches/mono/Makefile patches/ooxml/Makefile patches/postgresql/Makefile patches/scsolver/Makefile patches/unittesting/Makefile patches/64bit/Makefile po/Makefile po/sdf-templates/Makefile doc/Makefile src/Makefile src/icons/Makefile src/icons/tango/Makefile src/layout/Makefile src/sdf/Makefile stamp/Makefile templates/Makefile man/Makefile www/Makefile www/images/Makefile www/tinder-scripts/Makefile" +ac_config_files="$ac_config_files Makefile bin/setup bin/Makefile patches/dev300/pyuno-rpath-ooodir.diff patches/dev300/system-python-ure-bootstrap.diff bin/piece/sys-setup bin/piece/Makefile desktop/Makefile desktop/16x16/Makefile desktop/22x22/Makefile desktop/24x24/Makefile desktop/32x32/Makefile desktop/48x48/Makefile desktop/scalable/Makefile desktop/mimetypes/Makefile desktop/mimetypes/16x16/Makefile desktop/mimetypes/22x22/Makefile desktop/mimetypes/24x24/Makefile desktop/mimetypes/32x32/Makefile desktop/mimetypes/48x48/Makefile distro-configs/Makefile distro-configs/Ark.conf distro-configs/Common.conf distro-configs/CommonLinux.conf distro-configs/CommonWin32.conf distro-configs/CommonMac.conf distro-configs/GoOoWin32.conf distro-configs/GoOoMacOSX.conf distro-configs/DroplineGNOME.conf distro-configs/DroplineGNOME64.conf distro-configs/GNOMESlackBuild.conf distro-configs/GNOMESlackBuild64.conf distro-configs/Debian.conf distro-configs/DebianEtch.conf distro-configs/DebianSarge.conf distro-configs/FSFhuLinux.conf distro-configs/FSFhuMacOSX.conf distro-configs/FSFhuWindows.conf distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWindows.conf distro-configs/Ubuntu.conf distro-configs/UbuntuL10n.conf distro-configs/Ubuntu64.conf distro-configs/UbuntuDapper.conf distro-configs/UbuntuDapper64.conf distro-configs/UbuntuGutsy.conf distro-configs/UbuntuGutsy64.conf distro-configs/UbuntuHardy.conf distro-configs/UbuntuHardy64.conf distro-configs/UbuntuIntrepid.conf distro-configs/UbuntuIntrepid64.conf distro-configs/UbuntuJaunty.conf distro-configs/UbuntuJaunty64.conf distro-configs/SUSE.conf distro-configs/SUSE-reduced.conf distro-configs/SUSE-9.1.conf distro-configs/SUSE-9.2.conf distro-configs/SUSE-9.3.conf distro-configs/SUSE-10.0.conf distro-configs/SUSE-10.1.conf distro-configs/SUSE-10.2.conf distro-configs/SUSE-10.3.conf distro-configs/SUSE-11.0.conf distro-configs/Mandriva.conf distro-configs/Mandriva64.conf distro-configs/NovellWin32.conf distro-configs/NovellWin32ISO.conf distro-configs/Gentoo.conf distro-configs/Frugalware.conf distro-configs/openmamba.conf distro-configs/translate-org-za-linux.conf distro-configs/translate-org-za-win32.conf distro-configs/rpl2.conf distro-configs/rpl2-64.conf distro-configs/Pardus2007.conf distro-configs/Pardus2008.conf distro-configs/PlainLinux.conf distro-configs/Win32.conf distro-configs/Solaris.conf distro-configs/GoOoLinux.conf etc/Makefile patches/apply.pl patches/Makefile patches/cairo/Makefile patches/dev300/Makefile patches/evo2/Makefile patches/emf+/Makefile patches/gstreamer/Makefile patches/hotfixes/Makefile patches/vba/Makefile patches/mono/Makefile patches/ooxml/Makefile patches/postgresql/Makefile patches/scsolver/Makefile patches/unittesting/Makefile patches/64bit/Makefile po/Makefile po/sdf-templates/Makefile doc/Makefile src/Makefile src/icons/Makefile src/icons/tango/Makefile src/layout/Makefile src/sdf/Makefile stamp/Makefile templates/Makefile man/Makefile www/Makefile www/images/Makefile www/tinder-scripts/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7829,6 +7830,8 @@ "distro-configs/GoOoMacOSX.conf") CONFIG_FILES="$CONFIG_FILES distro-configs/GoOoMacOSX.conf" ;; "distro-configs/DroplineGNOME.conf") CONFIG_FILES="$CONFIG_FILES distro-configs/DroplineGNOME.conf" ;; "distro-configs/DroplineGNOME64.conf") CONFIG_FILES="$CONFIG_FILES distro-configs/DroplineGNOME64.conf" ;; + "distro-configs/GNOMESlackBuild.conf") CONFIG_FILES="$CONFIG_FILES distro-configs/GNOMESlackBuild.conf" ;; + "distro-configs/GNOMESlackBuild64.conf") CONFIG_FILES="$CONFIG_FILES distro-configs/GNOMESlackBuild64.conf" ;; "distro-configs/Debian.conf") CONFIG_FILES="$CONFIG_FILES distro-configs/Debian.conf" ;; "distro-configs/DebianEtch.conf") CONFIG_FILES="$CONFIG_FILES distro-configs/DebianEtch.conf" ;; "distro-configs/DebianSarge.conf") CONFIG_FILES="$CONFIG_FILES distro-configs/DebianSarge.conf" ;; diff -Naur ooo-build-3.0.1.3.old/configure.in ooo-build-3.0.1.3/configure.in --- ooo-build-3.0.1.3.old/configure.in 2009-03-06 14:22:27.000000000 +0000 +++ ooo-build-3.0.1.3/configure.in 2009-05-02 23:05:15.000000000 +0100 @@ -577,6 +577,7 @@ Ark*) VENDORNAME="Ark" ;; Debian*|Ubuntu*) VENDORNAME="Debian" ;; Dropline*) VENDORNAME="DroplineGNOME" ;; + GNOMESlackBuild*) VENDORNAME="GNOMESlackBuild" ;; Frugalware*) VENDORNAME="Frugalware" ;; Gentoo*) VENDORNAME="Gentoo" ;; Mandriva*) VENDORNAME="Mandriva" ;; @@ -1387,6 +1388,8 @@ distro-configs/GoOoMacOSX.conf distro-configs/DroplineGNOME.conf distro-configs/DroplineGNOME64.conf +distro-configs/GNOMESlackBuild.conf +distro-configs/GNOMESlackBuild64.conf distro-configs/Debian.conf distro-configs/DebianEtch.conf distro-configs/DebianSarge.conf diff -Naur ooo-build-3.0.1.3.old/download.in ooo-build-3.0.1.3/download.in --- ooo-build-3.0.1.3.old/download.in 2009-02-02 18:13:29.000000000 +0000 +++ ooo-build-3.0.1.3/download.in 2009-05-02 23:05:15.000000000 +0100 @@ -387,6 +387,7 @@ my $distro = '@DISTRO@'; if ($distro eq 'Ark' || $distro eq 'DroplineGNOME' || + $distro eq 'GNOMESlackBuild' || $distro eq 'Frugalware' || $distro eq 'Frugalware64' || $distro eq 'Gentoo.conf' || $distro eq 'openmamba' || diff -Naur ooo-build-3.0.1.3.old/patches/dev300/apply ooo-build-3.0.1.3/patches/dev300/apply --- ooo-build-3.0.1.3.old/patches/dev300/apply 2009-03-04 12:48:41.000000000 +0000 +++ ooo-build-3.0.1.3/patches/dev300/apply 2009-05-02 23:05:15.000000000 +0100 @@ -87,6 +87,9 @@ # DroplineGNOME DroplineGNOME : LinuxCommon, DroplineGNOMEOnly, NotDebian, Mono, msaccess DroplineGNOME64 : LinuxCommon, DroplineGNOMEOnly, NotDebian, Mono, msaccess +# GNOME SlackBuild +GNOMESlackBuild : LinuxCommon, GNOMESlackBuildOnly, NotDebian, msaccess, CairoFonts +GNOMESlackBuild64 : LinuxCommon, GNOMESlackBuildOnly, NotDebian, msaccess, CairoFonts # Ark Linux Ark: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, Gcc43, KDE4 # www.pld-linux.org @@ -995,6 +998,11 @@ pushfont-psstream.diff, i#84481 scp2-user-config-ooo3.diff +[ GNOMESlackBuildOnly ] +SectionOwner => GNOMESlackBuild + +pushfont-psstream.diff, i#84481 +scp2-user-config-ooo3.diff [ MandrivaOnly ] SectionOwner => gghibo diff -Naur ooo-build-3.0.1.3.old/patches/dev300/transogl-pixmap-to-texture.diff ooo-build-3.0.1.3/patches/dev300/transogl-pixmap-to-texture.diff --- ooo-build-3.0.1.3.old/patches/dev300/transogl-pixmap-to-texture.diff 2008-12-01 15:17:40.000000000 +0000 +++ ooo-build-3.0.1.3/patches/dev300/transogl-pixmap-to-texture.diff 2009-05-02 23:06:15.000000000 +0100 @@ -1087,219 +1087,6 @@ } else if( transitionType == animations::TransitionType::IRISWIPE && transitionSubType == animations::TransitionSubType::DIAMOND ) { pTransition = new OGLTransitionImpl(); pTransition->makeDiamond(); -diff -rup slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionerImpl.cxx.orig slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.orig ---- slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionerImpl.cxx.orig 2008-08-26 18:06:46.000000000 +0200 -+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.orig 2008-08-25 19:10:29.000000000 +0200 -@@ -93,7 +93,7 @@ public: - explicit OGLTransitionerImpl(OGLTransitionImpl* pOGLTransition); - bool initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView, double, double); - void setSlides( const uno::Reference< rendering::XBitmap >& xLeavingSlide , const uno::Reference< rendering::XBitmap >& xEnteringSlide ); -- static void initialize( const uno::Reference< presentation::XSlideShowView >& xView ); -+ static bool initialize( const uno::Reference< presentation::XSlideShowView >& xView ); - - // XTransition - virtual void SAL_CALL update( double nTime ) throw (uno::RuntimeException); -@@ -179,14 +179,20 @@ public: - /** Whether Mesa is the OpenGL vendor - */ - static bool cbMesa; -+ -+ /** -+ whether the display has GLX extension -+ */ -+ static bool cbGLXPresent; - }; - - // declare the static variables as some gcc versions have problems declaring them automaticaly - bool OGLTransitionerImpl::cbBrokenTexturesATI; - float OGLTransitionerImpl::cnGLVersion; - bool OGLTransitionerImpl::cbMesa; -+bool OGLTransitionerImpl::cbGLXPresent; - --void OGLTransitionerImpl::initialize( const uno::Reference< presentation::XSlideShowView >& xView ) -+bool OGLTransitionerImpl::initialize( const uno::Reference< presentation::XSlideShowView >& xView ) - { - // not thread safe - static bool initialized = false; -@@ -195,28 +201,34 @@ void OGLTransitionerImpl::initialize( co - OGLTransitionerImpl *instance; - - instance = new OGLTransitionerImpl( NULL ); -- instance->initWindowFromSlideShowView( xView, 0, 0 ); -+ if( instance->initWindowFromSlideShowView( xView, 0, 0 ) ) { - -- const GLubyte* version = glGetString( GL_VERSION ); -- if( version && version[0] ) { -- cnGLVersion = version[0] - '0'; -- if( version[1] == '.' && version[2] ) -- cnGLVersion += (version[2] - '0')/10.0; -- } else -- cnGLVersion = 1.0; -- OSL_TRACE("GL version: %s parsed: %f", version, cnGLVersion ); -+ const GLubyte* version = glGetString( GL_VERSION ); -+ if( version && version[0] ) { -+ cnGLVersion = version[0] - '0'; -+ if( version[1] == '.' && version[2] ) -+ cnGLVersion += (version[2] - '0')/10.0; -+ } else -+ cnGLVersion = 1.0; -+ OSL_TRACE("GL version: %s parsed: %f", version, cnGLVersion ); -+ -+ const GLubyte* vendor = glGetString( GL_VENDOR ); -+ cbMesa = ( vendor && strstr( (const char *) vendor, "Mesa" ) ); -+ OSL_TRACE("GL vendor: %s identified as Mesa: %d", vendor, cbMesa ); - -- const GLubyte* vendor = glGetString( GL_VENDOR ); -- cbMesa = ( vendor && strstr( (const char *) vendor, "Mesa" ) ); -- OSL_TRACE("GL vendor: %s identified as Mesa: %d", vendor, cbMesa ); -+ /* TODO: check for version once the bug in fglrx driver is fixed */ -+ cbBrokenTexturesATI = (vendor && strcmp( (const char *) vendor, "ATI Technologies Inc." ) == 0 ); - -- /* TODO: check for version once the bug in fglrx driver is fixed */ -- cbBrokenTexturesATI = (strcmp( (const char *) glGetString( GL_VENDOR ), "ATI Technologies Inc." ) == 0 ); -+ instance->disposing(); -+ cbGLXPresent = true; -+ } else -+ cbGLXPresent = false; - -- instance->disposing(); - delete instance; - initialized = true; - } -+ -+ return cbGLXPresent; - } - - bool OGLTransitionerImpl::initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView, double, double) -@@ -243,6 +255,10 @@ bool OGLTransitionerImpl::initWindowFrom - GLWin.hWnd = sysData->hWnd; - #elif defined( UNX ) - GLWin.dpy = reinterpret_cast(sysData->pDisplay); -+ -+ if( unx::glXQueryExtension( GLWin.dpy, NULL, NULL ) == false ) -+ return false; -+ - GLWin.win = sysData->aWindow; - GLWin.screen = unx::XDefaultScreen(GLWin.dpy); - unx::XVisualInfo* vi( NULL ); -@@ -553,10 +569,10 @@ void OGLTransitionerImpl::GLInitSlides() - static const OGLFormat lcl_RGB24[] = - { - // 24 bit RGB -+ {3, GL_BGR, GL_UNSIGNED_BYTE}, - {3, GL_RGB, GL_UNSIGNED_BYTE}, --// {3, GL_BGR, GL_UNSIGNED_BYTE}, -- {3, GL_RGB, GL_UNSIGNED_BYTE}, -- // {3, GL_BGR, GL_UNSIGNED_BYTE} -+ {3, GL_BGR, GL_UNSIGNED_BYTE}, -+ {3, GL_RGB, GL_UNSIGNED_BYTE} - }; - - #if defined(GL_VERSION_1_2) && defined(GLU_VERSION_1_3) -@@ -564,37 +580,37 @@ void OGLTransitionerImpl::GLInitSlides() - static const OGLFormat lcl_RGB16[] = - { - // 16 bit RGB -- {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5}, - {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV}, - {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5}, -- {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV} -+ {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV}, -+ {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5} - }; - - static const OGLFormat lcl_ARGB16_4[] = - { - // 16 bit ARGB -- {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4}, --// {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4}, -- // {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV}, -- {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4_REV} -+ {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4_REV}, -+ {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV}, -+ {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4}, -+ {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4} - }; - - static const OGLFormat lcl_ARGB16_5[] = - { - // 16 bit ARGB -- {4, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1}, -- // {4, GL_BGRA, GL_UNSIGNED_SHORT_5_5_5_1}, -- // {4, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV}, -- {4, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV} -+ {4, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV}, -+ {4, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV}, -+ {4, GL_BGRA, GL_UNSIGNED_SHORT_5_5_5_1}, -+ {4, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1} - }; - - static const OGLFormat lcl_ARGB32[] = - { - // 32 bit ARGB -- {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8}, --// {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8}, -- // {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV}, -- {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV} -+ {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV}, -+ {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV}, -+ {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8}, -+ {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8} - }; - - const uno::Sequence aComponentTags( -@@ -684,7 +700,7 @@ void OGLTransitionerImpl::GLInitSlides() - { - if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapLeaving) { - glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width, -- SlideSize.Height, &LeavingBytes[0]); -+ SlideSize.Height, 0, pDetectedFormat->eFormat, GL_UNSIGNED_BYTE, &LeavingBytes[0]); - glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST); -@@ -739,7 +755,7 @@ void OGLTransitionerImpl::GLInitSlides() - else - { - if( pTransition && !cbBrokenTexturesATI && !pTransition->mbUseMipMapEntering ) { -- glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width, SlideSize.Height, 0, Format, GL_UNSIGNED_BYTE, &EnteringBytes[0]); -+ glTexImage2D(GL_TEXTURE_2D, 0, pDetectedFormat->nInternalFormat, SlideSize.Width, SlideSize.Height, 0, pDetectedFormat->eFormat, GL_UNSIGNED_BYTE, &EnteringBytes[0]); - glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST); -@@ -770,7 +786,7 @@ void SAL_CALL OGLTransitionerImpl::updat - { - osl::MutexGuard const guard( m_aMutex ); - -- if (isDisposed() || pTransition->mnRequiredGLVersion > cnGLVersion) -+ if (isDisposed() || !cbGLXPresent || pTransition->mnRequiredGLVersion > cnGLVersion) - return; - - glEnable(GL_DEPTH_TEST); -@@ -904,7 +920,7 @@ public: - if( !hasTransition( transitionType, transitionSubType ) ) - return uno::Reference< presentation::XTransition >(); - -- OGLTransitionerImpl::initialize( view ); -+ bool bGLXPresent = OGLTransitionerImpl::initialize( view ); - - if( OGLTransitionerImpl::cbMesa && ( - ( transitionType == animations::TransitionType::FADE && transitionSubType == animations::TransitionSubType::CROSSFADE ) || -@@ -974,9 +990,11 @@ public: - - rtl::Reference xRes( - new OGLTransitionerImpl(pTransition) ); -- if(!xRes->initWindowFromSlideShowView(view,slideOffset.X,slideOffset.Y)) -- return uno::Reference< presentation::XTransition >(); -- xRes->setSlides(leavingBitmap,enteringBitmap); -+ if( bGLXPresent ) { -+ if( !xRes->initWindowFromSlideShowView(view,slideOffset.X,slideOffset.Y)) -+ return uno::Reference< presentation::XTransition >(); -+ xRes->setSlides(leavingBitmap,enteringBitmap); -+ } - - return uno::Reference(xRes.get()); - } -Only in slideshow/source/engine/OGLTrans: OGLTrans_TransitionerImpl.cxx.rej diff -rup slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.cxx slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx --- slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.cxx 2008-08-26 18:06:46.000000000 +0200 +++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx 2008-08-26 18:07:43.000000000 +0200 @@ -1494,84 +1281,3 @@ void displaySlidesShaders( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ); void prepareStatic( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ); void prepareDissolve( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ); -diff -rup slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.hxx.orig slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx.orig ---- slideshow/source/engine/OGLTrans-orig/OGLTrans_TransitionImpl.hxx.orig 2008-08-26 18:06:46.000000000 +0200 -+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx.orig 2008-08-25 19:10:22.000000000 +0200 -@@ -64,18 +64,25 @@ public: - OGLTransitionImpl() : - mbUseMipMapLeaving( true ), - mbUseMipMapEntering( true ), -+ mnRequiredGLVersion( 1.0 ), - maLeavingSlidePrimitives(), - maEnteringSlidePrimitives(), - maSceneObjects(), - mbReflectSlides( false ), -+ mVertexObject( 0 ), -+ mFragmentObject( 0 ), -+ mProgramObject( 0 ), -+ maHelperTexture( 0 ), - mmPrepare( NULL ), -+ mmPrepareTransition( NULL ), -+ mmClearTransition( NULL ), - mmDisplaySlides( NULL ) - {} - - ~OGLTransitionImpl(); - -- void prepare(); -- void display( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight); -+ void prepare( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ); -+ void display( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ); - void finish(); - - void makeOutsideCubeFaceToLeft(); -@@ -89,6 +96,9 @@ public: - void makeIris(); - void makeRochade(); - void makeVenetianBlinds( bool vertical, int parts ); -+ void makeStatic(); -+ void makeDissolve(); -+ void makeNewsflash(); - - /** 2D replacements - */ -@@ -100,6 +110,10 @@ public: - bool mbUseMipMapLeaving; - bool mbUseMipMapEntering; - -+ /** which GL version does the transition require -+ */ -+ float mnRequiredGLVersion; -+ - private: - /** clears all the primitives and operations - */ -@@ -138,6 +152,16 @@ private: - */ - void (OGLTransitionImpl::*mmPrepare)( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ); - -+ /** When this method is not NULL, it is called after glx context is ready to let the transition prepare GL related things, like GLSL program. -+ ** We might later replace this by cleaner derived class. -+ */ -+ void (OGLTransitionImpl::*mmPrepareTransition)( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ); -+ -+ /** When this method is not NULL, it is called when the transition needs to clear after itself, like delete own textures etc. -+ ** We might later replace this by cleaner derived class. -+ */ -+ void (OGLTransitionImpl::*mmClearTransition)(); -+ - /** When this method is not NULL, it is called in display method to display the slides. - ** We might later replace this by cleaner derived class. - */ -@@ -152,6 +176,10 @@ private: - */ - void prepareDiamond( double nTime, double SlideWidth, double SlideHeight,double DispWidth, double DispHeight ); - void displaySlidesFadeSmoothly( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ); -+ void displaySlidesShaders( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ); -+ void prepareStatic( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ); -+ void prepareDissolve( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ); -+ void preparePermShader(); - }; - - class SceneObject -Only in slideshow/source/engine/OGLTrans: OGLTrans_TransitionImpl.hxx.rej