rpms/flac123/devel flac123-0.0.9-flac-1.1.3.patch, 1.1, 1.2 flac123.spec, 1.4, 1.5

Mon Feb 26 04:56:37 UTC 2007

Author: sindrepb

Update of /cvs/extras/rpms/flac123/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31379

Modified Files:
	flac123-0.0.9-flac-1.1.3.patch flac123.spec 
Log Message:
Add fixed patch to really make build work against flac 1.1.3

flac123-0.0.9-flac-1.1.3.patch:

Index: flac123-0.0.9-flac-1.1.3.patch
===================================================================
RCS file: /cvs/extras/rpms/flac123/devel/flac123-0.0.9-flac-1.1.3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- flac123-0.0.9-flac-1.1.3.patch	26 Feb 2007 04:12:13 -0000	1.1
+++ flac123-0.0.9-flac-1.1.3.patch	26 Feb 2007 04:56:04 -0000	1.2
@@ -1,21 +1,72 @@
-diff -ru flac123-0.0.9/configure.ac flac123-0.0.9-b2/configure.ac
---- flac123-0.0.9/configure.ac	2005-05-07 16:05:24.000000000 -0700
-+++ flac123-0.0.9-b2/configure.ac	2006-10-31 00:03:09.000000000 -0800
-@@ -40,9 +40,9 @@
- AC_PROG_CC
+--- flac123-0.0.9/configure.orig	2007-02-26 05:47:59.000000000 +0100
++++ flac123-0.0.9/configure	2007-02-26 05:51:55.000000000 +0100
+@@ -2688,13 +2688,13 @@
  
  # Checks for libraries.
--AC_CHECK_LIB(FLAC, FLAC__file_decoder_new, [haveflac=yes], [haveflac=no], -lm)
-+AC_CHECK_LIB(FLAC, FLAC__stream_decoder_new, [haveflac=yes], [haveflac=no], -lm)
+ 
+-echo "$as_me:$LINENO: checking for FLAC__file_decoder_new in -lFLAC" >&5
+-echo $ECHO_N "checking for FLAC__file_decoder_new in -lFLAC... $ECHO_C" >&6
+-if test "${ac_cv_lib_FLAC_FLAC__file_decoder_new+set}" = set; then
++echo "$as_me:$LINENO: checking for FLAC__stream_decoder_new in -lFLAC" >&5
++echo $ECHO_N "checking for FLAC__stream_decoder_new in -lFLAC... $ECHO_C" >&6
++if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lFLAC -lm $LIBS"
++LIBS="-lFLAC -logg -lm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -2709,11 +2709,11 @@
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char FLAC__file_decoder_new ();
++char FLAC__stream_decoder_new ();
+ int
+ main ()
+ {
+-FLAC__file_decoder_new ();
++FLAC__stream_decoder_new ();
+   ;
+   return 0;
+ }
+@@ -2730,26 +2730,26 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_FLAC_FLAC__file_decoder_new=yes
++  ac_cv_lib_FLAC_FLAC__stream_decoder_new=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_FLAC_FLAC__file_decoder_new=no
++ac_cv_lib_FLAC_FLAC__stream_decoder_new=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__file_decoder_new" >&5
+-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__file_decoder_new" >&6
+-if test $ac_cv_lib_FLAC_FLAC__file_decoder_new = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5
++echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6
++if test $ac_cv_lib_FLAC_FLAC__stream_decoder_new = yes; then
+   haveflac=yes
+ else
+   haveflac=no
+ fi
+ 
  if test "$haveflac" = "yes"; then
 -	FLAC_LIBS="-lFLAC -lm"
 +	FLAC_LIBS="-lFLAC -logg -lm"
- 	AC_SUBST(FLAC_LIBS)
+ 
  else
