Request 320 (accepted)

Overview

Request 320 (accepted)

fix build on all build hosts.

Created by marguerite over 10 years ago
In state accepted
Package maintainer: detrei

Submit mediatomb

Submit package home:marguerit...hes:Multimedia / mediatomb to package Multimedia / mediatomb

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
-
-#-enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9.1/js/ 
 
 ###################
 # build the sqlite/mysql enabled mediatomb
@@ -170,19 +203,17 @@
 %if "%{_with_js}" == "1"
 	--enable-libjs \
 %endif
-	--enable-taglib
-#	--with-js-h=${jsincludedir}/unstable \
-#	--with-js-libs=${jslibdir}/sdk/lib/ \
+	--enable-taglib 
 
-%__make %{?jobs:-j%{jobs}}
+make %{?_smp_flags}
 %makeinstall \
 	INSTALL="install -p"
-%__mv %{buildroot}%{_bindir}/mediatomb \
+mv %{buildroot}%{_bindir}/mediatomb \
 	%{buildroot}%{_bindir}/mediatomb-mysql
 
 ###################
 # build the sqlite enabled mediatomb
-%__make clean
+make clean
 %configure \
 	--prefix=%{_prefix} \
 	--enable-sqlite3 \
@@ -195,45 +226,42 @@
 %if "%{_with_js}" == "1"
 	--enable-libjs \
 %endif
-	--enable-taglib
-#	--with-js-h=${jsincludedir}/unstable \
-#	--with-js-libs=${jslibdir}/sdk/lib/ \
-
-%__make %{?_smp_flags}
+	--enable-taglib 
+make %{?_smp_flags}
 
 %makeinstall \
-	INSTALL="%__install -p"
-%__mv %{buildroot}%{_bindir}/mediatomb \
+	INSTALL="install -p"
+mv %{buildroot}%{_bindir}/mediatomb \
 	%{buildroot}%{_bindir}/mediatomb-sqlite
 
 ###################
 # init script
-%__install -dm 755 %{buildroot}%{_sbindir}
-%__install -dm 755 %{buildroot}%{_sysconfdir}/init.d
-%__install -m 755 %{SOURCE1} \
+install -dm 755 %{buildroot}%{_sbindir}
+install -dm 755 %{buildroot}%{_sysconfdir}/init.d
+install -m 755 %{SOURCE1} \
 	%{buildroot}%{_sysconfdir}/init.d/mediatomb
-%__install -m 755 config/mediatomb-conf-fedora \
+install -m 755 config/mediatomb-conf-fedora \
 	%{buildroot}%{_sysconfdir}/mediatomb.conf
-%__ln_s ../../%{_sysconfdir}/init.d/%{name} \
+ln -s ../../%{_sysconfdir}/init.d/%{name} \
 	%{buildroot}%{_sbindir}/rcmediatomb
 
 ###################
 # sample config
-%__install -dm 755 %{buildroot}%{_sysconfdir}/%{name}
-%__install -m 644 %{SOURCE2} \
+install -dm 755 %{buildroot}%{_sysconfdir}/%{name}
+install -m 644 %{SOURCE2} \
 	%{buildroot}%{_sysconfdir}/%{name}/config.xml
 
 ###################
 # create a new home
-%__install -dm 755 %{buildroot}%{_localstatedir}/lib/%{name}
-%__install -m 644 %{SOURCE1} \
+install -dm 755 %{buildroot}%{_localstatedir}/lib/%{name}
+install -m 644 %{SOURCE1} \
 	%{buildroot}%{_localstatedir}/lib/%{name}/config.xml
 touch %{buildroot}%{_localstatedir}/lib/%{name}/{config.xml,mediatomb.db,mediatomb.html}
 
 ###################
 # logrotate
