Request 4234 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 4234 (accepted)

- Update to 68961b3 (2018-03-13)
- remove obsolete patch:
* Makefile.include.diff
- Add new patch to fix aarch64 compilation:
* fix_aarch64.patch
- refresh other patches

Created by guillaume about 6 years ago
In state accepted

Submit omxplayer

Submit package home:guillaume...hes:Multimedia / omxplayer to package Multimedia / omxplayer

omxplayer.changes Changed

omxplayer.spec Changed

@@ -20,17 +20,17 @@
 %bcond_with external_ffmpeg
 
 Name:           omxplayer
-Version:        2016.09.20
+Version:        2018.03.13
 Release:        0
 Summary:        omxplayer for Raspberry Pi
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            https://github.com/popcornmix/omxplayer
 Source:         omxplayer-%{version}.tar.gz
-Patch0:         Makefile.include.diff
 Patch1:         Makefile.ffmpeg.diff
 Patch2:         Makefile.diff
 Patch3:         omxplayer.cpp.diff
+Patch4:         fix_aarch64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  alsa-devel
 BuildRequires:  dbus-1-devel
@@ -57,19 +57,26 @@
 BuildRequires:  libssh-devel
 %endif
 Requires:       gnu-free-fonts
-ExclusiveArch:  armv6l armv6hl %arm
+ExclusiveArch:  armv6l armv6hl %arm aarch64
 
 %description
 omxplayer is a player for Raspberry Pi.
 
 %prep
 %setup -q
-%patch0 -p1
 %if !%{with external_ffmpeg}
 %patch1 -p1
 %endif
 %patch2 -p1
 %patch3 -p1
+%ifarch aarch64
+%patch4 -p1
+sed -i 's#/usr/lib/arm-linux-gnueabihf/dbus-1.0/include#/usr/lib64/dbus-1.0/include/#g;s#LDFLAGS+=-L./#LDFLAGS+=-L./ -L/usr/lib64/ #g' Makefile
+sed -i 's/-mfpu=vfp//g;s/-mfloat-abi=hard//g;s/-mno-apcs-stack-check//g;s/-mno-apcs-stack-check//g;s/-mstructure-size-boundary=32//g;s/-mno-sched-prolog//g;s/-mtune=arm1176jzf-s//g;s/-mabi=aapcs-linux//g;s/-mcpu=arm1176jzf-s//g' Makefile
+sed -i 's/--extra-cflags="-mfpu=vfp -mfloat-abi=hard -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog"//g' Makefile.ffmpeg
+sed -i 's/arch=arm/arch=aarch64/g' Makefile.ffmpeg
+sed -i 's/--cpu=arm1176jzf-s//g' Makefile.ffmpeg
+%endif
 
 %build
 %if !%{with external_ffmpeg}

Makefile.diff Changed

@@ -1,8 +1,17 @@
 diff --git a/Makefile b/Makefile
-index 3615ff7..60e6e99 100644
+index 5f4e414..fe88bc8 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -51,7 +51,7 @@ version:
+@@ -4,7 +4,7 @@ CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX
+ LDFLAGS=-L$(SDKSTAGE)/opt/vc/lib/
+ LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
+ 
+-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads
++INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads
+ 
+ DIST ?= omxplayer-dist
+ STRIP ?= strip
+@@ -53,7 +53,7 @@ version:
  	bash gen_version.sh > version.h 
  
  omxplayer.bin: version $(OBJS)
@@ -11,7 +20,7 @@
  	$(STRIP) omxplayer.bin
  
  help.h: README.md Makefile
-@@ -64,8 +64,8 @@ keys.h: README.md Makefile
+@@ -66,8 +66,8 @@ keys.h: README.md Makefile
  	> $@
  
  omxplayer.1: README.md
@@ -22,7 +31,7 @@
  
  clean:
  	for i in $(OBJS); do (if test -e "$$i"; then ( rm $$i ); fi ); done
-@@ -87,6 +87,6 @@ dist: omxplayer.bin omxplayer.1
+@@ -89,7 +89,7 @@ dist: omxplayer.bin omxplayer.1
  	cp omxplayer omxplayer.bin $(DIST)/usr/bin
  	cp COPYING $(DIST)/usr/share/doc/omxplayer
  	cp README.md $(DIST)/usr/share/doc/omxplayer/README
@@ -30,3 +39,4 @@
 +# 	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 *
+

Makefile.ffmpeg.diff Changed

Makefile.include.diff Deleted

@@ -1,53 +0,0 @@
-diff --git a/Makefile.include b/Makefile.include
-index 58e9560..8bf1fa9 100644
---- a/Makefile.include
-+++ b/Makefile.include
-@@ -9,32 +9,32 @@ 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
-+BUILDROOT	:=
-+SDKSTAGE	:=
-+TARGETFS	:=
-+TOOLCHAIN	:=
-+HOST		:=
- #SYSROOT		:=$(TOOLCHAIN)/arm-bcm2708hardfp-linux-gnueabi/sysroot
--SYSROOT		:=/opt/bcm-rootfs
-+SYSROOT		:=
- endif
- 
- JOBS=7
- 
--CFLAGS			:= -isystem$(PREFIX)/include
-+CFLAGS			:= 
- 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
-+LD			:= ld
-+CC			:= gcc
-+CXX         		:= g++ 
-+OBJDUMP			:= objdump
-+RANLIB			:= ranlib
-+STRIP			:= strip
-+AR 			:= ar
- CXXCP 			:= $(CXX) -E
--PATH 				:= $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
-+PATH 			:= $(PREFIX)/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
-+#INCLUDES		+= -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include

fix_aarch64.patch Added

omxplayer-2016.09.20.tar.gz -> omxplayer-2018.03.13.tar.gz Changed

Build Results
RPM Lint

Refresh

Comments for request 4234 0

Request History

guillaume created request about 6 years ago

- Update to 68961b3 (2018-03-13)
- remove obsolete patch:
* Makefile.include.diff
- Add new patch to fix aarch64 compilation:
* fix_aarch64.patch
- refresh other patches

guillaume accepted request about 6 years ago