From 94cee460dc94ca450979acd9bd8c3c3819977bd6 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 4 Apr 2005 14:13:16 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/04/04 16:13:07+02:00 uni-frankfurt.de!mickeyl update mplayer to 1.0pre6a, still broken - needs a C expert to unbreak demux_ogg.c BKrev: 42514b7cZqsZGKfb-sBOPaP71j6X4w --- .../mplayer/mplayer-1.0pre6/Makefile-vidix.patch | 0 packages/mplayer/mplayer-1.0pre6/Makefile.patch | 0 .../mplayer-w100_1.0pre3.1.modified.diff | 0 packages/mplayer/mplayer-1.0pre6/sdl.patch | 0 packages/mplayer/mplayer-1.0pre6/zlib.patch | 0 .../mplayer/mplayer-1.0pre6a/Makefile-vidix.patch | 0 packages/mplayer/mplayer-1.0pre6a/Makefile.patch | 0 .../mplayer-w100_1.0pre3.1.modified.diff | 0 packages/mplayer/mplayer-1.0pre6a/sdl.patch | 0 packages/mplayer/mplayer-1.0pre6a/zlib.patch | 0 packages/mplayer/mplayer_1.0pre6.bb | 90 ---------------------- packages/mplayer/mplayer_1.0pre6a.bb | 0 12 files changed, 90 deletions(-) delete mode 100644 packages/mplayer/mplayer-1.0pre6/Makefile-vidix.patch delete mode 100644 packages/mplayer/mplayer-1.0pre6/Makefile.patch delete mode 100644 packages/mplayer/mplayer-1.0pre6/mplayer-w100_1.0pre3.1.modified.diff delete mode 100644 packages/mplayer/mplayer-1.0pre6/sdl.patch delete mode 100644 packages/mplayer/mplayer-1.0pre6/zlib.patch create mode 100644 packages/mplayer/mplayer-1.0pre6a/Makefile-vidix.patch create mode 100644 packages/mplayer/mplayer-1.0pre6a/Makefile.patch create mode 100644 packages/mplayer/mplayer-1.0pre6a/mplayer-w100_1.0pre3.1.modified.diff create mode 100644 packages/mplayer/mplayer-1.0pre6a/sdl.patch create mode 100644 packages/mplayer/mplayer-1.0pre6a/zlib.patch delete mode 100644 packages/mplayer/mplayer_1.0pre6.bb create mode 100644 packages/mplayer/mplayer_1.0pre6a.bb (limited to 'packages/mplayer') diff --git a/packages/mplayer/mplayer-1.0pre6/Makefile-vidix.patch b/packages/mplayer/mplayer-1.0pre6/Makefile-vidix.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mplayer/mplayer-1.0pre6/Makefile.patch b/packages/mplayer/mplayer-1.0pre6/Makefile.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mplayer/mplayer-1.0pre6/mplayer-w100_1.0pre3.1.modified.diff b/packages/mplayer/mplayer-1.0pre6/mplayer-w100_1.0pre3.1.modified.diff deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mplayer/mplayer-1.0pre6/sdl.patch b/packages/mplayer/mplayer-1.0pre6/sdl.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mplayer/mplayer-1.0pre6/zlib.patch b/packages/mplayer/mplayer-1.0pre6/zlib.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mplayer/mplayer-1.0pre6a/Makefile-vidix.patch b/packages/mplayer/mplayer-1.0pre6a/Makefile-vidix.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mplayer/mplayer-1.0pre6a/Makefile.patch b/packages/mplayer/mplayer-1.0pre6a/Makefile.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mplayer/mplayer-1.0pre6a/mplayer-w100_1.0pre3.1.modified.diff b/packages/mplayer/mplayer-1.0pre6a/mplayer-w100_1.0pre3.1.modified.diff new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mplayer/mplayer-1.0pre6a/sdl.patch b/packages/mplayer/mplayer-1.0pre6a/sdl.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mplayer/mplayer-1.0pre6a/zlib.patch b/packages/mplayer/mplayer-1.0pre6a/zlib.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mplayer/mplayer_1.0pre6.bb b/packages/mplayer/mplayer_1.0pre6.bb deleted file mode 100644 index 23ce73e00d..0000000000 --- a/packages/mplayer/mplayer_1.0pre6.bb +++ /dev/null @@ -1,90 +0,0 @@ -DESCRIPTION = "Open Source multimedia player." -SECTION = "opie/multimedia" -PRIORITY = "optional" -HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad tremor-20021126 libogg libvorbis zlib libpng jpeg" -LICENSE = "GPL" -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_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 " - -S = "${WORKDIR}/MPlayer-${PV}" - -PACKAGES =+ "postproc postproc-dev" - -FILES_${PN} = "${bindir}/mplayer ${libdir}/mplayer/vidix/w100_vid.so" - -FILES_postproc = " ${libdir}/libpostproc.so.0.0.0 ${libdir}/libpostproc.so.0" -FILES_postproc-dev = " ${includedir}/postproc/postprocess.h ${libdir}/libpostproc.so ${libdir}/libpostproc.a" - -inherit autotools - -EXTRA_OECONF = " \ - --prefix=/usr \ - --mandir=${mandir} \ - --target=${TARGET_SYS} \ - --enable-shared-pp \ - \ - --disable-win32 \ - --disable-macosx \ - --disable-dvdread \ - --disable-mpdvdkit \ - --disable-tv \ - --disable-tv-v4l \ - --disable-tv-v4l2 \ - --disable-tv-bsdbt848 \ - --disable-mencoder \ - --disable-live \ - \ - --enable-dynamic-plugins \ - --enable-fbdev \ - --enable-sdl \ - --with-sdl-config=${STAGING_BINDIR}/sdl-config \ - \ - --enable-mad \ - --enable-tremor \ - --enable-vorbis \ - \ - --enable-ossaudio \ - \ - --enable-rtc \ - \ - --with-extralibdir=${STAGING_LIBDIR} " - -EXTRA_OECONF_append_corgi = " --enable-vidix " -EXTRA_OECONF_append_shepherd = " --enable-vidix " -EXTRA_OECONF_append_husky = " --enable-vidix " - -do_configure() { - ./configure ${EXTRA_OECONF} -} - -do_install_append () { - install -d ${D}${libdir} ${D}${includedir} ${D}${includedir}/postproc - install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/ - oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}${libdir} - cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0 - cd ${D}${libdir} - ln -sf libpostproc.so.0.0.0 libpostproc.so.0 - ln -sf libpostproc.so.0 libpostproc.so -} - -do_stage () { - oe_libinstall -a -so -C libavcodec/libpostproc libpostproc ${STAGING_LIBDIR} - cd ${STAGING_LIBDIR} - ln -sf libpostproc.so libpostproc.so.0.0.0 - ln -sf libpostproc.so libpostproc.so.0 - - install -d ${STAGING_INCDIR}/postproc - install -m 0644 ${S}/libavcodec/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h -} - diff --git a/packages/mplayer/mplayer_1.0pre6a.bb b/packages/mplayer/mplayer_1.0pre6a.bb new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3