From 7f9fbea4929df87d96878d5899f2e4b017fc9fa8 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 24 Sep 2014 08:47:14 -0600 Subject: [PATCH] alarm fixes --- Makefile | 30 ++++++++++-------------------- Makefile.include | 44 ++++---------------------------------------- omxplayer.cpp | 4 ++-- 3 files changed, 16 insertions(+), 62 deletions(-) diff --git a/Makefile b/Makefile index bcfadfb..3e6a994 100644 --- a/Makefile +++ b/Makefile @@ -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 -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 @@ -39,7 +39,7 @@ SRC=linux/XMemUtils.cpp \ OBJS+=$(filter %.o,$(SRC:.cpp=.o)) -all: dist +all: omxplayer.bin %.o: %.cpp @rm -f $@ @@ -51,7 +51,7 @@ version: bash gen_version.sh > version.h omxplayer.bin: version $(OBJS) - $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre + $(CXX) -o omxplayer.bin $(OBJS) $(LDFLAGS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre $(STRIP) omxplayer.bin help.h: README.md Makefile @@ -74,19 +74,9 @@ clean: @rm -rf $(DIST) @rm -f omxplayer-dist.tar.gz -ffmpeg: - @rm -rf ffmpeg - make -f Makefile.ffmpeg - make -f Makefile.ffmpeg install - -dist: omxplayer.bin omxplayer.1 - 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 -P ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/ - cd $(DIST); tar -czf ../$(DIST).tgz * +install: + install -d $(DESTDIR)/usr/bin + install -d $(DESTDIR)/usr/share/doc/omxplayer + install omxplayer $(DESTDIR)/usr/bin/ + install omxplayer.bin $(DESTDIR)/usr/bin/ + install README.md COPYING $(DESTDIR)/usr/share/doc/omxplayer/ diff --git a/Makefile.include b/Makefile.include index 58e9560..4789f10 100644 --- a/Makefile.include +++ b/Makefile.include @@ -1,40 +1,4 @@ -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 +STRIP := strip +CFLAGS += -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog +LDFLAGS += -L/opt/vc/lib/ +INCLUDES += -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads -I/usr/include/freetype2 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include diff --git a/omxplayer.cpp b/omxplayer.cpp index 5c03171..d3b4abc 100644 --- a/omxplayer.cpp +++ b/omxplayer.cpp @@ -83,8 +83,8 @@ bool m_osd = true; bool m_no_keys = false; std::string m_external_subtitles_path; bool m_has_external_subtitles = false; -std::string m_font_path = "/usr/share/fonts/truetype/freefont/FreeSans.ttf"; -std::string m_italic_font_path = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf"; +std::string m_font_path = "/usr/share/fonts/TTF/FreeSans.ttf"; +std::string m_italic_font_path = "/usr/share/fonts/TTF/FreeSansOblique.ttf"; std::string m_dbus_name = "org.mpris.MediaPlayer2.omxplayer"; bool m_asked_for_font = false; bool m_asked_for_italic_font = false; -- 2.8.2