- 	AC_MSG_ERROR(FLAC required!)
-diff -ru flac123-0.0.9/flac123.c flac123-0.0.9-b2/flac123.c
---- flac123-0.0.9/flac123.c	2005-05-08 21:25:20.000000000 -0700
-+++ flac123-0.0.9-b2/flac123.c	2006-10-31 00:06:06.000000000 -0800
+ 	{ { echo "$as_me:$LINENO: error: FLAC required!" >&5
+--- flac123-0.0.9/flac123.c.orig	2007-02-26 05:47:49.000000000 +0100
++++ flac123-0.0.9/flac123.c	2007-02-26 05:54:49.000000000 +0100
 @@ -49,12 +49,17 @@
  
  static void play_file(const char *);
@@ -196,9 +247,22 @@
  {
      int sample, channel, i;
      uint_32 samples = frame->header.blocksize;
-diff -ru flac123-0.0.9/flac123.h flac123-0.0.9-b2/flac123.h
---- flac123-0.0.9/flac123.h	2005-02-24 21:52:02.000000000 -0800
-+++ flac123-0.0.9-b2/flac123.h	2006-10-30 17:23:56.000000000 -0800
+--- flac123-0.0.9/configure.ac.orig	2007-02-26 05:46:46.000000000 +0100
++++ flac123-0.0.9/configure.ac	2007-02-26 05:54:49.000000000 +0100
+@@ -40,9 +40,9 @@
+ AC_PROG_CC
+ 
+ # Checks for libraries.
+-AC_CHECK_LIB(FLAC, FLAC__file_decoder_new, [haveflac=yes], [haveflac=no], -lm)
++AC_CHECK_LIB(FLAC, FLAC__stream_decoder_new, [haveflac=yes], [haveflac=no], -lm)
+ if test "$haveflac" = "yes"; then
+-	FLAC_LIBS="-lFLAC -lm"
++	FLAC_LIBS="-lFLAC -logg -lm"
+ 	AC_SUBST(FLAC_LIBS)
+ else
+ 	AC_MSG_ERROR(FLAC required!)
+--- flac123-0.0.9/flac123.h.orig	2007-02-26 05:47:42.000000000 +0100
++++ flac123-0.0.9/flac123.h	2007-02-26 05:54:49.000000000 +0100
 @@ -22,13 +22,24 @@
  #include <limits.h>
  #include <FLAC/all.h>
@@ -224,9 +288,8 @@
  
      /* bits, rate, channels, byte_format */
      ao_sample_format sam_fmt; /* input sample's true format */
-diff -ru flac123-0.0.9/remote.c flac123-0.0.9-b2/remote.c
---- flac123-0.0.9/remote.c	2005-02-24 21:50:41.000000000 -0800
-+++ flac123-0.0.9-b2/remote.c	2006-10-30 17:24:28.000000000 -0800
+--- flac123-0.0.9/remote.c.orig	2007-02-26 05:47:31.000000000 +0100
++++ flac123-0.0.9/remote.c	2007-02-26 05:54:49.000000000 +0100
 @@ -150,8 +150,13 @@
  		    file_info.current_sample += delta_frames;
  		}


Index: flac123.spec
===================================================================
RCS file: /cvs/extras/rpms/flac123/devel/flac123.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flac123.spec	26 Feb 2007 04:12:13 -0000	1.4
+++ flac123.spec	26 Feb 2007 04:56:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           flac123
 Version:        0.0.9 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Command-line program for playing FLAC audio files
 
 Group:          Applications/Multimedia
@@ -42,6 +42,8 @@
 %{_bindir}/*
 
 %changelog
+* Mon Feb 26 2007 Sindre Pedersen BjÃ¸rdal <foolish[AT]guezz.net> - 0.0.9-4
+- Add fixed patch to really make build work against flac 1.1.3
 * Mon Feb 26 2007 Sindre Pedersen BjÃ¸rdal <foolish[AT]guezz.net> - 0.0.9-3
 - Add patch to make build work against flac 1.1.3
 * Thu Feb 15 2007 Sindre Pedersen BjÃ¸rdal <foolish[AT]guezz.net> - 0.0.9-2


