summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2009-12-31 10:46:31 -0800
committerArwed von Merkatz2010-01-02 14:58:45 +0100
commit07e6dd942641d1261739929d40f672271c6ad1e0 (patch)
treee81363c564b92e93ff9a5af01ae750bf92858c55
parent22fd34ff59349a730dc8d54c86225efa00a9259d (diff)
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)
-rw-r--r--video-libs/gst-plugins-ugly/HISTORY5
-rwxr-xr-xvideo-libs/gst-plugins-ugly/PRE_SUB_DEPENDS2
-rwxr-xr-xvideo-libs/gst-plugins-ugly/REPAIR^1742cd12212ba4fa83234332dd4e6eb1^PRE_SUB_DEPENDS7
-rwxr-xr-xvideo-libs/gst-plugins-ugly/REPAIR^218d2c02685dcd3c5270094f98620415^SUB_DEPENDS11
-rwxr-xr-xvideo-libs/gst-plugins-ugly/SUB_DEPENDS4
5 files changed, 29 insertions, 0 deletions
diff --git a/video-libs/gst-plugins-ugly/HISTORY b/video-libs/gst-plugins-ugly/HISTORY
index 2257991ce3..4c06b80719 100644
--- a/video-libs/gst-plugins-ugly/HISTORY
+++ b/video-libs/gst-plugins-ugly/HISTORY
@@ -1,3 +1,8 @@
+2009-12-31 Eric Sandall <sandalle@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@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 51e751cbaa..3169bb720c 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 0000000000..3169bb720c
--- /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 0000000000..f46e6ad42a
--- /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 9143764493..f46e6ad42a 100755
--- a/video-libs/gst-plugins-ugly/SUB_DEPENDS
+++ b/video-libs/gst-plugins-ugly/SUB_DEPENDS
@@ -1,6 +1,10 @@
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
;;