Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into cimmeria.(none):/home/dp/zaurus/openembedded

2005/06/29 11:46:43+00:00 (none)!XorA
mplayer-atty: fix HOMEPAGE and remove old versions

BKrev: 42c28a49rGB0lileGJER_jMtNeVG9g

diff --git a/packages/mplayer/mplayer-atty-1.0.1/Makefile-libs.patch b/packages/mplayer/mplayer-atty-1.0.1/Makefile-libs.patch
deleted file mode 100644 (file)
index 11f2d6a..0000000
--- a/packages/mplayer/mplayer-atty-1.0.1/Makefile-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mplayer-1.0.1/Makefile.orig        2005-04-07 13:05:21.381660024 +0100
-+++ mplayer-1.0.1/Makefile     2005-04-07 13:05:49.957315864 +0100
-@@ -250,7 +250,7 @@
-     ifeq ($(TARGET_WIN32),yes)
-       windres -o osdep/mplayer-rc.o osdep/mplayer.rc
-     endif
--      $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
-+      $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) -lm  -ljpeg -lpng $(LDFLAGS)
- 
- mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
-       winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \

diff --git a/packages/mplayer/mplayer-atty-1.0.1/Makefile.patch b/packages/mplayer/mplayer-atty-1.0.1/Makefile.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mplayer/mplayer-atty-1.0.1/dsputil.patch b/packages/mplayer/mplayer-atty-1.0.1/dsputil.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mplayer/mplayer-atty-1.0.1/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-atty-1.0.1/libmpcodecs-ogg-include.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mplayer/mplayer-atty-1.0.1/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-atty-1.0.1/libmpdemux-ogg-include.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mplayer/mplayer-atty-1.0.1/sdl.patch b/packages/mplayer/mplayer-atty-1.0.1/sdl.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mplayer/mplayer-atty-1.1.3/Makefile-libs.patch b/packages/mplayer/mplayer-atty-1.1.3/Makefile-libs.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mplayer/mplayer-atty-1.1.3/Makefile.patch b/packages/mplayer/mplayer-atty-1.1.3/Makefile.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mplayer/mplayer-atty-1.1.3/dsputil.patch b/packages/mplayer/mplayer-atty-1.1.3/dsputil.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mplayer/mplayer-atty-1.1.3/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.3/libmpcodecs-ogg-include.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mplayer/mplayer-atty-1.1.3/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.3/libmpdemux-ogg-include.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mplayer/mplayer-atty-1.1.3/sdl.patch b/packages/mplayer/mplayer-atty-1.1.3/sdl.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mplayer/mplayer-atty_1.0.1.bb b/packages/mplayer/mplayer-atty_1.0.1.bb
deleted file mode 100644 (file)
index 2cbddb6..0000000
--- a/packages/mplayer/mplayer-atty_1.0.1.bb
+++ /dev/null
@@ -1,98 +0,0 @@
-DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg"
-LICENSE = "GPL"
-RCONFLICTS = "mplayer"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
-PR = "r6"
-
-SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \
-          file://Makefile.patch;patch=1;pnum=0 \
-          file://sdl.patch;patch=1 \
-          file://Makefile-libs.patch;patch=1 \
-          file://dsputil.patch;patch=1 \
-           file://libmpdemux-ogg-include.patch;patch=1 \
-           file://libmpcodecs-ogg-include.patch;patch=1 "
-
-PARALLEL_MAKE = ""
-
-DEPENDS_append_c7x0 = " sharp-aticore-oss"
-PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_akita = "${MACHINE_ARCH}"
-PACKAGE_ARCH_spitz = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/mplayer-${PV}"
-
-PACKAGES =+ "postproc postproc-dev"
-
-FILES_${PN} = "${bindir}/mplayer"
-
-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 \
-       --disable-smb \
-        \
-        --enable-dynamic-plugins \
-        --enable-fbdev \
-        --enable-sdl \
-        --with-sdl-config=${STAGING_BINDIR}/sdl-config \
-        \
-        --enable-mad \
-        --enable-vorbis \
-        \
-        --enable-ossaudio \
-        \
-        --enable-rtc \
-       --disable-ipp \
-       --disable-iwmmxt \
-        \
-        --with-extralibdir=${STAGING_LIBDIR} "
-
-EXTRA_OECONF_append_c7x0 = " --enable-w100"
-EXTRA_OECONF_append_akita = " --enable-bvdd"
-EXTRA_OECONF_append_spitz = " --enable-bvdd"
-
-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-atty_1.1.3.bb b/packages/mplayer/mplayer-atty_1.1.3.bb
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mplayer/mplayer-atty_1.1.4.bb b/packages/mplayer/mplayer-atty_1.1.4.bb
index cb43938..9afdab2 100644 (file)
--- a/packages/mplayer/mplayer-atty_1.1.4.bb
+++ b/packages/mplayer/mplayer-atty_1.1.4.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Open Source multimedia player."
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
-HOMEPAGE = "http://www.mplayerhq.hu/"
+HOMEPAGE = "http://atty.jp/?Zaurus%2Fmplayer"
 DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg"
 LICENSE = "GPL"
 RCONFLICTS = "mplayer"

diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb
index e69de29..9afdab2 100644 (file)
--- a/packages/mplayer/mplayer-atty_1.1.5.bb
+++ b/packages/mplayer/mplayer-atty_1.1.5.bb
@@ -0,0 +1,97 @@
+DESCRIPTION = "Open Source multimedia player."
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+HOMEPAGE = "http://atty.jp/?Zaurus%2Fmplayer"
+DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg"
+LICENSE = "GPL"
+RCONFLICTS = "mplayer"
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+PR = "r1"
+
+SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \
+          file://Makefile.patch;patch=1;pnum=0 \
+          file://sdl.patch;patch=1 \
+           file://Makefile-libs.patch;patch=1 \
+           file://libmpdemux-ogg-include.patch;patch=1 \
+           file://libmpcodecs-ogg-include.patch;patch=1 "
+
+PARALLEL_MAKE = ""
+
+DEPENDS_append_c7x0 = " sharp-aticore-oss"
+PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_akita = "${MACHINE_ARCH}"
+PACKAGE_ARCH_spitz = "${MACHINE_ARCH}"
+
+S = "${WORKDIR}/mplayer-${PV}"
+
+PACKAGES =+ "postproc postproc-dev"
+
+FILES_${PN} = "${bindir}/mplayer"
+
+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 \
+       --disable-smb \
+        \
+        --enable-dynamic-plugins \
+        --enable-fbdev \
+        --enable-sdl \
+        --with-sdl-config=${STAGING_BINDIR}/sdl-config \
+        \
+        --enable-mad \
+        --enable-vorbis \
+        \
+        --enable-ossaudio \
+        \
+        --enable-rtc \
+       --disable-ipp \
+       --disable-iwmmxt \
+        \
+        --with-extralibdir=${STAGING_LIBDIR} "
+
+EXTRA_OECONF_append_c7x0 = " --enable-w100"
+EXTRA_OECONF_append_akita = " --enable-bvdd"
+EXTRA_OECONF_append_spitz = " --enable-bvdd"
+
+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
+}
+