diff options
Diffstat (limited to 'package/mplayer')
| -rw-r--r-- | package/mplayer/Makefile | 24 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-configure | 39 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-loader_win32_c | 9 |
3 files changed, 11 insertions, 61 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 0c330a792..5ad3cc1f5 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -4,17 +4,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer -PKG_VERSION:= 1.0rc2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 7e27e535c2d267637df34898f1b91707 +PKG_VERSION:= 1.0-29973 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a2fd085d18fc92c70389e7b4d2b6ad43 PKG_DESCR:= popular video player PKG_SECTION:= video PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg PKG_URL:= http://www.mplayerhq.hu -PKG_SITES:= http://www7.mplayerhq.hu/MPlayer/releases/ +PKG_SITES:= http://openadk.org/distfiles/ -DISTFILES:= MPlayer-${PKG_VERSION}.tar.bz2 -WRKDIST= ${WRKDIR}/MPlayer-${PKG_VERSION} +#DISTFILES:= MPlayer-${PKG_VERSION}.tar.bz2 +#WRKDIST= ${WRKDIR}/MPlayer-${PKG_VERSION} include ${TOPDIR}/mk/package.mk @@ -23,12 +23,6 @@ $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P BUILD_STYLE:= auto INSTALL_STYLE:= auto -ifeq ($(ADK_X11),y) -CONFIGURE_ARG:= --enable-x11 -else -CONFIGURE_ARG:= --disable-x11 -endif - ifeq (${ADK_LINUX_X86_ALIX1C},y) CONFIGURE_CPU_OPTS:= \ --disable-ssse3 \ @@ -52,21 +46,19 @@ endif pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ ./configure \ + --enable-x11 \ --prefix=/usr \ --confdir=/etc \ --enable-cross-compile \ --target=$(REAL_GNU_TARGET_NAME) \ --cc=$(TARGET_CC) \ --host-cc=$(HOSTCC) \ - --with-extraincdir=$(STAGING_DIR)/usr/include \ - --with-extralibdir=$(STAGING_DIR)/usr/lib \ --disable-mencoder \ --enable-fbdev \ --enable-alsa \ --enable-png \ --enable-jpeg \ --enable-mad \ - --enable-faad-external \ --disable-faad-internal \ --enable-libvorbis \ --disable-ossaudio \ @@ -81,14 +73,12 @@ pre-configure: --disable-ftp \ --disable-v4l2 \ --disable-ivtv \ - --disable-vidix-internal \ --disable-dvdread-internal \ --disable-libdvdcss-internal \ --disable-freetype \ --disable-tremor-internal \ --disable-arts \ --disable-esd \ - --disable-polyp \ --disable-jack \ --disable-openal \ --disable-nas \ 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 diff --git a/package/mplayer/patches/patch-loader_win32_c b/package/mplayer/patches/patch-loader_win32_c index e5537e02a..9392be1ce 100644 --- a/package/mplayer/patches/patch-loader_win32_c +++ b/package/mplayer/patches/patch-loader_win32_c @@ -1,10 +1,9 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- MPlayer-1.0rc2.orig/loader/win32.c 2007-10-07 21:49:32.000000000 +0200 -+++ MPlayer-1.0rc2/loader/win32.c 2008-10-28 15:29:47.000000000 +0100 -@@ -63,7 +63,6 @@ for DLL to know too much about its envir - #include <sys/types.h> +--- mplayer-1.0-29973.orig/loader/win32.c 2009-12-02 19:45:33.000000000 +0100 ++++ mplayer-1.0-29973/loader/win32.c 2009-12-04 22:32:05.000000000 +0100 +@@ -61,7 +61,6 @@ for DLL to know too much about its envir #include <dirent.h> #include <sys/time.h> + #include <sys/stat.h> -#include <sys/timeb.h> #ifdef HAVE_KSTAT #include <kstat.h> |