rpms/libfishsound/EL-5 libfishsound-0.9.0-FLAC.patch, NONE, 1.1 libfishsound.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sat Jan 19 21:49:05 UTC 2008

Author: salimma

Update of /cvs/pkgs/rpms/libfishsound/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26232/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	libfishsound-0.9.0-FLAC.patch libfishsound.spec 
Log Message:
libfishsound-0.9.0


libfishsound-0.9.0-FLAC.patch:

--- NEW FILE libfishsound-0.9.0-FLAC.patch ---
--- libfishsound-0.9.0.orig/configure	2008-01-12 05:16:42.000000000 -0500
+++ libfishsound-0.9.0/configure	2008-01-19 12:13:38.000000000 -0500
@@ -1521,9 +1521,9 @@
   --enable-experimental   enable building of experimental code
   --disable-decode        disable building of decoding support
   --disable-encode        disable building of encoding support
-  --disable-vorbis        enable building of Vorbis codec support
-  --disable-speex         enable building of Speex codec support
-  --disable-flac        enable building of Flac codec support
+  --disable-vorbis        disable building of Vorbis codec support
+  --disable-speex         disable building of Speex codec support
+  --disable-flac        disable building of Flac codec support
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -20925,9 +20925,9 @@
 
 
 if test "x${ac_enable_flac}" = xyes ; then
-   { echo "$as_me:$LINENO: checking for FLAC__stream_decoder_init in -lFLAC" >&5
-echo $ECHO_N "checking for FLAC__stream_decoder_init in -lFLAC... $ECHO_C" >&6; }
-if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_init+set}" = set; then
+   { echo "$as_me:$LINENO: checking for FLAC__stream_decoder_init_stream in -lFLAC" >&5
+echo $ECHO_N "checking for FLAC__stream_decoder_init_stream in -lFLAC... $ECHO_C" >&6; }
+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -20945,11 +20945,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char FLAC__stream_decoder_init ();
+char FLAC__stream_decoder_init_stream ();
 int
 main ()
 {
-return FLAC__stream_decoder_init ();
+return FLAC__stream_decoder_init_stream ();
   ;
   return 0;
 }
@@ -20972,21 +20972,21 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_FLAC_FLAC__stream_decoder_init=yes
+  ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_FLAC_FLAC__stream_decoder_init=no
+	ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_init" >&5
-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_init" >&6; }
-if test $ac_cv_lib_FLAC_FLAC__stream_decoder_init = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream" >&5
+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream" >&6; }
+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream = yes; then
   HAVE_FLAC="maybe"
 fi
 
--- libfishsound-0.9.0.orig/src/libfishsound/flac.c	2008-01-12 02:08:39.000000000 -0500
+++ libfishsound-0.9.0/src/libfishsound/flac.c	2008-01-19 12:31:50.000000000 -0500
@@ -252,13 +252,18 @@
     return NULL;
   }
 
