Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 8

mediatomb.changes Changed

mediatomb.spec Changed

@@ -1,59 +1,86 @@
-# vim: set sw=4 ts=4 et:
-# Copyright (c) 2007-2010 oc2pus
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments to toni@links2linux.de
-
-# norootforbuild
+# spec file for package mediatomb
+#
+# Copyright (c) 2007-2010 oc2pus toni@links2linux.de.
+# Copyright (c) 2012 Marguerite i@marguerite.su.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.links2linux.org/
+#
 
+%if 0%{?suse_version} >= 1210
 %define _with_js	1
+%else
+%define _with_js        0
+%endif
 
-Name:			mediatomb
-Summary:		UPnP AV MediaServer
-Version:		0.12.1
-Release:		0.pm.1
-License:		GPL
-URL:			http://mediatomb.cc
-Group:			Productivity/Multimedia/Other
-Source0:		%{name}-%{version}.tar.gz
-Source1:		rcmediatomb
-Source2:		config.xml.tmp
-Patch0:		libav_0.7_support.patch
+Name:           mediatomb
+Version:        0.12.1.svn2103
+Release:        0.pm.1
+License:        GPL-2.0
+Summary:        UPnP AV MediaServer
+Url:            http://mediatomb.cc
+Group:          Productivity/Multimedia/Other
+Source0:        %{name}-%{version}.tar.bz2
+Source1:        rcmediatomb
+Source2:        config.xml.tmp
+Patch0:         libav_0.7_support.patch
+# PATCH-FIX-UPSTREAM - fix gcc 4.6 builds.
 Patch1:         mediatomb-0.12.1-gcc46.patch
-Source90:		%{name}-rpmlintrc
-BuildRoot:		%{_tmppath}/%{name}-%{version}-buildroot 
-BuildRequires:	udev
-BuildRequires:	file-devel
-BuildRequires:	gcc-c++
-BuildRequires:	curl-devel
-BuildRequires:	id3lib-devel
-BuildRequires:	libexif-devel
+# PATCH-FIX-UPSTREAM - fix automake 1.12 configure
+Patch2:		mediatomb-svn_automake_1.12.patch
+# PATCH-FIX-UPSTREAM - fix mozjs185 builds.
+Patch3:		mediatomb-0.12.1-mozjs185.patch
+# PATCH-FIX-UPSTREAM - fix gcc47 builds.
+Patch4:		mediatomb-0.12.1-gcc47.patch
+# PATCH-FIX-UPSTREAM - port to libextractor 0.6 series
+Patch5:		mediatomb-0.12.1-libextractor-0.6.patch
+# PATCH-FIX-UPSTREAM - build with ffmpeg new API
+Patch6:         libavformat_0.11_support.patch
+Source90:       %{name}-rpmlintrc
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  file-devel
+BuildRequires:  gcc-c++
+BuildRequires:	libcurl-devel
+BuildRequires:  libexpat-devel
+# Multimedia has no extractor package.
 #BuildRequires:	libextractor-devel
-BuildRequires:	libexpat-devel
-BuildRequires:	libffmpeg_oldabi-devel
-BuildRequires:	libffmpegthumbnailer-devel
-BuildRequires:	libjack-devel
-BuildRequires:	libmp4v2-devel
-BuildRequires:	mDNSResponder-lib
-BuildRequires:	libmysqlclient-devel
-BuildRequires:	mozilla-nspr
-BuildRequires:	pwdutils
-BuildRequires:	sqlite-devel
-BuildRequires:	libtag-devel
-BuildRequires:	liblastfm-devel
+BuildRequires:  libffmpeg-devel
+BuildRequires:  libffmpegthumbnailer-devel
+BuildRequires:  libjack-devel
+# it requires lastfmlib, not the same one.
+#BuildRequires:  liblastfm-devel
+BuildRequires:  libmp4v2-devel
+BuildRequires:  libmysqlclient-devel
+BuildRequires:  libtag-devel
+BuildRequires:  mDNSResponder-lib
+BuildRequires:  mozilla-nspr
+BuildRequires:  pwdutils
+BuildRequires:  sqlite3-devel
+BuildRequires:  udev
+BuildRequires:  pkgconfig(libexif)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %if "%{_with_js}" == "1"
-BuildRequires:	libjs-devel
-BuildRequires:  mozilla-xulrunner192-devel
+BuildRequires:  js-devel
+BuildRequires:  xulrunner-devel
 %endif
 
