From 4d86720be8056600fc418786c59ca701792dadfe Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Wed, 11 Oct 2006 10:29:00 +0000 Subject: [PATCH] Added patch from softdevice-cvs to prevent a segfault when having nonzero cutting parameter in combination with YUY2-pixelformat. Package-Manager: portage-2.1.2_pre2-r8 --- media-plugins/vdr-softdevice/ChangeLog | 10 +- media-plugins/vdr-softdevice/Manifest | 25 +++- .../files/digest-vdr-softdevice-0.3.0-r1 | 3 + ...dr-softdevice-0.3.0-YUY2-cut-segfault.diff | 38 +++++ .../vdr-softdevice-0.3.0-r1.ebuild | 132 ++++++++++++++++++ 5 files changed, 200 insertions(+), 8 deletions(-) create mode 100644 media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.0-r1 create mode 100644 media-plugins/vdr-softdevice/files/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff create mode 100644 media-plugins/vdr-softdevice/vdr-softdevice-0.3.0-r1.ebuild diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog index 988898729656..b6daad7853fb 100644 --- a/media-plugins/vdr-softdevice/ChangeLog +++ b/media-plugins/vdr-softdevice/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-plugins/vdr-softdevice # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.21 2006/10/09 21:24:51 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.22 2006/10/11 10:29:00 zzam Exp $ + +*vdr-softdevice-0.3.0-r1 (11 Oct 2006) + + 11 Oct 2006; Matthias Schwarzott + +files/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff, + +vdr-softdevice-0.3.0-r1.ebuild: + Added patch from softdevice-cvs to prevent a segfault when having nonzero + cutting parameter in combination with YUY2-pixelformat. *vdr-softdevice-0.3.0 (09 Oct 2006) diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest index 2285e19876e4..ae30219b2cbf 100644 --- a/media-plugins/vdr-softdevice/Manifest +++ b/media-plugins/vdr-softdevice/Manifest @@ -45,6 +45,10 @@ AUX vdr-softdevice-0.2.3a-CVS-20060511.diff 5732 RMD160 25b8bb29a77ec03de06effcd MD5 01851b3338d57baa07fcdeff833327f6 files/vdr-softdevice-0.2.3a-CVS-20060511.diff 5732 RMD160 25b8bb29a77ec03de06effcdbf0850e1c3303919 files/vdr-softdevice-0.2.3a-CVS-20060511.diff 5732 SHA256 c69f0de683ed6d5d0d031fbc86c2a1a3f32a031c5a2b6778ea73d79eca8bd5e7 files/vdr-softdevice-0.2.3a-CVS-20060511.diff 5732 +AUX vdr-softdevice-0.3.0-YUY2-cut-segfault.diff 1544 RMD160 8d97ab79bb68f769fc4e3d12003a9e1c7c62777d SHA1 74c8dc2a3aa5f87eb5e701e71a4f168e5d8703b6 SHA256 ad8bdaa4f6a02df39e840b2c18764391c22e66acf68d3cebbc824f365dfc27ce +MD5 c29be94696c90ea9b6003788a03cbb4c files/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff 1544 +RMD160 8d97ab79bb68f769fc4e3d12003a9e1c7c62777d files/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff 1544 +SHA256 ad8bdaa4f6a02df39e840b2c18764391c22e66acf68d3cebbc824f365dfc27ce files/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff 1544 DIST vdr-softdevice-0.2.3a.tgz 133780 RMD160 d97d7a1bbe4a3b325041bbe0e7ef23740f8121b1 SHA1 13f0b16b4bbde1c10b3dc31c075f43e8ca6eeb5d SHA256 bbf05254ce6f0559ce6aeed055272ba6fb207ba443a49926b91506e9de69ab92 DIST vdr-softdevice-0.3.0.tgz 154294 RMD160 fce250ac59e0a4bd3122fbed85bb6d8a6f4c2ebe SHA1 89b532c536c450e2eb51fedbf2a0192e0940a179 SHA256 2c15bfaf94c07dda3facd3c44219c4d9ebb1199093ec0aa4d35c1d3f67828b8a DIST vdr-softdevice-cvs-20060814.tar.bz2 122901 RMD160 d9b010f9d10eb574681cbea2ea433ddd3f5356f7 SHA1 c7fa5c511916995c7661134ef085091892d5ea7a SHA256 476722fe33ff3bb75e7859b93b563d68b098cd78be31fe40044b4d27324e60f4 @@ -66,14 +70,18 @@ EBUILD vdr-softdevice-0.2.3.20060912.ebuild 3502 RMD160 839ac96ff984a2f692ba9caa MD5 bac637bac289d5aeb8be2de5ca6de9e9 vdr-softdevice-0.2.3.20060912.ebuild 3502 RMD160 839ac96ff984a2f692ba9caaab17f208c2bd52fb vdr-softdevice-0.2.3.20060912.ebuild 3502 SHA256 d62ac03e91b4cdaa0366a2aac1bf57d7cc28432bae4690f4c6ef744d21800d9e vdr-softdevice-0.2.3.20060912.ebuild 3502 +EBUILD vdr-softdevice-0.3.0-r1.ebuild 3367 RMD160 b6fbde42a764a98720cc3143cdbef20828018e10 SHA1 5afb0121621e61e8656561b9dd18f3e47534edd2 SHA256 4ec3f4d4d32193a14efc9076104f1baca7a411602948c5a6134396214cfd1a32 +MD5 5689a941854220582d18c14aa1ce43cb vdr-softdevice-0.3.0-r1.ebuild 3367 +RMD160 b6fbde42a764a98720cc3143cdbef20828018e10 vdr-softdevice-0.3.0-r1.ebuild 3367 +SHA256 4ec3f4d4d32193a14efc9076104f1baca7a411602948c5a6134396214cfd1a32 vdr-softdevice-0.3.0-r1.ebuild 3367 EBUILD vdr-softdevice-0.3.0.ebuild 3306 RMD160 ee2a56ab3993ca9ed41fdb33d025c428157b0b76 SHA1 cd29a9d03c14f8a7c9fd229fb029b7a951f72ccb SHA256 7abe90fa9858fc658412306d8e26eb532de2b548cef89a818bb9c258128e406b MD5 88918c0c7cb96bb624dc453876bb0496 vdr-softdevice-0.3.0.ebuild 3306 RMD160 ee2a56ab3993ca9ed41fdb33d025c428157b0b76 vdr-softdevice-0.3.0.ebuild 3306 SHA256 7abe90fa9858fc658412306d8e26eb532de2b548cef89a818bb9c258128e406b vdr-softdevice-0.3.0.ebuild 3306 -MISC ChangeLog 5116 RMD160 61cb11d6c86964f477fcea8f1e78a0526456b728 SHA1 6d2db6c92612c8115a898e69db659a798f4c27c1 SHA256 aa10d956bc0b82d5896c5679251ca9a480c0e1abda920bce84e44a9641ca8dea -MD5 20ce0086ea95bd1c14a40b32ae688172 ChangeLog 5116 -RMD160 61cb11d6c86964f477fcea8f1e78a0526456b728 ChangeLog 5116 -SHA256 aa10d956bc0b82d5896c5679251ca9a480c0e1abda920bce84e44a9641ca8dea ChangeLog 5116 +MISC ChangeLog 5433 RMD160 d4d2dda9387c9debd82956fe9a75f2b6b36e34ce SHA1 5d6b4dad52e91248d4952f5cce825ad99b98cc6b SHA256 7e1f7cce70857c166643bdf4cec86b5cf7aff15c7c7acfa9560d05548fea8b87 +MD5 378202156dd3b86518c155f35e0eca8d ChangeLog 5433 +RMD160 d4d2dda9387c9debd82956fe9a75f2b6b36e34ce ChangeLog 5433 +SHA256 7e1f7cce70857c166643bdf4cec86b5cf7aff15c7c7acfa9560d05548fea8b87 ChangeLog 5433 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298 @@ -93,10 +101,13 @@ SHA256 72b63ba65244177985c6511baca48471cf48412d196441d9a8e354bc67ee7374 files/di MD5 1a99e63b0950911ea31f51ca8a438eb1 files/digest-vdr-softdevice-0.3.0 253 RMD160 2f9b5df740163dbee55f753866ca320381b1f123 files/digest-vdr-softdevice-0.3.0 253 SHA256 34eb4ff82a39af8ee4198902db6ae1551dd16194d1e668d50e52a1b209c65125 files/digest-vdr-softdevice-0.3.0 253 +MD5 1a99e63b0950911ea31f51ca8a438eb1 files/digest-vdr-softdevice-0.3.0-r1 253 +RMD160 2f9b5df740163dbee55f753866ca320381b1f123 files/digest-vdr-softdevice-0.3.0-r1 253 +SHA256 34eb4ff82a39af8ee4198902db6ae1551dd16194d1e668d50e52a1b209c65125 files/digest-vdr-softdevice-0.3.0-r1 253 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFKr4vt2vP6XvVdOcRAtWwAJ0appQ9GFpkxGs8VvZ8k0aFVMm8/wCgik4c -F1PL2uvWShY0CgaT+mXDZNE= -=dDqi +iD8DBQFFLMdzt2vP6XvVdOcRAsKmAJ9ZgHXvlvaqX3i81YmzQLb0qJEkQACgoEWy +F8c8G44MLzGgOrIxfe4Hq80= +=GOyq -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.0-r1 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.0-r1 new file mode 100644 index 000000000000..ac181d951443 --- /dev/null +++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.0-r1 @@ -0,0 +1,3 @@ +MD5 0be5f52328bd649a33f31df4cd905455 vdr-softdevice-0.3.0.tgz 154294 +RMD160 fce250ac59e0a4bd3122fbed85bb6d8a6f4c2ebe vdr-softdevice-0.3.0.tgz 154294 +SHA256 2c15bfaf94c07dda3facd3c44219c4d9ebb1199093ec0aa4d35c1d3f67828b8a vdr-softdevice-0.3.0.tgz 154294 diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff new file mode 100644 index 000000000000..660e6fdcedfe --- /dev/null +++ b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff @@ -0,0 +1,38 @@ +diff -ru --exclude=CVS softdevice-0.3.0/CHANGELOG softdevice-cvs/CHANGELOG +--- softdevice-0.3.0/CHANGELOG 2006-10-09 00:28:53.000000000 +0200 ++++ softdevice-cvs/CHANGELOG 2006-10-11 12:22:23.000000000 +0200 +@@ -1,4 +1,8 @@ + Changelog ++2006-10-10: ++ - fix segfaults when YUY2 pixelformat is used for xv-out and cut lines ++ from top is non zero. This fixes wrong colors and misplaced OSD drawing ++ too, when cut colums from left is non zero. + 2006-10-09: softdevice-0.3.0 + 2006-10-03: + - fix hang after long pause. +Nur in softdevice-cvs: .cvsignore. +diff -ru --exclude=CVS softdevice-0.3.0/PicBuffer.c softdevice-cvs/PicBuffer.c +--- softdevice-0.3.0/PicBuffer.c 2006-10-01 14:08:05.000000000 +0200 ++++ softdevice-cvs/PicBuffer.c 2006-10-11 12:22:23.000000000 +0200 +@@ -326,7 +326,10 @@ + int dstStride=dst->stride[0]; + int lumStride=src->stride[0]; + int chromStride=src->stride[1]; +- ++ ++ height -= 2 * (cutTop + cutBottom); ++ width -= 2 * (cutLeft + cutRight); ++ + if (src->interlaced_frame) { + for(int y=height/4; y--; ) { + /* --------------------------------------------- +@@ -492,6 +495,9 @@ + int lumStride=src->stride[0]; + int chromStride=src->stride[1]; + ++ height -= 2 * (cutTop + cutBottom); ++ width -= 2 * (cutLeft + cutRight); ++ + if (src->interlaced_frame) { + for(int y=height/4; y--; ) { + /* --------------------------------------------- diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0-r1.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0-r1.ebuild new file mode 100644 index 000000000000..b6ad6d2b7f2f --- /dev/null +++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0-r1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0-r1.ebuild,v 1.1 2006/10/11 10:29:00 zzam Exp $ + +inherit vdr-plugin + +DESCRIPTION="VDR plugin: Software output-Device" +HOMEPAGE="http://softdevice.berlios.de/" +SRC_URI="mirror://gentoo/${P}.tgz + http://dev.gentoo.org/~zzam/distfiles/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="xv fbcon directfb mmx mmxext xinerama" + +RDEPEND=">=media-video/vdr-1.3.36 + >=media-video/ffmpeg-0.4.9_pre1 + directfb? ( + dev-libs/DirectFB + dev-libs/DFB++ + ) + media-libs/alsa-lib + xv? ( || ( ( x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXv + xinerama? ( x11-libs/libXinerama ) + ) + virtual/x11 + ) )" + +DEPEND="${RDEPEND} + xv? ( || ( ( x11-proto/xproto + x11-proto/xextproto + x11-libs/libXv + xinerama? ( x11-proto/xineramaproto ) + ) + virtual/x11 + ) ) + fbcon? ( sys-kernel/linux-headers )" + + +PATCHES=" + ${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff + ${FILESDIR}/softdevice-cvs-xinerama-configure-opts.patch + ${FILESDIR}/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff" + +pkg_setup() { + vdr-plugin_pkg_setup + + if use !xv && use !fbcon && use !directfb; then + ewarn "You need to set at least one of these use-flags: xv fbcon directfb" + die "no output-method enabled" + fi + + COMPILE_SHM=0 + if has_version ">=media-video/vdr-1.3.0"; then + if use xv; then + COMPILE_SHM=1 + else + einfo "SHM does only support xv at the moment" + fi + else + einfo "SHM not supported on vdr-1.2" + fi + case ${COMPILE_SHM} in + 0) einfo "SHM support will not be compiled." ;; + 1) einfo "SHM support will be compiled." ;; + esac + + # Check for ffmpeg relying on libtheora without pkg-config-file + # Bug #142250 + if built_with_use media-video/ffmpeg theora && \ + has_version "