[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

Re: [pygame] nokia s60 branch merge...



hi,

I've committed some things... but still about 13 files to fix up.  All the .c and .h files have been committed... but nothing is tested yet... compiles though (on ubuntu jaunty i386 python2.6).

there seems to be an issue with pygame.h and the ifdefs.  I think it's to do with the intptr_t defs/undefs... but haven't looked into it much.

Will do the lib/ test/ and examples/ conflicts tomorrow.


cu!



On Fri, May 8, 2009 at 2:29 AM, Lenard Lindstrom <len-l@xxxxxxxxx> wrote:
I have committed the latest changes so Pygame now builds normally for Python 3.1. There may be a few error messages regarding compiling optional .py files, but they can be ignored. I will get to them later.

Good luck,

Lenard

René Dudfield wrote:
cool.  I'll try and do a portable python3 windows build on saturday.

Up to about 40 files left with conflicts in them... it's all been easy so far... just time consuming.


cu,



On Thu, May 7, 2009 at 5:01 PM, Lenard Lindstrom <len-l@xxxxxxxxx <mailto:len-l@xxxxxxxxx>> wrote:

   Hi,

   No, I don't have ready access to XP at the moment, though I could
   probably cross-build from Python 2.5 if absolutely necessary, as I
   did for Python 2.6.

   Lenard

   René Dudfield wrote:

       nice one.

       Well, I only did 2 files I think this morning... so feel free
       to keep going if you like.  It's no big deal if you keep going
       I think.  I'll just update from r2077 any of your changes past
       that before I commit.

       Do you have access to a windows machine at the moment?  If
       not, I'll try and build the installer for the python 3.x that
       Andre Krause is using.


       Andre: can you please confirm that you're using windows
       portable python 3.0.1 from http://www.portablepython.com/ ?

       Also, what day do you need pygame ready by?


       cheers,



       On Thu, May 7, 2009 at 1:01 PM, Lenard Lindstrom
       <len-l@xxxxxxxxx <mailto:len-l@xxxxxxxxx>
       <mailto:len-l@xxxxxxxxx <mailto:len-l@xxxxxxxxx>>> wrote:

          Hi René,

          Yeah, I kind of poured the code in there the last few days. I
          could have waited. I can use the time to clean up the remaining
          Python 3 changes before making another commit. I have
       updated all
          the modules that make sense for Python 3.1. setup.py will skip
          those modules not ported so a Python 3 build will be as
       simple as
          any other. I also need to spend some time on the test
       framework.

          Lenard


          René Dudfield wrote:

              hi,

              I made a diff like this:
              ...../trunk/ $ svn diff -r1761:2075
              svn://seul.org/svn/pygame/branches/symbian_s60/
       <http://seul.org/svn/pygame/branches/symbian_s60/>
              <http://seul.org/svn/pygame/branches/symbian_s60/>
              <http://seul.org/svn/pygame/branches/symbian_s60/> >
              ../../symbian_s60_patch.diff


              where 1761 was the revision the symbian branch was
       copied...
              and 2075 is the current revision on trunk

              I'm using this command to merge the changes into the trunk.
              ...../trunk/ $ svn merge -r1761:2075
              svn://seul.org/svn/pygame/branches/symbian_s60/
       <http://seul.org/svn/pygame/branches/symbian_s60/>
              <http://seul.org/svn/pygame/branches/symbian_s60/>
              <http://seul.org/svn/pygame/branches/symbian_s60/>



              I'm working through the merge conflicts slowly,
       hopefully more
              free time on the weekend... expect a day or two... or
       three :)



              cu,




              On Thu, May 7, 2009 at 4:56 AM, Lenard Lindstrom
              <len-l@xxxxxxxxx <mailto:len-l@xxxxxxxxx>
       <mailto:len-l@xxxxxxxxx <mailto:len-l@xxxxxxxxx>>
              <mailto:len-l@xxxxxxxxx <mailto:len-l@xxxxxxxxx>
       <mailto:len-l@xxxxxxxxx <mailto:len-l@xxxxxxxxx>>>> wrote:

                 Hi,

                 I guess I have made Pygame trunk a moving target the
       last few
                 days. I got carried away. So I am freezing commits
       at rev
              2075 --
                 with the exception to base_test.py -- until the
       symbian_s60
                  branch is merged back into trunk.

                 Lenard



                 Jussi Toivola wrote:

                     Hello,
                     I merged the latest trunk revisions(1993->2052) to
              symbian_s60
                     branch
                     and tested the compilation on Ubuntu as well.
       The tests
              passed on
                     Ubuntu, except audio tests because it's on a virtual
              machine
                     without
                     any audio devices and testLoadIcon, which was
       unable to
              locate
                     pygame/pygame_icon.bmp( checked and it wasn't
       there )...
                     Anyway, feel
                     free to start merging the branch to trunk.

                     The build is available at:
                                 http://pygame-symbian-s60.googlecode.com/files/pygame-S60_py25_SVN-2054_20090503_GCCE-UREL.sisx

                     2009/5/2 Lenard Lindstrom <len-l@xxxxxxxxx
       <mailto:len-l@xxxxxxxxx>
              <mailto:len-l@xxxxxxxxx <mailto:len-l@xxxxxxxxx>>
                     <mailto:len-l@xxxxxxxxx <mailto:len-l@xxxxxxxxx>
       <mailto:len-l@xxxxxxxxx <mailto:len-l@xxxxxxxxx>>>>:


                                       I've just committed the
       changes to SVN. As for the
              mixer
                         crash, there is a
                         know cleanup problem with SDL_mixer 1.2.8
       that has been
                         fixed in SVN. I use
                         the SVN version in Windows. It doesn't seem
       to help in
                         Debian though. I will
                         double check that the proper library is used. As
              for smpeg
                         there is some
                         recent activity (three months ago), but for the
              most part
                         nothing has been
                         checked in for nearly two years. The
       sndarray test also
                         fails, though the
                         sound_array_demos.py works.

                         Lenard

                         René Dudfield wrote:
                                                 hi,

                             awesome.

                             As for the mixer crash... I think it
       might be smpeg
                             related.  I think
                             on win/mac/source we are using svn smpeg
       with some
                             patches that
                             haven't made it into Debian as smpeg
       hasn't had any
                             releases in ages.
                             I haven't confirmed this yet though.  I
       noticed
              Tyler
                             had a crash on
                             mixer/ubuntu too.




                             On Sat, May 2, 2009 at 10:57 AM, Lenard
       Lindstrom
                             <len-l@xxxxxxxxx
       <mailto:len-l@xxxxxxxxx> <mailto:len-l@xxxxxxxxx
       <mailto:len-l@xxxxxxxxx>>
              <mailto:len-l@xxxxxxxxx <mailto:len-l@xxxxxxxxx>
       <mailto:len-l@xxxxxxxxx <mailto:len-l@xxxxxxxxx>>>> wrote:

                                                           Hi René,

                                 Good timing. I am preparing to merge
              python3 back
                                 into trunk. It builds
                                 and
                                 passes all tests in Python 2.5 on
       Windows.
              There
                                 is a mixer.music problem
                                 on
                                 Debian Linux though, causing
              mixer_music_test.py
                                 to crash. I think it is
                                 an
                                 SDL_mixer issue (not recent SVN), but am
              not sure.
                                 Otherwise mixer and
                                 mixer.music work. I will commit what
       I have
              then
                                 try a Python 3.1 build.
                                 Even if it doesn't build right away
       there are
                                 enough other fixes,
                                 basically
                                 in error checking and removing outdated
              coding, to
                                 make it worthwhile as
                                 is.

                                 Lenard


                                 René Dudfield wrote:

                                                                           hello,

                                     I have spoken to Jussi Toivola,
       about
              merging
                                     his pys60 branch into
                                     trunk before pygame 1.9 is released.

                                     So... the process we have
       decided is to
              slowly
                                     merge in changes... in
                                     small groups if possible.  This will
              allow us
                                     to discuss his changes,
                                     and to try and make sure things
       still build
                                     and run ok on various
                                     platforms.

                                     We can discuss any issues on the
              mailing list
                                     as they come up.

                                     Is this ok?  Lenard... what do you
              think?                          How does this go with the
                                     py3k branch?  Should we try and
       merge
              more of
                                     that first... or at the
                                     same time... or after?