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

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 (file)
index 0000000..e69de29

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 (file)
index 0000000..e69de29

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 (file)
index 0000000..e69de29

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 (file)
index 0000000..e69de29

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 (file)
index 0000000..e69de29

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 (file)
index 0000000..e69de29

diff --git a/packages/mplayer/mplayer-atty_1.0.1.bb b/packages/mplayer/mplayer-atty_1.0.1.bb
index 66e40ca..2cbddb6 100644 (file)
--- 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 (file)
index 0000000..e69de29

diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb
index 2c696e1..961f68e 100644 (file)
--- 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 \