Re: [Mesa-dev] robust-tarballs branch (Was: Error building on Windows with SCons)
- Original Message - On Mon, Jul 11, 2011 at 3:20 PM, Jose Fonseca jfons...@vmware.com wrote: - Original Message - On 07/09/2011 07:03 AM, Jose Fonseca wrote: I heard no concerns so I went ahead and made a branch where: - I removed GLUT - derived Mesa tarballs' file list from git ls-files. http://cgit.freedesktop.org/mesa/mesa/log/?h=robust-tarballs I've confirmed that both automake and scons+crossmingw32 build correctly on Linux. I'd like to merge to main if there are no objections. Concerning GLUT, we can make a separate branch/repos with just its source code if anybody sees value on it. ? Yes, I'd definitely like to see a new repo for glut. I still prefer it over freeglut. OK. I'll get it done then. I've filed https://bugs.freedesktop.org/show_bug.cgi?id=39138 requesting the creation of mesa/glut. Probably your sanction as Mesa project lead will be necessary. Used my one and only super-power to create this repo, so let me know if it works. Thanks. There are no notification mails, but I've push the history of all include/GL/glut.*.h src/glut/ changes plus enough autoconf/gmake stuff to build it with autogen.sh There might be some files/snippets too much / too litle, but the gist should be there. It produces working libGLUT.so and tarballs. Brian, let me know if this works for you. Jose ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] robust-tarballs branch (Was: Error building on Windows with SCons)
On 07/13/2011 07:55 AM, Jose Fonseca wrote: - Original Message - On Mon, Jul 11, 2011 at 3:20 PM, Jose Fonsecajfons...@vmware.com wrote: - Original Message - On 07/09/2011 07:03 AM, Jose Fonseca wrote: I heard no concerns so I went ahead and made a branch where: - I removed GLUT - derived Mesa tarballs' file list from git ls-files. http://cgit.freedesktop.org/mesa/mesa/log/?h=robust-tarballs I've confirmed that both automake and scons+crossmingw32 build correctly on Linux. I'd like to merge to main if there are no objections. Concerning GLUT, we can make a separate branch/repos with just its source code if anybody sees value on it. ? Yes, I'd definitely like to see a new repo for glut. I still prefer it over freeglut. OK. I'll get it done then. I've filed https://bugs.freedesktop.org/show_bug.cgi?id=39138 requesting the creation of mesa/glut. Probably your sanction as Mesa project lead will be necessary. Used my one and only super-power to create this repo, so let me know if it works. Thanks. There are no notification mails, but I've push the history of all include/GL/glut.*.h src/glut/ changes plus enough autoconf/gmake stuff to build it with autogen.sh There might be some files/snippets too much / too litle, but the gist should be there. It produces working libGLUT.so and tarballs. Brian, let me know if this works for you. Yup, works for me. I seem to recall that the commit emails are triggered by a config file under .git/ but I don't remember the details. Thanks, Jose. -Brian ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] robust-tarballs branch (Was: Error building on Windows with SCons)
Hi Jose, On Sat, Jul 9, 2011 at 6:03 AM, Jose Fonseca jfons...@vmware.com wrote: I heard no concerns so I went ahead and made a branch where: - I removed GLUT - derived Mesa tarballs' file list from git ls-files. http://cgit.freedesktop.org/mesa/mesa/log/?h=robust-tarballs I've confirmed that both automake and scons+crossmingw32 build correctly on Linux. I'd like to merge to main if there are no objections. Having a brief look through the commits, it looks like a lot of nice cleanup. A couple comments. 26edecac589819f0d0efe2165ab748dbc4e53394: Using the variable DIRECTORY is a little confusing since it's a symlink. DIRLINK may be better. 34983337f9d7db984e9f0117808274106d262110: - src/mesa/depend is in EXTRA_FILES. This seems like something that shouldn't be shipped. - You're passing -x autogen.sh to not ship autogen.sh, but is that the only thing that shouldn't be disted? Any chance you could compare an old tarball to a new tarball and see if any unintended new files slipped in? - This might be for another commit, but it would be nice to move that to a separate variable. To start it could be hacky with the arguments embedded: IGNORE_FILES = \ -x autogen.sh \ -x otherunwantedfile - $(LIBNAME).zip should depend on manifest.txt Looks good otherwise, though. -- Dan ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] robust-tarballs branch (Was: Error building on Windows with SCons)
- Original Message -
Hi Jose,
On Sat, Jul 9, 2011 at 6:03 AM, Jose Fonseca jfons...@vmware.com
wrote:
I heard no concerns so I went ahead and made a branch where:
- I removed GLUT
- derived Mesa tarballs' file list from git ls-files.
http://cgit.freedesktop.org/mesa/mesa/log/?h=robust-tarballs
I've confirmed that both automake and scons+crossmingw32 build
correctly on Linux.
I'd like to merge to main if there are no objections.
Having a brief look through the commits, it looks like a lot of nice
cleanup. A couple comments.
Thanks Dan
26edecac589819f0d0efe2165ab748dbc4e53394:
Using the variable DIRECTORY is a little confusing since it's a
symlink. DIRLINK may be better.
I agree DIRECTORY is not a very descriptive -- it was simply variable name
already being used before. DIRLINK doesn't explain much more so I went for the
typical PACKAGE_{VERSION/DIR/NAME}
34983337f9d7db984e9f0117808274106d262110:
- src/mesa/depend is in EXTRA_FILES. This seems like something that
shouldn't be shipped.
I've added because master's Makefile has it:
MAIN_FILES = \
[...]
$(DIRECTORY)/src/mesa/depend\
I thought there was some obscure need. I removed it now.
- You're passing -x autogen.sh to not ship autogen.sh, but is that
the only thing that shouldn't be disted?
I'm also skipping all .dotfiles files.
Any chance you could compare
an old tarball to a new tarball and see if any unintended new files
slipped in?
Yes. I did compare. There is more doc files, and additional test programs. I
personally don't see reason why not to dist, but exceptions can be easily added.
I confess I was more concerned with all the stuff that should be disted and
wasn't -- that was my main motive for doing the cleanup.
- This might be for another commit, but it would be nice to move that
to a separate variable. To start it could be hacky with the arguments
embedded:
IGNORE_FILES = \
-x autogen.sh \
-x otherunwantedfile
Done.
- $(LIBNAME).zip should depend on manifest.txt
Good catch.
Looks good otherwise, though.
Jose
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] robust-tarballs branch (Was: Error building on Windows with SCons)
On 07/09/2011 07:03 AM, Jose Fonseca wrote: I heard no concerns so I went ahead and made a branch where: - I removed GLUT - derived Mesa tarballs' file list from git ls-files. http://cgit.freedesktop.org/mesa/mesa/log/?h=robust-tarballs I've confirmed that both automake and scons+crossmingw32 build correctly on Linux. I'd like to merge to main if there are no objections. Concerning GLUT, we can make a separate branch/repos with just its source code if anybody sees value on it. ? Yes, I'd definitely like to see a new repo for glut. I still prefer it over freeglut. -Brian ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] robust-tarballs branch (Was: Error building on Windows with SCons)
On Mon, Jul 11, 2011 at 3:20 PM, Jose Fonseca jfons...@vmware.com wrote: - Original Message - On 07/09/2011 07:03 AM, Jose Fonseca wrote: I heard no concerns so I went ahead and made a branch where: - I removed GLUT - derived Mesa tarballs' file list from git ls-files. http://cgit.freedesktop.org/mesa/mesa/log/?h=robust-tarballs I've confirmed that both automake and scons+crossmingw32 build correctly on Linux. I'd like to merge to main if there are no objections. Concerning GLUT, we can make a separate branch/repos with just its source code if anybody sees value on it. ? Yes, I'd definitely like to see a new repo for glut. I still prefer it over freeglut. OK. I'll get it done then. I've filed https://bugs.freedesktop.org/show_bug.cgi?id=39138 requesting the creation of mesa/glut. Probably your sanction as Mesa project lead will be necessary. Used my one and only super-power to create this repo, so let me know if it works. Dave. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] robust-tarballs branch (Was: Error building on Windows with SCons)
I heard no concerns so I went ahead and made a branch where: - I removed GLUT - derived Mesa tarballs' file list from git ls-files. http://cgit.freedesktop.org/mesa/mesa/log/?h=robust-tarballs I've confirmed that both automake and scons+crossmingw32 build correctly on Linux. I'd like to merge to main if there are no objections. Concerning GLUT, we can make a separate branch/repos with just its source code if anybody sees value on it. ? Jose - Original Message - Probably it's missing the .def files too... I think that instead of manually listing source files in mesa/Makefile we should invoke 'git ls-files' (and maybe manually list any exclusions). Splitting out Mesa GLUT from the source tree would make things much easier. Which is probably a sensible thing to do anyway, given that there are no glut dependencies in Mesa, and most people are using freeglut anyway. Would anybody see any problem with that? Jose - Original Message - Hi There, Im trying to build Mesa so we can distribute it with Blender3D on Windows (we already do this on Linux). But I have have been unsable to build mesa 7.10.3 (Latest MingW XP, tested python 2.5, 2.7) Simply running 'm;\python25\Scripts\scons.bat' I always get this error: # --- snip scons: Reading SConscript files ... scons: warning: Ignoring missing SConscript 'build\windows-x86-debug\glut\glx\SConscript' File M:\Mesa-7.10.3\src\SConscript, line 13, in module warning: LLVM disabled: not building llvmpipe scons: done reading SConscript files. scons: Building targets ... scons: *** [build\windows-x86-debug\gallium\targets\libgl-gdi\opengl32.dll] Source `src\gallium\state_trackers\wgl\opengl32.def' not found, needed by target `build\windows-x86-debug\gallium\targets\libgl-gdi\opengl32.dll'. scons: building terminated because of errors. # --- snip So I copied: src\mesa\drivers\windows\gldirect\opengl32.def But then I get this error: # --- snip scons: Reading SConscript files ... warning: LLVM disabled: not building llvmpipe scons: done reading SConscript files. scons: Building targets ... link /nologo /fixed:no /incremental:no /dll /out:build\windows-x86-debug\gallium\targets\libgl-gdi\opengl32.dll build\windows-x86-debug\gallium\state_trackers\wgl\wgl.lib build\windows-x86-debug\gallium\winsys\sw\gdi\ws_gdi.lib build\windows-x86-debug\mapi\glapi\glapi.lib build\windows-x86-debug\mesa\mesa.lib build\windows-x86-debug\gallium\drivers\softpipe\softpipe.lib build\windows-x86-debug\gallium\drivers\trace\trace.lib build\windows-x86-debug\gallium\drivers\rbug\rbug.lib build\windows-x86-debug\gallium\auxiliary\gallium.lib build\windows-x86-debug\glsl\glsl.lib gdi32.lib user32.lib kernel32.lib ws2_32.lib /PDB:build\windows-x86-debug\gallium\targets\libgl-gdi\opengl32.pdb /DEBUG build\windows-x86-debug\gallium\targets\libgl-gdi\libgl_gdi.obj /def:src\gallium\state_trackers\wgl\opengl32.def src\gallium\state_trackers\wgl\opengl32.def(37) : warning LNK4017: DESCRIPTION statement not supported for the target platform; ignored opengl32.def : error LNK2001: unresolved external symbol glColorSubTableEXT build\windows-x86-debug\gallium\targets\libgl-gdi\opengl32.lib : fatal error LNK1120: 1 unresolved externals scons: building terminated because of errors. # --- snip Any hints on how to resolve these problems? -- - Campbell ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
