SOURCES: flac-without_xmms.patch - updated to 1.1.3

[grzegol]

Author: grzegol                      Date: Sun Dec  3 21:34:43 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 1.1.3

---- Files affected:
SOURCES:
   flac-without_xmms.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/flac-without_xmms.patch
diff -u SOURCES/flac-without_xmms.patch:1.2 SOURCES/flac-without_xmms.patch:1.3
--- SOURCES/flac-without_xmms.patch:1.2	Thu Jan 30 08:46:56 2003
+++ SOURCES/flac-without_xmms.patch	Sun Dec  3 22:34:37 2006
@@ -1,35 +1,36 @@
-diff -Nru flac-1.1.0.orig/configure.in flac-1.1.0/configure.in
---- flac-1.1.0.orig/configure.in	Wed Jan 15 21:56:07 2003
-+++ flac-1.1.0/configure.in	Wed Jan 29 18:52:47 2003
-@@ -248,9 +248,6 @@
- AC_DEFINE(FLAC__HAS_OGG)
- fi
+diff -urN aaa/flac-1.1.3/configure.in flac-1.1.3/configure.in
+--- aaa/flac-1.1.3/configure.in	2006-11-20 22:29:34.000000000 +0100
++++ flac-1.1.3/configure.in	2006-12-03 21:58:01.413969320 +0100
+@@ -212,10 +212,6 @@
+ 	no)  enable_xmms_plugin=false ;;
+ 	*) AC_MSG_ERROR(bad value ${enableval} for --enable-xmms-plugin) ;;
+ esac],[enable_xmms_plugin=true])
+-if test "x$enable_xmms_plugin" != xfalse ; then
+-	AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - XMMS support will not be built]))
+-fi
+-AM_CONDITIONAL(FLaC__HAS_XMMS, test -n "$XMMS_INPUT_PLUGIN_DIR")
  
--AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - xmms support will not be built]))
--AM_CONDITIONAL(FLaC__HAS_XMMS, test x$XMMS_INPUT_PLUGIN_DIR != x)
--
- dnl check for i18n(internationalization); these are from libiconv/gettext
- AM_ICONV
- AM_LANGINFO_CODESET
-diff -Nru flac-1.1.0.orig/src/Makefile.am flac-1.1.0/src/Makefile.am
---- flac-1.1.0.orig/src/Makefile.am	Sat Jan 25 19:14:45 2003
-+++ flac-1.1.0/src/Makefile.am	Wed Jan 29 18:53:35 2003
+ dnl check for ogg library
+ XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built]))
+diff -urN aaa/flac-1.1.3/src/Makefile.am flac-1.1.3/src/Makefile.am
+--- aaa/flac-1.1.3/src/Makefile.am	2006-10-14 05:35:42.000000000 +0200
++++ flac-1.1.3/src/Makefile.am	2006-12-03 21:59:27.660857800 +0100
 @@ -15,10 +15,6 @@
- #  along with this program; if not, write to the Free Software
- #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #  restrictive of those mentioned above.  See the file COPYING.Xiph in this
+ #  distribution.
  
 -if FLaC__HAS_XMMS
--XMMS_DIRS = plugin_xmms
+-XMMS_DIRS = plugin_common plugin_xmms
 -endif
 -
- if FLaC__HAS_OGG
- OGGFLAC_DIRS = libOggFLAC libOggFLAC++
- OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++
-@@ -33,7 +29,6 @@
+ SUBDIRS = \
+ 	libFLAC \
+ 	libFLAC++ \
+@@ -26,7 +22,6 @@
+ 	flac \
  	metaflac \
  	monkeys_audio_utilities \
- 	plugin_common \
 -	$(XMMS_DIRS) \
  	plugin_winamp2 \
- 	plugin_winamp3 \
  	test_grabbag \
+ 	test_libs_common \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/flac-without_xmms.patch?r1=1.2&r2=1.3&f=u