mplayer: internal copies of libdvdread/libdvdcss require largefile support

So disable when we don't have largefile support in toolchain.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 21848a67cababd87ef3244b699775428cc4698d0..fa0317c84ffc26bd834cc97781030b616d3a19cc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
 
        Fixes all over the tree.
 
-       Updated/fixed packages: xdriver_xf86-video-openchrome
+       Updated/fixed packages: mplayer, xdriver_xf86-video-openchrome
 
 2010.05-rc1, Released May 3rd, 2010:
 

diff --git a/package/multimedia/mplayer/mplayer-1.0rc2-100-atmel.1.patch b/package/multimedia/mplayer/mplayer-1.0rc2-100-atmel.1.patch
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 538bac9eff075051e9e4a697a2dc32686c18ff81..50afcfbd062ddcd736afe22e11f408c3ed805073 100644 (file)
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -22,7 +22,10 @@ endif
 ifeq ($(BR2_LARGEFILE),y)
 MPLAYER_LARGEFILE:=--enable-largefiles
 else
-MPLAYER_LARGEFILE:=--disable-largefiles
+# dvdread/dvdcss requires largefile support
+MPLAYER_LARGEFILE:=--disable-largefiles \
+                  --disable-dvdread-internal \
+                  --disable-libdvdcss-internal
 endif
 
 ifeq ($(BR2_i386),y)