diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-23 10:11:12 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-23 10:11:12 +0200 |
| commit | b0fdc2d8c35dbc72f2069c43433aeb250b91219c (patch) | |
| tree | 8b826f8ab69fff08a1440bf0176c1ceab4a767ab /package/omxplayer | |
| parent | c9952d01d5058e26b4d913079cc55f60027e315c (diff) | |
remove fbset usage, kernel oops
Diffstat (limited to 'package/omxplayer')
| -rw-r--r-- | package/omxplayer/patches/patch-Makefile_include.orig | 35 | ||||
| -rw-r--r-- | package/omxplayer/patches/patch-omxplayer | 25 |
2 files changed, 25 insertions, 35 deletions
diff --git a/package/omxplayer/patches/patch-Makefile_include.orig b/package/omxplayer/patches/patch-Makefile_include.orig deleted file mode 100644 index 705c80c13..000000000 --- a/package/omxplayer/patches/patch-Makefile_include.orig +++ /dev/null @@ -1,35 +0,0 @@ ---- omxplayer-0.1.orig/Makefile.include 2013-07-18 13:18:43.000000000 +0200 -+++ omxplayer-0.1/Makefile.include 2013-07-18 17:19:58.000000000 +0200 -@@ -19,20 +19,20 @@ endif - - JOBS=7 - --CFLAGS := -isystem$(PREFIX)/include --CXXFLAGS := $(CFLAGS) --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) --OBJDUMP := $(TOOLCHAIN)/bin/$(HOST)-objdump --RANLIB := $(TOOLCHAIN)/bin/$(HOST)-ranlib --STRIP := $(TOOLCHAIN)/bin/$(HOST)-strip --AR := $(TOOLCHAIN)/bin/$(HOST)-ar -+CFLAGS ?= -isystem$(PREFIX)/include -+CXXFLAGS ?= $(CFLAGS) -+CPPFLAGS ?= $(CPPFLAGS) -+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) -+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 - 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 -+INCLUDES += $(CPPFLAGS) diff --git a/package/omxplayer/patches/patch-omxplayer b/package/omxplayer/patches/patch-omxplayer new file mode 100644 index 000000000..cea125e57 --- /dev/null +++ b/package/omxplayer/patches/patch-omxplayer @@ -0,0 +1,25 @@ +--- omxplayer-0.1.orig/omxplayer 2013-07-18 13:18:41.000000000 +0200 ++++ omxplayer-0.1/omxplayer 2013-07-22 15:19:43.000000000 +0200 +@@ -36,14 +36,14 @@ YRES=1080 + XRES=1600 + YRES=900 + +-if [ -e $FBSET ]; then +- echo 0 > /sys/class/vtconsole/vtcon1/bind +- fbset -xres 1 -yres 1 +-fi ++#if [ -e $FBSET ]; then ++# echo 0 > /sys/class/vtconsole/vtcon1/bind ++# fbset -xres 1 -yres 1 ++#fi + + $OMXPLAYER --font $FONT --italic-font $ITALIC_FONT "$@" + +-if [ -e $FBSET ]; then +- fbset -xres ${XRES} -yres ${YRES} +- echo 1 > /sys/class/vtconsole/vtcon1/bind +-fi ++#if [ -e $FBSET ]; then ++# fbset -xres ${XRES} -yres ${YRES} ++# echo 1 > /sys/class/vtconsole/vtcon1/bind ++#fi |