Fix building with libdvdnav >= 4.2.0 wrt #399621 by Paweł Hajdan, Jr.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 50 insertions, 20 deletions

diff --git a/media-plugins/vdr-dvd/ChangeLog b/media-plugins/vdr-dvd/ChangeLog
index 011df8bcad9c..4541e6c90bad 100644
--- a/media-plugins/vdr-dvd/ChangeLog
+++ b/media-plugins/vdr-dvd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-dvd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/ChangeLog,v 1.18 2011/01/26 15:12:30 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/ChangeLog,v 1.19 2012/01/21 18:05:26 ssuominen Exp $
+
+  21 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  vdr-dvd-0.3.7_pre20090106.ebuild,
+  +files/vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch:
+  Fix building with libdvdnav >= 4.2.0 wrt #399621 by Paweł Hajdan, Jr.
 
   26 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-dvd-0.3.7_pre20090106.ebuild,
diff --git a/media-plugins/vdr-dvd/Manifest b/media-plugins/vdr-dvd/Manifest
index e31003ec63ab..9b3fc63657bb 100644
--- a/media-plugins/vdr-dvd/Manifest
+++ b/media-plugins/vdr-dvd/Manifest
@@ -8,17 +8,21 @@ AUX dvdspeed-cvs-20071113-2.diff 9609 RMD160 fb6142325f0cffceaed1b0566cd8db9ec51
 AUX gcc-4.x-compilefix.diff 574 RMD160 a5c22e2c748cbca22f650681e4304b8a142fc6d9 SHA1 b3b2a666942e05f47d56b4b9e42a204c7ea7505e SHA256 c4fc0d8ae4485c9c38a0b08e393b1b5e8d7f4f101101f64fc6a66cdfd412d270
 AUX rc-addon.sh 331 RMD160 538d4cee47b3c43226e7db00f4af2751db028eb4 SHA1 e3b1e28e7fe68043301ef29b6eb8f993a05e6201 SHA256 f8b743d062adea500b3cd513808af1361d218bd723fd008538f995e7e913843b
 AUX vdr-dvd-0.3.7_pre20090106-compile_warnings.diff 1981 RMD160 dd8ef0eb69e976a74e02bcb2301cdbe0cefc23ed SHA1 8dc5185839dbb7c396f60619997985f1f62b007e SHA256 451569ea1040cd14ed3dd5fb46554431f1c8a600559812dbe8070db018eb942f
+AUX vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch 515 RMD160 44e73d018cc324b7650aa23fddda6b97b068d38a SHA1 1d4fc6b34088eb2b06402bee1bb4094d4d33a42e SHA256 8914b16a734774b5c55ef1261bf9c6bce0f49e6b22c85d30aebb0e163857d8b2
 DIST vdr-dvd-cvs-20071113.tar.bz2 64057 RMD160 8a7919dddff059c233957dad025f809b1ee59519 SHA1 abf10b204a1ecd5faa6caa01fad4f331ebf32ab7 SHA256 b50e4952c49942fd6ddee38a2c88cb0e56a4fd857508ef3c9588c5ae87fdcbbc
 DIST vdr-dvd-cvs-20090106.tar.bz2 65387 RMD160 5e105fc969e2b4bc83cd7a0f8747a9f075bbd59b SHA1 709ec3c0e78e0923e252e3974854e50cdbfb1744 SHA256 8f244d4f17937546465cb2bb450fd7c9fcc888fdeec5c2185b327f8b9214f5ae
 EBUILD vdr-dvd-0.3.7_pre20071113-r1.ebuild 894 RMD160 03faad128fa2b80f2b3a7409ac848dd0dac46e66 SHA1 01d46f24bd53113c1b0f6057488f50549c199fb3 SHA256 e132d2c2c545139971432bdde9436623e05e18a683bea16c3bd9e96ba7f2f3c2
