diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-11 17:09:18 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-11 17:09:18 +0200 |
| commit | 7e1ae3b97f8d4fefa6a3b82c31e76f04cf151da2 (patch) | |
| tree | 9df955486e1a6e9bc9bee7489e3c62834362d41c /package/omxplayer/patches/patch-Makefile_include | |
| parent | 55dbf3bde2f62bcc7aa57db7a69a2530ec06c1ef (diff) | |
update omxplayer and bcm2835-vc to latest git version, compile bcm2835
Diffstat (limited to 'package/omxplayer/patches/patch-Makefile_include')
| -rw-r--r-- | package/omxplayer/patches/patch-Makefile_include | 50 |
1 files changed, 36 insertions, 14 deletions
diff --git a/package/omxplayer/patches/patch-Makefile_include b/package/omxplayer/patches/patch-Makefile_include index fbcbbeb89..14673c15f 100644 --- a/package/omxplayer/patches/patch-Makefile_include +++ b/package/omxplayer/patches/patch-Makefile_include @@ -1,9 +1,28 @@ ---- omxplayer-0.1.orig/Makefile.include 2013-07-18 13:18:43.000000000 +0200 -+++ omxplayer-0.1/Makefile.include 2013-07-22 11:11:12.000000000 +0200 -@@ -19,20 +19,20 @@ endif - +--- omxplayer-0.2.orig/Makefile.include 2013-10-11 15:17:41.000000000 +0200 ++++ omxplayer-0.2/Makefile.include 2013-10-11 15:34:42.000000000 +0200 +@@ -1,40 +1,16 @@ +-USE_BUILDROOT=0 +-FLOAT=hard +- +-ifeq ($(USE_BUILDROOT), 1) +-BUILDROOT :=/opt/xbmc-bcm/buildroot +-SDKSTAGE :=$(BUILDROOT)/output/staging +-TARGETFS :=$(BUILDROOT)/output/target +-TOOLCHAIN :=$(BUILDROOT)/output/host/usr/ +-HOST :=arm-unknown-linux-gnueabi +-SYSROOT :=$(BUILDROOT)/output/host/usr/arm-unknown-linux-gnueabi/sysroot +-else +-BUILDROOT :=/opt/bcm-rootfs +-SDKSTAGE :=/opt/bcm-rootfs +-TARGETFS :=/opt/bcm-rootfs +-TOOLCHAIN :=/home/dc4/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/ +-HOST :=arm-linux-gnueabihf +-#SYSROOT :=$(TOOLCHAIN)/arm-bcm2708hardfp-linux-gnueabi/sysroot +-SYSROOT :=/opt/bcm-rootfs +-endif +- JOBS=7 - +- -CFLAGS := -isystem$(PREFIX)/include -CXXFLAGS := $(CFLAGS) -CPPFLAGS := $(CFLAGS) @@ -15,22 +34,25 @@ -RANLIB := $(TOOLCHAIN)/bin/$(HOST)-ranlib -STRIP := $(TOOLCHAIN)/bin/$(HOST)-strip -AR := $(TOOLCHAIN)/bin/$(HOST)-ar +-CXXCP := $(CXX) -E +-PATH := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH) +- +-CFLAGS += -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog +-LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build +-#INCLUDES += -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2 +-INCLUDES += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include +CFLAGS ?= -isystem$(PREFIX)/include +CXXFLAGS ?= $(CFLAGS) -+CPPFLAGS ?= $(CPPFLAGS) ++CPPFLAGS ?= $(CFLAGS) +LDFLAGS ?= -L$(BUILDROOT)/lib +LD ?= $(TOOLCHAIN)/bin/$(HOST)-ld --sysroot=$(SYSROOT) +CC ?= $(TOOLCHAIN)/bin/$(HOST)-gcc --sysroot=$(SYSROOT) -+CXX ?= $(TOOLCHAIN)/bin/$(HOST)-g++ --sysroot=$(SYSROOT) ++CXX ?= $(TOOLCHAIN)/bin/$(HOST)-g++ --sysroot=$(SYSROOT) +OBJDUMP ?= $(TOOLCHAIN)/bin/$(HOST)-objdump +RANLIB ?= $(TOOLCHAIN)/bin/$(HOST)-ranlib +STRIP ?= $(TOOLCHAIN)/bin/$(HOST)-strip +AR ?= $(TOOLCHAIN)/bin/$(HOST)-ar - CXXCP := $(CXX) -E - PATH := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH) - --CFLAGS += -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -O3 -mstructure-size-boundary=32 -mno-sched-prolog -+CFLAGS += -pipe -fomit-frame-pointer -O3 -mstructure-size-boundary=32 -mno-sched-prolog - LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ --INCLUDES += -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2 ++CXXCP ?= $(CXX) -E ++PATH ?= $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH) +INCLUDES += $(CPPFLAGS) ++CFLAGS += -mstructure-size-boundary=32 -mno-sched-prolog |