summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2007-11-16 21:16:30 +0000
committerDavid Schleef <ds@schleef.org>2007-11-16 21:16:30 +0000
commit955feed93f37244fffa6ede6921dc126275b4bd8 (patch)
treec53325c94cb1269992c26c4c6588ff6d3575199b
parentd44a75bfc403d473a83560a4ec842cc533a64897 (diff)
Fix typo in README. Update modules for liboil move.
-rw-r--r--README4
-rw-r--r--gstreamer.jhbuildrc4
-rw-r--r--gstreamer.modules25
3 files changed, 26 insertions, 7 deletions
diff --git a/README b/README
index 58ecfdc..16d087a 100644
--- a/README
+++ b/README
@@ -4,8 +4,8 @@ Running jhbuild for GStreamer
- Build and install jhbuild from GNOME svn.
- - Edit the file 'gstreamer-jhbuildrc' to match your preferences.
+ - Edit the file 'gstreamer.jhbuildrc' to match your preferences.
- - Run 'jhbuild -f gstreamer-jhbuildrc build'.
+ - Run 'jhbuild -f gstreamer.jhbuildrc build'.
diff --git a/gstreamer.jhbuildrc b/gstreamer.jhbuildrc
index 8ae8326..a3bf3dc 100644
--- a/gstreamer.jhbuildrc
+++ b/gstreamer.jhbuildrc
@@ -1,5 +1,5 @@
-moduleset = 'http://webcvs.freedesktop.org/gstreamer/jhbuild/gstreamer.modules?revision=HEAD'
-#moduleset = os.path.expanduser('~/gst/jhbuild/gstreamer.modules')
+#moduleset = 'http://webcvs.freedesktop.org/gstreamer/jhbuild/gstreamer.modules?revision=HEAD'
+moduleset = os.path.expanduser('~/gst/jhbuild/gstreamer.modules')
modules = [ 'gst-all' ]
checkoutroot = os.path.expanduser('~/gst/jhbuild/build')
prefix = os.path.expanduser('~/gst/jhbuild/install')
diff --git a/gstreamer.modules b/gstreamer.modules
index ff8da38..f52921d 100644
--- a/gstreamer.modules
+++ b/gstreamer.modules
@@ -16,9 +16,13 @@
<repository type="cvs" name="gstreamer"
cvsroot=":pserver:anoncvs@cvs.freedesktop.org:/cvs/gstreamer"
password="" />
- <repository type="cvs" name="liboil"
- cvsroot=":pserver:anoncvs@cvs.freedesktop.org:/cvs/liboil"
- password="" />
+ <repository type="git" name="liboil"
+ href="git://anongit.freedesktop.org/~ds/"/>
+ <repository type="arch" name="seamless"
+ archive="soto@freedesktop.org--2004-personal"
+ href="http://mirrors.sourcecontrol.net/soto@freedesktop.org--2004-personal/" />
+ <repository type="svn" name="thoggen"
+ href="https://thoggen.svn.sourceforge.net/svnroot/"/>
<autotools id="liboil">
<branch repo="liboil" module="liboil" checkoutdir="liboil" />
@@ -143,6 +147,19 @@
<branch repo="elisa" module="trunk/elisa" checkoutdir="elisa"/>
</autotools>
+ <autotools id="seamless">
+ <dependencies>
+ </dependencies>
+ <branch repo="seamless" module="seamless" checkoutdir="seamless"/>
+ </autotools>
+
+ <autotools id="thoggen">
+ <dependencies>
+ <dep package="gstreamer"/>
+ </dependencies>
+ <branch repo="thoggen" module="thoggen/trunk" checkoutdir="thoggen"/>
+ </autotools>
+
<metamodule id="gst-all">
<dependencies>
@@ -161,6 +178,8 @@
<dep package="gst-fluendo-mpegdemux"/>
<dep package="gst-fluendo-mpegmux"/>
<dep package="gst-fluendo-mp3"/>
+ <dep package="seamless"/>
+ <dep package="thoggen"/>
</dependencies>
</metamodule>