[mediatomb] Reenable FLAC.

Tue May 14 19:17:25 UTC 2013

commit 8d879bc81d1a0371656dfeaef0964ec2ca607669
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue May 14 14:13:13 2013 -0500

    Reenable FLAC.

 mediatomb-0.12.1.flacart.config.patch |   13 +++++++------
 mediatomb.spec                        |    9 ++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)
---

diff --git a/mediatomb-0.12.1.flacart.config.patch b/mediatomb-0.12.1.flacart.config.patch
index 1631ae1..2f52f03 100644
--- a/mediatomb-0.12.1.flacart.config.patch
+++ b/mediatomb-0.12.1.flacart.config.patch
@@ -1,6 +1,6 @@
 --- mediatomb-0.12.1.orig/configure.ac	2010-04-07 17:38:51.000000000 -0500
 +++ mediatomb-0.12.1/configure.ac	2011-09-19 00:53:57.346913297 -0500
-@@ -1314,6 +1314,35 @@
+@@ -1124,6 +1124,35 @@
  LIBS="$LIBS_SAVE"
  CXXFLAGS="$CXXFLAGS_SAVE"
  CPPFLAGS="$CPPFLAGS_SAVE"
@@ -35,21 +35,22 @@
 +
  ######## curl
  
- CURL_PROG_FOUND=0
-@@ -1914,7 +1943,7 @@
+ if ((test "x$YOUTUBE_OPTION_ENABLED" = xyes) && (test "x$YOUTUBE_OPTION_REQUESTED" = xyes) && (test "x$CURL_OPTION_ENABLED" = "xno") && (test "x$CURL_OPTION_REQUESTED" = "xyes")); then
+@@ -1645,7 +1645,7 @@
      AC_DEFINE([SOPCAST], [1], [Enable support for the SopCast service])
  fi
  
