Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4bc0006f79a6b801c18a50815f6d5dfb5555e3e8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4bc0006f79a6b801c18a50815f6d5dfb5555e3e8)
  • Date: Fri, 24 Aug 2012 09:25:12 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

libs/openscenegraph/DEPENDS | 2 +-
libs/openscenegraph/HISTORY | 1 +
video/ffmpeg/HISTORY | 1 +
video/ffmpeg/PRE_SUB_DEPENDS | 4 ++--
video/ffmpeg/SUB_DEPENDS | 4 ++--
5 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit dd320fc06b9dcb3b8169a9e1f1ae8b4175aee55b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/openscenegraph: change ffmpeg sub dependency name to LEGACY

commit 6767499af7b56eb3d736b3b715fe5ddad87a0d8f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/ffmpeg: change sub dependency names to upper case

diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index 7ef7183..214989c 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -13,7 +13,7 @@ depends openthreads &&
depends tiff &&
depends unzip &&
depends zlib &&
-depends -sub legacy ffmpeg &&
+depends -sub LEGACY ffmpeg &&

optional_depends cairo '' '' 'for GTK+ plugins' &&
optional_depends gtk+2 '' '' 'for GTK+ plugins' &&
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index 68e343d..f82206b 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,5 +1,6 @@
2012-08-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: add dependency on legacy release of ffmpeg
+ * DEPENDS: changed ffmpeg sub dependency from legacy to LEGACY

2012-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.0.1
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 1df0e31..63ec5b1 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,6 +1,7 @@
2012-08-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* SUB_DEPENDS, PRE_SUB_DEPENDS: offer sub dependency on stable/legacy
release
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: changed sub dependency names to upper
case

2012-06-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated stable to 0.11.1; SECURITY_PATCH++
diff --git a/video/ffmpeg/PRE_SUB_DEPENDS b/video/ffmpeg/PRE_SUB_DEPENDS
index c6f1988..064b98b 100755
--- a/video/ffmpeg/PRE_SUB_DEPENDS
+++ b/video/ffmpeg/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case ${THIS_SUB_DEPENDS} in
-"legacy") [[ "$(installed_version ffmpeg)" == "0.7.13" ]] && return 0
;;
-"stable") [[ "$(installed_version ffmpeg)" != "0.7.13" ]] && return 0
;;
+"LEGACY") [[ "$(installed_version ffmpeg)" == "0.7.13" ]] && return 0
;;
+"STABLE") [[ "$(installed_version ffmpeg)" != "0.7.13" ]] && return 0
;;
esac
return 1
diff --git a/video/ffmpeg/SUB_DEPENDS b/video/ffmpeg/SUB_DEPENDS
index 84330fc..bf6ceb9 100755
--- a/video/ffmpeg/SUB_DEPENDS
+++ b/video/ffmpeg/SUB_DEPENDS
@@ -1,5 +1,5 @@
case ${THIS_SUB_DEPENDS} in
-"legacy") FFMPEG_RELEASE="legacy" && echo "Forcing legacy release." ;;
-"stable") FFMPEG_RELEASE="stable" && echo "Forcing stable release." ;;
+"LEGACY") FFMPEG_RELEASE="legacy" && echo "Forcing legacy release." ;;
+"STABLE") FFMPEG_RELEASE="stable" && echo "Forcing stable release." ;;
*) echo "Unknown sub depends!!!" && return 1 ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4bc0006f79a6b801c18a50815f6d5dfb5555e3e8), Florian Franzmann, 08/24/2012

Archive powered by MHonArc 2.6.24.

Top of Page