sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.39 grimoire by Arwed von Merkatz (c0f86d3f3ac7b33fdd875295f3f3dbe16dad938e)

From: Arwed von Merkatz <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to stable-0.39 grimoire by Arwed von Merkatz (c0f86d3f3ac7b33fdd875295f3f3dbe16dad938e)
Date: Sat, 2 Jan 2010 07:59:07 -0600

GIT changes to stable-0.39 grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

video-libs/gst-plugins-ugly/DEPENDS
| 8 ++++
video-libs/gst-plugins-ugly/HISTORY
| 10 +++++
video-libs/gst-plugins-ugly/PRE_SUB_DEPENDS
| 7 +++

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
| 11 ++++++
video/thoggen/DEPENDS
| 18 +++++-----
video/thoggen/HISTORY
| 4 ++
8 files changed, 67 insertions(+), 9 deletions(-)

New commits:
commit c0f86d3f3ac7b33fdd875295f3f3dbe16dad938e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

thoggen: Depends on gst-plugins-ugly built with libmpeg2
Fixes Bug #15019
(cherry picked from commit 2b47ad92d00ebf3356fc53cd91d0fb980d475bee)

commit 07e6dd942641d1261739929d40f672271c6ad1e0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gst-plugins-ugly: Enable forcing libmpeg2 dependency
Added REPAIR files for old versions of sub-dependency files
Fixes Bug #15019
(cherry picked from commit 3d2a9d4163c886126ee50aab03e16159d05e8e23)

commit 22fd34ff59349a730dc8d54c86225efa00a9259d
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gst-plugins-ugly: added libcdio as optional dependency - moved from
gst-plugins-good
added x264 as optional dependency - moved from
gst-plugins-bad
(cherry picked from commit b1cf62972a38dfd9eaaab34338de76dd4f3d2330)

diff --git a/video-libs/gst-plugins-ugly/DEPENDS
b/video-libs/gst-plugins-ugly/DEPENDS
index 5c1a154..01b1f75 100755
--- a/video-libs/gst-plugins-ugly/DEPENDS
+++ b/video-libs/gst-plugins-ugly/DEPENDS
@@ -35,6 +35,14 @@ optional_depends twolame \
# "--enable-sidplay" \
# "--disable-sidplay" \
# "for SID audio decoding" &&
+optional_depends libcdio \
+ "--enable-cdio" \
+ "--disable-cdio" \
+ "for audio cd reading" &&
+optional_depends x264 \
+ "--enable-x264" \
+ "--disable-x264" \
+ "for x264 encoder" &&
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
diff --git a/video-libs/gst-plugins-ugly/HISTORY
b/video-libs/gst-plugins-ugly/HISTORY
index 2fd5904..4c06b80 100644
--- a/video-libs/gst-plugins-ugly/HISTORY
+++ b/video-libs/gst-plugins-ugly/HISTORY
@@ -1,3 +1,13 @@
+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
+
+2009-12-19 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: added optional libcdio, x264
+ * PRE_SUB_DEPENDS: created
+ * SUB_DEPENDS: created
+
2009-12-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD: disable x264 plugin as it isn't compatible with current x264
* DEPENDS: added optional_depends on libcdio, libdvdread and twolame
diff --git a/video-libs/gst-plugins-ugly/PRE_SUB_DEPENDS
b/video-libs/gst-plugins-ugly/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..3169bb7
--- /dev/null
+++ b/video-libs/gst-plugins-ugly/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^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
new file mode 100755
index 0000000..f46e6ad
--- /dev/null
+++ b/video-libs/gst-plugins-ugly/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/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

[SM-Commit] GIT changes to stable-0.39 grimoire by Arwed von Merkatz (c0f86d3f3ac7b33fdd875295f3f3dbe16dad938e), Arwed von Merkatz, 01/02/2010