Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 21 insertions, 61 deletions

diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 3ff05701d..8ee6641c6 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -37,6 +37,7 @@ $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS
 $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+CONFIGURE_ENV+=		ac_cv_sys_file_offset_bits=yes
 CONFIGURE_ARGS+=	--with-magick-plus-plus=no \
 			--without-gslib \
 			--without-dps \
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 12c513504..01b5dbb4e 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libpng libtiff libnotify
 PKG_DEPENDS+=		nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
-PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf
+PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf libintl
 PKG_BUILDDEP:=		alsa-lib dbus-glib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
 PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite atk libpng hicolor-icon-theme libnotify
 PKG_URL:=		http://www.mozilla.org/
@@ -62,7 +62,6 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--with-system-jpeg \
 			--with-system-png \
 			--with-system-nss \
-			--with-system-nspr \
 			--enable-system-sqlite \
 			--with-libIDL-prefix=${STAGING_TARGET_DIR}/usr \
 			--with-glib-prefix=${STAGING_TARGET_DIR}/usr \
diff --git a/package/gettext/Makefile b/package/gettext/Makefile
index 14d502958..c15e43577 100644
--- a/package/gettext/Makefile
+++ b/package/gettext/Makefile
@@ -58,7 +58,7 @@ post-build:
 	${CP} ${WRKBUILD}/gettext-runtime/intl/.libs/libintl.so* \
 			${STAGING_DIR}/usr/lib
 
-post-install:
+do-install:
 	${INSTALL_DIR} ${IDIR_LIBINTL}/usr/lib
 	${CP} ${WRKBUILD}/gettext-runtime/intl/.libs/libintl.so* \
 		${IDIR_LIBINTL}/usr/lib
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index 0b733dcc0..f452f71b6 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		4dcf47665aa64161bc5ca74c0778a149
 PKG_DESCR:=		X11 Session Management library
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libuuid
-PKG_BUILDDEP:=		libICE
+PKG_BUILDDEP:=		libICE e2fsprogs
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBSM LIBSM_DEV
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
index 851550403..b412fa882 100644
--- a/package/libXft/Makefile
+++ b/package/libXft/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		0a1e129b1d8b2d3905dc02a64255b781
 PKG_DESCR:=		X FreeType library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		libXrender
+PKG_BUILDDEP:=		libXrender fontconfig
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBXFT LIBXFT_DEV
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 3b08057da..ee2e09a44 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -4,22 +4,18 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mplayer
-PKG_VERSION:=		1.0rc4
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		1699c94de39da9c4c5d34e8f58e418f0
+PKG_VERSION:=		1.0-32749
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		aadc5d8cca503c8b18b3ed00b3a52cf5
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		alsa-lib libjpeg libfaad2 libmad libncurses
 PKG_DEPENDS+=		libogg libpng libpthread libvorbis
 PKG_DEPENDS+=		libx11 libxau libxdmcp libxext libxv zlib
 PKG_BUILDDEP:=		alsa-lib libmad libvorbis faad2 ncurses zlib
-PKG_BUILDDEP+=		libX11 libXv libpng libXext
+PKG_BUILDDEP+=		libX11 libXv libpng libXext jpeg
 PKG_URL:=		http://www.mplayerhq.hu/
-#PKG_SITES:=		http://openadk.org/distfiles/
-PKG_SITES:=		http://www.mplayerhq.hu/MPlayer/releases/
-
-DISTFILES:=		MPlayer-$(PKG_VERSION).tar.bz2
-WRKDIST=		${WRKDIR}/MPlayer-$(PKG_VERSION)
+PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
 
@@ -33,6 +29,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+# gcc 4.5 produces internal compiler error with -Os
+TCFLAGS:=$(subst Os,O2,$(TCFLAGS))
+
 CONFIG_STYLE:=		minimal
 FAKE_FLAGS+=		INSTALLSTRIP=''
 
