Ticket #20952: wx-64-x11.diff

File wx-64-x11.diff, 5.2 KB (added by jmroot (Joshua Root), 15 years ago)

use X11 instead of wxMac when building 64-bit

  • files/patch-soundsdl-28.diff

     
     1--- ../Makefile.in.orig 2007-03-19 14:27:34.000000000 +0100
     2+++ ../Makefile.in      2006-11-14 21:45:39.000000000 +0100
     3@@ -4929,8 +4929,8 @@
     4 @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
     5 @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
     6 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
     7-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
     8-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = monodll_sound_sdl.o
     9+@COND_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
     10+@COND_USE_PLUGINS_0@   = monodll_sound_sdl.o
     11 COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
     12        $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
     13 @COND_MONOLITHIC_1_SHARED_0@__monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname)
     14@@ -6712,8 +6712,8 @@
     15 @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
     16 @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
     17 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
     18-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
     19-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = monolib_sound_sdl.o
     20+@COND_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
     21+@COND_USE_PLUGINS_0@   = monolib_sound_sdl.o
     22 COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
     23        $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
     24 @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
     25@@ -10209,8 +10209,8 @@
     26 @COND_TOOLKIT_MSW@     = advdll_datectrl.o
     27 @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 \
     28 @COND_TOOLKIT_WINCE@   = advdll_datectrl.o
     29-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
     30-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = advdll_sound_sdl.o
     31+@COND_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
     32+@COND_USE_PLUGINS_0@   = advdll_sound_sdl.o
     33 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
     34        $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
     35 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
     36@@ -10274,8 +10274,8 @@
     37 @COND_TOOLKIT_MSW@     = advlib_datectrl.o
     38 @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 \
     39 @COND_TOOLKIT_WINCE@   = advlib_datectrl.o
     40-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
     41-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = advlib_sound_sdl.o
     42+@USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
     43+@USE_PLUGINS_0@        = advlib_sound_sdl.o
     44 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname = \
     45        $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
     46 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname)

  • Portfile

     
    4545extract.only    ${distname}-${version}${extract.suffix}
    4646
    4747#patchfiles     patch-chkconf.diff patch-TECConvertText.diff
    48 patchfiles      patch-chkconf.diff
     48patchfiles      patch-chkconf.diff patch-soundsdl-28.diff
    4949
    5050#configure.cmd  ../${distname}-${version}/configure
    5151configure.cmd           ../configure
    … …  
    5858                            --with-zlib \
    5959                            --with-sdl \
    6060                            --with-opengl \
    61                             --with-mac \
     61                            --with-x11 \
    6262                            --disable-sdltest \
    6363                            --enable-unicode \
    6464                            --enable-display \
    … …  
    8989        readme-gtk.txt readme-mac.txt \
    9090        readme-mgl.txt readme-motif.txt readme-x11.txt \
    9191        ${destroot}${prefix}/share/doc/${name}
    92     set confscript ${prefix}/lib/wx/config/mac-unicode-${installtype}-2.8
     92        if {[info exists wxMac_enabled] && $wxMac_enabled} {
     93        set confscript ${prefix}/lib/wx/config/mac-unicode-${installtype}-2.8
     94    } else {
     95        set confscript ${prefix}/lib/wx/config/x11univ-unicode-${installtype}-2.8
     96    }
    9397    reinplace "s|-L${build.dir}/lib||" ${destroot}${confscript}
    9498    ln -sf ${confscript} ${destroot}${prefix}/bin/wx-config
    9599}
    … …  
    103107    set installtype debug
    104108}
    105109
     110platform macosx {
     111    global wxMac_enabled
     112    # wxMac doesn't build 64-bit
     113    if {(![variant_isset universal] && ($build_arch == "i386" || $build_arch == "ppc")) ||
     114        ([variant_isset universal] && ![string match *64* $universal_archs])} {
     115        configure.args-delete --with-x11
     116        configure.args-append --with-mac
     117        set wxMac_enabled yes
     118    } else {
     119        # configure script doesn't find mesa properly
     120        configure.args-delete --with-opengl
     121    }
     122}
     123
    106124livecheck.type          regex
    107125livecheck.url           ${homepage}/downloads/
    108126livecheck.regex         Current Stable Release.*(2\\.\[0-9\]\\.\[0-9\]+)