summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2005-04-05 15:02:20 +0000
committerGraeme Gregory <dp@xora.org.uk>2005-04-05 15:02:20 +0000
commitb19fe5370d9ff3612111575516bf32076e597c9e (patch)
tree45196e9c0090ad81d13deb435aedfcf627b67049
parentb189d3f222be07e8c140d86d5cd9fff2cb142d11 (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cimmeria.(none):/home/dp/zaurus/openembedded 2005/04/05 15:01:57+00:00 (none)!XorA Add patch for missing vidix hunk in the big vidix patch, brings pre6a to pre3try2 levels BKrev: 4252a87cvm32febL7WlYPn1a59qLEA
-rw-r--r--packages/mplayer/mplayer-1.0pre6a/vidix-drivers-w100.patch0
-rw-r--r--packages/mplayer/mplayer_1.0pre6a.bb5
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/mplayer/mplayer-1.0pre6a/vidix-drivers-w100.patch b/packages/mplayer/mplayer-1.0pre6a/vidix-drivers-w100.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mplayer/mplayer-1.0pre6a/vidix-drivers-w100.patch
diff --git a/packages/mplayer/mplayer_1.0pre6a.bb b/packages/mplayer/mplayer_1.0pre6a.bb
index b74ca0ce36..aa798b427c 100644
--- a/packages/mplayer/mplayer_1.0pre6a.bb
+++ b/packages/mplayer/mplayer_1.0pre6a.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
file://Makefile.patch;patch=1 \
file://sdl.patch;patch=0 \
file://zlib.patch;patch=0 "
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
PARALLEL_MAKE = ""
@@ -16,7 +16,8 @@ PARALLEL_MAKE = ""
DEPENDS_c7x0 += "sharp-aticore"
PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"
SRC_URI_append_c7x0 = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
- file://Makefile-vidix.patch;patch=0 "
+ file://Makefile-vidix.patch;patch=0 \
+ file://vidix-drivers-w100.patch;patch=1 "
S = "${WORKDIR}/MPlayer-${PV}"