summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-10-22 16:32:50 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-10-22 16:32:50 +0000
commitb2f2f00a308c461500ec72b145cde5fc20717700 (patch)
treeed40bac992e62ff5b524d785147c17cb61f02078
parent76470fec85c94deaddf42a9fbcfe7debd07cf0fa (diff)
parentcf444cd1f994325c7f9531506acb0a56074f7ca6 (diff)
merge of '70c98ecabf04e753c02721c28eb68c90f324d6de'
and 'cebb5151b05a1bb90d6e82d3f2b9883930c5dc35'
-rw-r--r--packages/gstreamer/gst-plugins-ugly_0.10.5.bb5
-rw-r--r--packages/gstreamer/gst-plugins-ugly_0.10.6.bb6
-rw-r--r--packages/mpeg2dec/mpeg2dec_0.4.0b.bb29
3 files changed, 12 insertions, 28 deletions
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.5.bb b/packages/gstreamer/gst-plugins-ugly_0.10.5.bb
deleted file mode 100644
index 51ce56dc1f..0000000000
--- a/packages/gstreamer/gst-plugins-ugly_0.10.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require gst-plugins.inc
-
-DEPENDS += "gst-plugins-base"
-SRC_URI += "file://cross-compile.patch;patch=1"
-PR = "r4"
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.6.bb b/packages/gstreamer/gst-plugins-ugly_0.10.6.bb
index 9eb6410d09..64f36ddb38 100644
--- a/packages/gstreamer/gst-plugins-ugly_0.10.6.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.6.bb
@@ -1,7 +1,7 @@
require gst-plugins.inc
-DEPENDS += "gst-plugins-base"
+DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
+PR = "r2"
+
SRC_URI += "file://cross-compile.patch;patch=1 \
file://gstmad_16bit.patch;patch=1"
-
-PR = "r1"
diff --git a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
index c279893ee5..571ddc4b12 100644
--- a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
+++ b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
@@ -1,35 +1,18 @@
-DESCRIPTION = "Library and test program for decoding mpeg-2 and mpeg-1 video streams"
+DESCRIPTION = "Libraries and test programs for decoding mpeg-2 and mpeg-1 video streams"
HOMEPAGE = "http://libmpeg2.sourceforge.net/"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "virtual/libsdl"
-PROVIDES += "libmpeg2"
-RPROVIDES += "libmpeg2"
-PR = "r3"
-
-S = "${WORKDIR}/mpeg2dec-0.4.0"
+PR = "r4"
SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz"
+S = "${WORKDIR}/mpeg2dec-0.4.0"
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-shared"
-PACKAGES += "libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev"
-
-FILES_${PN} += "${bindir}/*"
-FILES_libmpeg2 = "${libdir}/libmpeg2.so.*"
-FILES_libmpeg2convert = "${libdir}/libmpeg2convert.so.*"
-FILES_libmpeg2-dev = "${libdir}/libmpeg2.so \
- ${libdir}/libmpeg2.*a \
- ${libdir}/pkgconfig/libmpeg2.pc \
- ${includedir}/mpeg2dec/mpeg2.h"
-FILES_libmpeg2convert-dev = "${libdir}/libmpeg2convert.so \
- ${libdir}/libmpeg2convert.*a \
- ${libdir}/pkgconfig/libmpeg2convert.pc \
- ${includedir}/mpeg2dec/mpeg2convert.h"
-
mpeg2dec_include = "mpeg2.h mpeg2convert.h"
do_stage () {
@@ -41,3 +24,9 @@ do_stage () {
install -m 0644 include/$i ${STAGING_INCDIR}/mpeg2dec/
done
}
+
+PACKAGES += "mpeg2dec libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev"
+
+FILES_${PN} = "${bindir}/*"
+FILES_libmpeg2 = "${libdir}/libmpeg2.so.*"
+FILES_libmpeg2convert = "${libdir}/libmpeg2convert.so.*"