From: Samuli Suominen <ssuominen@gentoo.org>
Date: Mon, 9 Jan 2012 06:06:19 +0000 (+0000)
Subject: Fix compability with xine-lib >= 1.2.x wrt #397643 by Martin von Gagern
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bef7cf0eed5572c1615655b7a27b8e378a86a5d1;p=gentoo.git

Fix compability with xine-lib >= 1.2.x wrt #397643 by Martin von Gagern

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

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index d903010d935e..7152589a6b1a 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/openscenegraph
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.44 2011/11/17 18:57:24 reavertm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.45 2012/01/09 06:06:19 ssuominen Exp $
+
+  09 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  openscenegraph-3.0.1.ebuild, +files/openscenegraph-3.0.1-xinelib12x.patch:
+  Fix compability with xine-lib >= 1.2.x wrt #397643 by Martin von Gagern
 
   17 Nov 2011; Maciej Mrozowski <reavertm@gentoo.org>
   +files/openscenegraph-3.0.1-libav-0.7.patch, openscenegraph-3.0.1.ebuild:
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 838393d385b8..462da2f57ef5 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -6,16 +6,21 @@ AUX openscenegraph-2.8.3-curl.patch 345 RMD160 dd156aadfe3c6b368f4515475f800b8dd
 AUX openscenegraph-2.8.3-ffmpeg.patch 367 RMD160 d631abecf98c20824b8ee7cb8f0992df92c73d7c SHA1 fe7e574af4fd3bccc9552c35abd8b6ece8e13e3f SHA256 9adb7f5f1fa1e22130f2aa08b66ff680667f7adc44de4ddddafeaf3c4549277d
 AUX openscenegraph-3.0.1-cmake.patch 10551 RMD160 944cb102712dc8e579530ed51e840fdbabf1f07f SHA1 253d324e479994d37b8a43dc5ee806e7ba099ce7 SHA256 d7c38edfd7987d3a50003090901a3f7732d47ec6724934fb159496c4eb727e19
 AUX openscenegraph-3.0.1-libav-0.7.patch 763 RMD160 e5058fe467b66dd56b20a857f6bcc75a077392ae SHA1 bbb03ff3f2a9745afaac70dd06342ff46272d87e SHA256 8e78e9e26aefa640bb020beaa92ebfd29d5cd6ef341568926eb4d34ba5688a75
+AUX openscenegraph-3.0.1-xinelib12x.patch 706 RMD160 0b802643f8965d4760cab783e28692535e6357fa SHA1 b98a48f2586e7682fb5be48c7f8d0d994b4d2f4f SHA256 1d9baf7ec7cfaac0cdb4a08742e663f12a4fe5a431d8fe25b34a2cb4a0cbd828
 DIST OpenSceneGraph-2.8.3.zip 6740017 RMD160 40a4988f4aefff7dbb6aab5225204ae41c945277 SHA1 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc SHA256 3a7b80ea02eeb39c37ded4d07e28ed4071a4a0ceba93f2834d39be7f7487115e
 DIST OpenSceneGraph-3.0.1.zip 6780282 RMD160 54b315c318b7ade2bcc65703cea5f41377e93a71 SHA1 13c7e39f6d62047ad944d8d28a0f0eb60384ce33 SHA256 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296
 EBUILD openscenegraph-2.8.3.ebuild 3909 RMD160 0e46a2005edf541551285fa60c27c9655d173127 SHA1 fd6c16f408b1ceb8543cfefbfc9090cca7e1334f SHA256 440ab1d413973bee30147586d1e8b6309cc7f249da34ec4fb53d8c8740d5f335
