dev-libs/libfreenect: Version bump

svn path=/sunrise/; revision=12697

3 files changed, 29 insertions, 27 deletions

diff --git a/dev-libs/libfreenect/ChangeLog b/dev-libs/libfreenect/ChangeLog
index 754ac050f..037beadf4 100644
--- a/dev-libs/libfreenect/ChangeLog
+++ b/dev-libs/libfreenect/ChangeLog
@@ -1,7 +1,13 @@
-# ChangeLog for x11-drivers/libfreenect
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# ChangeLog for dev-libs/libfreenect
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*libfreenect-0.1.2 (24 Jan 2012)
+
+  24 Jan 2012; Matthew Schultz (mschultz) <mattsch@gmail.com>
+  -libfreenect-0.0.1_p20110105-r1.ebuild, +libfreenect-0.1.2.ebuild:
+  Version bump
+
   27 Jan 2011; Matthew Schultz (mschultz) <mattsch@gmail.com>
   -libfreenect-0.0.1_p20110105.ebuild,
   +libfreenect-0.0.1_p20110105-r1.ebuild, metadata.xml:
diff --git a/dev-libs/libfreenect/Manifest b/dev-libs/libfreenect/Manifest
index bcafe48a1..cba22a747 100644
--- a/dev-libs/libfreenect/Manifest
+++ b/dev-libs/libfreenect/Manifest
@@ -1,5 +1,5 @@
 AUX 51-kinect.rules 384 RMD160 9de784f7a2284e07b7db061159aaee8704e82241 SHA1 04cbcb9d5bbd5aaf25619567580ebbfe8582ac90 SHA256 447878c45d095acf01e14fe284e71bfb9406dec5e8072110027885bc27484352
-DIST libfreenect-0.0.1_p20110105.tar.bz2 1541523 RMD160 dc367e67f883404e948c4e413210a109c9d22f38 SHA1 1bdf91bc82e4ed467121c87099c3040eb7cdd580 SHA256 128fa3896695d4bfd1542a6172279becaa260e74b404e9562a1b7dbd2973bb95
-EBUILD libfreenect-0.0.1_p20110105-r1.ebuild 1977 RMD160 9204cb19a775a9096ab61c5b29de8db86bc2d427 SHA1 e641f67fa73c2366d57be780e777a8a934fe4424 SHA256 3f0cda1ae3384db3c71b5f1cef29b598e63c22a37fe30d0d7da214a79762450d
-MISC ChangeLog 528 RMD160 a6ff1fde90e75c1281f77871722d0d11ce5e5c81 SHA1 628ea783f40e0fb4b06455396384fc5e9f0e9623 SHA256 27346ab3d4c516eefa9e5887337b35f593e63e1c09357d8526f3a760f9cce57c
+DIST libfreenect-0.1.2.tar.gz 1096003 RMD160 2687003673e95ca8cc7d27d9d1f155d389424ffe SHA1 c2db5080dd1d471ed6e2a361b6345cd8fb1768c7 SHA256 88cadbea8fb28838bd56a1ec86808325a8f531e93f2bba171e368137d6b1f6e9
+EBUILD libfreenect-0.1.2.ebuild 1937 RMD160 a68ba93169e13b3a873e8926bdb331e29415ad53 SHA1 84717da8a303143ff60dc7110a1fd84f4c0edd28 SHA256 8a10e5735610f15f0e491a479775bab8f25c45bf87f3bb50f1d25784e6437c2a
+MISC ChangeLog 706 RMD160 60363ff41a499fdfad790f0961492ecb9e078d99 SHA1 75cb91f94fd91c00bd221800913320724a78e7a6 SHA256 7df5e8f31d6a7f3f08670a67cd664e64b39de275a913f8ba001b77c14a6d29b0
 MISC metadata.xml 610 RMD160 fe471209b6768baee285a798512a501d39240fc0 SHA1 0347f5e7da9ea4da9ab68e062e042bd6ae71ca38 SHA256 1fd0660166ecc2b4a45ab29081ce76d6fbd2a1d85adeec529998bd1ed0de3512
diff --git a/dev-libs/libfreenect/libfreenect-0.0.1_p20110105-r1.ebuild b/dev-libs/libfreenect/libfreenect-0.1.2.ebuild
index be9015fbb..53e475af2 100644
--- a/dev-libs/libfreenect/libfreenect-0.0.1_p20110105-r1.ebuild
+++ b/dev-libs/libfreenect/libfreenect-0.1.2.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 PYTHON_DEPEND="python? 2:2.6"
 
 inherit cmake-utils multilib python
 
 DESCRIPTION="Drivers and libraries for the Xbox Kinect device"
 HOMEPAGE="https://github.com/OpenKinect/libfreenect"
-SRC_URI="http://ompldr.org/vNzQ5bg/${P}.tar.bz2"
+SRC_URI="https://github.com/OpenKinect/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples fakenect c_sync opencv python"
+IUSE="c_sync examples fakenect opencv python"
+REQUIRED_USE="opencv? ( c_sync )
+	python? ( c_sync )"
 
 RDEPEND="dev-libs/libusb:1
 	examples? (
@@ -26,6 +28,11 @@ RDEPEND="dev-libs/libusb:1
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	mv OpenKinect-${PN}-* ${P} || die
+}
+
 pkg_setup() {
 	if use python; then
 		python_set_active_version 2
@@ -35,28 +42,13 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake-utils_use_build c_sync)
 		$(cmake-utils_use_build examples)
-		$(cmake-utils_use_build fakenect)
 		$(cmake-utils_use_build examples CPP)
+		$(cmake-utils_use_build fakenect)
 		$(cmake-utils_use_build opencv CV)
 		$(cmake-utils_use_build python)
 	)
-	# opencv & python requires c_sync
-	if ! use c_sync && ( use opencv || use python ); then
-		if use opencv; then
-			local useflag="opencv"
-		else
-			local useflag="python"
-		fi
-		ewarn "${useflag} requires c synchronous support to be enabled; c_sync enabled"
-	        mycmakeargs+=(
-			-DBUILD_C_SYNC=ON
-		)
-	else
-		mycmakeargs+=(
-			$(cmake-utils_use_build c_sync)
-		)
-	fi
 	if use python; then
 		#Add numpy core include path in python CMakeList.txt to allow compilation
 		sed -i -e "s|../c_sync/|$(python_get_sitedir)/numpy/core/include/ ../c_sync/|" "wrappers/python/CMakeLists.txt" || die
@@ -66,12 +58,16 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
+	# Rename record example so it does not collide with xawtv
+	if use examples && use fakenect; then
+		mv "${D}"/usr/bin/record "${D}"/usr/bin/frecord || die
+	fi
 	# Remove cvdemo if examples is not enabled
 	if use opencv && ! use examples; then
 		rm -f "${D}"/usr/bin/cvdemo || die
 	fi
 	insinto /$(get_libdir)/udev/rules.d/
-	doins "${FILESDIR}/51-kinect.rules" || die
+	doins "${FILESDIR}/51-kinect.rules"
 }
 
 pkg_postinst() {