GNOME Bugzilla – Bug 338040
Support for ekiga prequisites
Last modified: 2006-05-22 19:15:27 UTC
fcrozat has cooked a patch to build PWLib and OPAL that are needed for ekiga. It's here: http://twinpeaks.dyndns.org/patches/jhbuild-pwlib-opal.patch Would be nice to get it committed, as the tinderboxes cannot build ekiga otherwise.
How does bug 326376 relate to this?
Seems like this patch doesn't hit that problem by checking out pwlib instead of pwlib_unix. So, probably fixed by openh323 already... All this patch does actually is creating a new kind of cvsmodule that runs configure instead of autogen.sh. Maybe that should become an attribute of CVSModule proper.
Here's the CVSROOT/modules file for openh323: http://cvs.sourceforge.net/viewcvs.py/openh323/CVSROOT/modules?view=markup Which contains: pwlib -a pwlib/ReadMe.txt So a new checkout gives: $ cvs -d :pserver:anonymous@cvs.sourceforge.net:/cvsroot/openh323 \ checkout -P pwlib U pwlib/ReadMe.txt You can't do an initial checkout on "pwlib" and get a working source tree.
I tried using the above patch, but it fails at configure even though configure succeeded: http://jhbuild.bxlug.be/builds/2006-04-25-0005/logs/pwlib/#configure
Created attachment 64404 [details] [review] make pwlibmodule.py use jhbuild exceptions The attached patch makes pwlibmodule.py to use the new jhbuild exceptions, so configuring does succeed.
There is no CVSModule class in jhbuild now, so the patch is obsolete. I want to move tarball builds to use the new jhbuild.versioncontrol interfaces, and they need to run configure rather than autogen.sh too, so we should be able to share the module type between pwlib/opal and tarballs (perhaps merge support into AutogenModule?). I'll need to come back to this when the current refactoring is closer to completion.
In my bzr tree, the standard AutogenModule supports modules with a configure script but no autogen.sh (done to allow merging of support for tarball builds). This removes the need for a separate pwlibmodule type. So what remains is to modify jhbuild.versioncontrol.cvs to handle the pwlib CVS module. Namely: 1. allow specifying checkoutdir without causing "-d $checkoutdir" to be passed to CVS. 2. possibly add an option to disable passing "-d" to "cvs update", so that additional directories that were purposely skipped in checkout don't get pulled on update. With those issues fixed, the modules could be added as: <repository type="cvs" name="openh323.sf.net" cvsroot=":pserver:anonymous@cvs.sourceforge.net:/cvsroot/openh323" password=""/> <autotools id="pwlib"> <branch repo="openh323.sf.net" module="ptlib_unix" checkoutdir="pwlib" dont-specify-checkout-dir="yes" dont-grab-new-dirs="yes" /> </autotools> <autotools id="opal"> <branch repo="openh323.sf.net"/> <dependencies> <dep package="pwlib"/> </dependencies> </autotools>
The appropriate changes are now in both the bzr branch and CVS. If someone wants to test things and submit a patch, the additions would probably look something like this: <repository type="cvs" name="openh323" cvsroot=":pserver:anonymous@openh323.cvs.sourceforge.net:/cvsroot/openh323" password=""/> <autotools id="pwlib" autogen-sh="configure"> <branch repo="openh323" module="ptlib_unix" checkoutdir="pwlib" override_checkoutdir="no" update_new_dirs="no" /> </autotools> <autotools id="opal" autogen-sh="configure"> <branch repo="openh323"/> <dependencies> <dep package="pwlib"/> </dependencies> </autotools> (with the recent SF changes, the CVS hostname needs to be openh323.cvs.sourceforge.net rather than cvs.sourceforge.net). If any more Python changes are needed, please add a comment to that effect.
jamesh: there is a small typo in my last comment on that bug. The <branch> attributes are override-checkoutdir and update-new-dirs (dashes rather than underscores)
Created attachment 65828 [details] [review] config patch with latest jhbuild I've tested latest jhbuild and it works fine with pwlib, opal and ekiga. I've modified a little the default configuration to be able to build ekiga even if older pwlib is installed in /usr. Everything is in the new patch. Thanks james for your work on jhbuild again..
Comment on attachment 65828 [details] [review] config patch with latest jhbuild Looks good. Could you commit the change plus a similar change to gnome-2.16.modules?
committed for both modules.