Packman Build Service PMBS

omxplayer.changes Changed

omxplayer.spec Changed

Makefile.diff Changed

@@ -1,6 +1,8 @@
---- Makefile.orig	2014-02-14 16:44:19.466536965 +0100
-+++ Makefile	2014-02-17 09:49:59.581656592 +0100
-@@ -49,7 +49,7 @@ version:
+diff --git a/Makefile b/Makefile
+index 3615ff7..7b1404a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -51,7 +51,7 @@ version:
  	bash gen_version.sh > version.h 
  
  omxplayer.bin: version $(OBJS)
@@ -8,4 +10,15 @@
 +	$(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
+@@ -64,8 +64,8 @@ keys.h: README.md Makefile
+ 	> $@
+ 
+ omxplayer.1: README.md
+-	sed -e '/DOWNLOADING/,/omxplayer-dist/ d; /DBUS/,$$ d' $< >MAN
+-	curl -F page=@MAN http://mantastic.herokuapp.com 2>/dev/null >$@
++# 	sed -e '/DOWNLOADING/,/omxplayer-dist/ d; /DBUS/,$$ d' $< >MAN
++# 	curl -F page=@MAN http://mantastic.herokuapp.com 2>/dev/null >$@
+ 
  clean:
+ 	for i in $(OBJS); do (if test -e "$$i"; then ( rm $$i ); fi ); done

Makefile.ffmpeg.diff Changed

@@ -1,15 +1,17 @@
---- Makefile.ffmpeg.orig	2014-04-01 10:10:54.625335141 +0200
-+++ Makefile.ffmpeg	2014-04-01 10:59:01.525418476 +0200
-@@ -8,7 +8,7 @@ all: checkout configure compile
- 
+diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
+index abe4b26..cafbbcb 100644
+--- a/Makefile.ffmpeg
++++ b/Makefile.ffmpeg
+@@ -10,7 +10,7 @@ all: checkout configure compile
+ .PHONY : copy
  copy:
  	find ffmpeg -name '*.so*' -exec cp {} . \;
 -	$(HOST)-strip *.so*
 +	strip *.so*
  
+ .PHONY : compile
  compile: 
- 	+$(MAKE) -C ffmpeg
-@@ -19,7 +19,6 @@ configure:
+@@ -23,7 +23,6 @@ configure:
  	LDFLAGS="" \
    ./configure \
  			--extra-cflags="-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog" \
@@ -17,16 +19,17 @@
  			--enable-shared \
  			--disable-static \
  			--arch=arm \
-@@ -239,7 +238,6 @@ configure:
- 			--disable-decoder=bintext \
+@@ -244,7 +243,7 @@ configure:
  			--disable-decoder=xbin \
  			--disable-decoder=idf \
+ 			--enable-decoder=opus \
 -			--cross-prefix=$(HOST)-
++
  
+ .PHONY : clean
  clean:
- 	@rm -rf ffmpeg
-@@ -250,5 +248,5 @@ checkout:
- 
+@@ -257,5 +256,5 @@ checkout:
+ .PHONY : install
  install:
  	cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install
 -	$(HOST)-strip ffmpeg_compiled/usr/local/lib/*.so

omxplayer.cpp.diff Changed

@@ -1,7 +1,9 @@
---- omxplayer.cpp.orig	2014-04-01 10:10:54.633334942 +0200
-+++ omxplayer.cpp	2014-04-01 11:00:49.156288571 +0200
-@@ -88,8 +88,8 @@ int               m_use_hw_audio
- bool              m_osd                 = true;
+diff --git a/omxplayer.cpp b/omxplayer.cpp
+index 0e64aae..09856d9 100644
+--- a/omxplayer.cpp
++++ b/omxplayer.cpp
+@@ -91,8 +91,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";
@@ -11,14 +13,3 @@
  std::string       m_dbus_name           = "org.mpris.MediaPlayer2.omxplayer";
  bool              m_asked_for_font      = false;
  bool              m_asked_for_italic_font = false;
-@@ -173,8 +173,8 @@ void print_usage()
-   printf("              --no-osd                  do not display status information on screen\n");
-   printf("              --subtitles path          external subtitles in UTF-8 srt format\n");
-   printf("              --font path               subtitle font\n");
--  printf("                                        (default: /usr/share/fonts/truetype/freefont/FreeSans.ttf)\n");
--  printf("              --italic-font path        (default: /usr/share/fonts/truetype/freefont/FreeSansOblique.ttf)\n");
-+  printf("                                        (default: /usr/share/fonts/truetype/FreeSans.ttf)\n");
-+  printf("              --italic-font path        (default: /usr/share/fonts/truetype/FreeSansOblique.ttf)\n");
-   printf("              --font-size size          font size as thousandths of screen height\n");
-   printf("                                        (default: 55)\n");
-   printf("              --align left/center       subtitle alignment (default: left)\n");

get_from_git.sh Changed

omxplayer-2014.03.28.tar.gz -> omxplayer-2014.10.23.tar.gz Changed

Changes of Revision 5