summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-05-04 19:38:14 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-05-04 19:38:14 (GMT)
commit23ff3c278602bc4531bf8d5de179af188837907e (patch)
tree60a9dadc6aa770e5822c2e04d47a469682eb2537
parentca218debd5c54023517955babd080dc0db9204ee (diff)
downloadbuildroot-23ff3c278602bc4531bf8d5de179af188837907e.tar.gz
buildroot-23ff3c278602bc4531bf8d5de179af188837907e.tar.bz2
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>
-rw-r--r--CHANGES2
-rw-r--r--[-rwxr-xr-x]package/multimedia/mplayer/mplayer-1.0rc2-100-atmel.1.patch0
-rw-r--r--package/multimedia/mplayer/mplayer.mk5
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 21848a6..fa0317c 100644
--- 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
index 0de695f..0de695f 100755..100644
--- a/package/multimedia/mplayer/mplayer-1.0rc2-100-atmel.1.patch
+++ b/package/multimedia/mplayer/mplayer-1.0rc2-100-atmel.1.patch
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 538bac9..50afcfb 100644
--- 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)