summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-07-16 08:37:02 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-07-16 08:37:02 +0000
commit3bd1a846bccd89ea0d5f41decb812b4e47ac4a6b (patch)
tree75283ab4011bd0f12b7d2385a7f8abe257058381 /dev-libs/libcdio
parentversion bump, a few bugfixes like fixing build on bsd (diff)
downloadgentoo-2-3bd1a846bccd89ea0d5f41decb812b4e47ac4a6b.tar.gz
gentoo-2-3bd1a846bccd89ea0d5f41decb812b4e47ac4a6b.tar.bz2
gentoo-2-3bd1a846bccd89ea0d5f41decb812b4e47ac4a6b.zip
backport a patch from upstream fo fix build on fbsd, bug #227809, see also http://cvs.savannah.gnu.org/viewvc/libcdio/libcdio/lib/driver/FreeBSD/freebsd.h?r1=1.9&r2=1.10&sortby=date and http://savannah.gnu.org/bugs/?23228
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64)
Diffstat (limited to 'dev-libs/libcdio')
-rw-r--r--dev-libs/libcdio/ChangeLog8
-rw-r--r--dev-libs/libcdio/files/libcdio-0.80-fbsd.patch11
-rw-r--r--dev-libs/libcdio/libcdio-0.80.ebuild3
3 files changed, 20 insertions, 2 deletions
diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index c5966b93a6bd..3479f5b59d47 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/libcdio
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.100 2008/06/21 10:28:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.101 2008/07/16 08:37:01 aballier Exp $
+
+ 16 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+ +files/libcdio-0.80-fbsd.patch, libcdio-0.80.ebuild:
+ backport a patch from upstream fo fix build on fbsd, bug #227809, see also
+ http://cvs.savannah.gnu.org/viewvc/libcdio/libcdio/lib/driver/FreeBSD/free
+ bsd.h?r1=1.9&r2=1.10&sortby=date and http://savannah.gnu.org/bugs/?23228
21 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+files/libcdio-0.80-fix-pkgconfig.patch, libcdio-0.80.ebuild:
diff --git a/dev-libs/libcdio/files/libcdio-0.80-fbsd.patch b/dev-libs/libcdio/files/libcdio-0.80-fbsd.patch
new file mode 100644
index 000000000000..fb2313826877
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-0.80-fbsd.patch
@@ -0,0 +1,11 @@
+--- libcdio-0.80/lib/driver/FreeBSD/freebsd.h.old 2008-07-16 08:26:46 +0000
++++ libcdio-0.80/lib/driver/FreeBSD/freebsd.h 2008-07-16 08:26:54 +0000
+@@ -158,7 +158,7 @@
+ cdio_drive_write_cap_t *p_write_cap,
+ cdio_drive_misc_cap_t *p_misc_cap);
+
+-int get_media_changed_freebsd (const void *p_user_data);
++static int get_media_changed_freebsd (const void *p_user_data);
+
+ char *get_mcn_freebsd_ioctl (const _img_private_t *p_env);
+
diff --git a/dev-libs/libcdio/libcdio-0.80.ebuild b/dev-libs/libcdio/libcdio-0.80.ebuild
index 120e7518d44c..9cf0a808bbde 100644
--- a/dev-libs/libcdio/libcdio-0.80.ebuild
+++ b/dev-libs/libcdio/libcdio-0.80.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild,v 1.5 2008/06/21 10:28:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild,v 1.6 2008/07/16 08:37:01 aballier Exp $
EAPI=1
@@ -27,6 +27,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-minimal.patch
epatch "${FILESDIR}"/${P}-fix-pkgconfig.patch
+ epatch "${FILESDIR}"/${P}-fbsd.patch
sed -i -e 's:noinst_PROGRAMS:EXTRA_PROGRAMS:' test/Makefile.am \
|| die "unable to remove testdefault build"