-EBUILD vdr-dvd-0.3.7_pre20090106.ebuild 684 RMD160 866fdaf479acd8ceba23f3e00529791df54dd351 SHA1 620b8ae3819cdea6701485f73355e12a455a1695 SHA256 426c82613be648d7603d8709f21df2d3fe81b818f19cf7f73dabb955a82bf5db
-MISC ChangeLog 3939 RMD160 cb1862f43067de0084ab4b49ca58f3fe9f3486d9 SHA1 be0449a4f71854c9f0e6cab8d66bc67cf4d3e7ba SHA256 cf9677a67282fa5a081832f5d725b136e16dcb740a5e411fe321a0e501f53530
+EBUILD vdr-dvd-0.3.7_pre20090106.ebuild 735 RMD160 99d0ffce7972eb52ce25a9ef338a9af9d9b90edb SHA1 faa818d55cf67649987ae2837676194b59bd06ef SHA256 8bc51f3cb417411d3488450d0e55db91b129c2ed696a8de42bb3dc970775c5f2
+MISC ChangeLog 4175 RMD160 82d2086df446f9ff4bda5e7728cb7d74efe0c3c0 SHA1 c315cbd5f227e06de8aa33c39f0dd4bd50eb5971 SHA256 8a346375f1502baacfa787167c0f9f4a19b02c653cf10936907828a5e6507783
 MISC metadata.xml 367 RMD160 4bbe2db77cbe5cc404dd3d6fa10dc12fb46aebda SHA1 869c0f26507fe17e0531969649b65ffc3cc5f244 SHA256 59d2703ac7119217b962009196caa8584f5697acf745a2cf4de3256da580c47e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iD8DBQFNQDn+dn07HTTCgIoRApD/AJsGIj+F/zu7c/6hhiY/cRFXbofcEQCdEJoh
-smORwp5NBIDg863el6KVh5k=
-=YMHH
+iQEcBAEBAgAGBQJPGv3kAAoJEEdUh39IaPFNGkIH/3cgZxNQ8D/ukJZ6OyKosClk
+LfVwgI3lOvfQ5gQRuQ/WLuBe5aZe8whe+iZdBSeSQHQCjzd46VlqkY5xR0eGw49J
+q/BM/DcOUonX68ZSmyoiCJp4pGfoV9GOUOZ7Iax74z5lqeCj1qOWQ4gXBA19e/2K
+xXgaNbBGsHuRI36htE4Kj30QUeu8XC8rvB8hUrcaqfOxTU8O8tOivqLJtnWREiJX
+/NpzXXMxUW5GMUrLQv5phkkzhVcYghXonRwcH1kxRSF4QEE8JidBjin96pgPPmrQ
+LHyIPxA0HjDuzUrVq4+EUni114H2ohkjsURIjmioUuE+TedvHVlVFlu5MVKpqqE=
+=pPCD
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch
new file mode 100644
index 000000000000..237ad1876458
--- /dev/null
+++ b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch
@@ -0,0 +1,18 @@
+Description: When including dvdnvav.h define/undefine the "this" keyword,
+ used in dvdnav.h
+Author: Tobias Grimm <etobi@debian.org>
+Bug-Debian: http://bugs.debian.org/642673
+
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/player-dvd.h
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h
+@@ -11,8 +11,10 @@
+ #ifndef __PLAYER_DVD_H
+ #define __PLAYER_DVD_H
+ 
++#define this _this
+ #include <dvdnav/dvdnav.h>
+ #include <dvdnav/dvdnav_events.h>
++#undef this
+ 
+ #include <vdr/device.h>
+ #include <vdr/player.h>
diff --git a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106.ebuild b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106.ebuild
index 225faadb9884..25170f0476b4 100644
--- a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106.ebuild
+++ b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106.ebuild
@@ -1,26 +1,29 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106.ebuild,v 1.2 2011/01/26 15:12:30 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106.ebuild,v 1.3 2012/01/21 18:05:26 ssuominen Exp $
 
-EAPI="3"
+EAPI=3
 
 inherit vdr-plugin
 
-MY_P="${PN}-cvs-${PV#*_pre}"
-S="${WORKDIR}/${MY_P#vdr-}"
+MY_P=${PN}-cvs-${PV#*_pre}
+S=${WORKDIR}/${MY_P#vdr-}
 
 DESCRIPTION="VDR Plugin: DVD-Player"
 HOMEPAGE="http://sourceforge.net/projects/dvdplugin"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.6.0
-		>=media-libs/libdvdnav-4.1.2
-		>=media-libs/a52dec-0.7.4"
-RDEPEND="${DEPEND}"
+RDEPEND=">=media-video/vdr-1.6.0
+	>=media-libs/libdvdnav-4.2.0
+	>=media-libs/a52dec-0.7.4"
+DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-compile_warnings.diff" )
+PATCHES=(
+	"${FILESDIR}"/${P}-compile_warnings.diff
+	"${FILESDIR}"/${P}-fix-dvdnav-using-c++-keywords.patch
+	)