From: misi3k <misi3k@pld-linux.org>
Date: Mon, 26 May 2003 20:42:05 +0000 (+0000)
Subject: - updated to work with 0.13.1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdarkice.git;a=commitdiff_plain;h=c4a5a8077211ef8450f57b4ff7ea63062b597492

- updated to work with 0.13.1

Changed files:
    darkice-ac25x.patch -> 1.2
    darkice-am_fixes.patch -> 1.2
---

diff --git a/darkice-ac25x.patch b/darkice-ac25x.patch
index 8c34c62..a536b31 100644
--- a/darkice-ac25x.patch
+++ b/darkice-ac25x.patch
@@ -1,6 +1,6 @@
---- darkice-0.10/configure.in~	Tue Jul 23 06:23:29 2002
-+++ darkice-0.10/configure.in	Tue Jul 23 06:23:29 2002
-@@ -28,8 +28,6 @@
+--- 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-----------------------------------------------------------------------------
@@ -9,7 +9,7 @@
  
  AC_ARG_WITH( lame,
  [  --with-lame             use lame for encoding mp3 streams [yes] ],
-@@ -57,14 +55,12 @@
+@@ -66,14 +64,12 @@
  else
      AC_MSG_RESULT( [building without lame] )
  fi
@@ -26,14 +26,14 @@
  AC_ARG_WITH( vorbis,
  [  --with-vorbis           use Ogg Vorbis for encoding vorbis streams [yes] ],
      USE_VORBIS=${withval}, USE_VORBIS="yes" )
-@@ -106,7 +102,9 @@
- if test "x${LAME_LDFLAGS}" = "x" -a "x${VORBIS_LDFLAGS}" = "x" ; then
-     AC_MSG_ERROR( [neither lame nor Ogg Vorbis configured])
+@@ -110,6 +106,10 @@
+     AC_MSG_RESULT( [building without Ogg Vorbis] )
  fi
+ 
 +AC_SUBST(VORBIS_INCFLAGS)
 +AC_SUBST(VORBIS_LDFLAGS)
++
++
  
- 
--AC_OUTPUT(Makefile src/Makefile man/Makefile)
-+AC_OUTPUT([Makefile src/Makefile man/Makefile])
- 
+ dnl-----------------------------------------------------------------------------
+ dnl make sure at least one of lame and vorbis present
diff --git a/darkice-am_fixes.patch b/darkice-am_fixes.patch
index 5a72fce..6211958 100644
--- a/darkice-am_fixes.patch
+++ b/darkice-am_fixes.patch
@@ -1,14 +1,8 @@
---- darkice-0.10/src/Makefile.am~	Mon Jul 22 16:04:58 2002
-+++ darkice-0.10/src/Makefile.am	Mon Jul 22 16:04:58 2002
-@@ -1,8 +1,7 @@
+--- 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 = -g -pedantic -Wall
--#CXXFLAGS = -O2 -pedantic -Wall
--INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@
--LDADD = @LAME_LDFLAGS@ @VORBIS_LDFLAGS@
-+
-+INCLUDES = $(LAME_INCFLAGS) $(VORBIS_INCFLAGS)
-+LDADD = $(LAME_LDFLAGS) $(VORBIS_LDFLAGS)
+-CXXFLAGS = -O2 -pedantic -Wall @PTHREAD_CFLAGS@
+ INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@
+ LDADD = @PTHREAD_LIBS@ @LAME_LDFLAGS@ @VORBIS_LDFLAGS@
  
- darkice_SOURCES =   AudioEncoder.h\
-                     AudioSource.h\