From: Mariusz Mazur <mmazur@pld-linux.org>
Date: Thu, 4 Jan 2007 10:16:26 +0000 (+0000)
Subject: - update to 0.17.1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdarkice.git;a=commitdiff_plain;h=e22a89d98e92553008167e91bd6be8de9484541b

- update to 0.17.1

Changed files:
    darkice-ac25x.patch -> 1.3
    darkice-am_fixes.patch -> 1.3
    darkice-amd64.patch -> 1.1
    darkice-no_libnsl.patch -> 1.2
---

diff --git a/darkice-ac25x.patch b/darkice-ac25x.patch
deleted file mode 100644
index a536b31..0000000
--- a/darkice-ac25x.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- darkice-0.13.1/configure.in.orig	Mon May 26 22:22:44 2003
-+++ darkice-0.13.1/configure.in	Mon May 26 22:23:32 2003
-@@ -37,8 +37,6 @@
- dnl-----------------------------------------------------------------------------
- dnl link the lame library if requested
- dnl-----------------------------------------------------------------------------
--AC_SUBST( LAME_INCFLAGS)
--AC_SUBST( LAME_LDFLAGS)
- 
- AC_ARG_WITH( lame,
- [  --with-lame             use lame for encoding mp3 streams [yes] ],
-@@ -66,14 +64,12 @@
- else
-     AC_MSG_RESULT( [building without lame] )
- fi
--
-+AC_SUBST(LAME_INCFLAGS)
-+AC_SUBST(LAME_LDFLAGS)
- 
- dnl-----------------------------------------------------------------------------
- dnl link the ogg vorbis libraries if requested
- dnl-----------------------------------------------------------------------------
--AC_SUBST( VORBIS_INCFLAGS)
--AC_SUBST( VORBIS_LDFLAGS)
--
- AC_ARG_WITH( vorbis,
- [  --with-vorbis           use Ogg Vorbis for encoding vorbis streams [yes] ],
-     USE_VORBIS=${withval}, USE_VORBIS="yes" )
-@@ -110,6 +106,10 @@
-     AC_MSG_RESULT( [building without Ogg Vorbis] )
- fi
- 
-+AC_SUBST(VORBIS_INCFLAGS)
-+AC_SUBST(VORBIS_LDFLAGS)
-+
-+
- 
- dnl-----------------------------------------------------------------------------
- dnl make sure at least one of lame and vorbis present
diff --git a/darkice-am_fixes.patch b/darkice-am_fixes.patch
deleted file mode 100644
index 6211958..0000000
--- a/darkice-am_fixes.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- darkice-0.13.1/src/Makefile.am.orig	Wed Feb 12 16:15:17 2003
-+++ darkice-0.13.1/src/Makefile.am	Mon May 26 22:21:31 2003
-@@ -1,5 +1,4 @@
- bin_PROGRAMS = darkice
--CXXFLAGS = -O2 -pedantic -Wall @PTHREAD_CFLAGS@
- INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@
- LDADD = @PTHREAD_LIBS@ @LAME_LDFLAGS@ @VORBIS_LDFLAGS@
- 
diff --git a/darkice-amd64.patch b/darkice-amd64.patch
new file mode 100644
index 0000000..1ac09dc
--- /dev/null
+++ b/darkice-amd64.patch
@@ -0,0 +1,11 @@
+--- darkice-0.17.1/acinclude.m4~	2004-02-23 21:03:09.000000000 +0100
++++ darkice-0.17.1/acinclude.m4	2007-01-03 17:47:49.000000000 +0100
+@@ -43,7 +43,7 @@
+ dnl-----------------------------------------------------------------------------
+ AC_DEFUN(LA_SEARCH_LIB,[
+   dnl look for lib
+-  LA_SEARCH_FILE($1, $3, $5 $5/lib )
++  LA_SEARCH_FILE($1, $3, $5 $5/lib $5/lib64 )
+   dnl look for header.
+   LA_SEARCH_FILE($2, $4, $5 $5/include )
+   if test ".$1" = "." || test ".$2" = "."; then
diff --git a/darkice-no_libnsl.patch b/darkice-no_libnsl.patch
index db66331..6e965f2 100644
--- a/darkice-no_libnsl.patch
+++ b/darkice-no_libnsl.patch
@@ -1,11 +1,11 @@
---- darkice-0.7/configure.in~	Mon Jul 22 14:28:09 2002
-+++ darkice-0.7/configure.in	Mon Jul 22 14:28:09 2002
-@@ -19,7 +19,7 @@
- AC_TYPE_SIZE_T()
- 
- AC_CHECK_LIB( socket, socket)
--AC_CHECK_LIB( nsl, gethostbyname)
-+AC_CHECK_FUNC( gethostbyname, [], AC_CHECK_LIB( nsl, gethostbyname))
- AC_CHECK_LIB( rt, sched_getscheduler)
+--- darkice-0.17.1/configure.in~	2007-01-03 17:09:56.000000000 +0100
++++ darkice-0.17.1/configure.in	2007-01-03 17:11:22.000000000 +0100
+@@ -22,7 +22,7 @@
+ AC_C_BIGENDIAN()
  
+ AC_CHECK_LIB(socket, socket)
+-AC_CHECK_LIB(nsl, gethostbyname)
++AC_CHECK_FUNC(gethostbyname, [], AC_CHECK_LIB(nsl, gethostbyname))
+ AC_CHECK_LIB(rt, sched_getscheduler)
  
+ AC_CHECK_FUNC(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO, 1, [Does function getaddrinfo exist?] ))