vdr-plugin-2.eclass, fixed append string

Package-Manager: portage-2.1.11.9/cvs/Linux i686

5 files changed, 25 insertions, 103 deletions

diff --git a/media-plugins/vdr-osdpip/ChangeLog b/media-plugins/vdr-osdpip/ChangeLog
index fd7534fef8b5..0a43842590d2 100644
--- a/media-plugins/vdr-osdpip/ChangeLog
+++ b/media-plugins/vdr-osdpip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-osdpip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.15 2012/07/01 14:07:12 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.16 2012/10/20 18:02:23 hd_brummy Exp $
+
+*vdr-osdpip-0.1.1-r1 (20 Oct 2012)
+
+  20 Oct 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-osdpip-0.0.10.ebuild, -files/vdr-osdpip-0.0.10-avutil50.patch,
+  -vdr-osdpip-0.1.0.ebuild, +vdr-osdpip-0.1.1-r1.ebuild:
+  vdr-plugin-2.eclass, fixed append string
 
   01 Jul 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-osdpip-0.1.1.ebuild:
   stable amd64 x86, bug 419117
diff --git a/media-plugins/vdr-osdpip/Manifest b/media-plugins/vdr-osdpip/Manifest
index a9382da7fc83..8f77f474eb8b 100644
--- a/media-plugins/vdr-osdpip/Manifest
+++ b/media-plugins/vdr-osdpip/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX vdr-osdpip-0.0.10-avutil50.patch 2241 RMD160 4d5a2372ae1552aa82b2ed460fc2404e4c343598 SHA1 75d0b21d2936638b64dcd706719f17b845b34b8a SHA256 35ad245582793adbc66374ef5ee236913d1f1a251f7d24856e5b5bfbf618a7b5
-DIST vdr-osdpip-0.0.10.tgz 32703 RMD160 70e2fbffd15ea4d0b1b8899cbf27d93c5591751f SHA1 1a4d02236dd021d522a32e2d9863e4d6950f7ad7 SHA256 b324f99d178c30dc13b56d522998dd666eafa2f65a67c90d6221fe8e4058e378
-DIST vdr-osdpip-0.1.0.tgz 52090 RMD160 e49cf4cf85541cca02f60dc01b4cc62eb2b06554 SHA1 e91e40c94ea1fade4072c76a21f08997766c68d3 SHA256 40f5e8acc57c82d922b0a415bb0f12ac3cb68c014f9bafd090b71ded6a25a821
-DIST vdr-osdpip-0.1.1.tgz 53272 RMD160 eee8eaeefcdf4f5b47d6dd2aff993a50156440c1 SHA1 b2b18746abf30bf3e8fe0bdca21a793057f7a3af SHA256 777f5fd9abbfbf43227c78eb2b363d3bdade2b368425ed78caa836d4c38bfef4
-EBUILD vdr-osdpip-0.0.10.ebuild 1166 RMD160 51f88e770ec47cb9dd537f0c9756b7df1fdf0586 SHA1 f19f621490d712f54416507679cc3da10f8eba3f SHA256 c3f34c70a20962ac75ad2d6eb49ee1bd1f81ce81ea3181846e1022e09fc49823
-EBUILD vdr-osdpip-0.1.0.ebuild 750 RMD160 295af0fe8d2d26f7c4ff27b4d21a4f6847bbfe42 SHA1 dedb9a4c3d6b34b26f08b76247ddfe8440b4b5ff SHA256 bbdbe1b31ea6f1a38144cc712cb8490d0c7b2828fd6b354e619d97f3ee0d718f
-EBUILD vdr-osdpip-0.1.1.ebuild 789 RMD160 da3a00e60f2e919b3d4efac37e78c4170e659eba SHA1 6a25d9e67c48bdcf818c064559b14594996d4a63 SHA256 bf8d726ea0a354233b5495fb7f61417454b152467d56ad93b75be41feb815810
-MISC ChangeLog 2669 RMD160 8b24d231cb245cd4cc73185b541c0dbf0f823a30 SHA1 761c8e02d659278c2b41123c37b857a02fd3d0fc SHA256 57089fdeb4bdd641e70c230e0f890f402690f6f132b169804611e9d7adefd8d9
-MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+DIST vdr-osdpip-0.1.1.tgz 53272 SHA256 777f5fd9abbfbf43227c78eb2b363d3bdade2b368425ed78caa836d4c38bfef4 SHA512 176243cf8512abad764e3a35b7fb04dc023179c7b405596adbba36e8116831e9ff562f127d822a52d261576e2a166929af58852c6bff523c9796c22f93226420 WHIRLPOOL 25409c2d4e5b64dd9c8bbd9b3e389647810d710673891aecae80418b14775a10cadc117e0f63c32d46972d5b88ebad6207dc1a449654f319533661f1dc75a271
+EBUILD vdr-osdpip-0.1.1-r1.ebuild 801 SHA256 999cdb34a47fcb365fff8b77de5a9c17f910c13f0cf0bfee87d714382da522bf SHA512 d7c5c27f443f9ccd961f22f43af7d3fec77bc9793117da95b72d6538714843261695e366cbb14349031268ab3f02f060eae8a66ab01a8820dd6716ef1bb99b32 WHIRLPOOL ac8ac7d8b561dfb17316f5a2f929b314ec7a9218364834b1bfdc25e5058b3b7c9b6b743c7c5b10246e9f3449f21143730a3f249e5ebdbdbab841eabe96f6bd3e
+EBUILD vdr-osdpip-0.1.1.ebuild 789 SHA256 bf8d726ea0a354233b5495fb7f61417454b152467d56ad93b75be41feb815810 SHA512 0c330cdc99a887f0afa8320f7723e26c011dce78760ab321ef5c68972ca17a72920e59611e376b86b30c0bfa80c280233001b06fd90385617298b19c4b2797c3 WHIRLPOOL 5580b2c152d144ae805bfdb4547c2aa9f5f03f34678a230c93783861833cc7a3da5217d14863d041971385d112ce7fcffdc7140eed0fb6f849c39c0528895639
+MISC ChangeLog 2931 SHA256 76b36b741b4d8115f06ce199975d4f8775e176b8f47405bee9cd3dbbce051747 SHA512 af26631a5fb6e779f1116a87893cdee8076c7bce7c32b7fba18ac1d81407a2beb0b26279c2bc913762f599bfb16bbe191a089f035a56e2c7c8e5aff53005c8ac WHIRLPOOL 76c4192d6fb0c670f531121e35e617e3eeec10b975fb34fb30dd41aa9049c11421cd4c010e0806c94661cf54819872ee43959615bcb65c8dc889ca05f4ce6b9b
+MISC metadata.xml 298 SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 SHA512 73724667e75fe7d8ca3b0d440e79d70f1a9fa900cf9ea9c3c03036cef44d5fe3e24ce745630e04e9a0a3776f4a73bc47d29f92a4bbe93af0ad544936f5e33b3c WHIRLPOOL e77dccdbffec743aaa54f4dd9529b70e22df631d1d93375274ef70022b8fd0e7d9c3f2f60d4fdbf6f6d72fac24c709357d6ca949068a3eca3558f8a377360913
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFP8Fm2dn07HTTCgIoRAm5LAJ9bw4DJpEvh2cbIeMvZoN82Y+OecwCgulVi
-4KYLZZB8H6a3+nXozjcVx7c=
-=E2PF
+iD8DBQFQguc2dn07HTTCgIoRCBsMAJ0bn4mScaPWaMg0fKh4j9UFFdJvtgCeLt4Y
+H72JUUX6/5tQ+/aJeCtf+Fo=
+=nuNT
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-osdpip/files/vdr-osdpip-0.0.10-avutil50.patch b/media-plugins/vdr-osdpip/files/vdr-osdpip-0.0.10-avutil50.patch
deleted file mode 100644
index 822957030442..000000000000
--- a/media-plugins/vdr-osdpip/files/vdr-osdpip-0.0.10-avutil50.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: osdpip-0.0.10/decoder.c
-===================================================================
---- osdpip-0.0.10.orig/decoder.c
-+++ osdpip-0.0.10/decoder.c
-@@ -27,10 +27,10 @@ int cDecoder::Open()
-     }
-     m_PicDecoded = avcodec_alloc_frame();
-     m_PicResample = avcodec_alloc_frame();
--    m_BufferResample = new unsigned char[400 * 300 * 4]; // size for RGBA32
-+    m_BufferResample = new unsigned char[400 * 300 * 4]; // size for RGB32
- #ifndef USE_SWSCALE
-     m_PicConvert = avcodec_alloc_frame();
--    m_BufferConvert = new unsigned char[400 * 300 * 4]; // size for RGBA32
-+    m_BufferConvert = new unsigned char[400 * 300 * 4]; // size for RGB32
- #endif
- 
-     return 0;
-@@ -82,14 +82,14 @@ int cDecoder::Resample(int width, int he
-     context = sws_getContext(m_Context->width - (OsdPipSetup.CropLeft + OsdPipSetup.CropRight),
-                              m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom),
-                              PIX_FMT_YUV420P,
--                             m_Width, m_Height, ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P,
-+                             m_Width, m_Height, ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P,
-                              SWS_LANCZOS, NULL, NULL, NULL);
-     if (!context) {
-         printf("Error initializing scale context.\n");
-         return -1;
-     }
-     avpicture_fill((AVPicture *) m_PicResample, m_BufferResample,
--                   ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P,
-+                   ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P,
-                    m_Width, m_Height);
-     sws_scale(context, pic_crop.data, pic_crop.linesize,
-               0, m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom),
-@@ -121,8 +121,8 @@ int cDecoder::Resample(int width, int he
-     if (ConvertToRGB)
-     {
-         avpicture_fill((AVPicture *) m_PicConvert, m_BufferConvert,
--                PIX_FMT_RGBA32, m_Width, m_Height);
--        img_convert((AVPicture *) m_PicConvert, PIX_FMT_RGBA32,
-+                PIX_FMT_RGB32, m_Width, m_Height);
-+        img_convert((AVPicture *) m_PicConvert, PIX_FMT_RGB32,
-                 (AVPicture *) m_PicResample, PIX_FMT_YUV420P,
-                 m_Width, m_Height);
-     }
diff --git a/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild b/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild
deleted file mode 100644
index e1a5c95dfc76..000000000000
--- a/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild,v 1.5 2011/04/06 17:16:53 idl0r Exp $
-
-inherit vdr-plugin flag-o-matic
-
-DESCRIPTION="VDR plugin: Show another channel in the OSD"
-HOMEPAGE="http://www.magoa.net/linux"
-SRC_URI="http://home.arcor.de/andreas.regel/files/osdpip/${P}.tgz"
-
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.0
-	>=media-libs/libmpeg2-0.4.0
-	>=virtual/ffmpeg-0.4.9"
-RDEPEND="${DEPEND}"
-
-#PATCHES=("${FILESDIR}/${P}-vdr-1.5.0.diff")
-PATCHES=( "${FILESDIR}/${P}-avutil50.patch" )
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	sed -i Makefile \
-	  -e 's+^FFMDIR.*$+FFMDIR = /usr/include/ffmpeg+' \
-	  -e 's+-I\$(FFMDIR)/libavcodec+-I$(FFMDIR)+' \
-	  -e 's+-L\$(FFMDIR)/libavcodec++'
-
-	if has_version ">=virtual/ffmpeg-0.4.9_p20080326" ; then
-		#epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-new_header.diff"
-		sed -i Makefile -e 's/#WITH_NEW_FFMPEG_HEADERS/WITH_NEW_FFMPEG_HEADERS/'
-	fi
-	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
-}
diff --git a/media-plugins/vdr-osdpip/vdr-osdpip-0.1.0.ebuild b/media-plugins/vdr-osdpip/vdr-osdpip-0.1.1-r1.ebuild
index 70cd4e979218..b82ad4783a05 100644
--- a/media-plugins/vdr-osdpip/vdr-osdpip-0.1.0.ebuild
+++ b/media-plugins/vdr-osdpip/vdr-osdpip-0.1.1-r1.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.1.0.ebuild,v 1.2 2012/02/21 22:58:26 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.1.1-r1.ebuild,v 1.1 2012/10/20 18:02:23 hd_brummy Exp $
 
-EAPI=3
+EAPI="4"
 
-inherit vdr-plugin flag-o-matic
+VERSION="880" # every bump, new version
+
+inherit vdr-plugin-2 flag-o-matic
 
 DESCRIPTION="VDR plugin: Show another channel in the OSD"
 HOMEPAGE="http://projects.vdr-developer.org/projects/plg-osdpip"
-SRC_URI="mirror://vdr-developerorg/download/267/${P}.tgz"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
@@ -21,8 +23,8 @@ DEPEND=">=media-video/vdr-1.6.0_p2-r5
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	vdr-plugin_src_prepare
+	vdr-plugin-2_src_prepare
 
 	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
+	append-cxxflags -D__STDC_CONSTANT_MACROS
 }