[SM-Commit] GIT changes to master grimoire by Eric Sandall (cc6f2c669d5a8ab7338a95fe85cacc799ebf5915)

Eric Sandall scm at sourcemage.org
Thu Dec 31 13:52:37 EST 2009


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 video-libs/gst-plugins-ugly/HISTORY                                                 |    6 +++
 video-libs/gst-plugins-ugly/PRE_SUB_DEPENDS                                         |    2 +
 video-libs/gst-plugins-ugly/REPAIR^1742cd12212ba4fa83234332dd4e6eb1^PRE_SUB_DEPENDS |    7 +++
 video-libs/gst-plugins-ugly/REPAIR^218d2c02685dcd3c5270094f98620415^SUB_DEPENDS     |   11 ++++++
 video-libs/gst-plugins-ugly/SUB_DEPENDS                                             |    8 +++-
 video/thoggen/DEPENDS                                                               |   18 +++++-----
 video/thoggen/HISTORY                                                               |    4 ++
 7 files changed, 46 insertions(+), 10 deletions(-)

New commits:
commit cc6f2c669d5a8ab7338a95fe85cacc799ebf5915
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gst-plugins-ugly: Add sub-depends message for LIBCDIO

commit 2b47ad92d00ebf3356fc53cd91d0fb980d475bee
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    thoggen: Depends on gst-plugins-ugly built with libmpeg2
              Fixes Bug #15019

commit 3d2a9d4163c886126ee50aab03e16159d05e8e23
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gst-plugins-ugly: Enable forcing libmpeg2 dependency
              Added REPAIR files for old versions of sub-dependency files
              Fixes Bug #15019

diff --git a/video-libs/gst-plugins-ugly/HISTORY b/video-libs/gst-plugins-ugly/HISTORY
index 2257991..08ab15d 100644
--- a/video-libs/gst-plugins-ugly/HISTORY
+++ b/video-libs/gst-plugins-ugly/HISTORY
@@ -1,3 +1,9 @@
+2009-12-31 Eric Sandall <sandalle at sourcemage.org>
+	* PRE_SUB_DEPENDS,SUB_DEPENDS: Enable forcing libmpeg2 dependency
+	  Added REPAIR files for old versions of sub-dependency files
+	  Fixes Bug #15019
+	  Add sub-depends message for LIBCDIO
+
 2009-12-19 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DEPENDS: added optional libcdio, x264
 	* PRE_SUB_DEPENDS: created
diff --git a/video-libs/gst-plugins-ugly/PRE_SUB_DEPENDS b/video-libs/gst-plugins-ugly/PRE_SUB_DEPENDS
index 51e751c..3169bb7 100755
--- a/video-libs/gst-plugins-ugly/PRE_SUB_DEPENDS
+++ b/video-libs/gst-plugins-ugly/PRE_SUB_DEPENDS
@@ -1,5 +1,7 @@
 case $THIS_SUB_DEPENDS in
   LIBCDIO)  is_depends_enabled  $SPELL  libcdio  &&  return  0
             ;;
+ LIBMPEG2)  is_depends_enabled  $SPELL  libmpeg2  &&  return  0
+            ;;
 esac
 return 1