diff --git a/package/mplayer/patches/patch-Makefile b/package/mplayer/patches/patch-Makefile
index 9c8e32783..3f57255db 100644
--- a/package/mplayer/patches/patch-Makefile
+++ b/package/mplayer/patches/patch-Makefile
@@ -1,11 +1,11 @@
---- MPlayer-1.0rc4.orig/Makefile	2010-07-29 19:08:19.000000000 +0200
-+++ MPlayer-1.0rc4/Makefile	2011-04-01 16:14:58.571818417 +0200
-@@ -851,7 +851,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+--- mplayer-1.0-32749.orig/Makefile	2011-01-03 11:27:11.000000000 +0100
++++ mplayer-1.0-32749/Makefile	2011-02-05 18:20:49.000000000 +0100
+@@ -816,7 +816,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
  	$(CC) -o $@ $^ $(EXTRALIBS)
  
  codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
--	$(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
-+	$(CC_FOR_BUILD) -O -DCODECS2HTML -I. -o $@ $<
+-	$(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
++	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
  
  codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
  	./$^ > $@
diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure
index 2fe0e1e10..eb33a8720 100644
--- a/package/mplayer/patches/patch-configure
+++ b/package/mplayer/patches/patch-configure
@@ -1,6 +1,6 @@
---- MPlayer-1.0rc4.orig/configure	2010-07-29 02:31:57.000000000 +0200
-+++ MPlayer-1.0rc4/configure	2011-04-01 16:12:17.224319163 +0200
-@@ -2556,7 +2556,7 @@ else
+--- mplayer-1.0-32749.orig/configure	2011-01-03 11:27:11.000000000 +0100
++++ mplayer-1.0-32749/configure	2011-01-09 00:35:20.000000000 +0100
+@@ -2554,7 +2554,7 @@ else
  fi
  
  cflag_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer"
diff --git a/package/mplayer/patches/patch-libmpcodecs_vd_mpng_c b/package/mplayer/patches/patch-libmpcodecs_vd_mpng_c
deleted file mode 100644
index c783ec100..000000000
--- a/package/mplayer/patches/patch-libmpcodecs_vd_mpng_c
+++ /dev/null
@@ -1,39 +0,0 @@
---- MPlayer-1.0rc4.orig/libmpcodecs/vd_mpng.c	2010-02-26 16:01:37.000000000 +0100
-+++ MPlayer-1.0rc4/libmpcodecs/vd_mpng.c	2011-04-01 16:23:04.381818599 +0200
-@@ -74,7 +74,7 @@ static int    pngLength;
- 
- static void pngReadFN( png_structp pngstr,png_bytep buffer,png_size_t size )
- {
-- char * p = pngstr->io_ptr;
-+ char * p = png_get_io_ptr(pngstr);
-  if(size>pngLength-pngPointer && pngLength>=pngPointer) size=pngLength-pngPointer;
-  fast_memcpy( buffer,(char *)&p[pngPointer],size );
-  pngPointer+=size;
-@@ -90,6 +90,7 @@ static mp_image_t* decode(sh_video_t *sh
-     png_uint_32     png_width=0,png_height=0;
-     int             depth,color;
-     png_uint_32     i;
-+    png_byte        color_type;
-     mp_image_t* mpi;
- 
-     int cols;
-@@ -111,7 +112,9 @@ static mp_image_t* decode(sh_video_t *sh
-  png_get_IHDR( png,info,&png_width,&png_height,&depth,&color,NULL,NULL,NULL );
-  png_set_bgr( png );
- 
-- switch( info->color_type ) {
-+ color_type=png_get_color_type(png, info);
-+
-+ switch( color_type ) {
-    case PNG_COLOR_TYPE_GRAY_ALPHA:
-       mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry gray scaled png with alpha channel not supported at moment.\n" );
-       break;
-@@ -128,7 +131,7 @@ static mp_image_t* decode(sh_video_t *sh
-       out_fmt=IMGFMT_BGR24;
-       break;
-    default:
--      mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,info->color_type);
-+      mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,color_type);
-  }
- 
-  // (re)init libvo if image parameters changed (width/height/colorspace)