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

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

2005/04/05 13:23:47+00:00 (none)!XorA
Small compilation fix for libsdl-qpe and enebale vidix for c7x0

BKrev: 4252917aqjieAZnx9auBszMD8QSPaQ

diff --git a/packages/mplayer/mplayer-1.0pre6a/Makefile.patch b/packages/mplayer/mplayer-1.0pre6a/Makefile.patch
index e69de29..63f6973 100644 (file)
--- a/packages/mplayer/mplayer-1.0pre6a/Makefile.patch
+++ b/packages/mplayer/mplayer-1.0pre6a/Makefile.patch
@@ -0,0 +1,41 @@
+--- MPlayer-1.0pre6/Makefile.orig      2004-12-25 23:48:23.000000000 +0100
++++ MPlayer-1.0pre6/Makefile   2004-12-25 23:49:18.000000000 +0100
+@@ -8,11 +8,6 @@
+ 
+ PRG_CFG = codec-cfg
+ 
+-# Do not strip the binaries at installation
+-ifeq ($(STRIPBINARIES),yes)
+-INSTALLSTRIP = -s
+-endif
+-
+ # These subdirectories require installation due to binaries within them.
+ ifeq ($(VIDIX),yes)
+ SUBDIRS += libdha vidix
+@@ -234,7 +229,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) -ljpeg -lpng -lts $(LDFLAGS)
+ 
+ mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
+       winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
+@@ -267,7 +262,7 @@
+ $(MENCODER_DEP): version.h help_mp.h
+ 
+ $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
+-      $(HOST_CC) $(CFLAGS) -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(I18NLIBS)
++      $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(I18NLIBS)
+ 
+ install: $(ALL_PRG)
+ ifeq ($(VIDIX),yes)
+@@ -352,7 +347,7 @@
+       @for a in $(PARTS); do $(MAKE) -C $$a distclean; done
+ 
+ strip:
+-      strip -s $(ALL_PRG)
++
+ 
+ dep:  depend
+ 

diff --git a/packages/mplayer/mplayer_1.0pre6a.bb b/packages/mplayer/mplayer_1.0pre6a.bb
index e69de29..a8392aa 100644 (file)
--- a/packages/mplayer/mplayer_1.0pre6a.bb
+++ b/packages/mplayer/mplayer_1.0pre6a.bb
@@ -0,0 +1,92 @@
+DESCRIPTION = "Open Source multimedia player."
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.mplayerhq.hu/"
+DEPENDS = "virtual/libsdl libmad tremor 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"
+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 "
+
+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 "
+EXTRA_OECONF_append_c7x0 = " --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
+}                                       
+