diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-01-25 06:35:26 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-01-25 06:35:26 +0000 |
| commit | f049db91d02c30fb202b7e024f105a3a219f22b3 (patch) | |
| tree | 85cd5c868cefa2a99a64874a9c5bf595eff6561a | |
| parent | 9205783602472da081913b500dd027ccd1531864 (diff) | |
| download | aports-f049db91d02c30fb202b7e024f105a3a219f22b3.tar.bz2 aports-f049db91d02c30fb202b7e024f105a3a219f22b3.tar.xz | |
main/omxplayer: cherry-pick fix for issue 411
| -rw-r--r-- | main/omxplayer/APKBUILD | 6 | ||||
| -rw-r--r-- | main/omxplayer/issue-411.patch | 15 |
2 files changed, 20 insertions, 1 deletions
diff --git a/main/omxplayer/APKBUILD b/main/omxplayer/APKBUILD index 42c53e6b03..10de5c303d 100644 --- a/main/omxplayer/APKBUILD +++ b/main/omxplayer/APKBUILD @@ -2,7 +2,7 @@ pkgname=omxplayer pkgver=0.20151205 _commitid=f5440845cdd91e7816de1937c30057f58c10c268 -pkgrel=1 +pkgrel=2 pkgdesc="Commandline OMX player for Raspberry Pi" url="https://github.com/popcornmix/omxplayer" arch="armhf" @@ -15,6 +15,7 @@ subpackages="$pkgname-doc $pkgname-dbg" source="omxplayer-$pkgver.tar.gz::https://github.com/popcornmix/omxplayer/archive/$_commitid.tar.gz issue-260.patch issue-297.patch + issue-411.patch fix-makefile.patch fix-dbus-dispatch.patch default-font.patch @@ -62,6 +63,7 @@ package() { md5sums="7afc357b183d3c3b5b8e17cdec0e50fd omxplayer-0.20151205.tar.gz a900cdded87b7df503c6599ac43bd8de issue-260.patch c858882036b9fb03859edf7ce4a1d942 issue-297.patch +0e22690a7ded7d501b2e11759e1c9fc0 issue-411.patch d8f335e1dff4b34faf36c25ad2c2b881 fix-makefile.patch f56949213d53b8fbd6c0b0e393b9cab0 fix-dbus-dispatch.patch 9ebd96155288809fe0a657cf491e433f default-font.patch @@ -71,6 +73,7 @@ b4054a311d76aef91aa10bacd68bc9c4 omxplayer.initd sha256sums="de129817e5fda01f49e0fd80727caa14f2a715f7af9f035d77b1d0e9d0dc57d2 omxplayer-0.20151205.tar.gz 5eb797de354c63a23847a574b103a28d451a4329320f3335f82dc000adbc5c63 issue-260.patch 389c97df4919a3fe4d115f092cb256246e33374150102f0e2cb9ce11456cadb1 issue-297.patch +88d3b6e96ba4ad260a07872bdde065d528261cc7b51df675d1adbe172ea88afc issue-411.patch 799b0aba6aef8c665a685777cd912268315309d0d74ce76be5fdfd0dcffbb422 fix-makefile.patch 2de5b9b51146508ecff219d2c02a7df1c4ba4814b978254b2610d06eb4f6a0a8 fix-dbus-dispatch.patch 2bab3d05b12d730737220b8c0052498a34bbebc12b7beb8afb3c054beb0fb3bb default-font.patch @@ -80,6 +83,7 @@ e2db0f7ffbe2488dd69ee0bfad006bd863f418554f078ca3432f643de7589d2f omxplayer.init sha512sums="2993319f710b107d7ce431ec92868b0ba48a6209d06fa978b2d609cfe267abe432db73b4fe3e1fde18b250b8a256d0f6a3af4e344168b6f7128bdf6c31fd3b94 omxplayer-0.20151205.tar.gz c349eea5f7c513a07d82a6cf6467c4d21bcb29c053bc5e39d8f675b1212db9beef0abf5248d50ac5a2f14fda73055786f94f421377ffcf5f6bcf8daa2f1b56e8 issue-260.patch 2a8a6def1e09f726cba58c0b9109fa6c4fbd4a3b4f1d27d200488f262a0e0978579d83db7fe24f1d3e03beef318c3674ed79cbd2f1994c4551a59c9fe0f63489 issue-297.patch +1748bdfe7b055301add67bc91d7ce7f79f0cceb3158b560e42d4b1cec657f93a5f85d357386da6b4220b47d92edfbe608760b66da2c40f75d21694b58f3c3837 issue-411.patch 3210242f9b834ffec9d3077d5a25caf8be84aa7f4f13c73eb7f61c0a406ec787e4055951fc5a6236f1da7897c95db94a5e11e25d1b3e859a6ea67f31fc6eb517 fix-makefile.patch fe7d3ff020513a1688333918665468fffefd5b1e94bbc7cac82823e625e64c7894c438a30361deedf7b5545a38bcac2aced7d8ce0ab6bc5ef4d79eba5fa5fa40 fix-dbus-dispatch.patch 8aa58aaa07453186302dc68d92f28c1b50bf0f8fccd50359640a7fc8339b233b32a0c8c02284a9974599e56d69cc557acc25e76e6438c6d64d15afd9c1788a8e default-font.patch diff --git a/main/omxplayer/issue-411.patch b/main/omxplayer/issue-411.patch new file mode 100644 index 0000000000..84ec758db3 --- /dev/null +++ b/main/omxplayer/issue-411.patch @@ -0,0 +1,15 @@ +diff --git a/OMXAudio.cpp b/OMXAudio.cpp +index 41f282d..2fd12f1 100644 +--- a/OMXAudio.cpp ++++ b/OMXAudio.cpp +@@ -899,7 +899,8 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt + { + //CLog::Log(LOGDEBUG, "%s::%s copy(%d,%d,%d) (s:%d f:%d sin:%d c:%d)", CLASSNAME, __func__, dst-(uint8_t *)omx_buffer->pBuffer, src-demuxer + memcpy(dst, src, out_remaining * sample_pitch); +- src += plane_size; ++ ///*JEHUTTING 20160124 issue-411*/ src += plane_size; ++ /*JEHUTTING 20160124 fix*/src += out_remaining * sample_pitch; + dst += out_plane_size; + } + sample += out_remaining; + |