[pitivi] Specify the dependencies version requirements in only one place (check.py)



commit 1301daba783c5c0e13467fc82a47f1c48c033582
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Thu Nov 29 20:33:40 2012 -0500

    Specify the dependencies version requirements in only one place (check.py)
    
    Also update the README file to be more future-proof

 README                 |   14 ++++++++++----
 configure.ac           |   19 ++-----------------
 pitivi/configure.py.in |    9 ++-------
 3 files changed, 14 insertions(+), 28 deletions(-)
---
diff --git a/README b/README
index 5437052..555cc5f 100644
--- a/README
+++ b/README
@@ -1,5 +1,11 @@
-In order to get more video effects, you should install the frei0r library.
-Other "soft" dependencies include:
-- pycanberra and libnotify for sounds and notifications when rendering completes
+PiTiVi is a video editor built upon the GStreamer Editing Services.
+It aims to be an intuitive and flexible application
+that can appeal to newbies and professionals alike.
 
-Packagers should add them as recommended packages.
+For the list of dependencies, look at pitivi/check.py
+- "Hard" dependencies are required for Pitivi to function properly
+- "Soft" dependencies are recommended for an optimal user experience
+  (packagers should add them as recommended or required packages).
+
+Your involvement is what keeps this project moving forward.
+See the "contributing" section of http://www.pitivi.org to get started.
diff --git a/configure.ac b/configure.ac
index d15f307..190dac0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,7 @@
 AC_PREREQ(2.52)
 
+dnl Note for packagers: see pitivi/check.py for the dependencies
+
 dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
@@ -19,26 +21,9 @@ AS_NANO(PITIVI_CVS="no", PITIVI_CVS="yes")
 dnl can autoconf find the source ?
 AC_CONFIG_SRCDIR([pitivi/application.py])
 
-
 AC_SUBST_FILE(AUTHORS)
 AUTHORS=$srcdir/AUTHORS
 
-dnl Note for packagers
-dnl The following requirements are run-time requirements,
-dnl make sure you don't forget them, even though you're able to
-dnl build pitivi without them.
-dnl
-dnl For a more exhaustive list of checks, you can have a look at
-dnl the runtime checks in pitivi/check.py
-
-AC_SUBST(GTK_REQ, 2.24.0)
-AC_SUBST(PYGTK_REQ, 2.17.0)
-AC_SUBST(PYGST_REQ, 0.10.19)
-AC_SUBST(GST_REQ, 0.10.36)
-AC_SUBST(GES_REQ, 0.10.01)
-AC_SUBST(GNONLIN_REQ, 0.10.16)
-AC_SUBST(PYCAIRO_REQ, 1.0.0)
-
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4")
 
diff --git a/pitivi/configure.py.in b/pitivi/configure.py.in
index ca5cb57..4f673c7 100644
--- a/pitivi/configure.py.in
+++ b/pitivi/configure.py.in
@@ -25,7 +25,7 @@ Enables identical use for installed and uninstalled versions.
 
 import os.path
 
-
+# Again, mostly the same thing as in bin/pitivi.in and pitivi/utils/misc.py:
 def _get_root_dir():
     return '/'.join(os.path.dirname(os.path.abspath(__file__)).split('/')[:-1])
 
@@ -40,12 +40,7 @@ pitivi_version = '@VERSION@'
 APPNAME = '@PACKAGE_NAME@'
 APPURL = 'http://www.pitivi.org/'
 RELEASES_URL = 'http://pitivi.org/releases.txt'
-PYGTK_REQ = '@PYGTK_REQ@'
-GTK_REQ = '@GTK_REQ@'
-PYGST_REQ = '@PYGST_REQ@'
-GST_REQ = '@GST_REQ@'
-GNONLIN_REQ = '@GNONLIN_REQ@'
-PYCAIRO_REQ = '@PYCAIRO_REQ@'
+
 
 if _in_devel():
     APPMANUALURL_OFFLINE = 'ghelp://%s' % os.path.join(_get_root_dir(), 'help/C')



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