summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-01-21 18:05:26 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-01-21 18:05:26 +0000
commit07c6429e249457dbd08cc9d5663c38bde21c372b (patch)
treeed87e3bcb915b7160619edbf6e522e0628ded156 /media-plugins/vdr-dvd
parentKeyword 0.8.9 on alpha (diff)
downloadgentoo-2-07c6429e249457dbd08cc9d5663c38bde21c372b.tar.gz
gentoo-2-07c6429e249457dbd08cc9d5663c38bde21c372b.tar.bz2
gentoo-2-07c6429e249457dbd08cc9d5663c38bde21c372b.zip
Fix building with libdvdnav >= 4.2.0 wrt #399621 by Paweł Hajdan, Jr.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins/vdr-dvd')
-rw-r--r--media-plugins/vdr-dvd/ChangeLog9
-rw-r--r--media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch18
-rw-r--r--media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106.ebuild25
3 files changed, 39 insertions, 13 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/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
+ )