Fix CDDA build with fbsd.

Package-Manager: portage-2.1.2.5

4 files changed, 55 insertions, 10 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index b00ca9de2b72..2ab4e76aa57c 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.470 2007/04/22 13:30:39 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.471 2007/05/04 19:51:49 drac Exp $
+
+  04 May 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xine-lib-1.1.6-fbsd.patch, xine-lib-1.1.6.ebuild:
+  Apply patch from Diego Flameeyes Pettenò to Fix build of CDDA input on
+  FreeBSD, the NetBSD patch broke it as sys/scsiio.h is not present on
+  FreeBSD.
 
   22 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   xine-lib-1.1.4-r2.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index b8f073e045c5..71c1ddc7a381 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -2,6 +2,10 @@ AUX xine-lib-1.1.4-CVE-2007-1246.patch 1304 RMD160 56394c48df401162c225f956a9b83
 MD5 30a23851923288df6d34e7791b2dfc2f files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
 RMD160 56394c48df401162c225f956a9b83fc8c3970668 files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
 SHA256 6771d7b21d68882501f20d338f794d8400ec683dec5e90b7bce54bafd7b9dceb files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
+AUX xine-lib-1.1.6-fbsd.patch 1308 RMD160 da5504c5d49e0d80a5afe66eeed3f3b17609b7e2 SHA1 95cf14d4d35d11cd16df229de78a66b8d6b3c327 SHA256 dc87be5e854af5f208c928506b9c6c0f63f391231aed383b0e633664964141dd
+MD5 dd00b1090da5edc0773bdeb85a3885a0 files/xine-lib-1.1.6-fbsd.patch 1308
+RMD160 da5504c5d49e0d80a5afe66eeed3f3b17609b7e2 files/xine-lib-1.1.6-fbsd.patch 1308
+SHA256 dc87be5e854af5f208c928506b9c6c0f63f391231aed383b0e633664964141dd files/xine-lib-1.1.6-fbsd.patch 1308
 DIST xine-lib-1.1.2.tar.bz2 6457108 RMD160 21322d6d7e085237926741495d70f5ce7764910b SHA1 07e454e2287e34414b598faf78ae6d8ab8ffbb69 SHA256 871933c745f5824808a88720518c0164166906536c7f8723bd38e84f78319226
 DIST xine-lib-1.1.3.tar.gz 8508884 RMD160 8e28638385ea48e7d4d4d702573ca92c4eca77c8 SHA1 c0886910ddb1afa1a72572decf12c0251bba40bf SHA256 96e50c6e7b2fb1209c52dcab6b38f2a99aa1c9d6e028b479a800cafef11bccb0
 DIST xine-lib-1.1.4-xcb.patch.bz2 22346 RMD160 0e993341e7ca4bd1ae3604235a1004f1c5d6ee07 SHA1 51fb50edec0b3d66ef4b18667d332a885c5a8983 SHA256 8dc146699eadd52fcf1b1df296505fb24e5382696c40d325de22c782f7ca21bb
@@ -21,14 +25,14 @@ EBUILD xine-lib-1.1.4-r2.ebuild 5612 RMD160 93268aaeeb7a7f0387f912772966bb45c30e
 MD5 7f65162ed9760bdcf36cee1263091d5a xine-lib-1.1.4-r2.ebuild 5612
 RMD160 93268aaeeb7a7f0387f912772966bb45c30e2703 xine-lib-1.1.4-r2.ebuild 5612
 SHA256 a42bede1b15327306ccddec68f94aab8c1a20014118a442c60b4671d41c3a15f xine-lib-1.1.4-r2.ebuild 5612
