Commit 6bcedeed authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

mplayer: convert to gentargets, bump to a recent SVN version 



Based on the conversion to gentargets done by Martin Banky, several
issues were fixed, and the mplayer package was improved:

 * Updated to a recent SVN version

 * Removed mandatory dependency on libmad

 * The AVR32 specific patch has been removed. It was a pain to remain
   blocked at the old 1.0-rc2 just for this patch. All this
   optimization work should have been submitted upstream, Buildroot is
   not the place to carry such heavy modifications.

 * Options were added to select whether mplayer and/or mencoder should
   be built/installed.

 * Support for additional options if packages have been selected:
   tremor, libmad, libtheora, libpng, jpeg, xlib_libX11,
   xlib_libXv. More could be added in the future.

 * Support for ARM-related optimization options. Similar improvements
   could be done for x86 and PowerPC architectures.

[Peter: fix build with !IPV6]
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 1e17f73d

CHANGES

+4 −3
Original line number Diff line number Diff line
@@ -6,9 +6,10 @@ 
	Updated/fixed packages: alsa-utils, at, busybox, bzip2, dbus,

	direcfb-examples, dmalloc, cloop, cups, ffmpeg, gdk-pixbuf,

	hostapd, i2c-tools, input-tools, libaio, libconfig, lsof,

	ltp-testsuite, lvm2, m4, memtester, mii-diag, mrouted,

	netplug, openssh, openssl, openvpn, pango, qt, rsync, sdl_gfx,

	sdl_sound, sysklogd, sysvinit, udev, usbutils, xz, zlib

	ltp-testsuite, lvm2, m4, memtester, mii-diag, mplayer,

	mrouted, netplug, openssh, openssl, openvpn, pango, qt, rsync,

	sdl_gfx, sdl_sound, sysklogd, sysvinit, udev, usbutils, xz,

	zlib



	New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone

package/multimedia/mplayer/Config.in

+15 −1
Original line number Diff line number Diff line 
config BR2_PACKAGE_MPLAYER

	bool "mplayer"

	select BR2_PACKAGE_LIBMAD

	help

	  MPlayer is a movie player which runs on many systems and supports

	  many different file formats.



	  http://www.mplayerhq.hu/



if BR2_PACKAGE_MPLAYER



config BR2_PACKAGE_MPLAYER_MPLAYER

	bool "Build and install mplayer"

	default y

	help

	  This will install the video player.



config BR2_PACKAGE_MPLAYER_MENCODER

	bool "Build and install mencoder"

	help

	  This will install the video encoder.



endif

package/multimedia/mplayer/mplayer-1.0rc2-100-atmel.1.patch

deleted100644 → 0
+0 −6262

File deleted.

Preview size limit exceeded, changes collapsed.

package/multimedia/mplayer/mplayer-1.0rc2-largefile.patch

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
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)

package/multimedia/mplayer/mplayer-1.0rc2-remove-sys-timeb.patch

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
win32.c:67:23: error: sys/timeb.h: No such file or directory



--- a/loader/win32.c	2009-01-26 01:53:20.000000000 +0100

+++ b/loader/win32.c	2009-01-26 01:53:39.000000000 +0100

@@ -64,7 +64,6 @@

 #include <sys/types.h>

 #include <dirent.h>

 #include <sys/time.h>

-#include <sys/timeb.h>

 #ifdef	HAVE_KSTAT

 #include <kstat.h>

 #endif