-%__install -dm 755 %{buildroot}%{_sysconfdir}/logrotate.d
-%__cat > %{buildroot}%{_sysconfdir}/logrotate.d/%{name} << 'EOF'
+install -dm 755 %{buildroot}%{_sysconfdir}/logrotate.d
+cat > %{buildroot}%{_sysconfdir}/logrotate.d/%{name} << 'EOF'
 /var/log/mediatomb {
 create 644 root root
 	monthly
@@ -243,7 +271,7 @@
 EOF
 
 %clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+%{?buildroot:rm -rf %{buildroot}}
 
 %pre
 # create group if necessary
@@ -286,18 +314,18 @@
 		mediatomb > /dev/null 2> /dev/null || :
 
 %post sqlite
-%__rm -f "%{_bindir}/mediatomb"
-%__ln_s "%{_bindir}/mediatomb-sqlite" "%{_bindir}/mediatomb"
+rm -f "%{_bindir}/mediatomb"
+ln -s "%{_bindir}/mediatomb-sqlite" "%{_bindir}/mediatomb"
 
 %postun sqlite
-%__rm -f "%{_bindir}/mediatomb"
+rm -f "%{_bindir}/mediatomb"
 
 %post mysql
-%__rm -f "%{_bindir}/mediatomb"
-%__ln_s "%{_bindir}/mediatomb-mysql" "%{_bindir}/mediatomb"
+rm -f "%{_bindir}/mediatomb"
+ln -s "%{_bindir}/mediatomb-mysql" "%{_bindir}/mediatomb"
 
 %postun mysql
-%__rm -f "%{_bindir}/mediatomb"
+rm -f "%{_bindir}/mediatomb"
 
 %files
 %defattr(-,root,root)
@@ -309,8 +337,7 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_sysconfdir}/init.d/%{name}
 %{_sbindir}/rcmediatomb
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}/
 %{_mandir}/man1/*
 
 %files mysql

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")
+-        return EXTRACTOR_IMAGE_QUALITY;
+-    if (tag == "EXTRACTOR_WHITE_BALANCE")
+-        return EXTRACTOR_WHITE_BALANCE;
+-    if (tag == "EXTRACTOR_ORIENTATION")
+-        return EXTRACTOR_ORIENTATION;
+-#endif // EXTRACTOR_GE_0_5_2
++#define T(x) [EXTRACTOR_METATYPE_##x] = "EXTRACTOR_METATYPE_"#x,
++    /* XXX: should convert to EXTRACTOR_metatype_to_string() somehow */
++    const char *types[] =
++    {
++        T(RESERVED)
++        T(MIMETYPE)
++        T(FILENAME)
++        T(COMMENT)
++
++        T(TITLE)
++        T(BOOK_TITLE)
++        T(BOOK_EDITION)
++        T(BOOK_CHAPTER_NUMBER)
++        T(JOURNAL_NAME)
++        T(JOURNAL_VOLUME)
++        T(JOURNAL_NUMBER)
++        T(PAGE_COUNT)
++        T(PAGE_RANGE)
++        T(AUTHOR_NAME)
++        T(AUTHOR_EMAIL)
++        T(AUTHOR_INSTITUTION)
++        T(PUBLISHER)
++        T(PUBLISHER_ADDRESS)
++        T(PUBLISHER_INSTITUTION)
++        T(PUBLISHER_SERIES)
++        T(PUBLICATION_TYPE)
++        T(PUBLICATION_YEAR)
++        T(PUBLICATION_MONTH)
++        T(PUBLICATION_DAY)
++        T(PUBLICATION_DATE)
++        T(BIBTEX_EPRINT)
++        T(BIBTEX_ENTRY_TYPE)
++        T(LANGUAGE)
++        T(CREATION_TIME)
++        T(URL)
++
++        T(URI)
++        T(ISRC)
++        T(HASH_MD4)
++        T(HASH_MD5)
++        T(HASH_SHA0)
++        T(HASH_SHA1)
++        T(HASH_RMD160)
++
++        T(GPS_LATITUDE_REF)
++        T(GPS_LATITUDE)
++        T(GPS_LONGITUDE_REF)
++        T(GPS_LONGITUDE)
++        T(LOCATION_CITY)
++        T(LOCATION_SUBLOCATION)
++        T(LOCATION_COUNTRY)
++        T(LOCATION_COUNTRY_CODE)
++
++        T(UNKNOWN)
++        T(DESCRIPTION)
++        T(COPYRIGHT)
++        T(RIGHTS)
++        T(KEYWORDS)
++        T(ABSTRACT)
++        T(SUMMARY)
++        T(SUBJECT)
++        T(CREATOR)
++        T(FORMAT)
++        T(FORMAT_VERSION)
++
++        T(CREATED_BY_SOFTWARE)
++        T(UNKNOWN_DATE)
++        T(CREATION_DATE)
++        T(MODIFICATION_DATE)
++        T(LAST_PRINTED)
++        T(LAST_SAVED_BY)
++        T(TOTAL_EDITING_TIME)
++        T(EDITING_CYCLES)
++        T(MODIFIED_BY_SOFTWARE)
++        T(REVISION_HISTORY)
++
++        T(EMBEDDED_FILE_SIZE)
++        T(FINDER_FILE_TYPE)
++        T(FINDER_FILE_CREATOR)
++
++        T(PACKAGE_NAME)
++        T(PACKAGE_VERSION)
++        T(SECTION)
++        T(UPLOAD_PRIORITY)
++        T(PACKAGE_DEPENDENCY)
++        T(PACKAGE_CONFLICTS)
++        T(PACKAGE_REPLACES)
++        T(PACKAGE_PROVIDES)
++        T(PACKAGE_RECOMMENDS)
++        T(PACKAGE_SUGGESTS)
++        T(PACKAGE_MAINTAINER)
++        T(PACKAGE_INSTALLED_SIZE)
++        T(PACKAGE_SOURCE)
++        T(PACKAGE_ESSENTIAL)
++        T(TARGET_ARCHITECTURE)
++        T(PACKAGE_PRE_DEPENDENCY)
++        T(LICENSE)
++        T(PACKAGE_DISTRIBUTION)
++        T(BUILDHOST)
++        T(VENDOR)
++        T(TARGET_OS)
++        T(SOFTWARE_VERSION)
++        T(TARGET_PLATFORM)
++        T(RESOURCE_TYPE)
++        T(LIBRARY_SEARCH_PATH)
++        T(LIBRARY_DEPENDENCY)
++
++        T(CAMERA_MAKE)
++        T(CAMERA_MODEL)
++        T(EXPOSURE)
++        T(APERTURE)
++        T(EXPOSURE_BIAS)
++        T(FLASH)
++        T(FLASH_BIAS)
++        T(FOCAL_LENGTH)
++        T(FOCAL_LENGTH_35MM)
++        T(ISO_SPEED)
++        T(EXPOSURE_MODE)
++        T(METERING_MODE)
++        T(MACRO_MODE)
++        T(IMAGE_QUALITY)
++        T(WHITE_BALANCE)
++        T(ORIENTATION)
++        T(MAGNIFICATION)
++
++        T(IMAGE_DIMENSIONS)
++        T(PRODUCED_BY_SOFTWARE)
++        T(THUMBNAIL)
++        T(IMAGE_RESOLUTION)
++        T(SOURCE)
++
++        T(CHARACTER_SET)
++        T(LINE_COUNT)
++        T(PARAGRAPH_COUNT)
++        T(WORD_COUNT)
++        T(CHARACTER_COUNT)
++        T(PAGE_ORIENTATION)
++        T(PAPER_SIZE)
++        T(TEMPLATE)
++        T(COMPANY)
++        T(MANAGER)
++        T(REVISION_NUMBER)
++
++        T(DURATION)
++        T(ALBUM)
++        T(ARTIST)
++        T(GENRE)
++        T(TRACK_NUMBER)
++        T(DISC_NUMBER)
++        T(PERFORMER)
++        T(CONTACT_INFORMATION)
++        T(SONG_VERSION)
++        T(PICTURE)
++        T(COVER_PICTURE)
++        T(CONTRIBUTOR_PICTURE)
++        T(EVENT_PICTURE)
++        T(LOGO)
++        T(BROADCAST_TELEVISION_SYSTEM)
++        T(SOURCE_DEVICE)
++        T(DISCLAIMER)
++        T(WARNING)
++        T(PAGE_ORDER)
++        T(WRITER)
++        T(PRODUCT_VERSION)
++        T(CONTRIBUTOR_NAME)
++        T(MOVIE_DIRECTOR)
++        T(NETWORK_NAME)
++        T(SHOW_NAME)
++        T(CHAPTER_NAME)
++        T(SONG_COUNT)
++        T(STARTING_SONG)
++        T(PLAY_COUNTER)
++        T(CONDUCTOR)
++        T(INTERPRETATION)
++        T(COMPOSER)
++        T(BEATS_PER_MINUTE)
++        T(ENCODED_BY)
++        T(ORIGINAL_TITLE)
++        T(ORIGINAL_ARTIST)
++        T(ORIGINAL_WRITER)
++        T(ORIGINAL_RELEASE_YEAR)
++        T(ORIGINAL_PERFORMER)
++        T(LYRICS)
++        T(POPULARITY_METER)
++        T(LICENSEE)
++        T(MUSICIAN_CREDITS_LIST)
++        T(MOOD)
++        T(SUBTITLE)
++
++        T(GNUNET_DISPLAY_TYPE)
++        T(GNUNET_FULL_DATA)
++        T(RATING)
++        T(ORGANIZATION)
++        T(RIPPER)
++        T(PRODUCER)
++        T(GROUP)
++        T(GNUNET_ORIGINAL_FILENAME)
++    };
++#undef T
++    size_t i;
++
++    for (i = 0; i < sizeof(types) / sizeof(types[0]); ++i)
++        if (!strcmp(types[i], tag.c_str()))
++            return (EXTRACTOR_MetaType) i;
+ 
+     log_warning("Ignoring unknown libextractor tag: %s\n", tag.c_str());
+-    return EXTRACTOR_UNKNOWN;
++    return EXTRACTOR_METATYPE_UNKNOWN;
+ }
+ 
+-static void addMetaField(metadata_fields_t field, EXTRACTOR_KeywordList *keywords, Ref<CdsItem> item, Ref<StringConverter> sc)
++struct field_state {
++    Ref<CdsItem> item;
++    Ref<StringConverter> sc;
++    Ref<Array<StringBase> > aux;
++};
++
++static int addField(void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
++                    enum EXTRACTOR_MetaFormat format, const char *data_mime_type,
++                    const char *data, size_t data_len)
+ {
+-    String value;
+-    const char *temp = NULL;
+- 
++    metadata_fields_t field = M_MAX;
++    resource_attributes_t attr = R_MAX;
++
++    if (!data)
++        return 0;
++
++    log_debug("metadata %zu [%s] -> %s\n", (size_t)type, EXTRACTOR_metatype_to_string(type), data);
++
+     /// \todo check if UTF-8 conversion is needed, may already be in UTF-8
+-    
+-    switch (field)
++
++    switch (type)
+     {
+-        case M_TITLE:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_TITLE, keywords);
++        case EXTRACTOR_METATYPE_TITLE:
++            field = M_TITLE;
+             break;
+-        case M_ARTIST:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_ARTIST, keywords);
++        case EXTRACTOR_METATYPE_ARTIST:
++            field = M_ARTIST;
+             break;
+-        case M_ALBUM:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_ALBUM, keywords);
++        case EXTRACTOR_METATYPE_ALBUM:
++            field = M_ALBUM;
+             break;
+-        case M_DATE:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_DATE, keywords);
++        case EXTRACTOR_METATYPE_PUBLICATION_YEAR:
++            field = M_DATE;
+             break;
+-        case M_GENRE:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_GENRE, keywords);
++        case EXTRACTOR_METATYPE_GENRE:
++            field = M_GENRE;
+             break;
+-        case M_DESCRIPTION:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_DESCRIPTION, keywords);
+-
+-            if (temp == NULL)
+-                temp = EXTRACTOR_extractLast(EXTRACTOR_COMMENT, keywords);
++        case EXTRACTOR_METATYPE_DESCRIPTION:
++            field = M_DESCRIPTION;
++            break;
++        case EXTRACTOR_METATYPE_COMMENT:
++            field = M_DESCRIPTION;
++            break;
++        case EXTRACTOR_METATYPE_IMAGE_DIMENSIONS:
++            attr = R_RESOLUTION;
+             break;
+-        default:
+-            return;
+     }
+ 
+-    if (temp != NULL)
+-        value = temp;
++    String value;
++    struct field_state *field_state = (struct field_state *)cls;
++    Ref<CdsItem> item = field_state->item;
++    Ref<StringConverter> sc = field_state->sc;
++    Ref<Array<StringBase> > aux = field_state->aux;
++
++    if (field == M_MAX && attr == R_MAX && aux == nil)
++    {
++        log_debug("no match\n");
++        return 0;
++    }
+ 
++    value = data;
+     value = trim_string(value);
+-    
+-    if (string_ok(value))
++    if (!string_ok(value))
++        return 0;
++
++    if (field != M_MAX)
+     {
+         item->setMetadata(MT_KEYS[field].upnp, sc->convert(value));
+-//        log_debug("Setting metadata on item: %d, %s\n", field, sc->convert(value).c_str());
++        log_debug("Setting metadata on item: %d, %s\n", field, sc->convert(value).c_str());
+     }
+-}
+ 
+-static void addResourceField(resource_attributes_t attr, EXTRACTOR_KeywordList *keywords, Ref<CdsItem> item, Ref<StringConverter> sc)
+-{
+-    String value;
+-    const char *temp = NULL;
+-    
+-    switch (attr)
++    if (attr != R_MAX)
+     {
+-        case R_RESOLUTION:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_SIZE, keywords);
+-            break;
+-/*        case R_SIZE:
+-            temp = EXTRACTOR_extractLast(EXTRACTOR_SIZE, keywords);
+-            break;
+-*/
+-        default:
+-            return;
++        item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(attr), value);
++        log_debug("Setting attribute on item: %d, %s\n", attr, value.c_str());
+     }
+ 
+-    if (temp != NULL)
+-        value = temp;
+-
+-    if (string_ok(value))
++    if (aux != nil)
+     {
+-          item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(attr), value);
++        String tmp;
++        for (int j = 0; j < aux->size(); j++)
++        {
++            tmp = aux->get(j);
++            if (string_ok(tmp))
++            {
++                if (type == getTagFromString(tmp))
++                {
++                    value = sc->convert(value);
++                    item->setAuxData(tmp, value);
++                    log_debug(("Adding tag: %s with value %s\n", tmp.c_str(), value.c_str()));
++                }
++            }
++        }
+     }
++
++    return 0;
+ }
+ 
+ 
+ 
+-Ref<RExp> ReAudioFormat;
+-EXTRACTOR_ExtractorList *extractors = NULL;
+-bool load_libraries_failed = false;
++static Ref<RExp> ReAudioFormat;
++static EXTRACTOR_PluginList *plugins = NULL;
++static bool load_libraries_failed = false;
+ 
+ void ExtractorHandler::fillMetadata(Ref<CdsItem> item)
+ {
+     if (load_libraries_failed)
+         return;
+-    Ref<Array<StringBase> > aux;
+-    Ref<StringConverter> sc = StringConverter::i2i();
+-        
+-    if (! extractors)
++    if (! plugins)
+     {
+-        extractors = EXTRACTOR_loadDefaultLibraries();
+-        if (! extractors)
++        plugins = EXTRACTOR_plugin_add_defaults(EXTRACTOR_OPTION_DEFAULT_POLICY);
++        if (! plugins)
++        {
+             load_libraries_failed = true;
++            return;
++        }
+     }
+-    EXTRACTOR_KeywordList *keywords = EXTRACTOR_getKeywords(extractors, item->getLocation().c_str());
+-
+-    //EXTRACTOR_printKeywords(stdout, keywords);
+ 
+-    for (int i = 0; i < M_MAX; i++)
+-        addMetaField((metadata_fields_t)i, keywords, item, sc);
+-    
+-    for (int i = 0; i < R_MAX; i++)
+-        addResourceField((resource_attributes_t)i, keywords, item, sc);
++    log_debug("processing %s\n", item->getLocation().c_str());
+ 
+     Ref<ConfigManager> cm = ConfigManager::getInstance();
+-    aux = cm->getStringArrayOption(CFG_IMPORT_LIBOPTS_EXTRACTOR_AUXDATA_TAGS_LIST);
+-    if (aux != nil)
+-    {
+-        String value;
+-        String tmp;
+-        const char *temp = NULL;
+-        
+-        for (int j = 0; j < aux->size(); j++)
+-        {
+-
+-            tmp = aux->get(j);
+-            if (string_ok(tmp))
+-            {
+-                temp = EXTRACTOR_extractLast(getTagFromString(tmp), keywords);
+-                if (temp != NULL)
+-                {
+-                    value = temp; 
+-                    if (string_ok(value))
+-                    {
+-                        value = sc->convert(value);
+-                        item->setAuxData(tmp, value);
+-//                      log_debug(("Adding tag: %s with value %s\n", tmp.c_str(), value.c_str()));
+-                    }
+-                }
+-            }
+-        }
+-    }
++    struct field_state field_state = {
++        .item = item,
++        .sc = StringConverter::i2i(),
++        .aux = cm->getStringArrayOption(CFG_IMPORT_LIBOPTS_EXTRACTOR_AUXDATA_TAGS_LIST),
++    };
++    EXTRACTOR_extract(plugins, item->getLocation().c_str(), NULL, 0, addField, &field_state);
+ 
+     if (ReAudioFormat == nil)
+     {
+@@ -379,35 +401,9 @@ void ExtractorHandler::fillMetadata(Ref<CdsItem> item)
+         ReAudioFormat->compile(_("([0-9]+)\\s+kbps,\\s*([0-9]+)\\s+hz,\\s*"
+                                  "(([0-9]+)h)?([0-9]+)m([0-9]+)\\s(\\S+)"), "i");
+     }
+-   
+-    /*
+-    temp = EXTRACTOR_extractLast(EXTRACTOR_FORMAT, keywords);
+-    log_debug("EXTRACTOR_FORMAT: %s\n", temp);
+-
+-    if (temp)
+-    {
+-        Ref<Matcher> matcher = ReAudioFormat->match((char *)temp);
+-        if (matcher != nil)
+-        {
+-            log_debug(("BR:%s FR:%s H:%s M:%s S:%s TYPE:%s\n",
+-                       matcher->group(1).c_str(),
+-                       matcher->group(2).c_str(),
+-                       matcher->group(4).c_str(),
+-                       matcher->group(5).c_str(),
+-                       matcher->group(6).c_str(),
+-                       matcher->group(7).c_str()));
+-        }
+-        else
+-        {
+-            log_debug(("format pattern unmatched!"));
+-        }
+-    }
+-
+-    */
+-    EXTRACTOR_freeKeywords(keywords);
+ 
+     // commented out for the sake of efficiency
+-    // EXTRACTOR_removeAll(extractors);
++    // EXTRACTOR_plugin_remove_all(plugins);
+ }
+ 
+ Ref<IOHandler> ExtractorHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size)

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);
+-        log_js("%s\n", JS_GetStringBytes(str));
++
++        char * log_str = JS_EncodeString(cx, str);
++        log_js("%s\n", log_str);
++        JS_free(cx, log_str);
+     }
+     return JS_TRUE;
+ }
+ 
+ JSBool
+-js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++js_copyObject(JSContext *cx, uintN argc, jsval *argv)
+ {
+     jsval arg;
+     JSObject *js_cds_obj;
+     JSObject *js_cds_clone_obj;
+ 
+-    Script *self = (Script *)JS_GetPrivate(cx, obj);
++    Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
+ 
+     try
+     {
+@@ -91,7 +106,7 @@ js_copyObject(JSContext *cx, JSObject *o
+ 
+         self->cdsObject2jsObject(cds_obj, js_cds_clone_obj);
+ 
+-        *rval = OBJECT_TO_JSVAL(js_cds_clone_obj);
++        JS_SET_RVAL(cx, argv, OBJECT_TO_JSVAL(js_cds_clone_obj));
+ 
+         return JS_TRUE;
+ 
+@@ -110,28 +125,56 @@ js_copyObject(JSContext *cx, JSObject *o
+ }
+ 
+ JSBool
+-js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++js_addCdsObject(JSContext *cx, uintN argc, jsval *argv)
+ {
+     try
+     {
+-        jsval arg;
+-        JSString *str;
+-        String path;
+-        String containerclass;
++    	// Inputs from native code
++        JSObject *js_cds_obj = NULL;
++        JSString *str =  NULL;
++        JSString *cont = NULL;
+ 
+-        JSObject *js_cds_obj;
++        String path = nil;
++        String containerclass = nil;
++
++        JSObject *obj = JS_THIS_OBJECT(cx, argv);
+         JSObject *js_orig_obj = NULL;
+         Ref<CdsObject> orig_object;
+ 
+         Ref<StringConverter> p2i;
+         Ref<StringConverter> i2i;
+-
++        switch (argc)
++        {
++        case 0:
++        	log_debug("No input arguments given\n");
++        	return JS_FALSE;
++        case 1:
++			if(!JS_ConvertArguments(cx, 1, JS_ARGV(cx, argv), "o", &js_cds_obj))
++			{
++				log_debug("Could not parse input arguments\n");
++				return JS_TRUE;
++			}
++			break;
++        case 2:
++        	if(!JS_ConvertArguments(cx, 2, JS_ARGV(cx, argv), "oS", &js_cds_obj, &str))
++			{
++				log_debug("Could not parse input arguments\n");
++				return JS_TRUE;
++			}
++			break;
++        default:
++        	if(!JS_ConvertArguments(cx, 3, JS_ARGV(cx, argv), "oSS", &js_cds_obj, &str, &cont))
++			{
++				log_debug("Could not parse input arguments\n");
++				return JS_TRUE;			}
++			break;
++        }
+         Script *self = (Script *)JS_GetPrivate(cx, obj);
+ 
+         if (self == NULL)
+         {
+             log_debug("Could not retrieve class instance from global object\n");
+-            return JS_FALSE;
++            return JS_TRUE;
+         }
+ 
+         if (self->whoami() == S_PLAYLIST)
+@@ -142,26 +185,14 @@ js_addCdsObject(JSContext *cx, JSObject
+         {
+             i2i = StringConverter::i2i();
+         }
+- 
+-        arg = argv[0];
+-        if (!JSVAL_IS_OBJECT(arg))
+-            return JS_TRUE;
+-        if (!JS_ValueToObject(cx, arg, &js_cds_obj))
+-            return JS_TRUE;
+-
+-        // root it
+-        argv[0] = OBJECT_TO_JSVAL(js_cds_obj);
+-
+-        str = JS_ValueToString(cx, argv[1]);
+         if (!str)
+             path = _("/");
+         else
+-            path = JS_GetStringBytes(str);
++            path = JS_EncodeString(cx, str);
+ 
+-        JSString *cont = JS_ValueToString(cx, argv[2]);
+         if (cont)
+         {
+-            containerclass = JS_GetStringBytes(cont);
++            containerclass = JS_EncodeString(cx, cont);
+             if (!string_ok(containerclass) || containerclass == "undefined")
+                 containerclass = nil;
+         }
+@@ -177,9 +208,6 @@ js_addCdsObject(JSContext *cx, JSObject
+             return JS_TRUE;
+         }
+ 
+-        // root it
+-        argv[1] = OBJECT_TO_JSVAL(js_orig_obj);
+-
+         orig_object = self->jsObject2cdsObject(js_orig_obj, self->getProcessedObject());
+         if (orig_object == nil)
+             return JS_TRUE;
+@@ -285,8 +313,7 @@ js_addCdsObject(JSContext *cx, JSObject
+         JSString *str2 = JS_NewStringCopyN(cx, tmp.c_str(), tmp.length());
+         if (!str2)
+             return JS_TRUE;
+-        *rval = STRING_TO_JSVAL(str2);
+-
++        JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2)); 
+         return JS_TRUE;
+     }
+     catch (ServerShutdownException se)
+@@ -302,7 +329,7 @@ js_addCdsObject(JSContext *cx, JSObject
+     return JS_TRUE;
+ }
+ 
+-static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, charset_convert_t chr)
++static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, charset_convert_t chr)
+ {
+     try
+     {
+@@ -321,7 +348,7 @@ static JSBool convert_charset_generic(JS
+         {
+             str = JS_ValueToString(cx, argv[0]);
+             if (str)
+-                result = JS_GetStringBytes(str);
++                result = JS_EncodeString(cx, str);
+         }
+ 
+         if (result != nil)
+@@ -330,7 +357,7 @@ static JSBool convert_charset_generic(JS
+             JSString *str2 = JS_NewStringCopyN(cx, result.c_str(), result.length());
+             if (!str2)
+                 return JS_TRUE;
+-            *rval = STRING_TO_JSVAL(str2);
++            JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2));
+         }
+     }
+     catch (ServerShutdownException se)
+@@ -347,24 +374,24 @@ static JSBool convert_charset_generic(JS
+ }
+ 
+ 
+-JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv)
+ {
+-     return convert_charset_generic(cx, obj, argc, argv, rval, F2I);
++     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, F2I);
+ }
+ 
+-JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv)
+ {
+-     return convert_charset_generic(cx, obj, argc, argv, rval, M2I);
++     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, M2I); 
+ }
+ 
+-JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv)
+ {
+-     return convert_charset_generic(cx, obj, argc, argv, rval, P2I);
++     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, P2I);
+ }
+ 
+-JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv)
+ {
+-     return convert_charset_generic(cx, obj, argc, argv, rval, J2I);
++     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, J2I);
+ }
+ 
+ } // extern "C"
+Index: mediatomb-0.12.1.svn2103/src/scripting/js_functions.h
+===================================================================
+--- mediatomb-0.12.1.svn2103.orig/src/scripting/js_functions.h
++++ mediatomb-0.12.1.svn2103/src/scripting/js_functions.h
+@@ -40,18 +40,18 @@
+ extern "C" {
+ 
+ /// \brief Log output.
+-JSBool js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
++JSBool js_print(JSContext *cx, uintN argc, jsval *argv);
+ 
+ /// \brief Adds an object to the database.
+-JSBool js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
++JSBool js_addCdsObject(JSContext *cx, uintN argc, jsval *argv);
+ 
+ /// \brief Makes a copy of an CDS object.
+-JSBool js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
++JSBool js_copyObject(JSContext *cx, uintN argc, jsval *argv);
+ 
+-JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+-JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+-JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+-JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
++JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv);
++JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv);
++JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv);
++JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv);
+ 
+ } // extern "C"
+ 
+Index: mediatomb-0.12.1.svn2103/src/scripting/playlist_parser_script.cc
+===================================================================
+--- mediatomb-0.12.1.svn2103.orig/src/scripting/playlist_parser_script.cc
++++ mediatomb-0.12.1.svn2103/src/scripting/playlist_parser_script.cc
+@@ -46,9 +46,9 @@ using namespace zmm;
+ extern "C" {
+ 
+ static JSBool
+-js_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
++js_readln(JSContext *cx, uintN argc, jsval *argv)
+ {
+-    PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, obj);
++    PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
+ 
+     String line;
+     
+@@ -69,7 +69,7 @@ js_readln(JSContext *cx, JSObject *obj,
+ 
+     JSString *jsline = JS_NewStringCopyZ(cx, line.c_str());
+ 
+-    *rval = STRING_TO_JSVAL(jsline);
++    JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(jsline));
+   
+     return JS_TRUE;
+ }
+@@ -93,8 +93,8 @@ PlaylistParserScript::PlaylistParserScri
+ 
+         String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT); 
+         load(scriptPath);
+-        root = JS_NewScriptObject(cx, script);
+-        JS_AddNamedRoot(cx, &root, "PlaylistScript");
++        root = JS_NewObject(cx, NULL, script, NULL);
++        JS_AddNamedObjectRoot(cx, &root, "PlaylistScript");
+     }
+     catch (Exception ex)
+     {
+@@ -245,7 +245,7 @@ PlaylistParserScript::~PlaylistParserScr
+ #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/script.cc
+===================================================================
+--- mediatomb-0.12.1.svn2103.orig/src/scripting/script.cc
++++ mediatomb-0.12.1.svn2103/src/scripting/script.cc
+@@ -87,7 +87,7 @@ String Script::getProperty(JSObject *obj
+     str = JS_ValueToString(cx, val);
+     if (! str)
+         return nil;
+-    return JS_GetStringBytes(str);
++    return JS_EncodeString(cx, str);
+ }
+ 
+ int Script::getBoolProperty(JSObject *obj, String name)
+@@ -427,14 +427,14 @@ static JSFunctionSpec js_global_function
+         try
+         {
+             common_script = _load(common_scr_path);
+-            common_root = JS_NewScriptObject(cx, common_script);
+-            JS_AddNamedRoot(cx, &common_root, "common-script");
++            common_root = JS_NewObject(cx, NULL, common_script, NULL);
++            JS_AddNamedObjectRoot(cx, &common_root, "common-script");
+             _execute(common_script);
+         }
+         catch (Exception e)
+         {
+             if (common_root)
+-                JS_RemoveRoot(cx, &common_root);
++                JS_RemoveObjectRoot(cx, &common_root);
+ 
+             log_js("Unable to load %s: %s\n", common_scr_path.c_str(), 
+                     e.getMessage().c_str());
+@@ -460,7 +460,7 @@ Script::~Script()
+     JS_BeginRequest(cx);
+ #endif
+     if (common_root)
+-        JS_RemoveRoot(cx, &common_root);
++                JS_RemoveObjectRoot(cx, &common_root);
+ 
+ /*
+  * scripts are unrooted and will be cleaned up by GC
+@@ -504,11 +504,11 @@ void Script::initGlobalObject()
+     static JSClass global_class =
+     {
+         "global",                                   /* name */
+-        JSCLASS_HAS_PRIVATE,                        /* flags */
++        JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS,/* flags */
+         JS_PropertyStub,                            /* add property */
+         JS_PropertyStub,                            /* del property */
+         JS_PropertyStub,                            /* get property */
+-        JS_PropertyStub,                            /* set property */
++        JS_StrictPropertyStub,                      /* set property */
+         JS_EnumerateStandardClasses,                /* enumerate */
+         JS_ResolveStub,                             /* resolve */
+         JS_ConvertStub,                             /* convert */
+@@ -517,7 +517,7 @@ void Script::initGlobalObject()
+     };
+ 
+     /* create the global object here */
+-    glob = JS_NewObject(cx, &global_class, NULL, NULL);
++    glob = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
+     if (! glob)
+         throw _Exception(_("Scripting: could not initialize glboal class"));
+ 
+@@ -539,12 +539,12 @@ void Script::defineFunctions(JSFunctionS
+         throw _Exception(_("Scripting: JS_DefineFunctions failed"));
+ }
+ 
+-JSScript *Script::_load(zmm::String scriptPath)
++JSObject *Script::_load(zmm::String scriptPath)
+ {
+     if (glob == NULL)
+         initGlobalObject();
+ 
+-    JSScript *scr;
++    JSObject *scr;
+ 
+     String scriptText = read_text_file(scriptPath);
+ 
+@@ -571,14 +571,11 @@ JSScript *Script::_load(zmm::String scri
+ 
+ void Script::load(zmm::String scriptPath)
+ {
+-    if (script)
+-        JS_DestroyScript(cx, script);
+-
+     script = _load((scriptPath));
+ }
+ 
+ 
+-void Script::_execute(JSScript *scr)
++void Script::_execute(JSObject *scr)
+ {
+     jsval ret_val;
+ 
+@@ -662,7 +659,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
+     JSObject *js_meta = getObjectProperty(js, _("meta"));
+     if (js_meta)
+     {
+-        JS_AddNamedRoot(cx, &js_meta, "meta");
++        JS_AddNamedObjectRoot(cx, &js_meta, "meta");
+         /// \todo: only metadata enumerated in MT_KEYS is taken
+         for (int i = 0; i < M_MAX; i++)
+         {
+@@ -687,7 +684,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
+                 }
+             }
+         }
+-        JS_RemoveRoot(cx, &js_meta);
++        JS_RemoveObjectRoot(cx, &js_meta);
+     }
+     
+     // stuff that has not been exported to js
+Index: mediatomb-0.12.1.svn2103/src/scripting/script.h
+===================================================================
+--- mediatomb-0.12.1.svn2103.orig/src/scripting/script.h
++++ mediatomb-0.12.1.svn2103/src/scripting/script.h
+@@ -66,8 +66,8 @@ public:
+     JSRuntime *rt;
+     JSContext *cx;
+     JSObject  *glob;
+-    JSScript *script;
+-    JSScript *common_script;
++    JSObject  *script;
++    JSObject  *common_script;
+     
+ public:
+     Script(zmm::Ref<Runtime> runtime);
+@@ -115,8 +115,8 @@ private:
+     JSObject *common_root;
+ 
+     void initGlobalObject();
+-    JSScript *_load(zmm::String scriptPath);
+-    void _execute(JSScript *scr);
++    JSObject *_load(zmm::String scriptPath);
++    void _execute(JSObject *scr);
+     zmm::Ref<StringConverter> _p2i;
+     zmm::Ref<StringConverter> _j2i;
+     zmm::Ref<StringConverter> _f2i;

mediatomb-svn_automake_1.12.patch Added

mediatomb-0.12.1.svn2103.tar.bz2 Added

mediatomb-0.12.1.tar.gz Deleted

Build Results
RPM Lint

Refresh

Comments for request 320 0

Request History

marguerite created request over 10 years ago

fix build on all build hosts.

mrdocs accepted request over 11 years ago

Thanks. Great work!