From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 20 Jan 2009 09:29:50 +0000 (-0000)
Subject: mplayer: fix non-largefile build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=81dc300b4dc6d345336ed2e3fc89c7f8fa205192;p=buildroot.git

mplayer: fix non-largefile build
---

diff --git a/package/multimedia/mplayer/mplayer-1.0rc1-largefile.patch b/package/multimedia/mplayer/mplayer-1.0rc1-largefile.patch
new file mode 100644
index 0000000000..bcba2fffa0
--- /dev/null
+++ b/package/multimedia/mplayer/mplayer-1.0rc1-largefile.patch
@@ -0,0 +1,18 @@
+mplayer: don't unconditionally force largefile support for libraries
+---
+ common.mak |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: MPlayer-1.0rc1/common.mak
+===================================================================
+--- MPlayer-1.0rc1.orig/common.mak
++++ MPlayer-1.0rc1/common.mak
+@@ -5,7 +5,7 @@
+ SRC_DIR = $(SRC_PATH)/lib$(NAME)
+ VPATH = $(SRC_DIR)
+ 
+-CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
++CFLAGS += -DHAVE_AV_CONFIG_H \
+           -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
+           -I$(SRC_PATH)/libavutil $(OPTFLAGS)
+ SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index e51c7925d1..719cc67540 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -17,6 +17,14 @@ else
 MPLAYER_ENDIAN:=--disable-big-endian
 endif
 
+# mplayer unfortunately uses --disable-largefileS, so we cannot use
+# DISABLE_LARGEFILE
+ifeq ($(BR2_LARGEFILE),y)
+MPLAYER_LARGEFILE:=--enable-largefiles
+else
+MPLAYER_LARGEFILE:=--disable-largefiles
+endif
+
 $(DL_DIR)/$(MPLAYER_SOURCE):
 	$(call DOWNLOAD,$(MPLAYER_SITE),$(MPLAYER_SOURCE))
 
@@ -45,6 +53,7 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
 		--enable-mad \
 		--enable-fbdev \
 		$(MPLAYER_ENDIAN) \
+		$(MPLAYER_LARGEFILE) \
 		--enable-cross-compile \
 		--disable-mpdvdkit \
 		--disable-ivtv \