From 65b27b644c5817eb63fe7b8392236c37e0386f9b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Dec 2009 12:15:12 +0100 Subject: update some packages to latest upstream - openssh, aircrack-ng, autoconf, lighttpd - use mplayer svn version --- package/mplayer/patches/patch-configure | 39 --------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 package/mplayer/patches/patch-configure (limited to 'package/mplayer/patches/patch-configure') diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure deleted file mode 100644 index 4ef4de805..000000000 --- a/package/mplayer/patches/patch-configure +++ /dev/null @@ -1,39 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- MPlayer-1.0rc2.orig/configure 2007-10-07 21:49:33.000000000 +0200 -+++ MPlayer-1.0rc2/configure 2009-05-10 18:37:32.000000000 +0200 -@@ -2331,7 +2331,7 @@ elif test -z "$CFLAGS" ; then - elif test "$cc_vendor" != "gnu" ; then - CFLAGS="-O2 $_march $_mcpu $_pipe" - else -- CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" -+ CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" - fi - else - _warn_CFLAGS=yes -@@ -3853,26 +3853,6 @@ else - fi - - --echocheck "X11 headers presence" -- _x11_headers="no" -- _res_comment="check if the dev(el) packages are installed" -- for I in `echo $_inc_extra | sed s/-I//g` /usr/include ; do -- if test -f "$I/X11/Xlib.h" ; then -- _x11_headers="yes" -- _res_comment="" -- break -- fi -- done -- for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/openwin/include ; do -- if test -f "$I/X11/Xlib.h" ; then -- _inc_extra="$_inc_extra -I$I" -- _x11_headers="yes" -- _res_comment="using $I" -- break -- fi -- done --echores "$_x11_headers" -- - - echocheck "X11" - if test "$_x11" = auto && test "$_x11_headers" = yes ; then -- cgit v1.2.3 From 5474d03f63e63675203198f0369aa2de0e6297ed Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 6 Mar 2010 14:33:35 +0100 Subject: fix compile for mips64 --- package/mplayer/Makefile | 4 +++- package/mplayer/patches/patch-configure | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 package/mplayer/patches/patch-configure (limited to 'package/mplayer/patches/patch-configure') diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index a5a612bac..71e6190d8 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -17,7 +17,7 @@ PKG_BUILDDEP+= libX11 libXv libpng libXext PKG_URL:= http://www.mplayerhq.hu PKG_SITES:= http://openadk.org/distfiles/ -PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle +PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle lemote include ${TOPDIR}/mk/package.mk @@ -25,6 +25,8 @@ $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P CONFIG_STYLE:= manual +FAKE_FLAGS+= INSTALLSTRIP='' + ifeq (${ADK_LINUX_X86_ALIX1C},y) CONFIGURE_CPU_OPTS:= \ --disable-ssse3 \ diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure new file mode 100644 index 000000000..dcebb8645 --- /dev/null +++ b/package/mplayer/patches/patch-configure @@ -0,0 +1,11 @@ +--- mplayer-1.0-29987.orig/configure 2009-12-10 13:18:20.000000000 +0100 ++++ mplayer-1.0-29987/configure 2010-03-06 12:52:36.000000000 +0100 +@@ -2266,7 +2266,7 @@ EOF + _optimizing="$proc" + ;; + +- mips) ++ mips|mips64|mipsel|mips64el) + _arch='SGI_MIPS' + _target_arch='ARCH_SGI_MIPS = yes' + iproc='sgi-mips' -- cgit v1.2.3