-EBUILD xine-lib-1.1.6.ebuild 5861 RMD160 abb32f16e15903f6c1e05a9d9262e6f79f49a2f2 SHA1 95307cddb204060d89cd8f30f8c6a756011172de SHA256 a08eec8437b3e87638e3e7c4ce9f8b55e2bce250e52c9a125861e4bdbda8516b
-MD5 f5cafa995dd9c04e63b22ef96d3b9e9c xine-lib-1.1.6.ebuild 5861
-RMD160 abb32f16e15903f6c1e05a9d9262e6f79f49a2f2 xine-lib-1.1.6.ebuild 5861
-SHA256 a08eec8437b3e87638e3e7c4ce9f8b55e2bce250e52c9a125861e4bdbda8516b xine-lib-1.1.6.ebuild 5861
-MISC ChangeLog 51738 RMD160 3a80226e5ae51bfb90b375e587e07d339f20b6dd SHA1 4bff29ddf32a68134163b72c244890c172126904 SHA256 1f21c8605a0f336919adcb8084f5557dbec217d6cd6ce664c58f64e7b107c417
-MD5 62f3eb122d3eba133eb2d10785efb417 ChangeLog 51738
-RMD160 3a80226e5ae51bfb90b375e587e07d339f20b6dd ChangeLog 51738
-SHA256 1f21c8605a0f336919adcb8084f5557dbec217d6cd6ce664c58f64e7b107c417 ChangeLog 51738
+EBUILD xine-lib-1.1.6.ebuild 5898 RMD160 0393d8dad82239cd8d47cf17f1f68ac6b6879c1d SHA1 064b5cb4bbc6693b31969c3a85c9cef6b4aadc9c SHA256 d91cfc6367046f8e51de160d057d901f7c9ed9ea4d8e90e462133c2dff18bddb
+MD5 d0eec8d50478ef022ccd99079ff4782c xine-lib-1.1.6.ebuild 5898
+RMD160 0393d8dad82239cd8d47cf17f1f68ac6b6879c1d xine-lib-1.1.6.ebuild 5898
+SHA256 d91cfc6367046f8e51de160d057d901f7c9ed9ea4d8e90e462133c2dff18bddb xine-lib-1.1.6.ebuild 5898
+MISC ChangeLog 51997 RMD160 859bf49a58ef0bc45baf4c149ebf4f5adec6f529 SHA1 6919a74cdf6151da2593be5250d8bdbf9881db3a SHA256 203835cc4aa47966648c54c158174867f6137fd01bbab662e744df007eda8933
+MD5 537654b0787ab7c58fabdfeec62f6dd8 ChangeLog 51997
+RMD160 859bf49a58ef0bc45baf4c149ebf4f5adec6f529 ChangeLog 51997
+SHA256 203835cc4aa47966648c54c158174867f6137fd01bbab662e744df007eda8933 ChangeLog 51997
 MISC metadata.xml 306 RMD160 032164f452f69c128150b68ddf2c837a20fa11e7 SHA1 1b6a82c8dbb60a55051e663290b1fa4fbd0cdb2e SHA256 cc2402ccd44aff7c94a0865c12d43a8250e8277253395924cb145fe99a6fb560
 MD5 baed93b1b1c2bcbdce8ae48aa25df8fd metadata.xml 306
 RMD160 032164f452f69c128150b68ddf2c837a20fa11e7 metadata.xml 306
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.6-fbsd.patch b/media-libs/xine-lib/files/xine-lib-1.1.6-fbsd.patch
new file mode 100644
index 000000000000..6f508c061366
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.6-fbsd.patch
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
+# Date 1178289959 -7200
+# Node ID ee3cb7841d1490bb5dfb760df2f49642da9f6837
+# Parent  ce82ad163b0e36d3edefd90bfe3f2ba05ab3ace3
+Fix building of CDDA input on FreeBSD, the NetBSD patch broke it as sys/scsiio.h is not present on FreeBSD.
+
+diff -r ce82ad163b0e -r ee3cb7841d14 configure.ac
+--- a/configure.ac	Wed May 02 21:51:16 2007 +0200
++++ b/configure.ac	Fri May 04 16:45:59 2007 +0200
+@@ -1656,7 +1656,7 @@ dnl ------------------------------------
+ dnl ---------------------------------------------
+ 
+ AC_CHECK_HEADERS([linux/cdrom.h sys/dvdio.h], [break])
+-AC_CHECK_HEADERS([sys/cdio.h])
++AC_CHECK_HEADERS([sys/cdio.h sys/scsiio.h])
+ AM_CHECK_CDROM_IOCTLS(
+ 	[AC_DEFINE(HAVE_CDROM_IOCTLS,1,[Define this if you have CDROM ioctls])],
+ 	[AC_MSG_RESULT([*** (S)VCD support will be disabled ***])])
+diff -r ce82ad163b0e -r ee3cb7841d14 src/input/input_cdda.c
+--- a/src/input/input_cdda.c	Wed May 02 21:51:16 2007 +0200
++++ b/src/input/input_cdda.c	Fri May 04 16:45:59 2007 +0200
+@@ -617,7 +617,10 @@ static int read_cdrom_frames(cdda_input_
+ #elif defined(__FreeBSD__) || defined(__NetBSD__)
+ 
+ #include <sys/cdio.h>
++
++#ifdef HAVE_SYS_SCSIIO_H
+ #include <sys/scsiio.h>
++#endif
+ 
+ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
+ 
diff --git a/media-libs/xine-lib/xine-lib-1.1.6.ebuild b/media-libs/xine-lib/xine-lib-1.1.6.ebuild
index e558c2253653..521c3ce81c41 100644
--- a/media-libs/xine-lib/xine-lib-1.1.6.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.6.ebuild,v 1.3 2007/04/22 01:38:26 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.6.ebuild,v 1.4 2007/05/04 19:51:49 drac Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -93,6 +93,8 @@ src_unpack() {
 	# Workaround from Flameeyes until using external
 	# libdts is done properly (in xine-lib-1.1.7)
 	echo '#include_next <dts.h>' > src/libdts/dts.h
+
+	epatch "${FILESDIR}"/${P}-fbsd.patch
 }
 
 src_compile() {