openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File sox-12.18.1.dif of Package sox (Revision 893562566e5f99532764578c35af1536)

Currently displaying revision 893562566e5f99532764578c35af1536 , Show latest

--- Makefile.in
+++ Makefile.in
@@ -14,6 +14,8 @@
 mandir = @mandir@
 includedir = @includedir@
 
+DESTDIR =
+
 # Shell commands.
 
 INSTALL	= @INSTALL@
@@ -32,22 +34,22 @@
 
 install: $(PLAY_INSTALL_$(PLAY_SUPPORT))
 	cd src && $(MAKE) $@
-	$(srcdir)/mkinstalldirs $(mandir)/man1
-	$(INSTALL) -c -m 644 $(srcdir)/sox.1 $(mandir)/man1
-	if [ -f $(mandir)/man1/soxmix.1 ] ; then $(RM) $(mandir)/man1/soxmix.1; fi
-	cd $(mandir)/man1 && $(LN_S) sox.1 soxmix.1
-	$(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(mandir)/man1
+	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
+	$(INSTALL) -c -m 644 $(srcdir)/sox.1 $(DESTDIR)$(mandir)/man1
+	if [ -f $(DESTDIR)$(mandir)/man1/soxmix.1 ] ; then $(RM) $(DESTDIR)$(mandir)/man1/soxmix.1; fi
+	cd $(DESTDIR)$(mandir)/man1 && $(LN_S) sox.1 soxmix.1
+	$(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(DESTDIR)$(mandir)/man1
 
 install-play:
-	if [ -f $(mandir)/man1/rec.1 ]; then $(RM) $(mandir)/man1/rec.1; fi
-	$(srcdir)/mkinstalldirs $(mandir)/man1
-	$(INSTALL) -c -m 644 $(srcdir)/play.1 $(mandir)/man1
-	cd $(mandir)/man1 && $(LN_S) play.1 rec.1
+	if [ -f $(DESTDIR)$(mandir)/man1/rec.1 ]; then $(RM) $(DESTDIR)$(mandir)/man1/rec.1; fi
+	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
+	$(INSTALL) -c -m 644 $(srcdir)/play.1 $(DESTDIR)$(mandir)/man1
+	cd $(DESTDIR)$(mandir)/man1 && $(LN_S) play.1 rec.1
 
 install-lib:
 	cd src && $(MAKE) $@
-	$(srcdir)/mkinstalldirs $(mandir)/man3
-	$(INSTALL) -c -m 644 $(srcdir)/libst.3 $(mandir)/man3
+	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man3
+	$(INSTALL) -c -m 644 $(srcdir)/libst.3 $(DESTDIR)$(mandir)/man3
 
 
 PLAY_UNINSTALL_0    =
@@ -55,16 +57,16 @@
 
 uninstall: $(PLAY_UNINSTALL_$(PLAY_SUPPORT))
 	cd src && $(MAKE) $@
-	$(RM) $(mandir)/man1/sox.1
-	$(RM) $(mandir)/man1/soxmix.1
-	$(RM) $(mandir)/man1/soxexam.1
+	$(RM) $(DESTDIR)$(mandir)/man1/sox.1
+	$(RM) $(DESTDIR)$(mandir)/man1/soxmix.1
+	$(RM) $(DESTDIR)$(mandir)/man1/soxexam.1
 
 uninstall-play:
-	$(RM) $(mandir)/man1/play.1 $(mandir)/man1/rec.1
+	$(RM) $(DESTDIR)$(mandir)/man1/play.1 $(DESTDIR)$(mandir)/man1/rec.1
 
 uninstall-lib:
 	cd src && $(MAKE) $@
-	$(RM) $(mandir)/man3/libst.3
+	$(RM) $(DESTDIR)$(mandir)/man3/libst.3
 
 clean:
 	cd src && $(MAKE) $@
--- src/Makefile.in
+++ src/Makefile.in
@@ -15,6 +15,7 @@
 mandir = @mandir@
 includedir = @includedir@
 
+DESTDIR =
 # Shell commands.
 
 CC	= @CC@
@@ -103,40 +104,40 @@
 PLAY_INSTALL_1    = install-play
 
 install: sox soxmix $(PLAY_INSTALL_$(PLAY_SUPPORT))
-	$(top_srcdir)/mkinstalldirs $(bindir)
-	$(INSTALL) -c -m 755 sox $(bindir)
-	$(INSTALL) -c -m 755 soxmix $(bindir)
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+	$(INSTALL) -c -m 755 sox $(DESTDIR)$(bindir)
+	$(INSTALL) -c -m 755 soxmix $(DESTDIR)$(bindir)
 
 install-play:
-	if [ -f $(bindir)/rec ] ; then $(RM) $(bindir)/rec; fi
-	$(top_srcdir)/mkinstalldirs $(bindir)
-	$(INSTALL) -c -m 755 play $(bindir)
-	cd $(bindir) && $(LN_S) play rec
+	if [ -f $(DESTDIR)$(bindir)/rec ] ; then $(RM) $(DESTDIR)$(bindir)/rec; fi
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+	$(INSTALL) -c -m 755 play $(DESTDIR)$(bindir)
+	cd $(DESTDIR)$(bindir) && $(LN_S) play rec
 
 install-lib: libst.a
-	$(top_srcdir)/mkinstalldirs $(libdir)
-	$(top_srcdir)/mkinstalldirs $(includedir)
-	$(INSTALL) -c -m 755 libst-config $(bindir)
-	$(INSTALL) -c -m 644 libst.a $(libdir)
-	$(RANLIB) $(libdir)/libst.a
-	$(INSTALL) -c -m 644 $(srcdir)/st.h $(includedir)
-	$(INSTALL) -c -m 644 ststdint.h $(includedir)
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
+	$(INSTALL) -c -m 755 libst-config $(DESTDIR)$(bindir)
+	$(INSTALL) -c -m 644 libst.a $(DESTDIR)$(libdir)
+	$(RANLIB) $(DESTDIR)$(libdir)/libst.a
+	$(INSTALL) -c -m 644 $(srcdir)/st.h $(DESTDIR)$(includedir)
+	$(INSTALL) -c -m 644 ststdint.h $(DESTDIR)$(includedir)
 
 PLAY_UNINSTALL_0    =
 PLAY_UNINSTALL_1    = uninstall-play
 
 uninstall: $(PLAY_UNINSTALL_$(PLAY_SUPPORT))
-	$(RM) $(bindir)/sox
-	$(RM) $(bindir)/soxmix
+	$(RM) $(DESTDIR)$(bindir)/sox
+	$(RM) $(DESTDIR)$(bindir)/soxmix
 
 uninstall-play:
-	$(RM) $(bindir)/play
-	$(RM) $(bindir)/rec
+	$(RM) $(DESTDIR)$(bindir)/play
+	$(RM) $(DESTDIR)$(bindir)/rec
 
 uninstall-lib:
-	$(RM) $(libdir)/libst.a
-	$(RM) $(includedir)/st.h
-	$(RM) $(includedir)/ststdint.h
+	$(RM) $(DESTDIR)$(libdir)/libst.a
+	$(RM) $(DESTDIR)$(includedir)/st.h
+	$(RM) $(DESTDIR)$(includedir)/ststdint.h
 
 clean:
 	$(RM) *.o libst.a
--- src/vorbis.c
+++ src/vorbis.c
@@ -363,7 +363,12 @@
         }
 
         /* Set encoding to average bit rate of 112kbps VBR */
-        vorbis_encode_init_vbr(&ve->vi, ft->info.channels, ft->info.rate, 0.3f);
+        if (vorbis_encode_init_vbr(&ve->vi, ft->info.channels, ft->info.rate, 0.3f))
+	{
+    	    st_fail_errno(ft,ST_ERATE,
+    	      "libVorbis does not support this mode (eg, too low a bitrate, etc)");
+    	    return (ST_EOF);
+	}
 
         vorbis_analysis_init(&ve->vd, &ve->vi);
         vorbis_block_init(&ve->vd, &ve->vb);

Places

File sox-12.18.1.dif of Package sox (Revision 893562566e5f99532764578c35af1536)

Places