[mediatomb] Re-apply transcoding fix.

Jon Ciesla limb at fedoraproject.org
Tue Apr 16 14:14:42 UTC 2013


commit 5c5274ec176d828e0df581f45a9539b3cb1aa20c
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Apr 16 09:10:28 2013 -0500

    Re-apply transcoding fix.

 mediatomb-0.12.1-transcode-segfault.patch |   11 -----------
 mediatomb.spec                            |    9 ++++++---
 2 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/mediatomb-0.12.1-transcode-segfault.patch b/mediatomb-0.12.1-transcode-segfault.patch
index f7591f7..fa5a760 100644
--- a/mediatomb-0.12.1-transcode-segfault.patch
+++ b/mediatomb-0.12.1-transcode-segfault.patch
@@ -10,14 +10,3 @@
          if (param != newParam)
              params->set(newParam, i);
      }
---- configure.ac~	2013-01-15 07:30:33.000000000 -0600
-+++ configure.ac	2013-01-15 07:38:22.875252055 -0600
-@@ -30,7 +30,7 @@
- 
- AC_PREREQ(2.61)
- AC_INIT([MediaTomb], [0.12.1], [jin at mediatomb.cc])
--AM_CONFIG_HEADER([autoconfig.h tombupnp/upnp/inc/upnpconfig.h])
-+AC_CONFIG_HEADERS([autoconfig.h tombupnp/upnp/inc/upnpconfig.h])
- AC_CONFIG_AUX_DIR(configure_aux)
- AC_CONFIG_SRCDIR([src/common.h])
- AM_INIT_AUTOMAKE([1.9 -Wall])
diff --git a/mediatomb.spec b/mediatomb.spec
index 992ff41..309f18e 100644
--- a/mediatomb.spec
+++ b/mediatomb.spec
@@ -13,7 +13,7 @@
 Version: 0.12.1
 Summary: UPnP AV MediaServer 
 Name: mediatomb
-Release: 25%{?dist}.20120403gitb66dc1
+Release: 26%{?dist}.20120403gitb66dc1
 Summary: MediaTomb - UPnP AV Mediaserver for Linux
 License: GPLv2
 Group: Applications/Multimedia
@@ -42,7 +42,7 @@ Patch8: mediatomb-0.12.1.fixyoutube.patch
 #Patch9: mediatomb-0.12.1.gcc47.patch
 # Add subtitles support: http://sourceforge.net/tracker/?func=detail&aid=3014026&group_id=129766&atid=715782
 Patch10: mediatomb-0.12.1-samsung_video_subtitles.patch
-#Patch11: mediatomb-0.12.1-transcode-segfault.patch
+Patch11: mediatomb-0.12.1-transcode-segfault.patch
 #Patch12: mediatomb-0.12.1-unbundle-libupnp.patch
 
 Provides: bundled(libupnp)
@@ -93,7 +93,7 @@ be found on http://www.upnp.org/.
 #%patch9 -p0
 %endif
 %patch10 -p0
-#%patch11 -p0
+%patch11 -p0
 #%patch12 -p1
 
 #rm -rf tombupnp
@@ -221,6 +221,9 @@ fi
 %endif
 
 %changelog
+* Tue Apr 16 2013 Jon Ciesla <limburgher at gmail.com> - 0.12.1-26.20120403gitb66dc1
+- Re-add transcoding segfault fix.
+
 * Wed Apr 03 2013 Jon Ciesla <limburgher at gmail.com> - 0.12.1-25.20120403gitb66dc1
 - Re-bundle libupnp, patch for multiple CVEs
 - Update to latest git master.


More information about the scm-commits mailing list