rpms/mediatomb/F-9 mediatomb_fedora11.patch, NONE, 1.1 import.log, 1.2, 1.3 mediatomb-service-disable.patch, 1.1, 1.2 mediatomb.spec, 1.6, 1.7 mediatomb_curl.patch, 1.1, NONE
Marc Wiriadisastra
mwiriadi at fedoraproject.org
Sun Jul 5 10:54:09 UTC 2009
Author: mwiriadi
Update of /cvs/pkgs/rpms/mediatomb/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8981/F-9
Modified Files:
import.log mediatomb-service-disable.patch mediatomb.spec
Added Files:
mediatomb_fedora11.patch
Removed Files:
mediatomb_curl.patch
Log Message:
Change requires from mysql to mysql-libs closes bz#483635
Change priority of system-init scripts hopefully closes bz#487877
Fix the building of the package on other versions
mediatomb_fedora11.patch:
--- NEW FILE mediatomb_fedora11.patch ---
diff -Naur mediatomb-0.11.0/src/storage/mysql/mysql_storage.cc mediatomb-0.11.0_patched/src/storage/mysql/mysql_storage.cc
--- mediatomb-0.11.0/src/storage/mysql/mysql_storage.cc 2008-03-01 23:48:34.000000000 +0100
+++ mediatomb-0.11.0_patched/src/storage/mysql/mysql_storage.cc 2009-06-27 20:50:08.000000000 +0200
@@ -124,7 +124,6 @@
throw _Exception(_("could not create pthread_key"));
}
mysql_server_init(0, NULL, NULL);
- my_init();
pthread_setspecific(mysql_init_key, (void *) 1);
Ref<ConfigManager> config = ConfigManager::getInstance();
diff -Naur mediatomb-0.11.0/src/tools.cc mediatomb-0.11.0_patched/src/tools.cc
--- mediatomb-0.11.0/src/tools.cc 2008-03-01 23:48:36.000000000 +0100
+++ mediatomb-0.11.0_patched/src/tools.cc 2009-06-27 20:52:49.000000000 +0200
@@ -303,8 +303,8 @@
Ref<StringBuffer> buf(new StringBuffer(len / 2));
for (int i = 0; i < len; i += 2)
{
- char *chi = strchr(HEX_CHARS, ptr[i]);
- char *clo = strchr(HEX_CHARS, ptr[i + 1]);
+ const char *chi = strchr(HEX_CHARS, ptr[i]);
+ const char *clo = strchr(HEX_CHARS, ptr[i + 1]);
int hi, lo;
if (chi)
@@ -397,7 +397,7 @@
char clo = data[i++];
int hi, lo;
- char *pos;
+ const char *pos;
pos = strchr(hex, chi);
if (!pos)
@@ -981,15 +981,13 @@
void getTimespecNow(struct timespec *ts)
{
-#ifdef HAVE_CLOCK_GETTIME
- clock_gettime(CLOCK_REALTIME, ts);
-#else
-
struct timeval tv;
- gettimeofday(&tv, NULL);
+ int ret = gettimeofday(&tv, NULL);
+ if (ret != 0)
+ throw _Exception(_("gettimeofday failed: ") + mt_strerror(errno));
+
ts->tv_sec = tv.tv_sec;
ts->tv_nsec = tv.tv_usec * 1000;
-#endif
}
long getDeltaMillis(struct timespec *first)
@@ -1054,14 +1052,7 @@
#ifndef __CYGWIN__
if (path.charAt(0) != DIR_SEPARATOR)
#else
- #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! this function is not finished for Cygwin
- #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! this function is not finished for Cygwin
- #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! this function is not finished for Cygwin
- #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! this function is not finished for Cygwin
- #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! this function is not finished for Cygwin
- #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! this function is not finished for Cygwin
- #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! this function is not finished for Cygwin
- #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! this function is not finished for Cygwin
+ #error !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! this function is not finished for Cygwin
for (int i = 0; i < 20; i++)
print_backtrace();
/// \todo this doesn't seem to be correct...
@@ -1113,7 +1104,7 @@
*(str++) = DIR_SEPARATOR;
*str = 0;
-
+ result->len = strlen(result->data);
return String(result);
}
@@ -1201,6 +1192,9 @@
Ref<Array<StringBase> > parseCommandLine(String line, String in, String out)
{
Ref<Array<StringBase> > params = split_string(line, ' ');
+ if ((in == nil) && (out == nil))
+ return params;
+
for (int i = 0; i < params->size(); i++)
{
String param = params->get(i);
@@ -1302,6 +1296,11 @@
FILE *f;
char buffer[7];
f = fopen(ogg_filename.c_str(), "rb");
+ if (!f)
+ {
+ throw _Exception(_("Error opening ") + ogg_filename + _(" : ") +
+ mt_strerror(errno));
+ }
if (fread(buffer, 1, 4, f) != 4)
{
@@ -1439,13 +1438,12 @@
}
else
{
- sum->tv_nsec += 1000000000 + now.tv_nsec - last_start->tv_nsec;
- //log_debug("adding 1 sec %ld nsec\n", 1000000000 + now.tv_nsec - last_start->tv_nsec);
- sum->tv_sec ++;
+ sum->tv_nsec += 1000000000L - last_start->tv_nsec + now.tv_nsec;
+ sum->tv_sec --;
}
- if (sum->tv_nsec >= 1000000000)
+ if(sum->tv_nsec >= 1000000000L)
{
- sum->tv_nsec -= 1000000000;
+ sum->tv_nsec -= 1000000000L;
sum->tv_sec ++;
}
diff -Naur mediatomb-0.11.0/src/url.cc mediatomb-0.11.0_patched/src/url.cc
--- mediatomb-0.11.0/src/url.cc 2008-03-01 23:48:36.000000000 +0100
+++ mediatomb-0.11.0_patched/src/url.cc 2009-06-27 20:53:49.000000000 +0200
@@ -75,7 +75,7 @@
if (only_header)
{
- curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
+ curl_easy_setopt(curl_handle, CURLOPT_NOBODY, 1);
curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA,
(void *)buffer.getPtr());
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mediatomb/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 7 Oct 2008 12:49:19 -0000 1.2
+++ import.log 5 Jul 2009 10:54:08 -0000 1.3
@@ -1,2 +1,3 @@
mediatomb-0_11_0-2_fc9:F-9:mediatomb-0.11.0-2.fc9.src.rpm:1223381990
mediatomb-0_11_0-3_fc9:F-9:mediatomb-0.11.0-3.fc9.src.rpm:1223383727
+mediatomb-0_11_0-9_fc11:F-9:mediatomb-0.11.0-9.fc11.src.rpm:1246791182
mediatomb-service-disable.patch:
Index: mediatomb-service-disable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mediatomb/F-9/mediatomb-service-disable.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mediatomb-service-disable.patch 2 Mar 2008 16:54:36 -0000 1.1
+++ mediatomb-service-disable.patch 5 Jul 2009 10:54:08 -0000 1.2
@@ -5,7 +5,7 @@
# mediatomb This script starts and stops the mediatomb daemon
#
-# chkconfig: 2345 95 30
-+# chkconfig: - 95 30
++# chkconfig: - 20 80
# processname: mediatomb
# description: mediatomb is a daemon process which provides a UPnP service
# config: /etc/mediatomb
Index: mediatomb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediatomb/F-9/mediatomb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mediatomb.spec 7 Oct 2008 12:49:19 -0000 1.6
+++ mediatomb.spec 5 Jul 2009 10:54:08 -0000 1.7
@@ -1,23 +1,23 @@
Version: 0.11.0
Summary: UPnP AV MediaServer
Name: mediatomb
-Release: 3%{?dist}
+Release: 9%{?dist}
Summary: MediaTomb - UPnP AV Mediaserver for Linux
License: GPLv2
Group: Applications/Multimedia
Source: http://downloads.sourceforge.net/mediatomb/%{name}-%{version}.tar.gz
Patch0: mediatomb-service-disable.patch
-Patch1: mediatomb_curl.patch
+Patch1: mediatomb_fedora11.patch
URL: http://mediatomb.cc
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, js-devel, zlib-devel, taglib-devel
-BuildRequires: expat-devel
+BuildRequires: expat-devel, libcurl-devel
%if 0%{?fedora} >= 9
BuildRequires: xulrunner-devel
%else
BuildRequires: firefox-devel
%endif
-Requires: mysql, expat
+Requires: mysql-libs, expat
Requires(pre): shadow-utils
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
@@ -36,7 +36,9 @@ be found on http://www.upnp.org/.
%patch1 -p1
%build
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} >= 11
+%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9.1/js/
+%else if 0%{?fedora} = 10
%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9/js/
%else
%configure --enable-inotify --enable-taglib --enable-libjs
@@ -94,17 +96,41 @@ fi
%attr(-,mediatomb,mediatomb)%ghost %{_sysconfdir}/%{name}/*
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%{_bindir}/mediatomb
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}/
%{_mandir}/man1/*
%{_initrddir}/mediatomb
%changelog
+* Sun Jun 28 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 0.11.0-9
+- Change requires from mysql to mysql-libs closes bz#483635
+- Change priority of system-init scripts closes bz#487877
+
+* Sun Jun 28 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 0.11.0-8
+- Added upstream patch which fixes compile time errors and a couple of segfaults
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 16 2009 Caolán McNamara <caolanm at redhat.com> 0.11.0-6
+- needs to point to xulrunner/js 1.9.1 now
+- include my_sys.h for my_init
+- fix some char* -> const char*
+
+* Sat Jan 24 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> 0.11.0-5
+- Rebuild for mysql dependancy
+
+* Mon Dec 1 2008 Michael Schwendt <mschwendt at fedoraproject.org> 0.11.0-4
+- Include /usr/share/mediatomb directory.
+
* Tue Oct 7 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> 0.11.0-3
- Added the line change for xulrunner
* Tue Oct 7 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> 0.11.0-2
- Added patch from upstream for Curl
+* Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> 0.11.0-2
+- Include /usr/share/mediatomb directory.
+
* Sun Mar 2 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> 0.11.0-1
- New release version 0.11.0
- Upstream has asked me to remove libextractor
--- mediatomb_curl.patch DELETED ---
More information about the fedora-extras-commits
mailing list