update to latest upstream version

package/ffmpeg/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
-PKG_VERSION:=		2.1.1
+PKG_VERSION:=		2.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		2719ab2b3311ac3775b9cdeb66c54849
+PKG_MD5SUM:=		744febca199548c9393b1f1ed05ccdd8
 PKG_DESCR:=		record, convert and stream audio & video
 PKG_SECTION:=		libs
 PKG_FDEPENDS:=		libpthread
@@ -100,9 +100,8 @@ $(eval $(call PKG_template,FFSERVER,ffserver,${PKG_VERSION}-${PKG_RELEASE},${PKG
 $(eval $(call PKG_template,FFPROBE,ffprobe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFPROBE},${PKGSC_FFPROBE}))
 #$(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_CFLAGS:=		$(subst Os,O2,$(TARGET_CFLAGS))
-TARGET_CPPFLAGS+=	-D_POSIX_SOURCE=1 -D_GNU_SOURCE=1
+TARGET_CPPFLAGS+=	-D_POSIX_SOURCE -D_GNU_SOURCE
 
 ifeq ($(ADK_TARGET_CPU_WITH_MMX),y)
 CONFIGURE_CPU_OPTS:=	--enable-mmx

package/omxplayer/Makefile

@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		omxplayer
-# actually d1a4a0e1030249e40e2e9bb04518f1b786b18488 from 7.01.2014
-PKG_VERSION:=		0.3
+# actually 1ca2f7adaa7f6a92410d9664e76c395537659dba from 07.04.2014
+PKG_VERSION:=		0.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1882cac6032baa59291068af30df1702
+PKG_MD5SUM:=		d4efff32305bd16315e6fa4f80ea2a98
 PKG_DESCR:=		video player for raspberry pi
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libffmpeg boost bcm2835-vc libfreetype libpcre

package/omxplayer/patches/patch-Makefile

@@ -1,14 +1,20 @@
---- omxplayer-0.2.orig/Makefile	2013-10-11 15:17:41.000000000 +0200
-+++ omxplayer-0.2/Makefile	2013-10-11 15:30:49.000000000 +0200
+--- omxplayer-0.4.orig/Makefile	2014-04-07 13:50:34.000000000 +0200
++++ omxplayer-0.4/Makefile	2014-04-07 15:39:22.000000000 +0200
 @@ -2,9 +2,9 @@ include Makefile.include
  
  CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
  
--LDFLAGS+=-L./ -ldbus-1 -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/local/lib/
-+LDFLAGS+=-L./ -ldbus-1 -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lkhrn_static
+-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
++LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
  
 -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
 +INCLUDES+=-I./ -Ilinux
  
  DIST ?= omxplayer-dist
  
+@@ -71,5 +71,4 @@ dist: omxplayer.bin
+ 	cp omxplayer omxplayer.bin $(DIST)/usr/bin
+ 	cp COPYING $(DIST)/usr/share/doc/
+ 	cp README.md $(DIST)/usr/share/doc/README
+-	cp -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/
+ 	cd $(DIST); tar -czf ../$(DIST).tgz *