* [gentoo-commits] gentoo-x86 commit in media-video/ushare/files: 03_all_ushare_mp4_video_mime.patch 02_all_ushare_build_warnings.patch 01_all_ushare_build_system.patch
@ 2012-04-02 19:14 Pacho Ramos (pacho)
0 siblings, 0 replies; only message in thread
From: Pacho Ramos (pacho) @ 2012-04-02 19:14 UTC (permalink / raw
To: gentoo-commits
pacho 12/04/02 19:14:04
Added: 03_all_ushare_mp4_video_mime.patch
02_all_ushare_build_warnings.patch
01_all_ushare_build_system.patch
Log:
Revision bump fixing tons of bugs and with a new maintainer by #403979. Thanks a lot to Sal Gonzalez for his work. Remove old.
(Portage version: 2.1.10.54/cvs/Linux x86_64)
Revision Changes Path
1.1 media-video/ushare/files/03_all_ushare_mp4_video_mime.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare/files/03_all_ushare_mp4_video_mime.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare/files/03_all_ushare_mp4_video_mime.patch?rev=1.1&content-type=text/plain
Index: 03_all_ushare_mp4_video_mime.patch
===================================================================
diff --git a/src/mime.c b/src/mime.c
index bf0121b..f38deca 100644
--- a/src/mime.c
+++ b/src/mime.c
@@ -53,6 +53,7 @@ const struct mime_type_t MIME_Type_List[] = {
{ "mpeg2", UPNP_VIDEO, "http-get:*:video/mpeg2:"},
{ "m4v", UPNP_VIDEO, "http-get:*:video/mp4:"},
{ "m4p", UPNP_VIDEO, "http-get:*:video/mp4:"},
+ { "mp4", UPNP_VIDEO, "http-get:*:video/mp4:"},
{ "mp4ps", UPNP_VIDEO, "http-get:*:video/x-nerodigital-ps:"},
{ "ts", UPNP_VIDEO, "http-get:*:video/mpeg2:"},
{ "ogm", UPNP_VIDEO, "http-get:*:video/mpeg:"},
@@ -79,7 +80,6 @@ const struct mime_type_t MIME_Type_List[] = {
{ "mp1", UPNP_AUDIO, "http-get:*:audio/mp1:"},
{ "mp2", UPNP_AUDIO, "http-get:*:audio/mp2:"},
{ "mp3", UPNP_AUDIO, "http-get:*:audio/mpeg:"},
- { "mp4", UPNP_AUDIO, "http-get:*:audio/mp4:"},
{ "m4a", UPNP_AUDIO, "http-get:*:audio/mp4:"},
{ "ogg", UPNP_AUDIO, "http-get:*:audio/x-ogg:"},
{ "wav", UPNP_AUDIO, "http-get:*:audio/wav:"},
1.1 media-video/ushare/files/02_all_ushare_build_warnings.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare/files/02_all_ushare_build_warnings.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare/files/02_all_ushare_build_warnings.patch?rev=1.1&content-type=text/plain
Index: 02_all_ushare_build_warnings.patch
===================================================================
diff --git a/src/ctrl_telnet.c b/src/ctrl_telnet.c
index 0849d80..b3e9e8d 100644
--- a/src/ctrl_telnet.c
+++ b/src/ctrl_telnet.c
@@ -202,6 +202,7 @@ ctrl_telnet_start (int port)
void
ctrl_telnet_stop (void)
{
+ ssize_t tmp;
pthread_mutex_lock (&startstop_lock);
if (!started)
@@ -211,7 +212,7 @@ ctrl_telnet_stop (void)
}
/* yes is int, which is bigger then char, so this should be safe */
- write (ttd.killer[1], &yes, sizeof (char));
+ tmp = write (ttd.killer[1], &yes, sizeof (char));
pthread_mutex_unlock (&startstop_lock);
pthread_join (ttd.thread, NULL);
diff --git a/src/mime.c b/src/mime.c
index 66c48ab..bf0121b 100644
--- a/src/mime.c
+++ b/src/mime.c
@@ -144,7 +144,8 @@ char *mime_get_protocol (struct mime_type_t *mime)
if (!mime)
return NULL;
- sprintf (protocol, mime->mime_protocol);
+ //sprintf (protocol, mime->mime_protocol);
+ strcpy (protocol, mime->mime_protocol);
strcat (protocol, "*");
return strdup (protocol);
}
1.1 media-video/ushare/files/01_all_ushare_build_system.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare/files/01_all_ushare_build_system.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare/files/01_all_ushare_build_system.patch?rev=1.1&content-type=text/plain
Index: 01_all_ushare_build_system.patch
===================================================================
diff -uNr ushare-1.1a/configure ushare-1.1b/configure
--- ushare-1.1a/configure 2007-12-09 08:03:36.000000000 -0500
+++ ushare-1.1b/configure 2012-03-25 17:35:07.000000000 -0400
@@ -42,6 +42,9 @@
echo " --with-libdlna-dir=DIR check for libdlna installed in DIR"
echo ""
echo "Advanced options (experts only):"
+ echo " --disable-sysconf disable installation of init files"
+ echo " --enable-developer enable developer options"
+ echo " --disable-developer disable developer options"
echo " --enable-debug enable debugging symbols"
echo " --disable-debug disable debugging symbols"
echo " --disable-strip disable stripping of executables at installation"
@@ -164,6 +167,11 @@
echo "#define $1 \"$2\"" >> $CONFIG_H
}
+check_cmd_exists(){
+ log check_cmd_exists "$@"
+ which "$@" >>$logfile 2>&1
+}
+
check_cmd(){
log "$@"
"$@" >>$logfile 2>&1
@@ -300,13 +308,15 @@
strip="strip"
cpu=`uname -m`
optimize="yes"
+sysconf="yes"
+developer="no"
debug="no"
dostrip="yes"
extralibs=""
installstrip="-s"
cross_compile="no"
INSTALL="/usr/bin/install -c"
-VERSION="1.1a"
+VERSION="1.2.0"
system_name=`uname -s 2>&1`
#################################################
@@ -420,6 +430,12 @@
;;
--disable-dlna) dlna="no"
;;
+ --disable-sysconf) sysconf="no"
+ ;;
+ --enable-developer) developer="yes"
+ ;;
+ --disable-developer) developer="no"
+ ;;
--enable-debug) debug="yes"
;;
--disable-debug) debug="no"
@@ -584,6 +600,25 @@
linux && add_cflags -D_GNU_SOURCE
#################################################
+# check for developer options
+#################################################
+if enabled developer; then
+ add_cflags -Werror
+ add_cflags -DHAVE_DEVELOPER
+
+ have_ctags='no'
+ if check_cmd_exists 'ctags'; then
+ have_ctags='yes'
+ fi
+
+ have_etags='no'
+ if check_cmd_exists 'etags'; then
+ have_etags='yes'
+ fi
+
+fi
+
+#################################################
# check for debug symbols
#################################################
if enabled debug; then
@@ -684,6 +719,8 @@
echolog " STRIP $strip"
echolog " make $make"
echolog " CPU $cpu ($tune)"
+echolog " install sysconf $sysconf"
+echolog " developer options $developer"
echolog " debug symbols $debug"
echolog " strip symbols $dostrip"
echolog " optimize $optimize"
@@ -724,6 +761,10 @@
append_config "LDFLAGS=$LDFLAGS"
append_config "INSTALL=$INSTALL"
+append_config "INSTALL_SYSCONF=$sysconf"
+append_config "DEVELOPER=$developer"
+append_config "HAVE_CTAGS=$have_ctags"
+append_config "HAVE_ETAGS=$have_etags"
append_config "DEBUG=$debug"
diff -uNr ushare-1.1a/scripts/Makefile ushare-1.1b/scripts/Makefile
--- ushare-1.1a/scripts/Makefile 2007-12-09 08:03:36.000000000 -0500
+++ ushare-1.1b/scripts/Makefile 2012-03-25 17:35:07.000000000 -0400
@@ -3,6 +3,11 @@
endif
include ../config.mak
+INSTALL_RULES =
+ifeq ($(INSTALL_SYSCONF),yes)
+ INSTALL_RULES += install-sysconf
+endif
+
CONF_FILE = "ushare.conf"
INITD_FILE = "ushare"
@@ -14,7 +19,9 @@
distclean:
-install:
+install: $(INSTALL_RULES)
+
+install-sysconf:
$(INSTALL) -d $(sysconfdir)
$(INSTALL) -m 644 $(CONF_FILE) $(sysconfdir)
$(INSTALL) -d $(sysconfdir)/init.d
diff -uNr ushare-1.1a/src/Makefile ushare-1.1b/src/Makefile
--- ushare-1.1a/src/Makefile 2007-12-09 08:03:36.000000000 -0500
+++ ushare-1.1b/src/Makefile 2012-03-25 17:35:07.000000000 -0400
@@ -3,6 +3,15 @@
endif
include ../config.mak
+ifeq ($(DEVELOPER),yes)
+ ifeq ($(HAVE_ETAGS),yes)
+ BUILD_RULES += TAGS
+ endif
+ ifeq ($(HAVE_CTAGS),yes)
+ BUILD_RULES += tags
+ endif
+endif
+
PROG = ushare
EXTRADIST = ushare.1 \
@@ -50,7 +59,7 @@
.SUFFIXES: .c .o
-all: depend $(PROG)
+all: depend $(BUILD_RULES) $(PROG)
.c.o:
$(CC) -c $(CFLAGS) $(OPTFLAGS) -o $@ $<
@@ -58,6 +67,14 @@
$(PROG): $(OBJS)
$(CC) $(OBJS) $(LDFLAGS) $(EXTRALIBS) -o $@
+TAGS:
+ @rm -f $@; \
+ ( find -name '*.[chS]' -print ) | xargs etags -a
+
+tags:
+ @rm -f $@; \
+ ( find -name '*.[chS]' -print ) | xargs ctags -a;
+
clean:
-$(RM) -f *.o $(PROG)
-$(RM) -f .depend
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-04-02 19:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-02 19:14 [gentoo-commits] gentoo-x86 commit in media-video/ushare/files: 03_all_ushare_mp4_video_mime.patch 02_all_ushare_build_warnings.patch 01_all_ushare_build_system.patch Pacho Ramos (pacho)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox