From dba2b89720b0318a28ebe7778294873b9353f71d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 23 Feb 2005 12:47:30 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 11:34:13+01:00 mn-solutions.de!schurig Merge http://oe-devel@openembedded.bkbits.net/openembedded into mnz66.mn-solutions.de:/usr/src/oe/p 2005/02/23 11:33:31+01:00 mn-solutions.de!schurig fix installation stage 2005/02/23 09:27:44+00:00 (none)!xora New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission 2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though. 2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl bump cvsdate on oz-3.5.3 2005/02/22 17:37:44-06:00 ti.com!kergoth Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp. Thanks to holger freyther for pointing it out. BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A --- packages/mplayer/mplayer_1.0pre3try2.bb | 4 ++-- packages/mplayer/mplayer_1.0pre6.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/mplayer') diff --git a/packages/mplayer/mplayer_1.0pre3try2.bb b/packages/mplayer/mplayer_1.0pre3try2.bb index f22b7a23e6..788f07f36e 100644 --- a/packages/mplayer/mplayer_1.0pre3try2.bb +++ b/packages/mplayer/mplayer_1.0pre3try2.bb @@ -64,9 +64,9 @@ do_configure() { } do_install_append () { - install -d ${D}/${libdir} ${D}${includedir} ${D}${includedir}/postproc + 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} + 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 diff --git a/packages/mplayer/mplayer_1.0pre6.bb b/packages/mplayer/mplayer_1.0pre6.bb index 5dd6702e48..c1ea58ef45 100644 --- a/packages/mplayer/mplayer_1.0pre6.bb +++ b/packages/mplayer/mplayer_1.0pre6.bb @@ -67,9 +67,9 @@ do_configure() { } do_install_append () { - install -d ${D}/${libdir} ${D}${includedir} ${D}${includedir}/postproc + 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} + 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 -- cgit v1.2.3