summaryrefslogtreecommitdiff
path: root/packages/mplayer
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-02-14 10:22:01 +0000
committerMichael Lauer <mickey@vanille-media.de>2005-02-14 10:22:01 +0000
commitd264c684381ace00faa32ea710718d85c4253810 (patch)
tree8e7142c0d654bd49cd1fd5a11f36ab26c7b9057a /packages/mplayer
parent69fade6e3c11fee16b5c369b88dc236790321f7e (diff)
consolidate collie, shepherd, husky into the common machine c7x0. kernel 2.6 handles all three machines, for kernel 2.4 we build three different kernels for every -image build.
BKrev: 42107bc9qhsZjYvjPqkddsMIsQuYAA
Diffstat (limited to 'packages/mplayer')
-rw-r--r--packages/mplayer/mplayer_1.0pre3try2.bb20
-rw-r--r--packages/mplayer/mplayer_1.0pre6.bb19
2 files changed, 10 insertions, 29 deletions
diff --git a/packages/mplayer/mplayer_1.0pre3try2.bb b/packages/mplayer/mplayer_1.0pre3try2.bb
index 2749c01cbb..e227eb3664 100644
--- a/packages/mplayer/mplayer_1.0pre3try2.bb
+++ b/packages/mplayer/mplayer_1.0pre3try2.bb
@@ -3,28 +3,18 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
HOMEPAGE = "http://www.mplayerhq.hu/"
DEPENDS = "virtual/libsdl libmad tremor-20021126 libogg libvorbis zlib libpng jpeg"
-PR = "r4"
+PR = "r5"
LICENSE = "GPL"
SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
file://Makefile.patch;patch=0 \
file://sdl.patch;patch=0 \
file://zlib.patch;patch=0 "
-DEPENDS_corgi += "sharp-aticore"
-DEPENDS_shepherd += "sharp-aticore"
-DEPENDS_husky += "sharp-aticore"
+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 "
-PACKAGE_ARCH_corgi = "${MACHINE_ARCH}"
-PACKAGE_ARCH_shepherd = "${MACHINE_ARCH}"
-PACKAGE_ARCH_husky = "${MACHINE_ARCH}"
-
-SRC_URI_append_corgi = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
- file://Makefile-vidix.patch;patch=0 "
-SRC_URI_append_shepherd = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
- file://Makefile-vidix.patch;patch=0 "
-SRC_URI_append_husky = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
- file://Makefile-vidix.patch;patch=0 "
-
S = "${WORKDIR}/MPlayer-${PV}"
PACKAGES =+ "postproc postproc-dev"
diff --git a/packages/mplayer/mplayer_1.0pre6.bb b/packages/mplayer/mplayer_1.0pre6.bb
index 4d96a4e4ff..95c44961a4 100644
--- a/packages/mplayer/mplayer_1.0pre6.bb
+++ b/packages/mplayer/mplayer_1.0pre6.bb
@@ -8,24 +8,15 @@ 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"
DEFAULT_PREFERENCE = "-1"
-DEPENDS_corgi += "sharp-aticore"
-DEPENDS_shepherd += "sharp-aticore"
-DEPENDS_husky += "sharp-aticore"
+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 "
-PACKAGE_ARCH_corgi = "${MACHINE_ARCH}"
-PACKAGE_ARCH_shepherd = "${MACHINE_ARCH}"
-PACKAGE_ARCH_husky = "${MACHINE_ARCH}"
-
-SRC_URI_append_corgi = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
- file://Makefile-vidix.patch;patch=0 "
-SRC_URI_append_shepherd = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
- file://Makefile-vidix.patch;patch=0 "
-SRC_URI_append_husky = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
- file://Makefile-vidix.patch;patch=0 "
-
S = "${WORKDIR}/MPlayer-${PV}"
PACKAGES =+ "postproc postproc-dev"