From c9952d01d5058e26b4d913079cc55f60027e315c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 22 Jul 2013 15:20:22 +0200 Subject: add omxplayer for raspberry pi --- package/omxplayer/patches/patch-Makefile | 11 +++++++ package/omxplayer/patches/patch-Makefile_include | 36 ++++++++++++++++++++++ .../omxplayer/patches/patch-Makefile_include.orig | 35 +++++++++++++++++++++ .../omxplayer/patches/patch-OMXPlayerSubtitles_cpp | 17 ++++++++++ 4 files changed, 99 insertions(+) create mode 100644 package/omxplayer/patches/patch-Makefile create mode 100644 package/omxplayer/patches/patch-Makefile_include create mode 100644 package/omxplayer/patches/patch-Makefile_include.orig create mode 100644 package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp (limited to 'package/omxplayer/patches') diff --git a/package/omxplayer/patches/patch-Makefile b/package/omxplayer/patches/patch-Makefile new file mode 100644 index 000000000..dd053d03d --- /dev/null +++ b/package/omxplayer/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- omxplayer-0.1.orig/Makefile 2013-07-18 13:18:41.000000000 +0200 ++++ omxplayer-0.1/Makefile 2013-07-18 17:19:38.000000000 +0200 +@@ -3,7 +3,7 @@ include Makefile.include + CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_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./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/local/lib/ +-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ ++INCLUDES+=-I./ -Ilinux + + DIST ?= omxplayer-dist + diff --git a/package/omxplayer/patches/patch-Makefile_include b/package/omxplayer/patches/patch-Makefile_include new file mode 100644 index 000000000..fbcbbeb89 --- /dev/null +++ b/package/omxplayer/patches/patch-Makefile_include @@ -0,0 +1,36 @@ +--- 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 + + 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 ++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 ++INCLUDES += $(CPPFLAGS) diff --git a/package/omxplayer/patches/patch-Makefile_include.orig b/package/omxplayer/patches/patch-Makefile_include.orig new file mode 100644 index 000000000..705c80c13 --- /dev/null +++ b/package/omxplayer/patches/patch-Makefile_include.orig @@ -0,0 +1,35 @@ +--- 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-OMXPlayerSubtitles_cpp b/package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp new file mode 100644 index 000000000..4ecea91ad --- /dev/null +++ b/package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp @@ -0,0 +1,17 @@ +--- omxplayer-0.1.orig/OMXPlayerSubtitles.cpp 2013-07-18 13:18:41.000000000 +0200 ++++ omxplayer-0.1/OMXPlayerSubtitles.cpp 2013-07-22 11:04:00.000000000 +0200 +@@ -43,11 +43,9 @@ OMXPlayerSubtitles::OMXPlayerSubtitles() + m_font_size(), + m_centered(), + m_lines(), +- m_av_clock(), +-#ifndef NDEBUG +- m_open() +-#endif +-{} ++ m_av_clock() ++{ ++} + + OMXPlayerSubtitles::~OMXPlayerSubtitles() BOOST_NOEXCEPT + { -- cgit v1.2.3