diff options
| author | Juuso Alasuutari | 2007-07-01 22:39:42 +0300 |
|---|---|---|
| committer | Juuso Alasuutari | 2007-07-01 22:39:42 +0300 |
| commit | 4cdc2dacd763ec312e029033b0e0673146aa42e9 (patch) | |
| tree | 0b3e5c8e7f79823dc18c712b8f765525ea41769e /audio-drivers/jack | |
| parent | 5b93c122728c6fbfa7db4f578fc5c9ecf1e0a2d5 (diff) | |
jack: Changed the time patch option to only apply to the stable version
because the code is already in the SVN branch.
Diffstat (limited to 'audio-drivers/jack')
| -rwxr-xr-x | audio-drivers/jack/CONFIGURE | 7 | ||||
| -rwxr-xr-x | audio-drivers/jack/DETAILS | 1 | ||||
| -rw-r--r-- | audio-drivers/jack/HISTORY | 6 | ||||
| -rwxr-xr-x | audio-drivers/jack/PRE_BUILD | 4 | ||||
| -rwxr-xr-x | audio-drivers/jack/PRE_SUB_DEPENDS | 2 | ||||
| -rwxr-xr-x | audio-drivers/jack/SUB_DEPENDS | 7 |
6 files changed, 19 insertions, 8 deletions
diff --git a/audio-drivers/jack/CONFIGURE b/audio-drivers/jack/CONFIGURE index ba64ee3cf2..9811f96a00 100755 --- a/audio-drivers/jack/CONFIGURE +++ b/audio-drivers/jack/CONFIGURE @@ -28,8 +28,11 @@ config_query_option JACK_OPTIMIZE \ "--enable-optimize" \ "--disable-optimize" && -config_query JACK_TIME \ - "Apply time patch (required by jackmidi_alsaseq)?" n && +if [[ $JACK_VCS != y ]] +then + config_query JACK_TIME \ + "Apply time patch (required by jackmidi_alsaseq)?" n +fi && local _DEFTMP && if [[ $JACK_SHM == "--enable-posix-shm" ]] diff --git a/audio-drivers/jack/DETAILS b/audio-drivers/jack/DETAILS index 6a993e28c1..7aab06c490 100755 --- a/audio-drivers/jack/DETAILS +++ b/audio-drivers/jack/DETAILS @@ -11,6 +11,7 @@ then SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jack/trunk/jack:jack SOURCE_IGNORE=volatile + FORCE_DOWNLOAD=on else VERSION=0.103.0 SOURCE=jack-audio-connection-kit-$VERSION.tar.gz diff --git a/audio-drivers/jack/HISTORY b/audio-drivers/jack/HISTORY index 51003b47e5..ef439538b3 100644 --- a/audio-drivers/jack/HISTORY +++ b/audio-drivers/jack/HISTORY @@ -1,3 +1,9 @@ +2007-07-01 Juuso Alasuutari <iuso@sourcemage.org> + * CONFIGURE, PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS: Changed + the time patch option to only apply to the stable version + because the code is already in the SVN branch. + * DETAILS: Added FORCE_DOWNLOAD=on for VCS option. + 2007-04-11 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS, DEPENDS, PRE_BUILD: Added SVN version support. * PREPARE: Added, query about SVN. diff --git a/audio-drivers/jack/PRE_BUILD b/audio-drivers/jack/PRE_BUILD index 6b15833538..7522f858a4 100755 --- a/audio-drivers/jack/PRE_BUILD +++ b/audio-drivers/jack/PRE_BUILD @@ -4,9 +4,7 @@ cd "$SOURCE_DIRECTORY" && if [[ $JACK_VCS == y ]] then ./autogen.sh --no-conf -fi && - -if [[ $JACK_TIME == y ]] +elif [[ $JACK_TIME == y ]] then patch -p1 < "$SCRIPT_DIRECTORY/jack_time.patch" fi diff --git a/audio-drivers/jack/PRE_SUB_DEPENDS b/audio-drivers/jack/PRE_SUB_DEPENDS index 63ee4b02df..6e8ad3cabb 100755 --- a/audio-drivers/jack/PRE_SUB_DEPENDS +++ b/audio-drivers/jack/PRE_SUB_DEPENDS @@ -1,5 +1,5 @@ case $THIS_SUB_DEPENDS in - TIMEPATCH) [[ $JACK_TIME == y ]] && return 0 ;; + TIMEPATCH) [[ $JACK_VCS == y || $JACK_TIME == y ]] && return 0 ;; VCS) [[ $JACK_VCS == y ]] && return 0 ;; esac return 1 diff --git a/audio-drivers/jack/SUB_DEPENDS b/audio-drivers/jack/SUB_DEPENDS index 184d1eab07..75b186f250 100755 --- a/audio-drivers/jack/SUB_DEPENDS +++ b/audio-drivers/jack/SUB_DEPENDS @@ -1,6 +1,9 @@ case $THIS_SUB_DEPENDS in - TIMEPATCH) echo "Time patch requested, forcing option JACK_TIME=y." && - JACK_TIME=y && persistent_add JACK_TIME + TIMEPATCH) if [[ $JACK_VCS != y ]] + then + echo "Time patch requested, forcing option JACK_TIME=y." && + JACK_TIME=y && persistent_add JACK_TIME + fi ;; VCS) echo "Development version requested, forcing option JACK_VCS=y." && JACK_VCS=y && persistent_add JACK_VCS |