Skip to contentSkip to conversation

package/kodi: Fix path to binary in service

PATCH New Maxime Hadjinlian 3 participants 7 messages Apr 12, 2015 – Apr 13, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/kodi: Fix path to binary in service

---
 package/kodi/kodi.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/kodi/kodi.service +1 -1
index acd3b8e..f30741c 100644
@@ -4,7 +4,7 @@ After = network.target
 
 [Service]
 Type = simple
-ExecStart = /usr/lib/xbmc/xbmc.bin --standalone -fs -n
+ExecStart = /usr/lib/kodi/kodi.bin --standalone -fs -n
 Restart = on-failure
 
 [Install]
Signature · 1 line
2.1.4
#1 lore raw

PATCH 2/2 package/kodi: Fix build errors due to new ffmpeg

We bumped ffmpeg to 2.6.1, the commit log makes a reference to:
https://github.com/xbmc/xbmc/pull/6636

But this pull request was only merged for Isengard which is the next version of Kodi, with the current Helix version, it doesn't build.

It doesn't seem a good idea to revert the cited commit, so while Isengard is not out, we can live with that small patch to Kodi.

This patch applies what can be found with in the pull request:
https://github.com/xbmc/xbmc/commit/dfe123f23a5e933c8f0f3367f24630de2beb29ec

---
 .../0002-Fix-build-error-with-ffmpeg-2.6.1.patch   | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 package/kodi/0002-Fix-build-error-with-ffmpeg-2.6.1.patch
package/kodi/0002-Fix-build-error-with-ffmpeg-2.6.1.patch new file +41 -0
new file mode 100644
index 0000000..5e5f5b6
@@ -0,0 +1,41 @@
+From 0d0c975f87bbf0fff008b091485c5f2e26f5ef5e Mon Sep 17 00:00:00 2001
+From: Maxime Hadjinlian <[email protected]>
+Date: Wed, 8 Apr 2015 17:44:38 +0200
+Subject: [PATCH] Fix build error with ffmpeg 2.6.1
+
+With this commit: 4d094d9eb4edba5b6c3c229a2c02da1427e43fe5
+
+We bumped ffmpeg to 2.6.1, the commit log makes a reference to:
+ https://github.com/xbmc/xbmc/pull/6636
+
+But this pull request was only merged for Isengard which is the next
+version of Kodi, with the current Helix version, it won't build.
+
+This patch applies what can be found in the pull request:
+https://github.com/xbmc/xbmc/commit/dfe123f23a5e933c8f0f3367f24630de2beb29ec
+
+So it builds with the newer ffmpeg.
+
+This patch *MUST* be removed when we bump Kodi to Isengard.
+
+Signed-off-by: Maxime Hadjinlian <[email protected]>
+---
+ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+index 6f37758..fdb770e 100644
+--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
++++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+@@ -541,7 +541,7 @@ void CDVDDemuxFFmpeg::Flush()
+ {
+   // naughty usage of an internal ffmpeg function
+   if (m_pFormatContext)
+-    av_read_frame_flush(m_pFormatContext);
++    avformat_flush(m_pFormatContext);
+
+   m_currentPts = DVD_NOPTS_VALUE;
+
+--
+2.1.4
+
Signature · 1 line
2.1.4
#2 lore raw

PATCH 2/2 package/kodi: Fix build errors due to new ffmpeg

Maxime Hadjinlian
<[email protected]> wrote in news:1428875137-16284-2-git-send-email-maxime.hadjinlian at gmail.com:

Quoted 3 lines

This patch applies what can be found with in the pull request:
https://github.com/xbmc/xbmc/commit/dfe123f23a5e933c8f0f3367f24630de2beb2
9ec

Hi,

this fix is already in buildroot ;)
http://git.buildroot.net/buildroot/commit/package/ffmpeg/0013-add-public-ve
rsion-of-ff_read_frame_flush.patch?id=032e2beedfe7f503f0686470ae930d4c8b41b 780

Regards, Bernd

#3 lore raw

PATCH 2/2 package/kodi: Fix build errors due to new ffmpeg

Hey,

Ah ! I was quick to detect it but slow to send it. Anyway, I'll change this in the patchwork.

Quoted 21 lines · Bernd Kuhls

Maxime Hadjinlian
<[email protected]> wrote in news:1428875137-16284-2-git-send-email-maxime.hadjinlian at gmail.com:

Quoted 3 lines

This patch applies what can be found with in the pull request:
https://github.com/xbmc/xbmc/commit/dfe123f23a5e933c8f0f3367f24630de2beb2
9ec

Hi,

this fix is already in buildroot ;)
http://git.buildroot.net/buildroot/commit/package/ffmpeg/0013-add-public-ve
rsion-of-ff_read_frame_flush.patch?id=032e2beedfe7f503f0686470ae930d4c8b41b 780

Regards, Bernd

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#4 lore raw

PATCH 2/2 package/kodi: Fix build errors due to new ffmpeg

Quoted 20 lines · Maxime Hadjinlian

Hey,

Ah ! I was quick to detect it but slow to send it. Anyway, I'll change this in the patchwork.

Quoted 14 lines · Bernd Kuhls

Maxime Hadjinlian
<[email protected]> wrote in news:1428875137-16284-2-git-send-email-maxime.hadjinlian at gmail.com:

Quoted 3 lines

This patch applies what can be found with in the pull request:
https://github.com/xbmc/xbmc/commit/dfe123f23a5e933c8f0f3367f24630de2beb2
9ec

Hi,

this fix is already in buildroot ;)
http://git.buildroot.net/buildroot/commit/package/ffmpeg/0013-add-public-ve
rsion-of-ff_read_frame_flush.patch?id=032e2beedfe7f503f0686470ae930d4c8b41b 780

Just to make sure, does this patch tries to uses the old API of ffmpeg by reintroducing the function that is missing instead of simply using the one ?
Or am I missing something here ?

Quoted 7 lines
Quoted 7 lines

Regards, Bernd

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#5 lore raw

PATCH 1/2 package/kodi: Fix path to binary in service

In reply to Maxime Hadjinlian

Maxime Hadjinlian <[email protected]>
wrote in news:1428875137-16284-1-git-send-email-maxime.hadjinlian at gmail.com:

Quoted 1 line
Signed-off-by Maxime Hadjinlian <maxime.hadjinlian-

[email protected]>

Quoted 9 lines
---
 package/kodi/kodi.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/kodi/kodi.service +0 -0
index acd3b8e..f30741c 100644

package/kodi/kodi.service After = network.target · line 10

Quoted 8 lines
package/kodi/kodi.service +1 -1
@@ -4,7 +4,7 @@ After = network.target
 
 [Service]
 Type = simple
-ExecStart = /usr/lib/xbmc/xbmc.bin --standalone -fs -n
+ExecStart = /usr/lib/kodi/kodi.bin --standalone -fs -n
 Restart = on-failure
 
 [Install]

Regards, Bernd

#6 lore raw

PATCH 1/2 package/kodi: Fix path to binary in service

In reply to Maxime Hadjinlian

Dear Maxime Hadjinlian,

Quoted 4 lines · Maxime Hadjinlian
---
 package/kodi/kodi.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com