Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 1a4b7ee28bf7413af6513fb45ad0d0736048f866 / . / meta-raspberrypi / recipes-multimedia / omxplayer / omxplayer / 0001-Remove-Makefile.include-which-includes-hardcoded.patch
blob: 0c8843e7710f61201de9577c81f907cdb9f140cb [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]1From 19c9bc5fd8f43d3e9117906c3c48a3891357f8bc Mon Sep 17 00:00:00 2001
Patrick Williams8b8bc412016-08-17 15:02:23 -0500[diff] [blame]2From: Andrei Gherzan <andrei@gherzan.ro>
3Date: Tue, 20 Aug 2013 16:10:51 +0300
4Subject: [PATCH] Remove Makefile.include which includes hardcoded
5
6Remove Makefile.include which includes hardcoded paths and rely on
7variables provided by build system.
8
9Upstream-Status: Inappropriate [embedded specific]
10Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
11
12Updated patch to apply to c0dd9502ed2c43c487674939195c69680f3d98b0 revision
13
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]14---
15 Makefile | 1 -
16 Makefile.ffmpeg | 1 -
17 Makefile.include | 40 ----------------------------------------
18 3 files changed, 42 deletions(-)
19 delete mode 100644 Makefile.include
20
Patrick Williams8b8bc412016-08-17 15:02:23 -0500[diff] [blame]21diff --git a/Makefile b/Makefile
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]22index 2857e94..76ee9bf 100644
Patrick Williams8b8bc412016-08-17 15:02:23 -0500[diff] [blame]23--- a/Makefile
24+++ b/Makefile
25@@ -1,4 +1,3 @@
26-include Makefile.include
27
28 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
29
30diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame^]31index ea12aad..749f47f 100644
Patrick Williams8b8bc412016-08-17 15:02:23 -0500[diff] [blame]32--- a/Makefile.ffmpeg
33+++ b/Makefile.ffmpeg
34@@ -1,4 +1,3 @@
35-include Makefile.include
36
37 CFLAGS=-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_HAVE_SBRK -D_LARGEFILE64_SOURCE -DHAVE_CMAKE_CONFIG -DHAVE_VMCS_CONFIG -D_REENTRANT -DUSE_VCHIQ_ARM -DVCHI_BULK_ALIGN=1 -DVCHI_BULK_GRANULARITY=1 -DEGL_SERVER_DISPMANX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__VIDEOCORE4__ -DGRAPHICS_X_VG=1 -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DOMX -DOMX_SKIP64BIT
38
39diff --git a/Makefile.include b/Makefile.include
40deleted file mode 100644
41index 58e9560..0000000
42--- a/Makefile.include
43+++ /dev/null
44@@ -1,40 +0,0 @@
45-USE_BUILDROOT=0
46-FLOAT=hard
47-
48-ifeq ($(USE_BUILDROOT), 1)
49-BUILDROOT :=/opt/xbmc-bcm/buildroot
50-SDKSTAGE :=$(BUILDROOT)/output/staging
51-TARGETFS :=$(BUILDROOT)/output/target
52-TOOLCHAIN :=$(BUILDROOT)/output/host/usr/
53-HOST :=arm-unknown-linux-gnueabi
54-SYSROOT :=$(BUILDROOT)/output/host/usr/arm-unknown-linux-gnueabi/sysroot
55-else
56-BUILDROOT :=/opt/bcm-rootfs
57-SDKSTAGE :=/opt/bcm-rootfs
58-TARGETFS :=/opt/bcm-rootfs
59-TOOLCHAIN :=/home/dc4/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/
60-HOST :=arm-linux-gnueabihf
61-#SYSROOT :=$(TOOLCHAIN)/arm-bcm2708hardfp-linux-gnueabi/sysroot
62-SYSROOT :=/opt/bcm-rootfs
63-endif
64-
65-JOBS=7
66-
67-CFLAGS := -isystem$(PREFIX)/include
68-CXXFLAGS := $(CFLAGS)
69-CPPFLAGS := $(CFLAGS)
70-LDFLAGS := -L$(BUILDROOT)/lib
71-LD := $(TOOLCHAIN)/bin/$(HOST)-ld --sysroot=$(SYSROOT)
72-CC := $(TOOLCHAIN)/bin/$(HOST)-gcc --sysroot=$(SYSROOT)
73-CXX := $(TOOLCHAIN)/bin/$(HOST)-g++ --sysroot=$(SYSROOT)
74-OBJDUMP := $(TOOLCHAIN)/bin/$(HOST)-objdump
75-RANLIB := $(TOOLCHAIN)/bin/$(HOST)-ranlib
76-STRIP := $(TOOLCHAIN)/bin/$(HOST)-strip
77-AR := $(TOOLCHAIN)/bin/$(HOST)-ar
78-CXXCP := $(CXX) -E
79-PATH := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
80-
81-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
82-LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build
83-#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
84-INCLUDES += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include