mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
107 lines
4.9 KiB
Diff
107 lines
4.9 KiB
Diff
diff -urN a/Makefile b/Makefile
|
|
--- a/Makefile 2014-08-10 15:20:40.333620698 -0600
|
|
+++ b/Makefile 2014-08-10 16:00:28.275387482 -0600
|
|
@@ -2,9 +2,9 @@
|
|
|
|
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 @@
|
|
|
|
OBJS+=$(filter %.o,$(SRC:.cpp=.o))
|
|
|
|
-all: dist
|
|
+all: omxplayer.bin
|
|
|
|
%.o: %.cpp
|
|
@rm -f $@
|
|
@@ -51,7 +51,7 @@
|
|
bash gen_version.sh > version.h
|
|
|
|
omxplayer.bin: version $(OBJS)
|
|
- $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
|
|
+ $(CXX) -o omxplayer.bin $(OBJS) $(LDFLAGS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
|
|
$(STRIP) omxplayer.bin
|
|
|
|
help.h: README.md Makefile
|
|
@@ -74,19 +74,9 @@
|
|
@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 -a 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 -urN a/Makefile.include b/Makefile.include
|
|
--- a/Makefile.include 2014-08-10 15:20:40.333620698 -0600
|
|
+++ b/Makefile.include 2014-08-10 16:03:26.779799178 -0600
|
|
@@ -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
|