summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-12-09 17:29:20 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-12-09 17:29:20 +0000
commite8affca9f7a6d52546aed4a0849af48339f851c0 (patch)
tree07928330b6c76da4c053ca4e3d016fe526fa2637
parent21f40a9a2f055cc2c531db5c4a58c7bb95cdfcbc (diff)
tweaks 'n' docs
Original commit message from CVS: tweaks 'n' docs
-rw-r--r--README37
-rw-r--r--configure.ac2
2 files changed, 39 insertions, 0 deletions
diff --git a/README b/README
index 7c36d59..449f491 100644
--- a/README
+++ b/README
@@ -1,2 +1,39 @@
This is a sandbox module to test if our build setup for external libraries
(for example FFmpeg) is sane.
+
+What we are trying to achieve:
+
+satisfy:
+ patching of CVS checkout using our patch files placed in our CVS
+
+ passing of
+ make
+ make distcheck
+ non-srcdir build (ie, mkdir build; cd build; ../configure; make)
+
+How it works:
+
+* configure checks whether or not it should update ffmpeg from CVS by looking
+ at the nano version number
+ - if it's 1, we're in cvs mode, and it should check it out
+ - if it's not 1, we're in prerel or rel mode, and the code should already
+ be on disk
+ FIXME: we could change this to really check out the source code if some
+ required files aren't there just in case someone checks out from CVS
+ but CVS is not at nano 1
+
+* patching of the checked-out copy happens at
+
+Axioms under which we work:
+- the dist tarball needs to include either
+ - the pristine ffmpeg checkout + our patches + a patch mechanism on make
+ or
+ - the ffmpeg checkout with patches already applied
+
+- configure/make is not allowed to touch files that already live in the source
+ tree; if they need to then they need to be copied first and cleaned
+ afterward
+
+- it would be very nice if, on update of either the Tag file or the patch set,
+ make would know exactly what to do with it.
+
diff --git a/configure.ac b/configure.ac
index 965b894..ded2f39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,8 @@ AM_MAINTAINER_MODE
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
AS_VERSION(gst-ffmpeg, GST_FFMPEG_VERSION, 0, 7, 2, 1, GST_CVS="no", GST_CVS="yes")
+dnl we cheat here so we don't have to change the actual configure code bit
+GST_PLUGINS_VERSION_NANO=$GST_FFMPEG_VERSION_NANO
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)