diff --git a/video-libs/gst-plugins-ugly/REPAIR^1742cd12212ba4fa83234332dd4e6eb1^PRE_SUB_DEPENDS b/video-libs/gst-plugins-ugly/REPAIR^1742cd12212ba4fa83234332dd4e6eb1^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..3169bb7
--- /dev/null
+++ b/video-libs/gst-plugins-ugly/REPAIR^1742cd12212ba4fa83234332dd4e6eb1^PRE_SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+  LIBCDIO)  is_depends_enabled  $SPELL  libcdio  &&  return  0
+            ;;
+ LIBMPEG2)  is_depends_enabled  $SPELL  libmpeg2  &&  return  0
+            ;;
+esac
+return 1
diff --git a/video-libs/gst-plugins-ugly/REPAIR^218d2c02685dcd3c5270094f98620415^SUB_DEPENDS b/video-libs/gst-plugins-ugly/REPAIR^218d2c02685dcd3c5270094f98620415^SUB_DEPENDS
new file mode 100755
index 0000000..f46e6ad
--- /dev/null
+++ b/video-libs/gst-plugins-ugly/REPAIR^218d2c02685dcd3c5270094f98620415^SUB_DEPENDS
@@ -0,0 +1,11 @@
+case $THIS_SUB_DEPENDS in
+  LIBCDIO)  depends  libcdio  '--enable-cdio'
+            ;;
+ LIBMPEG2)  message "${MESSAGE_COLOR}Forcing dependency on ${SPELL_COLOR}libmpeg2${DEFAULT_COLOR}" \
+                    "${MESSAGE_COLOR}to satisfy ${SPELL_COLOR}$THIS_SUB_DEPENDS${DEFAULT_COLOR}${MESSAGE_COLOR} requirement.${DEFAULT_COLOR}"  &&
+            depends  libmpeg2  '--enable-mpeg2dec'
+            ;;
+        *)  echo "Unknown sub-depends!" ;
+            return 1
+            ;;
+esac
diff --git a/video-libs/gst-plugins-ugly/SUB_DEPENDS b/video-libs/gst-plugins-ugly/SUB_DEPENDS
index 9143764..2cbf952 100755
--- a/video-libs/gst-plugins-ugly/SUB_DEPENDS
+++ b/video-libs/gst-plugins-ugly/SUB_DEPENDS
@@ -1,5 +1,11 @@
 case $THIS_SUB_DEPENDS in
-  LIBCDIO)  depends  libcdio  '--enable-cdio'
+  LIBCDIO)  message "${MESSAGE_COLOR}Forcing dependency on ${SPELL_COLOR}libcdio${DEFAULT_COLOR}" \
+                    "${MESSAGE_COLOR}to satisfy ${SPELL_COLOR}$THIS_SUB_DEPENDS${DEFAULT_COLOR}${MESSAGE_COLOR} requirement.${DEFAULT_COLOR}"  &&
+            depends  libcdio  '--enable-cdio'
+            ;;
+ LIBMPEG2)  message "${MESSAGE_COLOR}Forcing dependency on ${SPELL_COLOR}libmpeg2${DEFAULT_COLOR}" \
+                    "${MESSAGE_COLOR}to satisfy ${SPELL_COLOR}$THIS_SUB_DEPENDS${DEFAULT_COLOR}${MESSAGE_COLOR} requirement.${DEFAULT_COLOR}"  &&
+            depends  libmpeg2  '--enable-mpeg2dec'
             ;;
         *)  echo "Unknown sub-depends!" ;
             return 1
diff --git a/video/thoggen/DEPENDS b/video/thoggen/DEPENDS
index 8f3bd5a..de66df0 100755
--- a/video/thoggen/DEPENDS
+++ b/video/thoggen/DEPENDS
@@ -1,10 +1,10 @@
-depends  gtk+2             &&
-depends  libglade2         &&
-depends  gstreamer         &&
-depends  gst-plugins-base  &&
-depends  gst-plugins-good  &&
-depends  gst-plugins-ugly  &&
-depends  libdvdread        &&
-depends  dbus-glib         &&
-depends  iso-codes         &&
+depends  gtk+2                              &&
+depends  libglade2                          &&
+depends  gstreamer                          &&
+depends  gst-plugins-base                   &&
+depends  gst-plugins-good                   &&
+depends  -sub "LIBMPEG2"  gst-plugins-ugly  &&
+depends  libdvdread                         &&
+depends  dbus-glib                          &&
+depends  iso-codes                          &&
 depends  hal
diff --git a/video/thoggen/HISTORY b/video/thoggen/HISTORY
index 6d59f04..76f85b3 100644
--- a/video/thoggen/HISTORY
+++ b/video/thoggen/HISTORY
@@ -1,3 +1,7 @@
+2009-12-31 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Depends on gst-plugins-ugly built with libmpeg2
+	  Fixes Bug #15019
+
 2008-06-13 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.7.1
 



More information about the SM-Commit mailing list