All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-raspberrypi][PATCH] omxplayer: Bump revision
@ 2016-04-16  1:20 Jonathan Liu
  2016-04-21 19:08 ` Andrei Gherzan
  0 siblings, 1 reply; 4+ messages in thread
From: Jonathan Liu @ 2016-04-16  1:20 UTC (permalink / raw)
  To: yocto

Fixes linking error due to missing vchostif library dependency.
Rebased patches and removed patches already merged upstream.

Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 ...es-and-headers-from-ffmpeg-are-installed-in-u.patch | 12 +++++++-----
 .../don-t-preserve-file-attributes-when-cp.patch       | 18 ------------------
 .../omxplayer/fix-tar-command-with-DIST.patch          |  5 ++++-
 recipes-multimedia/omxplayer/omxplayer_git.bb          |  3 +--
 4 files changed, 12 insertions(+), 26 deletions(-)
 delete mode 100644 recipes-multimedia/omxplayer/omxplayer/don-t-preserve-file-attributes-when-cp.patch

diff --git a/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch b/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
index 366772e..75f7254 100644
--- a/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
+++ b/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
@@ -6,14 +6,16 @@ Subject: [PATCH] Libraries and headers from ffmpeg are installed in /usr.
 Don't search for libraries and headers in /usr/local.
 
 Upstream-Status: Inappropriate [embedded specific]
+
 Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+Signed-off-by: Jonathan Liu <net147@gmail.com>
 ---
  Makefile        | 6 +++---
  Makefile.ffmpeg | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 38e1400..1b15999 100644
+index be97c2b..2c120fc 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,9 +1,9 @@
@@ -32,14 +34,14 @@ index 38e1400..1b15999 100644
  	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/
-+	cp -a ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
+-	cp -P ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/
++	cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
  	cd $(DIST); tar -czf ../$(DIST).tgz *
 diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
-index 4d2d720..9d66a85 100644
+index 5ccf96f..a7ddd5f 100644
 --- a/Makefile.ffmpeg
 +++ b/Makefile.ffmpeg
-@@ -256,5 +256,5 @@ checkout:
+@@ -254,5 +254,5 @@ checkout:
  .PHONY : install
  install:
  	cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install
diff --git a/recipes-multimedia/omxplayer/omxplayer/don-t-preserve-file-attributes-when-cp.patch b/recipes-multimedia/omxplayer/omxplayer/don-t-preserve-file-attributes-when-cp.patch
deleted file mode 100644
index 08df12e..0000000
--- a/recipes-multimedia/omxplayer/omxplayer/don-t-preserve-file-attributes-when-cp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-When running install (fakeroot) host-user-contaminated will fail because dist
-rule copies files while preserving file attributes like user ID.
-
-Upstream-Status: Submitted [https://github.com/popcornmix/omxplayer/pull/431]
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile
-+++ git/Makefile
-@@ -87,5 +87,5 @@ dist: omxplayer.bin omxplayer.1
- 	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/lib/*.so* $(DIST)/usr/lib/omxplayer/
-+	cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
- 	tar -czf omxplayer-dist.tar.gz $(DIST)
-\ No newline at end of file
diff --git a/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch b/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch
index 5b3bd21..ab40e40 100644
--- a/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch
+++ b/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch
@@ -3,7 +3,10 @@ https://github.com/popcornmix/omxplayer/commit/201c77973155861e60492e45d35467b19
 
 This fails if DIST is an absolute path. The old command was working just fine.
 
+Upstream-Status: Pending
+
 Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+Signed-off-by: Jonathan Liu <net147@gmail.com>
 
 Index: git/Makefile
 ===================================================================
@@ -12,7 +15,7 @@ Index: git/Makefile
 @@ -71,4 +71,4 @@ dist: omxplayer.bin
  	cp COPYING $(DIST)/usr/share/doc/
  	cp README.md $(DIST)/usr/share/doc/README
- 	cp -a ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
+ 	cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
 -	cd $(DIST); tar -czf ../$(DIST).tgz *
 +	tar -czf omxplayer-dist.tar.gz $(DIST)
 \ No newline at end of file
diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb
index c8251fe..7d3b464 100644
--- a/recipes-multimedia/omxplayer/omxplayer_git.bb
+++ b/recipes-multimedia/omxplayer/omxplayer_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh"
 PR = "r4"
 
-SRCREV = "15a490b2397b358776c56b017a137c4716eb6b4e"
+SRCREV = "8466acf65f5f444dfa22631fb83c07ac759c02a5"
 SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \
            file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \
            file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master
            file://0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch \
            file://fix-tar-command-with-DIST.patch \
            file://use-native-pkg-config.patch \
-           file://don-t-preserve-file-attributes-when-cp.patch \
            "
 S = "${WORKDIR}/git"
 
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [meta-raspberrypi][PATCH] omxplayer: Bump revision
  2016-04-16  1:20 [meta-raspberrypi][PATCH] omxplayer: Bump revision Jonathan Liu
@ 2016-04-21 19:08 ` Andrei Gherzan
  0 siblings, 0 replies; 4+ messages in thread
