diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-06-21 14:13:19 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-21 14:13:19 +0000 |
| commit | 12078ec6590a4a7844829634e81270ee42f66988 (patch) | |
| tree | 39b83f55a681d0c0516643b6828aede9968c35ec | |
| parent | 91564285c8b22b2ce3254cdcc00caff8eb3f15a9 (diff) | |
| parent | 20319b4e93aaec04be3598e78077e7b143487a81 (diff) | |
merge of 794196dd65f7f3765c599271625175daa1d20cde
and 819d48f7dfdcf5e59b36b88b9b518d8d76d04f06
| -rw-r--r-- | packages/mplayer/mplayer_svn.bb (renamed from packages/mplayer/mplayer_1.0pre7+cvs20060519.bb) | 9 | ||||
| -rw-r--r-- | packages/vnc/tightvnc/Makefile | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb b/packages/mplayer/mplayer_svn.bb index 9298f0645c..7af431430b 100644 --- a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -5,8 +5,7 @@ HOMEPAGE = "http://www.mplayerhq.hu/" DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common" RDEPENDS = "mplayer-common" LICENSE = "GPL" -SRC_URI = "http://www.xora.org.uk/oe/mplayer_20060519.tar.bz2 \ - http://www.xora.org.uk/oe/ffmpeg_20060519.tar.bz2 \ +SRC_URI = "svn://svn.mplayerhq.hu/;module=mplayer \ file://vo_w100.c \ file://vo_w100_api.h \ file://vo_w100_fb.h \ @@ -19,13 +18,16 @@ SRC_URI = "http://www.xora.org.uk/oe/mplayer_20060519.tar.bz2 \ MAINTAINER="Graeme Gregory <dp@xora.org.uk>" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" + +PV = "1.0pre8+svn${SRCDATE}" PR = "r0" +DEFAULT_PREFERENCE = "-1" PARALLEL_MAKE = "" DEPENDS_append_c7x0 = " sharp-aticore-oss" -S = "${WORKDIR}/mplayer_20060519" +S = "${WORKDIR}/mplayer/trunk/" PACKAGES =+ "mencoder" @@ -60,7 +62,6 @@ EXTRA_OECONF = " \ EXTRA_OECONF_append_c7x0 = " --enable-w100 " do_configure() { - cp -r ${WORKDIR}/ffmpeg_20060519/libavcodec ${WORKDIR}/ffmpeg_20060519/libavutil ${WORKDIR}/ffmpeg_20060519/libavformat ${S} cp ${WORKDIR}/vo_w100.c ${S}/libvo cp ${WORKDIR}/vo_w100_api.h ${S}/libvo cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo diff --git a/packages/vnc/tightvnc/Makefile b/packages/vnc/tightvnc/Makefile index a684e9c987..16420423f2 100644 --- a/packages/vnc/tightvnc/Makefile +++ b/packages/vnc/tightvnc/Makefile @@ -18,5 +18,5 @@ vncviewer.c \ ../libvncauth/d3des.c tightvncviewer : $(SOURCES) - $(CC) $(CFLAGS) $(LDFLAGS) -I. -I../include -I../libvncauth/ -lX11 -lXaw -ljpeg -lz -o tightvncviewer $(SOURCES) + $(CC) $(CFLAGS) $(LDFLAGS) -I. -I../include -I../libvncauth/ -lX11 -lXaw6 -ljpeg -lz -o tightvncviewer $(SOURCES) |