--AC_DEFINE_UNQUOTED([COMPILE_INFO], "\thost:\t\t\t$host\n\tsqlite3:\t\t$SQLITE3_STATUS\n\tmysql:\t\t\t$MYSQL_STATUS\n\tlibjs:\t\t\t$JS_OK\n\tlibmagic:\t\t$LIBMAGIC_STATUS\n\tinotify:\t\t$INOTIFY_STATUS\n\tlibexif:\t\t$LIBEXIF_STATUS\n\tid3lib:\t\t\t$ID3LIB_STATUS\n\ttaglib:\t\t\t$TAGLIB_STATUS\n\tffmpeg\t\t\t$FFMPEG_STATUS\n\tlibmp4v2:\t\t$LIBMP4V2_STATUS\n\texternal transcoding:\t$EXTERNAL_TRANSCODING_OPTION_ENABLED\n\tcurl:\t\t\t$CURL_OK\n\tYouTube:\t\t$YOUTUBE_OPTION_ENABLED\n\tlibextractor\t\t$LIBEXTRACTOR_STATUS\n\tdb-autocreate:\t\t$DB_AUTOCREATE_OPTION_ENABLED\n\tdebug log:\t\t$DEBUG_LOG_OPTION_ENABLED\n\tprotocol info extension:$PROTOCOLINFO_EXTENSION_OPTION_ENABLED\n\tffmpegthumbnailer:\t$FFMPEGTHUMBNAILER_STATUS\n\tlastfmlib:\t\t$LASTFMLIB_STATUS\n\tdata directory:\t\t$PACKAGE_DATADIR", [compile option summary])
+-AC_DEFINE_UNQUOTED([COMPILE_INFO], "\thost:\t\t\t$host\n\tsqlite3:\t\t$SQLITE3_STATUS\n\tmysql:\t\t\t$MYSQL_STATUS\n\tlibjs:\t\t\t$JS_STATUS\n\tlibmagic:\t\t$LIBMAGIC_STATUS\n\tinotify:\t\t$INOTIFY_STATUS\n\tlibexif:\t\t$LIBEXIF_STATUS\n\tid3lib:\t\t\t$ID3LIB_STATUS\n\ttaglib:\t\t\t$TAGLIB_STATUS\n\tffmpeg\t\t\t$FFMPEG_STATUS\n\tlibmp4v2:\t\t$LIBMP4V2_STATUS\n\texternal transcoding:\t$EXTERNAL_TRANSCODING_OPTION_ENABLED\n\tcurl:\t\t\t$CURL_OK\n\tYouTube:\t\t$YOUTUBE_OPTION_ENABLED\n\tdb-autocreate:\t\t$DB_AUTOCREATE_OPTION_ENABLED\n\tdebug log:\t\t$DEBUG_LOG_OPTION_ENABLED\n\tprotocol info extension:$PROTOCOLINFO_EXTENSION_OPTION_ENABLED\n\tffmpegthumbnailer:\t$FFMPEGTHUMBNAILER_STATUS\n\tlastfmlib:\t\t$LASTFMLIB_STATUS\n\tdata directory:\t\t$PACKAGE_DATADIR", [compile option summary])
 +AC_DEFINE_UNQUOTED([COMPILE_INFO], "\thost:\t\t\t$host\n\tsqlite3:\t\t$SQLITE3_STATUS\n\tmysql:\t\t\t$MYSQL_STATUS\n\tlibjs:\t\t\t$JS_OK\n\tlibmagic:\t\t$LIBMAGIC_STATUS\n\tinotify:\t\t$INOTIFY_STATUS\n\tlibexif:\t\t$LIBEXIF_STATUS\n\tid3lib:\t\t\t$ID3LIB_STATUS\n\ttaglib:\t\t\t$TAGLIB_STATUS\n\tFLAC:\t\t\t$FLAC_STATUS\n\tffmpeg\t\t\t$FFMPEG_STATUS\n\tlibmp4v2:\t\t$LIBMP4V2_STATUS\n\texternal transcoding:\t$EXTERNAL_TRANSCODING_OPTION_ENABLED\n\tcurl:\t\t\t$CURL_OK\n\tYouTube:\t\t$YOUTUBE_OPTION_ENABLED\n\tlibextractor\t\t$LIBEXTRACTOR_STATUS\n\tdb-autocreate:\t\t$DB_AUTOCREATE_OPTION_ENABLED\n\tdebug log:\t\t$DEBUG_LOG_OPTION_ENABLED\n\tprotocol info extension:$PROTOCOLINFO_EXTENSION_OPTION_ENABLED\n\tffmpegthumbnailer:\t$FFMPEGTHUMBNAILER_STATUS\n\tlastfmlib:\t\t$LASTFMLIB_STATUS\n\tdata directory:\t\t$PACKAGE_DATADIR", [compile option summary])
  
  ###############
  AC_CONFIG_FILES([
-@@ -1946,6 +1975,7 @@
- echo "libexif               : $LIBEXIF_STATUS"
+@@ -1678,6 +1678,7 @@
+ echo "expat                 : $EXPAT_STATUS"
  echo "id3lib                : $ID3LIB_STATUS"
  echo "taglib                : $TAGLIB_STATUS"
 +echo "FLAC                  : $FLAC_STATUS"
  echo "libmp4v2              : $LIBMP4V2_STATUS"
  echo "ffmpeg                : $FFMPEG_STATUS"
  echo "ffmpegthumbnailer     : $FFMPEGTHUMBNAILER_STATUS"
+
diff --git a/mediatomb.spec b/mediatomb.spec
index c41dc16..7b76a82 100644
--- a/mediatomb.spec
+++ b/mediatomb.spec
@@ -13,7 +13,7 @@
 Version: 0.12.1
 Summary: UPnP AV MediaServer 
 Name: mediatomb
-Release: 27%{?dist}.20120403gitb66dc1
+Release: 28%{?dist}.20120403gitb66dc1
 Summary: MediaTomb - UPnP AV Mediaserver for Linux
 License: GPLv2
 Group: Applications/Multimedia
@@ -35,7 +35,7 @@ Patch1: mediatomb-0.12.1.fixbufferoverrun.patch
 Patch5: mediatomb-0.12.1.ps3_timeseekrange.patch
 # Enable album art for FLAC based on libflac.  http://sourceforge.net/tracker/?func=detail&aid=2960326&group_id=129766&atid=715782
 Patch6: mediatomb-0.12.1.flacart.patch
-#Patch7: mediatomb-0.12.1.flacart.config.patch
+Patch7: mediatomb-0.12.1.flacart.config.patch
 # Fix youtube support.  RHBZ#747023, upstream bug http://sourceforge.net/tracker/?func=detail&aid=3382320&group_id=129766&atid=715780
 Patch8: mediatomb-0.12.1.fixyoutube.patch
 # Fix for gcc 4.7 build errors
@@ -86,7 +86,7 @@ be found on http://www.upnp.org/.
 %endif
 %patch5 -p0
 %patch6 -p0
-#%patch7 -p1
+%patch7 -p1
 %patch8 -p3
 %if ! %{rhel6}
 #%patch9 -p0
@@ -221,6 +221,9 @@ fi
 
 %changelog
 * Tue May 14 2013 Jon Ciesla <limburgher at gmail.com> - 0.12.1-27.20120403gitb66dc1
+- Re-enable FLAC support.  BZ 962916.
+
+* Tue May 14 2013 Jon Ciesla <limburgher at gmail.com> - 0.12.1-27.20120403gitb66dc1
 - Drop explicit deps on mysql-libs and expat.
 - Fix perms on unit file.
 
