closing bug 48836, alsalib-1.0 failed configure test (configure.in not accepting the possibility of SND_MAJ_LIB==1)

5 files changed, 46 insertions, 7 deletions

diff --git a/media-video/ogle/ChangeLog b/media-video/ogle/ChangeLog
index ea1eeb1a3fa7..20b2ed31469c 100644
--- a/media-video/ogle/ChangeLog
+++ b/media-video/ogle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ogle
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ChangeLog,v 1.23 2004/05/04 02:19:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ChangeLog,v 1.24 2004/06/01 08:15:50 ferringb Exp $
+
+  01 Jun 2004; Brian Harring <ferringb@gentoo.org> ogle-0.9.1.ebuild,
+  ogle-0.9.2.ebuild files/ogle-configure-alsa-fix.patch:
+  Adding alsalib-1.0 configure fix (bug #48836), courtesy of rodgling.
 
   03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> ogle-0.9.1.ebuild,
   ogle-0.9.2.ebuild:
diff --git a/media-video/ogle/Manifest b/media-video/ogle/Manifest
index 7a9587199e52..9f4d7cbe223e 100644
--- a/media-video/ogle/Manifest
+++ b/media-video/ogle/Manifest
@@ -1,6 +1,7 @@
-MD5 ec04f1e0df4a8f0a9f2547f6b06784a3 ogle-0.9.2.ebuild 1789
-MD5 442897c9c189ef72ba29673dd04eb902 ogle-0.9.1.ebuild 1804
 MD5 6cd169e0d71b3db6ed8b4a3ed1cfca85 ChangeLog 3175
 MD5 526f11a066c4a4c196484c623e3aa5c5 metadata.xml 164
+MD5 2271444bedb115f3e58c07e53428c5cb ogle-0.9.1.ebuild 1935
+MD5 4bd8e63617bf393fd80cd73759723ce8 ogle-0.9.2.ebuild 1920
 MD5 69fb0f18b0f74a88453cf989a0515f08 files/digest-ogle-0.9.1 62
 MD5 9e5be8c6673243e1604cfbec495081d5 files/digest-ogle-0.9.2 62
+MD5 d928c8bc3c69f3128bda1f74f0424f52 files/ogle-configure-alsa-fix.patch 726
diff --git a/media-video/ogle/files/ogle-configure-alsa-fix.patch b/media-video/ogle/files/ogle-configure-alsa-fix.patch
new file mode 100644
index 000000000000..b01329f12555
--- /dev/null
+++ b/media-video/ogle/files/ogle-configure-alsa-fix.patch
@@ -0,0 +1,22 @@
+--- configure.in.original	2003-03-11 17:03:17.000000000 +0000
++++ configure.in	2004-05-15 16:15:02.543912249 +0100
+@@ -485,7 +485,7 @@
+           [ 
+ #include <sys/asoundlib.h>
+ #if defined(SND_LIB_MAJOR) && defined(SND_LIB_MINOR)
+-#if SND_LIB_MAJOR>0 || (SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)
++#if (SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)
+ AP_maGiC_VALUE
+ #endif
+ #endif
+--- configure.original	2004-05-15 16:19:06.688869260 +0100
++++ configure	2004-05-15 16:19:21.039809418 +0100
+@@ -13011,7 +13011,7 @@
+ 
+ #include <sys/asoundlib.h>
+ #if defined(SND_LIB_MAJOR) && defined(SND_LIB_MINOR)
+-#if SND_LIB_MAJOR>0 || (SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)
++#if (SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)
+ AP_maGiC_VALUE
+ #endif
+ #endif
diff --git a/media-video/ogle/ogle-0.9.1.ebuild b/media-video/ogle/ogle-0.9.1.ebuild
index 6691f1eac21b..d1d09bf1e7d1 100644
--- a/media-video/ogle/ogle-0.9.1.ebuild
+++ b/media-video/ogle/ogle-0.9.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.9.1.ebuild,v 1.8 2004/05/04 02:19:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.9.1.ebuild,v 1.9 2004/06/01 08:15:50 ferringb Exp $
 
-inherit libtool
+inherit eutils libtool
 
 IUSE="oss mmx alsa xv"
 
@@ -23,6 +23,12 @@ DEPEND=">=media-libs/libdvdcss-1.2.2
 	>=media-libs/a52dec-0.7.3
 	alsa? ( media-libs/alsa-lib )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/ogle-configure-alsa-fix.patch || die "failed applying alsa-fix"
+}
+
 src_compile() {
 	# STOP!  If you make any changes, make sure to unmerge all copies
 	# of ogle and ogle-gui from your system and merge ogle-gui using your
diff --git a/media-video/ogle/ogle-0.9.2.ebuild b/media-video/ogle/ogle-0.9.2.ebuild
index 5d4901da059e..c4820a83a520 100644
--- a/media-video/ogle/ogle-0.9.2.ebuild
+++ b/media-video/ogle/ogle-0.9.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.9.2.ebuild,v 1.5 2004/05/04 02:19:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.9.2.ebuild,v 1.6 2004/06/01 08:15:50 ferringb Exp $
 
-inherit libtool
+inherit eutils libtool
 
 DESCRIPTION="Full featured DVD player that supports DVD menus."
 HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd/"
@@ -22,6 +22,12 @@ DEPEND=">=media-libs/libdvdcss-1.2.2
 	>=media-libs/a52dec-0.7.3
 	alsa? ( media-libs/alsa-lib )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/ogle-configure-alsa-fix.patch || die "applying alsa-fix failed"
+}
+
 src_compile() {
 	# STOP!  If you make any changes, make sure to unmerge all copies
 	# of ogle and ogle-gui from your system and merge ogle-gui using your