diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-04 13:40:09 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-04 13:40:09 +0000 |
| commit | 32076690a4804afae16f07d26f18d2ac9a030a6a (patch) | |
| tree | 44abe5153df8e0b64e093d4cb665dcd908c5f117 | |
| parent | 9537f89fcd0a0396f2f65d99a11ac02de6650698 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/05/04 14:02:30+01:00 (none)!XorA
New versions and disabling samba support
BKrev: 4278d0b9Ac3TUZPn8zzGIAWAtuINUw
9 files changed, 3 insertions, 1 deletions
diff --git a/packages/mplayer/mplayer-atty-1.1.3/Makefile-libs.patch b/packages/mplayer/mplayer-atty-1.1.3/Makefile-libs.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-atty-1.1.3/Makefile-libs.patch diff --git a/packages/mplayer/mplayer-atty-1.1.3/Makefile.patch b/packages/mplayer/mplayer-atty-1.1.3/Makefile.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-atty-1.1.3/Makefile.patch diff --git a/packages/mplayer/mplayer-atty-1.1.3/dsputil.patch b/packages/mplayer/mplayer-atty-1.1.3/dsputil.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-atty-1.1.3/dsputil.patch 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 new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-atty-1.1.3/libmpcodecs-ogg-include.patch 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 new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-atty-1.1.3/libmpdemux-ogg-include.patch diff --git a/packages/mplayer/mplayer-atty-1.1.3/sdl.patch b/packages/mplayer/mplayer-atty-1.1.3/sdl.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-atty-1.1.3/sdl.patch diff --git a/packages/mplayer/mplayer-atty_1.0.1.bb b/packages/mplayer/mplayer-atty_1.0.1.bb index 66e40ca568..2cbddb6871 100644 --- a/packages/mplayer/mplayer-atty_1.0.1.bb +++ b/packages/mplayer/mplayer-atty_1.0.1.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg" LICENSE = "GPL" RCONFLICTS = "mplayer" MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" -PR = "r5" +PR = "r6" SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \ file://Makefile.patch;patch=1;pnum=0 \ @@ -50,6 +50,7 @@ EXTRA_OECONF = " \ --disable-tv-bsdbt848 \ --disable-mencoder \ --disable-live \ + --disable-smb \ \ --enable-dynamic-plugins \ --enable-fbdev \ diff --git a/packages/mplayer/mplayer-atty_1.1.3.bb b/packages/mplayer/mplayer-atty_1.1.3.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-atty_1.1.3.bb diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb index 2c696e1161..961f68ec92 100644 --- a/packages/mplayer/mplayer_1.0pre7.bb +++ b/packages/mplayer/mplayer_1.0pre7.bb @@ -49,6 +49,7 @@ EXTRA_OECONF = " \ --disable-tv-bsdbt848 \ --disable-mencoder \ --disable-live \ + --disable-smb \ \ --enable-dynamic-plugins \ --enable-fbdev \ |