+Requires:       %{name}-dbbackend = %{version}
+Requires:       logrotate
 Requires(pre):	%insserv_prereq
 Requires(pre):	coreutils
 Requires(pre):	grep
 Requires(pre):	pwdutils
-Requires:		%{name}-dbbackend = %{version}
-Requires:		logrotate
 
 %description
 MediaTomb - UPnP AV Mediaserver for Linux.
@@ -78,13 +105,13 @@
 addionally one db backend: mediatom-sqlite or mediatomb-mysql
 
 %package mysql
-Summary:		UPnP AV MediaServer mysql
-Group:			Productivity/Multimedia/Other
+Summary:        UPnP AV MediaServer mysql
+Group:          Productivity/Multimedia/Other
+Requires:       %{name} = %{version}
+Requires:       mysql
+Provides:       %{name}-dbbackend = %{version}
 Requires(pre):	coreutils
-Requires:		mysql
-Requires:		%{name} = %{version}
-Conflicts:		%{name}-sqlite
-Provides:		%{name}-dbbackend = %{version}
+Conflicts:      %{name}-sqlite
 
 %description mysql
 MediaTomb - UPnP AV Mediaserver for Linux.
@@ -108,13 +135,13 @@
 This package contains a mysql AND sqlite enabled binary.
 
 %package sqlite
-Summary:		UPnP AV MediaServer sqlite
-Group:			Productivity/Multimedia/Other
+Summary:        UPnP AV MediaServer sqlite
+Group:          Productivity/Multimedia/Other
+Requires:       %{name} = %{version}
+Requires:       sqlite
+Provides:       %{name}-dbbackend = %{version}
 Requires(pre):	coreutils
-Requires:		sqlite
-Requires:		%{name} = %{version}
-Conflicts:		%{name}-mysql
-Provides:		%{name}-dbbackend = %{version}
+Conflicts:      %{name}-mysql
 
 %description sqlite
 MediaTomb - UPnP AV Mediaserver for Linux.
@@ -139,22 +166,28 @@
 
 %prep
 %setup -q %{name}-%{version}
+autoreconf -i
 %patch0 -p1
 %patch1 -p1
+%if 0%{?suse_version} >= 1220
+%patch2 -p1
+%endif
+%if 0%{?suse_version} >= 1210
+%patch3 -p1
+# we patched configure.ac
+autoreconf -i
+%endif
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
-%__cp %{SOURCE2} .
+cp %{SOURCE2} .
 
 %build
 # otherwise rpmlint is yelling:
 #... rpm-buildroot-usage ...
 
 %install
-%if "%{_with_js}" == "1"
-jsincludedir=`grep "includedir=" %{_libdir}/pkgconfig/libxul.pc  | awk -F = '{print $2}'`
-jslibdir=`grep "sdkdir=" %{_libdir}/pkgconfig/libxul.pc  | awk -F = '{print $2}'`
-%endif

libavformat_0.11_support.patch Added

@@ -0,0 +1,52 @@
+--- mediatomb-0.12.1.orig/src/metadata/ffmpeg_handler.cc	2012-06-18 02:50:35.000000000 -0400
++++ mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc	2012-06-18 02:59:02.000000000 -0400
+@@ -107,8 +107,8 @@
+ 		return;
+ 	for (const mapping_t *m = mapping; m->avname != NULL; m++)
+ 	{
+-		AVMetadataTag *tag = NULL;
+-		tag = av_metadata_get(pFormatCtx->metadata, m->avname, NULL, 0);
++		AVDictionaryEntry *tag = NULL;
++		tag = av_dict_get(pFormatCtx->metadata, m->avname, NULL, 0);
+ 		if (tag && tag->value && tag->value[0])
+ 		{
+ 			log_debug("Added metadata %s: %s\n", m->avname, tag->value);
+@@ -278,7 +278,7 @@
+     int x = 0;
+     int y = 0;
+ 
+-	AVFormatContext *pFormatCtx;
++	AVFormatContext *pFormatCtx = avformat_alloc_context();
+ 	
+ 	// Suppress all log messages
+ 	av_log_set_callback(FfmpegNoOutputStub);
+@@ -286,15 +286,15 @@
+ 	// Register all formats and codecs
+     av_register_all();
+ 
+-    // Open video file
+-    if (av_open_input_file(&pFormatCtx, 
+-                          item->getLocation().c_str(), NULL, 0, NULL) != 0)
++	// Open video file
++    if (avformat_open_input(&pFormatCtx, 
++                          item->getLocation().c_str(), NULL, NULL) != 0)
+         return; // Couldn't open file
+ 
+     // Retrieve stream information
+-    if (av_find_stream_info(pFormatCtx) < 0)
++    if (avformat_find_stream_info(pFormatCtx,NULL) < 0)
+     {
+-        av_close_input_file(pFormatCtx);
++        avformat_close_input(&pFormatCtx);
+         return; // Couldn't find stream information
+     }   
+ 	// Add metadata using ffmpeg library calls
+@@ -303,7 +303,7 @@
+ 	addFfmpegResourceFields(item, pFormatCtx, &x, &y);
+ 	
+     // Close the video file
+-    av_close_input_file(pFormatCtx);
++    avformat_close_input(&pFormatCtx);
+ }
+ 
+ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size)

