rpms/libtunepimp/devel tunepimp-0.5.2-configure-disable-plugins.patch, NONE, 1.1 libtunepimp.spec, 1.24, 1.25 libtunepimp-0.5.1-PLUGIN_DIR.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	libtunepimp.spec 
Added Files:
	tunepimp-0.5.2-configure-disable-plugins.patch 
Removed Files:
	libtunepimp-0.5.1-PLUGIN_DIR.patch 
Log Message:
sync patches, touchup python bits


tunepimp-0.5.2-configure-disable-plugins.patch:

--- NEW FILE tunepimp-0.5.2-configure-disable-plugins.patch ---
--- libtunepimp-0.5.2/configure.in	2006-09-29 19:51:56.000000000 -0300
+++ libtunepimp-0.5.2/configure.in	2006-12-02 19:20:09.000000000 -0300
@@ -57,6 +57,12 @@
               [use_lgpl=yes], 
               [use_lgpl=no])
 
+AC_ARG_ENABLE([flac], AS_HELP_STRING([--disable-flac], [Build without flac support (default: test)]))
+AC_ARG_ENABLE([mp4], AS_HELP_STRING([--disable-mp4], [Build without mp4 support (default: test)]))
+AC_ARG_ENABLE([taglib], AS_HELP_STRING([--disable-taglib], [Build without taglib support (default: test)]))
+AC_ARG_ENABLE([ogg], AS_HELP_STRING([--disable-ogg], [Build without ogg support (default: test)]))
+AC_ARG_ENABLE([mp3], AS_HELP_STRING([--disable-mp3], [Build without mp3 support (default: test)]))
+
 AC_CHECK_LIB(z, compress,
              [LIB="$LIB -lz"],
              [echo "*"
@@ -203,50 +209,67 @@
 dnl Check for libmpcdec
 AC_CHECK_LIB(mpcdec, mpc_decoder_decode, have_mpcdec=yes,)
 
-dnl Check if we can build TagLib-based plugins
-if test "x$have_taglib" = "xyes"; then
-    TP_PLUGINS="$TP_PLUGINS wma mpc wv speex tta"
-    with_wma=yes
-    with_wv=yes
-    with_speex=yes
-    with_tta=yes
-    if test "x$have_mpcdec" = "xyes"; then
-	AC_C_BIGENDIAN
-	with_mpc="yes"
-    else
-        with_mpc="yes (without decoder)"
-    fi
+if test "x$enable_taglib" != "xno" ; then
+	dnl Check if we can build TagLib-based plugins
+	if test "x$have_taglib" = "xyes"; then
+		TP_PLUGINS="$TP_PLUGINS wma mpc wv speex tta"
+		with_wma=yes
+		with_wv=yes
+		with_speex=yes
+		with_tta=yes
+		if test "x$have_mpcdec" = "xyes"; then
+			AC_C_BIGENDIAN
+			with_mpc="yes"
+		else
+			with_mpc="yes (without decoder)"
+		fi
+	else
+		with_wma=no
+		with_mpc=no
+		with_wv=no
+		with_speex=no
+		with_tta=no
+	fi
 else
-    with_wma=no
-    with_mpc=no
-    with_wv=no
-    with_speex=no
-    with_tta=no
+	with_wma=no
+	with_mpc=no
+	with_wv=no
+	with_speex=no
+	with_tta=no
 fi
+
 AM_CONDITIONAL(HAVE_MPCDEC, test "x$with_mpc" = "xyes")
 
-dnl Check for mp4v2
-AC_CHECK_LIB(mp4v2, MP4Read, [
-    TP_PLUGINS="$TP_PLUGINS mp4"
-    AC_DEFINE(HAVE_MP4,1,[MP4 Support])
-    with_mp4=yes
-], [
-    with_mp4=no
-])
-
-if test "x$use_lgpl" = "xno"; then
-    dnl Check for MAD decoder lib for mp3 support
-    AC_CHECK_LIB(mad,mad_version,
-                 AC_DEFINE(HAVE_LIBMAD,1,[MP3 Decode Support])
-                 TP_PLUGINS="$TP_PLUGINS mp3"
-		 with_mp3=yes,
-                 echo "*"
-                 echo "*  The MAD mp3 decoder is not installed. Please download "
-                 echo "*  the decoder from http://www.mars.org/home/rob/proj/mpeg"
-                 echo "*  to include MP3 TRM generation capabilities."
-                 echo "*"
-		 with_mp3=no
-                 ,-lm)
+if test "x$enable_mp4" != "xno" ; then
+	dnl Check for mp4v2
+	AC_CHECK_LIB(mp4v2, MP4Read, [
+		TP_PLUGINS="$TP_PLUGINS mp4"
+		AC_DEFINE(HAVE_MP4,1,[MP4 Support])
+		with_mp4=yes
+		], [
+		with_mp4=no
+		])
+else
+	with_mp4=no
+fi
+
+if test "x$use_lgpl" = "xno" ; then
+	if test "x$enable-mp3" != "xno" ; then
+		dnl Check for MAD decoder lib for mp3 support
+		AC_CHECK_LIB(mad,mad_version,
+			AC_DEFINE(HAVE_LIBMAD,1,[MP3 Decode Support])
+			TP_PLUGINS="$TP_PLUGINS mp3"
+			with_mp3=yes,
+			echo "*"
+			echo "*  The MAD mp3 decoder is not installed. Please download "
+			echo "*  the decoder from http://www.mars.org/home/rob/proj/mpeg"
+			echo "*  to include MP3 TRM generation capabilities."
+			echo "*"
+			with_mp3=no
+			,-lm)
+	else
+		with_mp3=no
+	fi
 else
     with_mp3=no
 fi
@@ -255,25 +278,33 @@
 AC_CHECK_LIB(ogg, ogg_sync_init, have_ogg="yes",)
 AC_CHECK_LIB(vorbisfile, ov_info, have_vorbis="yes",, -lvorbis -logg)
 
-if test "x$have_ogg" = "xyes"; then
-  if test "x$have_vorbis" = "xyes"; then
-     TP_PLUGINS="$TP_PLUGINS vorbis"
-     AC_DEFINE(HAVE_OGGVORBIS,1,[Ogg/Vorbis Support])
-     with_vorbis=yes
-  else
-     with_vorbis=no
-  fi
+if test "x$enable_ogg" != "xno" ; then
+	if test "x$have_ogg" = "xyes"; then
+		if test "x$have_vorbis" = "xyes"; then
+			TP_PLUGINS="$TP_PLUGINS vorbis"
+			AC_DEFINE(HAVE_OGGVORBIS,1,[Ogg/Vorbis Support])
+			with_vorbis=yes
+		else
+			with_vorbis=no
+		fi
+	fi
+else
+	with_vorbis=no
 fi
 
 dnl Check for libFLAC
-AC_CHECK_LIB(FLAC, FLAC__metadata_object_new, have_flac="yes",, -lFLAC -lm)
+if test "x$enable_flac" != "xno"; then
+	AC_CHECK_LIB(FLAC, FLAC__metadata_object_new, have_flac="yes",, -lFLAC -lm)
 
-if test "x$have_flac" = "xyes"; then
-   TP_PLUGINS="$TP_PLUGINS flac"
-   AC_DEFINE(HAVE_FLAC,1,[FLAC Support])
-   with_flac=yes
+	if test "x$have_flac" = "xyes"; then
+	   TP_PLUGINS="$TP_PLUGINS flac"
+	   AC_DEFINE(HAVE_FLAC,1,[FLAC Support])
+	   with_flac=yes
+	else
+	   with_flac=no
+	fi
 else
-   with_flac=no
+	with_flac=no
 fi
 
 


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libtunepimp.spec	29 Nov 2006 13:06:05 -0000	1.24
+++ libtunepimp.spec	7 Dec 2006 16:26:36 -0000	1.25
@@ -57,10 +57,10 @@
 Summary: Python bindings for developing programs that will use %{name} 
 Group:   Development/Libraries
 License: GPL
-#define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
-#if "%{?python_ver}" > "2"
-#Requires: python-abi = %{python_ver}
-#endif
+%define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
+%if "%{?python_ver}" > "2"
+Requires: python-abi = %{python_ver}
+%endif
 %description -n python-tunepimp
 %{summary}.
 


--- libtunepimp-0.5.1-PLUGIN_DIR.patch DELETED ---