-  FLAC__stream_decoder_set_read_callback(fi->fsd, fs_flac_read_callback);
-  FLAC__stream_decoder_set_write_callback(fi->fsd, fs_flac_write_callback);
-  FLAC__stream_decoder_set_metadata_callback(fi->fsd, fs_flac_meta_callback);
-  FLAC__stream_decoder_set_error_callback(fi->fsd, fs_flac_error_callback);
-  FLAC__stream_decoder_set_client_data(fi->fsd, fsound);
-
-  if (FLAC__stream_decoder_init(fi->fsd) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
+  if (FLAC__stream_decoder_init_stream
+      (fi->fsd,
+       fs_flac_read_callback,
+       NULL, // seek callback
+       NULL, // tell callback
+       NULL, // length callback
+       NULL, // EOF callback
+       fs_flac_write_callback,
+       fs_flac_meta_callback,
+       fs_flac_error_callback,
+       fsound
+       ) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
     return NULL;
 
   return fi->fsd;
@@ -539,16 +544,19 @@
   FLAC__stream_encoder_set_channels(fi->fse, fsound->info.channels);
   FLAC__stream_encoder_set_sample_rate(fi->fse, fsound->info.samplerate);
   FLAC__stream_encoder_set_bits_per_sample(fi->fse, BITS_PER_SAMPLE);
-  FLAC__stream_encoder_set_write_callback(fi->fse, fs_flac_enc_write_callback);
-  FLAC__stream_encoder_set_metadata_callback(fi->fse, fs_flac_enc_meta_callback);
-  FLAC__stream_encoder_set_client_data(fi->fse, fsound);
 
+  // if it's NULL, then init_stream is passed NULL which is fine
   metadata = fs_flac_encode_vorbiscomments (fsound);
-  if (metadata != NULL)
-    FLAC__stream_encoder_set_metadata (fi->fse, &metadata, 1);
 
   /* FLAC__stream_encoder_set_total_samples_estimate(fi->fse, ...);*/
-  if (FLAC__stream_encoder_init(fi->fse) != FLAC__STREAM_ENCODER_OK)
+  if (FLAC__stream_encoder_init_stream
+      (fi->fse,
+       fs_flac_enc_write_callback,
+       NULL, // seek callback
+       NULL, // tell callback
+       fs_flac_enc_meta_callback,
+       fsound
+       ) != FLAC__STREAM_ENCODER_OK)
     return NULL;
 
   return fsound;


--- NEW FILE libfishsound.spec ---
Name:           libfishsound
Version:        0.9.0
Release:        3%{?dist}
Summary:        Simple programming interface for Xiph.Org codecs

Group:          System Environment/Libraries
License:        BSD
URL:            http://www.annodex.net/
Source0:        http://www.annodex.net/software/libfishsound/download/libfishsound-%{version}.tar.gz
Patch0:         libfishsound-0.9.0-FLAC.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# also pulled in by speex-devel
BuildRequires:  pkgconfig
BuildRequires:  flac-devel
BuildRequires:  speex-devel libvorbis-devel liboggz-devel libsndfile-devel
BuildRequires:  doxygen

%description
libfishsound provides a simple programming interface for decoding and
encoding audio data using Xiph.Org codecs (FLAC, Speex and Vorbis).

libfishsound by itself is designed to handle raw codec streams from a
lower level layer such as UDP datagrams. When these codecs are used in
files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex
and Ogg Vorbis files.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%package        doc
Summary:        Documentation for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description    doc
The %{name}-doc package contains the documentation for %{name}.

%package        tools
Summary:        Sample programs bundled with %{name}
Group:          Applications/Multimedia
Requires:       %{name} = %{version}-%{release}

%description    tools
The %{name}-tools package contains sample programs that use %{name}.
The source code for these are included in %{name}-doc.


%prep
%setup -q
%patch0 -p1 -b .flac


%build
%configure --disable-static # --docdir=%{_datadir}/doc/%{name}-docs-%{version}
# Don't use rpath!
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
# overriding docdir does not work
mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} \
   other-docs
# move the examples we want
mkdir -p $RPM_BUILD_ROOT%{_bindir}
(cd src/examples/ && \
  mv .libs/* $RPM_BUILD_ROOT%{_bindir} &&
  make clean && rm -rf .deps .libs Makefile.*)
mv src/examples .


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/fishsound.pc

%files doc
%defattr(-,root,root,-)
%doc examples other-docs/*

%files tools
%defattr(-,root,root,-)
%{_bindir}/*


%changelog
* Sat Jan 19 2008 Michel Salim <michel.sylvan at gmail.com> - 0.9.0-3
- Port FLAC support to new (>= 1.1.3) API

* Fri Jan 18 2008 Michel Salim <michel.sylvan at gmail.com> - 0.9.0-2
- Add dependency on liboggz
- Rename -docs subpackage to -doc
- Note in description that FLAC support is currently disabled

* Wed Jan 16 2008 Michel Salim <michel.sylvan at gmail.com> - 0.9.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libfishsound/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2008 20:57:36 -0000	1.1
+++ .cvsignore	19 Jan 2008 21:48:28 -0000	1.2
@@ -0,0 +1 @@
+libfishsound-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libfishsound/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2008 20:57:36 -0000	1.1
+++ sources	19 Jan 2008 21:48:28 -0000	1.2
@@ -0,0 +1 @@
+8fab7ecd777a87bf337047a63f9d75f5  libfishsound-0.9.0.tar.gz


