| 1 |
vapier 12/10/02 03:32:15 |
| 2 |
|
| 3 |
Added: mediatomb-0.12.1-system-uuid.patch |
| 4 |
mediatomb-0.12.1.initd |
| 5 |
Log: |
| 6 |
Use system libuuid from util-linux #270830 by Diego Elio Pettenò. Make mysql init script optional all the time to support external services #368409 by David Carlos Manuelda. Update to EAPI=4 and split up USE flags to make things more explicit. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha131/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-misc/mediatomb/files/mediatomb-0.12.1-system-uuid.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mediatomb/files/mediatomb-0.12.1-system-uuid.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mediatomb/files/mediatomb-0.12.1-system-uuid.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: mediatomb-0.12.1-system-uuid.patch |
| 17 |
=================================================================== |
| 18 |
diff --git a/build/Makefile.am b/build/Makefile.am |
| 19 |
index 6cdfc16..64a965a 100644 |
| 20 |
--- a/build/Makefile.am |
| 21 |
+++ b/build/Makefile.am |
| 22 |
@@ -58,6 +58,7 @@ mediatomb_CXXFLAGS = -I$(top_srcdir)/src \ |
| 23 |
mediatomb_LDADD = \ |
| 24 |
libmediatomb.a \ |
| 25 |
$(top_srcdir)/tombupnp/build/libtombupnp.a \ |
| 26 |
+ -luuid \ |
| 27 |
$(LIBEXIF_LDFLAGS) \ |
| 28 |
$(ZLIB_LDFLAGS) \ |
| 29 |
$(EXPAT_LDFLAGS) \ |
| 30 |
diff --git a/build/libmediatomb_src b/build/libmediatomb_src |
| 31 |
index 1173942..9d4f7fd 100644 |
| 32 |
--- a/build/libmediatomb_src |
| 33 |
+++ b/build/libmediatomb_src |
| 34 |
@@ -231,19 +231,6 @@ libmediatomb_a_SOURCES = \ |
| 35 |
../src/url.h \ |
| 36 |
../src/url_request_handler.cc \ |
| 37 |
../src/url_request_handler.h \ |
| 38 |
-../src/uuid/clear.c \ |
| 39 |
-../src/uuid/compare.c \ |
| 40 |
-../src/uuid/copy.c \ |
| 41 |
-../src/uuid/gen_uuid.c \ |
| 42 |
-../src/uuid/isnull.c \ |
| 43 |
-../src/uuid/pack.c \ |
| 44 |
-../src/uuid/parse.c \ |
| 45 |
-../src/uuid/unpack.c \ |
| 46 |
-../src/uuid/unparse.c \ |
| 47 |
-../src/uuid/uuid.h \ |
| 48 |
-../src/uuid/uuidP.h \ |
| 49 |
-../src/uuid/uuid_time.c \ |
| 50 |
-../src/uuid/uuid_types.h \ |
| 51 |
../src/web/action.cc \ |
| 52 |
../src/web/add.cc \ |
| 53 |
../src/web/add_object.cc \ |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.1 net-misc/mediatomb/files/mediatomb-0.12.1.initd |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mediatomb/files/mediatomb-0.12.1.initd?rev=1.1&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mediatomb/files/mediatomb-0.12.1.initd?rev=1.1&content-type=text/plain |
| 61 |
|
| 62 |
Index: mediatomb-0.12.1.initd |
| 63 |
=================================================================== |
| 64 |
#!/sbin/runscript |
| 65 |
# Copyright 1999-2012 Gentoo Foundation |
| 66 |
# Distributed under the terms of the GNU General Public License v2 |
| 67 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/files/mediatomb-0.12.1.initd,v 1.1 2012/10/02 03:32:15 vapier Exp $ |
| 68 |
|
| 69 |
depend() { |
| 70 |
need net |
| 71 |
# In order to properly support this (need vs use), we would have to |
| 72 |
# parse ${MEDIATOMB_CONFIG} and see if mysql is enabled and if it is |
| 73 |
# pointing to the local system. #368409 |
| 74 |
use mysql |
| 75 |
} |
| 76 |
|
| 77 |
start() { |
| 78 |
ebegin "Starting MediaTomb" |
| 79 |
start-stop-daemon --start --quiet --exec /usr/bin/mediatomb \ |
| 80 |
--pidfile ${MEDIATOMB_PIDFILE} -- --daemon \ |
| 81 |
--pidfile ${MEDIATOMB_PIDFILE} --user ${MEDIATOMB_USER} \ |
| 82 |
--group ${MEDIATOMB_GROUP} --logfile ${MEDIATOMB_LOGFILE} \ |
| 83 |
--config ${MEDIATOMB_CONFIG} --port ${MEDIATOMB_PORT} \ |
| 84 |
${MEDIATOMB_OPTIONS} |
| 85 |
eend $? |
| 86 |
} |
| 87 |
|
| 88 |
stop () { |
| 89 |
ebegin "Stopping MediaTomb" |
| 90 |
start-stop-daemon --stop --retry 10 --quiet --pidfile ${MEDIATOMB_PIDFILE} |
| 91 |
eend $? |
| 92 |
} |
Archives