Waldemar Brodkorb 9 роки тому
батько
коміт
c467f5a66a
2 змінених файлів з 8 додано та 17 видалено
  1. 4 7
      package/omxplayer/Makefile
  2. 4 10
      package/omxplayer/patches/patch-Makefile

+ 4 - 7
package/omxplayer/Makefile

@@ -4,10 +4,10 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		omxplayer
-# actually 46616c55c2fad3dac47d17e8a6b41a16a4d6f15e from 13.04.2014
-PKG_VERSION:=		0.5
+# actually git from 25.09.2014
+PKG_VERSION:=		0.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1c882539dfcbc4e8efeae85ff8069cbe
+PKG_MD5SUM:=		19efdc33063526e6996bdc44190c6d4e
 PKG_DESCR:=		video player for raspberry pi
 PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		libffmpeg boost bcm2835-vc libfreetype libpcre
@@ -16,8 +16,6 @@ PKG_BUILDDEP:=		ffmpeg boost bcm2835-vc freetype pcre dbus
 PKG_URL:=		https://github.com/popcornmix/omxplayer
 PKG_SITES:=		http://openadk.org/distfiles/
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 PKG_LIBC_DEPENDS:=      glibc musl
 
@@ -27,8 +25,7 @@ $(eval $(call PKG_template,OMXPLAYER,omxplayer,$(PKG_VERSION)-${PKG_RELEASE},${P
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
-TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \
-			-I$(STAGING_TARGET_DIR)/usr/include/freetype2 \
+TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/freetype2 \
 			-I$(STAGING_TARGET_DIR)/usr/include/dbus-1.0 \
 			-I$(STAGING_TARGET_DIR)/opt/vc/include \
 			-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vcos/pthreads \

+ 4 - 10
package/omxplayer/patches/patch-Makefile

@@ -1,20 +1,14 @@
---- omxplayer-0.4.orig/Makefile	2014-04-07 13:50:34.000000000 +0200
-+++ omxplayer-0.4/Makefile	2014-04-07 16:25:29.144139758 +0200
+--- omxplayer-0.6.orig/Makefile	2014-08-27 21:32:21.000000000 +0200
++++ omxplayer-0.6/Makefile	2014-09-25 12:37:02.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./ -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 -lkhrn_static
++LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
  
--INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
+-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/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 *