-EBUILD openscenegraph-3.0.1.ebuild 3906 RMD160 e0a2a0d50035448df6103dead0d26f853b1223a9 SHA1 dbbf0cb807445c5480dd6d07050ddcc94335adef SHA256 ec20660a38a2080a0aaa7feac7957c8d30a843463203eaef7d3682349748cfd0
-MISC ChangeLog 6675 RMD160 f871c75447c8a589bf633ee33d8c39d50ceecabe SHA1 60fb03d344779afc2c52201661e4ce67711154b3 SHA256 ea39cc4c454cd816cea3b5db316a15965152a9e3d7c441434293b6233c0d413d
+EBUILD openscenegraph-3.0.1.ebuild 3958 RMD160 6bd659cf006fb4b5af605ff98094f697ba0b1d45 SHA1 3989ef660929ae45620b99b9e0f5ae77e015a946 SHA256 f9656594dce07f607bb8326b90a18af20b7ea9ce46d0b8d8ef210b38681390ee
+MISC ChangeLog 6882 RMD160 974581f39cbed44d5b4306f1d7b03b28367b7ddb SHA1 64bf3ba7a1d04997eb7be2ca1bed2f1531afbc54 SHA256 73ee6c0d727a865d9bb894fbee688f12253ed844362d4633334e5c7de220c8b2
 MISC metadata.xml 1272 RMD160 5a2c78de8616a0a8be6b253d0d4bc74c2e23937c SHA1 615d4392fda234a9f3fee934e54291e27f6668a9 SHA256 b481215aaefd210da29e865fee328cf6d4bd8eb75a0dcfa1876396fcb16a8a03
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7FWRgACgkQFuHa/bHpVdtPgwCeKWfSQ27kKIOitp5l4ycBIXAG
-IEMAoLYk1tjyF8KhScG2Aditvw+sPlSO
-=9AHC
+iQEcBAEBAgAGBQJPCoOJAAoJEEdUh39IaPFN9ZwH/1Pu/XSuv596yTkaPZIGgyxp
+bjshTLnm1Gcx9cVCvcO1lNdZ0M3E5njXhG8aLptuJiSPGbcmM0/L2ow+QuruNMlw
+6kmUE6YDJmE5zpAJDlukb0SZXMmJoEg01cNF9NVvF9nLAxQ5Tx+nLrRHI6XlkSdg
+P+CiUZLW2pqkEJCRxarQluDQHEF/7umQ+fUmNAvXGAGoAKwoIJayCE4PSxZ61Zwb
+PotACZRqqKKXyB1kx0cDw0qFHGd+1yOvrOBJSBxi6yjix/8vU/xKgQEttZuSq2fg
+RrG5PmZzs9kRGttHXyqcTzaFFLCFZe956RksZjCu215SZLWhRoeQ6TMZachSMzQ=
+=5qkZ
 -----END PGP SIGNATURE-----
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch b/dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch
new file mode 100644
index 000000000000..a69a6604e003
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch
@@ -0,0 +1,19 @@
+http://bugs.gentoo.org/397643
+
+--- src/osgPlugins/xine/video_out_rgb.c
++++ src/osgPlugins/xine/video_out_rgb.c
+@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual
+ 	clear(rgb_class, sizeof(rgbout_class_t));
+ 
+ 	rgb_class->driver_class.open_plugin     = open_plugin;
++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
+ 	rgb_class->driver_class.get_identifier  = get_identifier;
+ 	rgb_class->driver_class.get_description = get_description;
++#else
++	rgb_class->driver_class.identifier  = get_identifier(NULL);
++	rgb_class->driver_class.description = get_description(NULL);
++#endif
++
+ 	rgb_class->driver_class.dispose         = dispose_class;
+ 
+ 	return(rgb_class);
diff --git a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
index 5b591903b193..dfd480862cab 100644
--- a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild,v 1.2 2011/11/17 18:57:24 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild,v 1.3 2012/01/09 06:06:19 ssuominen Exp $
 
 EAPI=3
 
@@ -83,8 +83,9 @@ S=${WORKDIR}/${MY_P}
 DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
 
 PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${PN}-3.0.1-libav-0.7.patch"
+	"${FILESDIR}"/${PN}-3.0.1-cmake.patch
+	"${FILESDIR}"/${PN}-3.0.1-libav-0.7.patch
+	"${FILESDIR}"/${PN}-3.0.1-xinelib12x.patch
 )
 
 src_configure() {