summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/build.mk2
-rw-r--r--package/bcm28xx-bootloader/Makefile (renamed from package/bcm2835-bootloader/Makefile)80
-rw-r--r--package/bcm28xx-vc/Makefile (renamed from package/bcm2835-vc/Makefile)48
-rw-r--r--package/kodi/Makefile8
-rw-r--r--package/libcec/Makefile8
-rw-r--r--package/omxplayer/Makefile12
-rw-r--r--package/omxplayer/patches/patch-Makefile22
7 files changed, 97 insertions, 83 deletions
diff --git a/mk/build.mk b/mk/build.mk
index d8d1a047c..8fc7bcd68 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -110,7 +110,7 @@ POSTCONFIG= -@\
done; \
for i in ADK_KERNEL_BCM2708_DT ADK_KERNEL_BCM2709_DT ADK_TARGET_GPU_MEM ADK_KERNEL_SND_BCM2708;do \
if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \
- touch .rebuild.bcm2835-bootloader;\
+ touch .rebuild.bcm28xx-bootloader;\
rebuild=1;\
fi; \
done; \
diff --git a/package/bcm2835-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile
index 2fbf19d16..32524bf6f 100644
--- a/package/bcm2835-bootloader/Makefile
+++ b/package/bcm28xx-bootloader/Makefile
@@ -3,8 +3,8 @@
include $(ADK_TOPDIR)/rules.mk
-PKG_NAME:= bcm2835-bootloader
-PKG_VERSION:= a43480416153e88e8499ae85e4a760dcaa4a5810
+PKG_NAME:= bcm28xx-bootloader
+PKG_VERSION:= dc3afd4c8b885e75f624efb266d65fc00a8a4219
PKG_RELEASE:= 1
PKG_DESCR:= bootloader for bcm28xx
PKG_SECTION:= base/boot
@@ -13,94 +13,94 @@ PKG_SITES:= https://github.com/raspberrypi/firmware.git
PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2
-PKG_CHOICES_BCM2835_BOOTLOADER:= DEFAULT EXTRA CUTDOWN
+PKG_CHOICES_BCM28XX_BOOTLOADER:= DEFAULT EXTRA CUTDOWN
PKGCD_DEFAULT:= default bootloader
PKGCD_EXTRA:= bootloader with extra features and codecs
PKGCD_CUTDOWN:= cut down bootloader
-PKG_SUBPKGS:= BCM2835_BOOTLOADER BCM2835_DEBUGTOOL
-PKGSD_BCM2835_DEBUGTOOL:= debugtool
-PKGSC_BCM2835_DEBUGTOOL:= sys/hw
+PKG_SUBPKGS:= BCM28XX_BOOTLOADER BCM28XX_DEBUGTOOL
+PKGSD_BCM28XX_DEBUGTOOL:= debugtool
+PKGSC_BCM28XX_DEBUGTOOL:= sys/hw
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,BCM2835_BOOTLOADER,bcm2835-bootloader,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-$(eval $(call PKG_template,BCM2835_DEBUGTOOL,bcm2835-debugtool,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_BCM2835_DEBUGTOOL)))
+$(eval $(call PKG_template,BCM28XX_BOOTLOADER,bcm28xx-bootloader,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+$(eval $(call PKG_template,BCM28XX_DEBUGTOOL,bcm28xx-debugtool,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_BCM28XX_DEBUGTOOL)))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
do-install:
- $(INSTALL_DIR) $(IDIR_BCM2835_BOOTLOADER)/boot
- $(CP) $(WRKBUILD)/boot/bootcode.bin $(IDIR_BCM2835_BOOTLOADER)/boot/
- printf "kernel=kernel\n" > $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
-ifeq ($(ADK_PACKAGE_BCM2835_BOOTLOADER_DEFAULT),y)
- $(CP) $(WRKBUILD)/boot/{start.elf,fixup.dat} $(IDIR_BCM2835_BOOTLOADER)/boot/
- printf "start_file=start.elf\n" >> $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
- printf "fixup_file=fixup.dat\n" >> $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(INSTALL_DIR) $(IDIR_BCM28XX_BOOTLOADER)/boot
+ $(CP) $(WRKBUILD)/boot/bootcode.bin $(IDIR_BCM28XX_BOOTLOADER)/boot/
+ printf "kernel=kernel\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
+ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_DEFAULT),y)
+ $(CP) $(WRKBUILD)/boot/{start.elf,fixup.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/
+ printf "start_file=start.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
+ printf "fixup_file=fixup.dat\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
-ifeq ($(ADK_PACKAGE_BCM2835_BOOTLOADER_EXTRA),y)
- $(CP) $(WRKBUILD)/boot/{start_x.elf,fixup_x.dat} $(IDIR_BCM2835_BOOTLOADER)/boot/
- printf "start_file=start_x.elf\n" >> $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
- printf "fixup_file=fixup_x.dat\n" >> $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_EXTRA),y)
+ $(CP) $(WRKBUILD)/boot/{start_x.elf,fixup_x.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/
+ printf "start_file=start_x.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
+ printf "fixup_file=fixup_x.dat\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
-ifeq ($(ADK_PACKAGE_BCM2835_BOOTLOADER_CUTDOWN),y)
- $(CP) $(WRKBUILD)/boot/{start_cd.elf,fixup_cd.dat} $(IDIR_BCM2835_BOOTLOADER)/boot/
- printf "start_file=start_cd.elf\n" >> $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
- printf "fixup_file=fixup_cd.dat\n" >> $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_CUTDOWN),y)
+ $(CP) $(WRKBUILD)/boot/{start_cd.elf,fixup_cd.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/
+ printf "start_file=start_cd.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
+ printf "fixup_file=fixup_cd.dat\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
ifeq ($(ADK_KERNEL_BCM2709_DT),y)
printf "device_tree=bcm2709-rpi-2-b.dtb\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
ifeq ($(ADK_KERNEL_BCM2708_DT),y)
printf "device_tree=bcm2708-rpi-b.dtb\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
ifneq ($(ADK_KERNEL_BCM2708_DT)$(ADK_KERNEL_BCM2709_DT),)
printf "device_tree_address=0x100\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
printf "kernel_address=0x8000\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
printf "disable_commandline_tags=2\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
printf "dtparam=i2s=on,spi=on,i2c_arm=on,i2c_vc=on\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_AMP),)
printf "dtoverlay=hifiberry-amp\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC),)
printf "dtoverlay=hifiberry-dac\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI),)
printf "dtoverlay=hifiberry-digi\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC),)
printf "dtoverlay=rpi-dac\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC),)
printf "dtoverlay=iqaudio-dac\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_RPI_PROTO),)
printf "dtoverlay=rpi-proto\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
else
printf "device_tree=\n" >> \
- $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
-ifeq ($(ADK_PACKAGE_BCM2835_DEBUGTOOL),y)
- $(INSTALL_DIR) $(IDIR_BCM2835_DEBUGTOOL)/opt/vc/bin
+ifeq ($(ADK_PACKAGE_BCM28XX_DEBUGTOOL),y)
+ $(INSTALL_DIR) $(IDIR_BCM28XX_DEBUGTOOL)/opt/vc/bin
$(INSTALL_BIN) $(WRKBUILD)/hardfp/opt/vc/bin/vcdbg \
- $(IDIR_BCM2835_DEBUGTOOL)/opt/vc/bin
+ $(IDIR_BCM28XX_DEBUGTOOL)/opt/vc/bin
endif
include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/bcm2835-vc/Makefile b/package/bcm28xx-vc/Makefile
index f215e9f93..6c907ac3e 100644
--- a/package/bcm2835-vc/Makefile
+++ b/package/bcm28xx-vc/Makefile
@@ -3,8 +3,8 @@
include $(ADK_TOPDIR)/rules.mk
-PKG_NAME:= bcm2835-vc
-PKG_VERSION:= 3b81b91c18ff19f97033e146a9f3262ca631f0e9
+PKG_NAME:= bcm28xx-vc
+PKG_VERSION:= 0de0b205ea94ab61c24ea515cd3935e37d41ac03
PKG_RELEASE:= 1
PKG_DESCR:= videocore tools and libraries for bcm28xx
PKG_SECTION:= libs/video
@@ -13,47 +13,47 @@ PKG_BUILDDEP:= cmake-host
PKG_URL:= https://github.com/raspberrypi/userland
PKG_SITES:= https://github.com/raspberrypi/userland.git
-PKG_SUBPKGS:= BCM2835_VC_TOOLS BCM2835_VC_LIBS BCM2835_VC_GL_LIBS
-PKGSS_BCM2835_VC_TOOLS:=bcm2835-vc-libs
-PKGSC_BCM2835_VC_TOOLS:=sys/hw
-PKGSD_BCM2835_VC_TOOLS:=videocore tool vcgencmd
-PKGSC_BCM2835_VC_LIBS:= libs/misc
-PKGSC_BCM2835_VC_GL_LIBS:=libs/video
+PKG_SUBPKGS:= BCM28XX_VC_TOOLS BCM28XX_VC_LIBS BCM28XX_VC_GL_LIBS
+PKGSS_BCM28XX_VC_TOOLS:=bcm28XX-vc-libs
+PKGSC_BCM28XX_VC_TOOLS:=sys/hw
+PKGSD_BCM28XX_VC_TOOLS:=videocore tool vcgencmd
+PKGSC_BCM28XX_VC_LIBS:= libs/misc
+PKGSC_BCM28XX_VC_GL_LIBS:=libs/video
PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,BCM2835_VC_TOOLS,bcm2835-vc-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_BCM2835_VC_TOOLS),$(PKG_DESCR),$(PKGSC_BCM2835_VC_TOOLS)))
-$(eval $(call PKG_template,BCM2835_VC_LIBS,bcm2835-vc-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-$(eval $(call PKG_template,BCM2835_VC_GL_LIBS,bcm2835-vc-gl-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+$(eval $(call PKG_template,BCM28XX_VC_TOOLS,bcm28xx-vc-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_BCM28XX_VC_TOOLS),$(PKG_DESCR),$(PKGSC_BCM28XX_VC_TOOLS)))
+$(eval $(call PKG_template,BCM28XX_VC_LIBS,bcm28xx-vc-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+$(eval $(call PKG_template,BCM28XX_VC_GL_LIBS,bcm28xx-vc-gl-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIG_STYLE:= cmake
-bcm2835-vc-tools-install:
- $(INSTALL_DIR) $(IDIR_BCM2835_VC_TOOLS)/opt/vc/bin
+bcm28xx-vc-tools-install:
+ $(INSTALL_DIR) $(IDIR_BCM28XX_VC_TOOLS)/opt/vc/bin
$(INSTALL_BIN) $(WRKINST)/opt/vc/bin/vcgencmd \
- $(IDIR_BCM2835_VC_TOOLS)/opt/vc/bin
+ $(IDIR_BCM28XX_VC_TOOLS)/opt/vc/bin
-bcm2835-vc-libs-install:
- $(INSTALL_DIR) $(IDIR_BCM2835_VC_LIBS)/opt/vc/lib
+bcm28xx-vc-libs-install:
+ $(INSTALL_DIR) $(IDIR_BCM28XX_VC_LIBS)/opt/vc/lib
$(CP) $(WRKINST)/opt/vc/lib/libvcos.so \
- $(IDIR_BCM2835_VC_LIBS)/opt/vc/lib
+ $(IDIR_BCM28XX_VC_LIBS)/opt/vc/lib
$(CP) $(WRKINST)/opt/vc/lib/libvchiq_arm.so \
- $(IDIR_BCM2835_VC_LIBS)/opt/vc/lib
+ $(IDIR_BCM28XX_VC_LIBS)/opt/vc/lib
-rm -rf $(STAGING_TARGET_DIR)/opt/vc
mkdir -p $(STAGING_TARGET_DIR)/opt/vc
$(CP) $(WRKINST)/opt/vc/lib $(STAGING_TARGET_DIR)/opt/vc
$(CP) $(WRKINST)/opt/vc/include $(STAGING_TARGET_DIR)/opt/vc
-bcm2835-vc-gl-libs-install:
- $(INSTALL_DIR) $(IDIR_BCM2835_VC_GL_LIBS)/opt/vc/lib
+bcm28xx-vc-gl-libs-install:
+ $(INSTALL_DIR) $(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib
$(CP) $(WRKINST)/opt/vc/lib/libEGL.so \
- $(IDIR_BCM2835_VC_GL_LIBS)/opt/vc/lib
+ $(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib
$(CP) $(WRKINST)/opt/vc/lib/libGLESv2.so \
- $(IDIR_BCM2835_VC_GL_LIBS)/opt/vc/lib
+ $(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib
$(CP) $(WRKINST)/opt/vc/lib/libOpenVG.so \
- $(IDIR_BCM2835_VC_GL_LIBS)/opt/vc/lib
- (cd $(IDIR_BCM2835_VC_GL_LIBS)/opt/vc/lib && ln -sf libEGL.so libEGL.so.1)
+ $(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib
+ (cd $(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib && ln -sf libEGL.so libEGL.so.1)
include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index ce6a41ae5..b5bba5b60 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -73,10 +73,10 @@ PKGFD_WITH_WEBSERVER:= enable internal webserver support
# libiconv missing, freescale GL libraries linked against glibc
PKG_LIBC_DEPENDS:= glibc
-PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc
-PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc
-PKG_DEPENDS_RASPBERRY_PI2:= bcm2835-vc
-PKG_BUILDDEP_RASPBERRY_PI2:= bcm2835-vc
+PKG_DEPENDS_RASPBERRY_PI:= bcm28xx-vc
+PKG_BUILDDEP_RASPBERRY_PI:= bcm28xx-vc
+PKG_DEPENDS_RASPBERRY_PI2:= bcm28xx-vc
+PKG_BUILDDEP_RASPBERRY_PI2:= bcm28xx-vc
PKG_DEPENDS_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q
PKG_BUILDDEP_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q
PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 solidrun-imx6
diff --git a/package/libcec/Makefile b/package/libcec/Makefile
index 27b1fe6f6..917aca375 100644
--- a/package/libcec/Makefile
+++ b/package/libcec/Makefile
@@ -15,10 +15,10 @@ PKG_URL:= http://libcec.pulse-eight.com/
PKG_SITES:= http://openadk.org/distfiles/
PKG_OPTS:= dev
-PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc
-PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc
-PKG_DEPENDS_RASPBERRY_PI2:= bcm2835-vc
-PKG_BUILDDEP_RASPBERRY_PI2:= bcm2835-vc
+PKG_DEPENDS_RASPBERRY_PI:= bcm28xx-vc
+PKG_BUILDDEP_RASPBERRY_PI:= bcm28xx-vc
+PKG_DEPENDS_RASPBERRY_PI2:= bcm28xx-vc
+PKG_BUILDDEP_RASPBERRY_PI2:= bcm28xx-vc
PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 solidrun-imx6
include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile
index b04524ee7..fe47f3970 100644
--- a/package/omxplayer/Makefile
+++ b/package/omxplayer/Makefile
@@ -4,20 +4,18 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= omxplayer
-# actually git from 25.09.2014
-PKG_VERSION:= 0.6
+PKG_VERSION:= c5ab80828159c64a283ff69d40748923648f8a0a
PKG_RELEASE:= 1
-PKG_HASH:= 6b22523bbb949ef6b7905f9fe12da7757cdcae0d4970ff752a3cdb3d7340e66d
PKG_DESCR:= video player for raspberry pi
PKG_SECTION:= mm/video
-PKG_DEPENDS:= libffmpeg boost bcm2835-vc libfreetype libpcre
+PKG_DEPENDS:= libffmpeg bcm28xx-vc-libs bcm28xx-vc-gl-libs
PKG_DEPENDS+= librt zlib libpthread libstdcxx libdbus
-PKG_BUILDDEP:= ffmpeg boost bcm2835-vc freetype pcre dbus
+PKG_DEPENDS+= boost libfreetype libpcre
+PKG_BUILDDEP:= ffmpeg boost bcm28xx-vc freetype pcre dbus
PKG_URL:= https://github.com/popcornmix/omxplayer
-PKG_SITES:= http://openadk.org/distfiles/
+PKG_SITES:= https://github.com/popcornmix/omxplayer.git
PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2
-PKG_LIBC_DEPENDS:= glibc musl
include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/omxplayer/patches/patch-Makefile b/package/omxplayer/patches/patch-Makefile
index d321eff17..5f6fa2e24 100644
--- a/package/omxplayer/patches/patch-Makefile
+++ b/package/omxplayer/patches/patch-Makefile
@@ -1,14 +1,30 @@
---- 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
+--- omxplayer-c5ab80828159c64a283ff69d40748923648f8a0a.orig/Makefile 2015-03-06 00:24:01.000000000 -0600
++++ omxplayer-c5ab80828159c64a283ff69d40748923648f8a0a/Makefile 2015-03-06 00:52:15.283681501 -0600
@@ -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
++LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lkhrn_static
-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
+@@ -79,14 +79,8 @@ ffmpeg:
+ make -f Makefile.ffmpeg
+ make -f Makefile.ffmpeg install
+
+-dist: omxplayer.bin omxplayer.1
++dist: omxplayer.bin
+ mkdir -p $(DIST)/usr/lib/omxplayer
+ mkdir -p $(DIST)/usr/bin
+- mkdir -p $(DIST)/usr/share/doc/omxplayer
+- mkdir -p $(DIST)/usr/share/man/man1
+ cp omxplayer omxplayer.bin $(DIST)/usr/bin
+- cp COPYING $(DIST)/usr/share/doc/omxplayer
+- cp README.md $(DIST)/usr/share/doc/omxplayer/README
+- cp omxplayer.1 $(DIST)/usr/share/man/man1
+- cp -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/
+ cd $(DIST); tar -czf ../$(DIST).tgz *