summaryrefslogtreecommitdiff
path: root/package/omxplayer/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/omxplayer/patches')
-rw-r--r--package/omxplayer/patches/patch-Makefile30
-rw-r--r--package/omxplayer/patches/patch-Makefile_include58
-rw-r--r--package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp17
3 files changed, 0 insertions, 105 deletions
diff --git a/package/omxplayer/patches/patch-Makefile b/package/omxplayer/patches/patch-Makefile
deleted file mode 100644
index 5f6fa2e24..000000000
--- a/package/omxplayer/patches/patch-Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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 -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 *
diff --git a/package/omxplayer/patches/patch-Makefile_include b/package/omxplayer/patches/patch-Makefile_include
deleted file mode 100644
index 14673c15f..000000000
--- a/package/omxplayer/patches/patch-Makefile_include
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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)
--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 -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 ?= $(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
-+CXXCP ?= $(CXX) -E
-+PATH ?= $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
-+INCLUDES += $(CPPFLAGS)
-+CFLAGS += -mstructure-size-boundary=32 -mno-sched-prolog
diff --git a/package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp b/package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp
deleted file mode 100644
index c23d1c9b3..000000000
--- a/package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- omxplayer-0.2.orig/OMXPlayerSubtitles.cpp 2013-10-11 15:17:41.000000000 +0200
-+++ omxplayer-0.2/OMXPlayerSubtitles.cpp 2013-10-11 15:28:35.000000000 +0200
-@@ -43,11 +43,9 @@ OMXPlayerSubtitles::OMXPlayerSubtitles()
- m_centered(),
- m_ghost_box(),
- m_lines(),
-- m_av_clock(),
--#ifndef NDEBUG
-- m_open()
--#endif
--{}
-+ m_av_clock()
-+{
-+}
-
- OMXPlayerSubtitles::~OMXPlayerSubtitles() BOOST_NOEXCEPT
- {