From: Andrei Gherzan @ 2016-04-21 19:08 UTC (permalink / raw)
  To: Jonathan Liu; +Cc: yocto

[-- Attachment #1: Type: text/plain, Size: 290 bytes --]

On Sat, Apr 16, 2016 at 11:20:51AM +1000, Jonathan Liu wrote:
> Fixes linking error due to missing vchostif library dependency.
> Rebased patches and removed patches already merged upstream.
>
> Signed-off-by: Jonathan Liu <net147@gmail.com>

Merged to master.

--
Andrei Gherzan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [meta-raspberrypi][PATCH] omxplayer: bump revision
  2016-02-26 11:55 [meta-raspberrypi][PATCH] omxplayer: bump revision Jonathan Liu
@ 2016-02-27 13:02 ` Andrei Gherzan
  0 siblings, 0 replies; 4+ messages in thread
From: Andrei Gherzan @ 2016-02-27 13:02 UTC (permalink / raw)
  To: Jonathan Liu; +Cc: yocto

On Fri, Feb 26, 2016 at 10:55:48PM +1100, Jonathan Liu wrote:
> Fixes compile errors with ffmpeg 3.0.
>
> Signed-off-by: Jonathan Liu <net147@gmail.com>
> ---
>  recipes-multimedia/omxplayer/omxplayer_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb
> index 2f45fb0..a0690a0 100644
> --- a/recipes-multimedia/omxplayer/omxplayer_git.bb
> +++ b/recipes-multimedia/omxplayer/omxplayer_git.bb
> @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>  DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh"
>  PR = "r4"
>
> -SRCREV = "d99bd86c9fd80ea01f98761e130d7ac9a2bb7588"
> +SRCREV = "15a490b2397b358776c56b017a137c4716eb6b4e"

Merged to master. Thanks.

--
Andrei Gherzan


^ permalink raw reply	[flat|nested] 4+ messages in thread
* [meta-raspberrypi][PATCH] omxplayer: bump revision
@ 2016-02-26 11:55 Jonathan Liu
  2016-02-27 13:02 ` Andrei Gherzan
  0 siblings, 1 reply; 4+ messages in thread
From: Jonathan Liu @ 2016-02-26 11:55 UTC (permalink / raw)
  To: yocto

Fixes compile errors with ffmpeg 3.0.

Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 recipes-multimedia/omxplayer/omxplayer_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb
index 2f45fb0..a0690a0 100644
--- a/recipes-multimedia/omxplayer/omxplayer_git.bb
+++ b/recipes-multimedia/omxplayer/omxplayer_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh"
 PR = "r4"
 
-SRCREV = "d99bd86c9fd80ea01f98761e130d7ac9a2bb7588"
+SRCREV = "15a490b2397b358776c56b017a137c4716eb6b4e"
 SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \
            file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \
            file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \
-- 
2.7.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-04-21 19:08 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-16  1:20 [meta-raspberrypi][PATCH] omxplayer: Bump revision Jonathan Liu
2016-04-21 19:08 ` Andrei Gherzan
  -- strict thread matches above, loose matches on Subject: below --
2016-02-26 11:55 [meta-raspberrypi][PATCH] omxplayer: bump revision Jonathan Liu
2016-02-27 13:02 ` Andrei Gherzan

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.