mediatomb-0.12.1-gcc47.patch Added

@@ -0,0 +1,120 @@
+Index: mediatomb-0.12.1.svn2103/src/hash/dbo_hash.h
+===================================================================
+--- mediatomb-0.12.1.svn2103.orig/src/hash/dbo_hash.h
++++ mediatomb-0.12.1.svn2103/src/hash/dbo_hash.h
+@@ -106,7 +106,7 @@ public:
+     inline bool remove(KT key)
+     {
+         struct dbo_hash_slot<KT, VT> *slot;
+-        if (! search(key, &slot))
++        if (! this->search(key, &slot))
+             return false;
+         slot->key = deletedKey;
+         slot->value->release();
+@@ -136,7 +136,7 @@ public:
+     inline void put(KT key, zmm::Ref<VT> value)
+     {
+         struct dbo_hash_slot<KT, VT> *slot;
+-        search(key, &slot);
++        this->search(key, &slot);
+         put(key, (hash_slot_t)slot, value);
+     }
+     void put(KT key, hash_slot_t destSlot, zmm::Ref<VT> value)
+@@ -162,7 +162,7 @@ public:
+     inline zmm::Ref<VT> get(KT key)
+     {
+         struct dbo_hash_slot<KT, VT> *slot;
+-        bool found = search(key, &slot);
++        bool found = this->search(key, &slot);
+         if (found)
+             return zmm::Ref<VT>(slot->value);
+         else
+@@ -174,7 +174,7 @@ public:
+     inline zmm::Ref<VT> get(KT key, hash_slot_t *destSlot)
+     {
+         struct dbo_hash_slot<KT, VT> **slot = (struct dbo_hash_slot<KT, VT> **)destSlot;
+-        bool found = search(key, slot);
++        bool found = this->search(key, slot);
+         if (found)
+             return zmm::Ref<VT>((*slot)->value);
+         else
+Index: mediatomb-0.12.1.svn2103/src/hash/dbr_hash.h
+===================================================================
+--- mediatomb-0.12.1.svn2103.orig/src/hash/dbr_hash.h
++++ mediatomb-0.12.1.svn2103/src/hash/dbr_hash.h
+@@ -124,7 +124,7 @@ public:
+     inline bool remove(KT key)
+     {
+         struct dbr_hash_slot<KT> *slot;
+-        if (! search(key, &slot))
++        if (! this->search(key, &slot))
+             return false;
+         slot->key = deletedKey;
+         int array_slot = slot->array_slot;
+@@ -134,7 +134,7 @@ public:
+             return true;
+         }
+         data_array[array_slot] = data_array[--this->count];
+-        if (! search(data_array[array_slot], &slot))
++        if (! this->search(data_array[array_slot], &slot))
+         {
+             log_debug("DBR-Hash-Error: (%d; array_slot=%d; count=%d)\n", data_array[array_slot], array_slot, this->count);
+             throw zmm::Exception(_("DBR-Hash-Error: key in data_array not found in hashtable"));
+@@ -146,7 +146,7 @@ public:
+     inline void put(KT key)
+     {
+         struct dbr_hash_slot<KT> *slot;
+-        if (! search(key, &slot))
++        if (! this->search(key, &slot))
+         {
+ #ifdef TOMBDEBUG
+             if (this->count >= realCapacity)
+@@ -194,7 +194,7 @@ public:
+     inline bool exists(KT key)
+     {
+         struct dbr_hash_slot<KT> *slot;
+-        return search(key, &slot);
++        return this->search(key, &slot);
+     }
+     
+     /*
+Index: mediatomb-0.12.1.svn2103/src/hash/dso_hash.h
+===================================================================
+--- mediatomb-0.12.1.svn2103.orig/src/hash/dso_hash.h
++++ mediatomb-0.12.1.svn2103/src/hash/dso_hash.h
+@@ -100,7 +100,7 @@ public:
+     inline bool remove(zmm::String key)
+     {
+         struct dso_hash_slot<VT> *slot;
+-        if (! search(key, &slot))
++        if (! this->search(key, &slot))
+             return false;
+         slot->key->release();
+         slot->value->release();
+@@ -112,7 +112,7 @@ public:
+     inline void put(zmm::String key, zmm::Ref<VT> value)
+     {
+         struct dso_hash_slot<VT> *slot;
+-        search(key, &slot);
++        this->search(key, &slot);
+         put(key, (hash_slot_t)slot, value);
+     }
+     void put(zmm::String key, hash_slot_t destSlot, zmm::Ref<VT> value)
+@@ -141,7 +141,7 @@ public:
+     inline zmm::Ref<VT> get(zmm::String key)
+     {
+         struct dso_hash_slot<VT> *slot;
+-        bool found = search(key, &slot);
++        bool found = this->search(key, &slot);
+         if (found)
+             return zmm::Ref<VT>(slot->value);
+         else
+@@ -153,7 +153,7 @@ public:
+     inline zmm::Ref<VT> get(zmm::String key, hash_slot_t *destSlot)
+     {
+         struct dso_hash_slot<VT> **slot = (struct dso_hash_slot<VT> **)destSlot;
+-        bool found = search(key, slot);
++        bool found = this->search(key, slot);
+         if (found)
+             return zmm::Ref<VT>((*slot)->value);
+         else

mediatomb-0.12.1-libextractor-0.6.patch Added

@@ -0,0 +1,675 @@
+http://bugs.gentoo.org/435394
+
+port to libextractor-0.6.x
+
+patch by Mike Frysinger <vapier@gentoo.org>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1631,7 +1631,7 @@ MT_CHECK_OPTIONAL_PACKAGE([lastfmlib], [disable],
+ ######## extractor
+ 
+ if test "x$LIBEXTRACTOR_OPTION_ENABLED" = xyes; then
+-    MT_CHECK_PACKAGE([libextractor], [extractor], [extractor], [EXTRACTOR_getKeywords])
++    MT_CHECK_PACKAGE([libextractor], [extractor], [extractor], [EXTRACTOR_extract])
+ fi
+ 
+ if test "x$LIBEXTRACTOR_STATUS" = xyes; then
+--- a/src/metadata/extractor_handler.cc
++++ b/src/metadata/extractor_handler.cc
+@@ -55,322 +55,344 @@ ExtractorHandler::ExtractorHandler() : MetadataHandler()
+ {
+ }
+ 
+-static EXTRACTOR_KeywordType getTagFromString(String tag)
++static EXTRACTOR_MetaType getTagFromString(String tag)
+ {
+-    if (tag == "EXTRACTOR_UNKNOWN")
+-        return EXTRACTOR_UNKNOWN;
+-    if (tag == "EXTRACTOR_FILENAME")
+-        return EXTRACTOR_FILENAME;
+-    if (tag == "EXTRACTOR_MIMETYPE")
+-        return EXTRACTOR_MIMETYPE;
+-    if (tag == "EXTRACTOR_TITLE")
+-        return EXTRACTOR_TITLE;
+-    if (tag == "EXTRACTOR_AUTHOR")
+-        return EXTRACTOR_AUTHOR;
+-    if (tag == "EXTRACTOR_ARTIST")
+-        return EXTRACTOR_ARTIST;
+-    if (tag == "EXTRACTOR_DESCRIPTION")
+-        return EXTRACTOR_DESCRIPTION;
+-    if (tag == "EXTRACTOR_COMMENT")
+-        return EXTRACTOR_COMMENT;
+-    if (tag == "EXTRACTOR_DATE")
+-        return EXTRACTOR_DATE;
+-    if (tag == "EXTRACTOR_PUBLISHER")
+-        return EXTRACTOR_PUBLISHER;
+-    if (tag == "EXTRACTOR_LANGUAGE")
+-        return EXTRACTOR_LANGUAGE;
+-    if (tag == "EXTRACTOR_ALBUM")
+-        return EXTRACTOR_ALBUM;
+-    if (tag == "EXTRACTOR_GENRE")
+-        return EXTRACTOR_GENRE;
+-    if (tag == "EXTRACTOR_LOCATION")
+-        return EXTRACTOR_LOCATION;
+-    if (tag == "EXTRACTOR_VERSIONNUMBER")
+-        return EXTRACTOR_VERSIONNUMBER;
+-    if (tag == "EXTRACTOR_ORGANIZATION")
+-        return EXTRACTOR_ORGANIZATION;
+-    if (tag == "EXTRACTOR_COPYRIGHT")
+-        return EXTRACTOR_COPYRIGHT;
+-    if (tag == "EXTRACTOR_SUBJECT")
+-        return EXTRACTOR_SUBJECT;
+-    if (tag == "EXTRACTOR_KEYWORDS")
+-        return EXTRACTOR_KEYWORDS;
+-    if (tag == "EXTRACTOR_CONTRIBUTOR")
+-        return EXTRACTOR_CONTRIBUTOR;
+-    if (tag == "EXTRACTOR_RESOURCE_TYPE")
+-        return EXTRACTOR_RESOURCE_TYPE;
+-    if (tag == "EXTRACTOR_FORMAT")
+-        return EXTRACTOR_FORMAT;
+-    if (tag == "EXTRACTOR_RESOURCE_IDENTIFIER")
+-        return EXTRACTOR_RESOURCE_IDENTIFIER;
+-    if (tag == "EXTRACTOR_SOURCE")
+-        return EXTRACTOR_SOURCE;
+-    if (tag == "EXTRACTOR_RELATION")
+-        return EXTRACTOR_RELATION;
+-    if (tag == "EXTRACTOR_COVERAGE")
+-        return EXTRACTOR_COVERAGE;
+-    if (tag == "EXTRACTOR_SOFTWARE")
+-        return EXTRACTOR_SOFTWARE;
+-    if (tag == "EXTRACTOR_DISCLAIMER")
+-        return EXTRACTOR_DISCLAIMER;
+-    if (tag == "EXTRACTOR_WARNING")
+-        return EXTRACTOR_WARNING;
+-    if (tag == "EXTRACTOR_TRANSLATED")
+-        return EXTRACTOR_TRANSLATED;
+-    if (tag == "EXTRACTOR_CREATION_DATE")
+-        return EXTRACTOR_CREATION_DATE;
+-    if (tag == "EXTRACTOR_MODIFICATION_DATE")
+-        return EXTRACTOR_MODIFICATION_DATE;
+-    if (tag == "EXTRACTOR_CREATOR")
+-        return EXTRACTOR_CREATOR;
+-    if (tag == "EXTRACTOR_PRODUCER")
+-        return EXTRACTOR_PRODUCER;
+-    if (tag == "EXTRACTOR_PAGE_COUNT")
+-        return EXTRACTOR_PAGE_COUNT;
+-    if (tag == "EXTRACTOR_PAGE_ORIENTATION")
+-        return EXTRACTOR_PAGE_ORIENTATION;
+-    if (tag == "EXTRACTOR_PAPER_SIZE")
+-        return EXTRACTOR_PAPER_SIZE;
+-    if (tag == "EXTRACTOR_USED_FONTS")
+-        return EXTRACTOR_USED_FONTS;
+-    if (tag == "EXTRACTOR_PAGE_ORDER")
+-        return EXTRACTOR_PAGE_ORDER;
+-    if (tag == "EXTRACTOR_CREATED_FOR")
+-        return EXTRACTOR_CREATED_FOR;
+-    if (tag == "EXTRACTOR_MAGNIFICATION")
+-        return EXTRACTOR_MAGNIFICATION;
+-    if (tag == "EXTRACTOR_RELEASE")
+-        return EXTRACTOR_RELEASE;
+-    if (tag == "EXTRACTOR_GROUP")
+-        return EXTRACTOR_GROUP;
+-    if (tag == "EXTRACTOR_SIZE")
+-        return EXTRACTOR_SIZE;
+-    if (tag == "EXTRACTOR_SUMMARY")
+-        return EXTRACTOR_SUMMARY;
+-    if (tag == "EXTRACTOR_PACKAGER")
+-        return EXTRACTOR_PACKAGER;
+-    if (tag == "EXTRACTOR_VENDOR")
+-        return EXTRACTOR_VENDOR;
+-    if (tag == "EXTRACTOR_LICENSE")
+-        return EXTRACTOR_LICENSE;
+-    if (tag == "EXTRACTOR_DISTRIBUTION")
+-        return EXTRACTOR_DISTRIBUTION;
+-    if (tag == "EXTRACTOR_BUILDHOST")
+-        return EXTRACTOR_BUILDHOST;
+-    if (tag == "EXTRACTOR_OS")
+-        return EXTRACTOR_OS;
+-    if (tag == "EXTRACTOR_DEPENDENCY")
+-        return EXTRACTOR_DEPENDENCY;
+-    if (tag == "EXTRACTOR_HASH_MD4")
+-        return EXTRACTOR_HASH_MD4;
+-    if (tag == "EXTRACTOR_HASH_MD5")
+-        return EXTRACTOR_HASH_MD5;
+-    if (tag == "EXTRACTOR_HASH_SHA0")
+-        return EXTRACTOR_HASH_SHA0;
+-    if (tag == "EXTRACTOR_HASH_SHA1")
+-        return EXTRACTOR_HASH_SHA1;
+-    if (tag == "EXTRACTOR_HASH_RMD160")
+-        return EXTRACTOR_HASH_RMD160;
+-    if (tag == "EXTRACTOR_RESOLUTION")
+-        return EXTRACTOR_RESOLUTION;
+-    if (tag == "EXTRACTOR_CATEGORY")
+-        return EXTRACTOR_CATEGORY;
+-    if (tag == "EXTRACTOR_BOOKTITLE")
+-        return EXTRACTOR_BOOKTITLE;
+-    if (tag == "EXTRACTOR_PRIORITY")
+-        return EXTRACTOR_PRIORITY;
+-    if (tag == "EXTRACTOR_CONFLICTS")
+-        return EXTRACTOR_CONFLICTS;
+-    if (tag == "EXTRACTOR_REPLACES")
+-        return EXTRACTOR_REPLACES;
+-    if (tag == "EXTRACTOR_PROVIDES")
+-        return EXTRACTOR_PROVIDES;
+-    if (tag == "EXTRACTOR_CONDUCTOR")
+-        return EXTRACTOR_CONDUCTOR;
+-    if (tag == "EXTRACTOR_INTERPRET")
+-        return EXTRACTOR_INTERPRET;
+-    if (tag == "EXTRACTOR_OWNER")
+-        return EXTRACTOR_OWNER;
+-    if (tag == "EXTRACTOR_LYRICS")
+-        return EXTRACTOR_LYRICS;
+-    if (tag == "EXTRACTOR_MEDIA_TYPE")
+-        return EXTRACTOR_MEDIA_TYPE;
+-    if (tag == "EXTRACTOR_CONTACT")
+-        return EXTRACTOR_CONTACT;
+-    if (tag == "EXTRACTOR_THUMBNAIL_DATA")
+-        return EXTRACTOR_THUMBNAIL_DATA;
+-
+-#ifdef EXTRACTOR_GE_0_5_2
+-    if (tag == "EXTRACTOR_PUBLICATION_DATE")
+-        return EXTRACTOR_PUBLICATION_DATE;
+-    if (tag == "EXTRACTOR_CAMERA_MAKE")
+-        return EXTRACTOR_CAMERA_MAKE;
+-    if (tag == "EXTRACTOR_CAMERA_MODEL")
+-        return EXTRACTOR_CAMERA_MODEL;
+-    if (tag == "EXTRACTOR_EXPOSURE")
+-        return EXTRACTOR_EXPOSURE;
+-    if (tag == "EXTRACTOR_APERTURE")
+-        return EXTRACTOR_APERTURE;
+-    if (tag == "EXTRACTOR_EXPOSURE_BIAS")
+-        return EXTRACTOR_EXPOSURE_BIAS;
+-    if (tag == "EXTRACTOR_FLASH")
+-        return EXTRACTOR_FLASH;
+-    if (tag == "EXTRACTOR_FLASH_BIAS")
+-        return EXTRACTOR_FLASH_BIAS;
+-    if (tag == "EXTRACTOR_FOCAL_LENGTH")
+-        return EXTRACTOR_FOCAL_LENGTH;
+-    if (tag == "EXTRACTOR_FOCAL_LENGTH_35MM")
+-        return EXTRACTOR_FOCAL_LENGTH_35MM;
+-    if (tag == "EXTRACTOR_ISO_SPEED")
+-        return EXTRACTOR_ISO_SPEED;
+-    if (tag == "EXTRACTOR_EXPOSURE_MODE")
+-        return EXTRACTOR_EXPOSURE_MODE;
+-    if (tag == "EXTRACTOR_METERING_MODE")
+-        return EXTRACTOR_METERING_MODE;
+-    if (tag == "EXTRACTOR_MACRO_MODE")
+-        return EXTRACTOR_MACRO_MODE;
+-    if (tag == "EXTRACTOR_IMAGE_QUALITY")

mediatomb-0.12.1-mozjs185.patch Added

@@ -0,0 +1,617 @@
+Index: mediatomb-0.12.1.svn2103/build/Makefile.in
+===================================================================
+--- mediatomb-0.12.1.svn2103.orig/build/Makefile.in
++++ mediatomb-0.12.1.svn2103/build/Makefile.in
+@@ -278,7 +278,7 @@ CURL_LIBS = @CURL_LIBS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = -fpermissive @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
+ DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
+Index: mediatomb-0.12.1.svn2103/configure.ac
+===================================================================
+--- mediatomb-0.12.1.svn2103.orig/configure.ac
++++ mediatomb-0.12.1.svn2103/configure.ac
+@@ -1013,18 +1013,27 @@ if test "x$JS_OK" = xyes; then
+                     LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lsmjs $ADD_PTHREAD_CFLAGS"
+                     AC_CHECK_LIB(smjs, JS_NewObject,
+                         [
+-                            JS_LIBS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lsmjs $ADD_PTHREAD_CFLAGS"
++                            JS_LIBS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lsmjs185 $ADD_PTHREAD_CFLAGS"
+                             MOZLIB=smjs
+                         ],
+                         [
+-                            LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS"
+-                            AC_CHECK_LIB(mozjs, JS_NewObject,
++                            LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs185 $ADD_PTHREAD_CFLAGS"
++                            AC_CHECK_LIB(mozjs185, JS_NewObject,
+                                 [
+-                                    JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs"
+-                                    MOZLIB=mozjs
++                                    JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs185"
++                                    MOZLIB=mozjs185
+                                 ],
+                                 [
+-                                    AC_MSG_ERROR([Spidermonkey not found in requested location $JS_SEARCH_LIBS])
++	                            LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS"
++	                            AC_CHECK_LIB(mozjs, JS_NewObject,
++	                                [
++	                                    JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs"
++	                                    MOZLIB=mozjs
++	                                ],
++	                                [
++	                                    AC_MSG_ERROR([Spidermonkey not found in requested location $JS_SEARCH_LIBS])
++	                                ]
++	                            )
+                                 ]
+                             )
+                         ]
+@@ -1047,39 +1056,58 @@ if test "x$JS_OK" = xyes; then
+                 ],
+                 [
+                     unset ac_cv_lib_smjs_JS_NewObject
+-                    AC_CHECK_LIB(mozjs, JS_NewObject,
++                    AC_CHECK_LIB(mozjs185, JS_NewObject,
+                         [
+-                            MOZLIB=mozjs
+-                            JS_LIBS="-lmozjs"
++                            MOZLIB=mozjs185
++                            JS_LIBS="-lmozjs185"
+                         ],
+                         [
+-                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE $ADD_PTHREAD_CFLAGS"
+-                            unset ac_cv_lib_js_JS_NewObject
+-                            AC_CHECK_LIB(js, JS_NewObject,
+-                                [
+-                                    JS_LIBS="-L$SEARCH_DIR_LIBS -ljs"
+-                                    MOZLIB=js
+-                                ],
+-                                [
+-                                    unset ac_cv_lib_smjs_JS_NewObject
+-                                    AC_CHECK_LIB(smjs, JS_NewObject,
+-                                        [
+-                                            JS_LIBS="-L$SEARCH_DIR_LIBS -lsmjs"
+-                                            MOZLIB=smjs
+-                                        ],
+-                                        [
+-                                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
+-                                            unset ac_cv_lib_mozjs_JS_NewObject
+-                                            AC_CHECK_LIB(mozjs, JS_NewObject,
+-                                                [
+-                                                    JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs"
+-                                                    MOZLIB=mozjs
+-                                                ],
+-                                                [
+-                                                    JS_OK=missing
+-                                                    AC_MSG_RESULT(libjs/libsmjs link failed, giving up)
+-                                                ]
+-                                            )
++	                    unset ac_cv_lib_smjs_JS_NewObject
++	                    AC_CHECK_LIB(mozjs, JS_NewObject,
++	                        [
++	                            MOZLIB=mozjs
++	                            JS_LIBS="-lmozjs"
++	                        ],
++	                        [
++	                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE $ADD_PTHREAD_CFLAGS"
++	                            unset ac_cv_lib_js_JS_NewObject
++	                            AC_CHECK_LIB(js, JS_NewObject,
++	                                [
++	                                    JS_LIBS="-L$SEARCH_DIR_LIBS -ljs"
++	                                    MOZLIB=js
++	                                ],
++	                                [
++	                                    unset ac_cv_lib_smjs_JS_NewObject
++	                                    AC_CHECK_LIB(smjs, JS_NewObject,
++	                                        [
++	                                            JS_LIBS="-L$SEARCH_DIR_LIBS -lsmjs"
++	                                            MOZLIB=smjs
++	                                        ],
++	                                        [
++	                                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs185"
++	                                            unset ac_cv_lib_mozjs_JS_NewObject
++	                                            AC_CHECK_LIB(mozjs185, JS_NewObject,
++	                                                [
++	                                                    JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185"
++	                                                    MOZLIB=mozjs185
++	                                                ],
++	                                                [
++		                                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
++		                                            unset ac_cv_lib_mozjs_JS_NewObject
++		                                            AC_CHECK_LIB(mozjs, JS_NewObject,
++		                                                [
++		                                                    JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs"
++		                                                    MOZLIB=mozjs
++		                                                ],
++		                                                [
++		                                                    JS_OK=missing
++		                                                    AC_MSG_RESULT(libjs/libsmjs link failed, giving up)
++		                                                ]
++		                                            )
++	                                                ]
++	                                            )
++	                                        ]
++	                                    )
+                                         ]
+                                     )
+                                 ]
+Index: mediatomb-0.12.1.svn2103/src/scripting/import_script.cc
+===================================================================
+--- mediatomb-0.12.1.svn2103.orig/src/scripting/import_script.cc
++++ mediatomb-0.12.1.svn2103/src/scripting/import_script.cc
+@@ -53,8 +53,8 @@ ImportScript::ImportScript(Ref<Runtime>
+     try 
+     {
+         load(scriptPath);
+-        root = JS_NewScriptObject(cx, script);
+-        JS_AddNamedRoot(cx, &root, "ImportScript");
++        root = JS_NewObject(cx, NULL, script, NULL);
++        JS_AddNamedObjectRoot(cx, &root, "ImportScript");
+     }
+     catch (Exception ex)
+     {
+@@ -117,7 +117,7 @@ ImportScript::~ImportScript()
+ #endif
+     
+     if (root)
+-        JS_RemoveRoot(cx, &root);
++        JS_RemoveObjectRoot(cx, &root);
+ 
+ #ifdef JS_THREADSAFE
+     JS_EndRequest(cx);
+Index: mediatomb-0.12.1.svn2103/src/scripting/js_functions.cc
+===================================================================
+--- mediatomb-0.12.1.svn2103.orig/src/scripting/js_functions.cc
++++ mediatomb-0.12.1.svn2103/src/scripting/js_functions.cc
+@@ -49,30 +49,45 @@ using namespace zmm;
+ extern "C" {
+ 
+ JSBool 
+-js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++js_print(JSContext *cx, uintN argc, jsval *argv)
+ {
+-    uintN i;
++    uintN i, j;
+     JSString *str;
+ 
+     for (i = 0; i < argc; i++) 
+     {
+-        str = JS_ValueToString(cx, argv[i]);
++    	String fmtStr;
++    	for (j = 0; j < argc; j++)
++    	{
++    		if (j == i)
++    			fmtStr = fmtStr + "S";
++    		else
++    			fmtStr = fmtStr + "*";
++    	}
++    	if(!JS_ConvertArguments(cx, 1, JS_ARGV(cx, argv), fmtStr.c_str(), &str))
++		{
++			log_debug("Could not parse input arguments\n");
++			return JS_TRUE;
++		}
++
+         if (!str)
+             return JS_TRUE;
+-        argv[i] = STRING_TO_JSVAL(str);

mediatomb-svn_automake_1.12.patch Added

mediatomb-0.12.1.svn2103.tar.bz2 Added

mediatomb-0.12.1.tar.gz Deleted