From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SEmhq-0003kJ-BI for garchives@archives.gentoo.org; Mon, 02 Apr 2012 19:14:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BD2DE07EC; Mon, 2 Apr 2012 19:14:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5C86AE07EC for ; Mon, 2 Apr 2012 19:14:15 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E782A1B402E for ; Mon, 2 Apr 2012 19:14:13 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2262) id 4F5D02004C; Mon, 2 Apr 2012 19:14:04 +0000 (UTC) From: "Pacho Ramos (pacho)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, pacho@gentoo.org Subject: [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 X-VCS-Repository: gentoo-x86 X-VCS-Files: 03_all_ushare_mp4_video_mime.patch 02_all_ushare_build_warnings.patch 01_all_ushare_build_system.patch X-VCS-Directories: media-video/ushare/files X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos Content-Type: text/plain; charset=utf8 Message-Id: <20120402191404.4F5D02004C@flycatcher.gentoo.org> Date: Mon, 2 Apr 2012 19:14:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f66f9d8a-82de-47ed-8ab4-5c65053ccd4e X-Archives-Hash: 6c2e0fff571112d17b26058cf095dfb9 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. =20 (Portage version: 2.1.10.54/cvs/Linux x86_64) Revision Changes Path 1.1 media-video/ushare/files/03_all_ushare_mp4_video_mim= e.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare= /files/03_all_ushare_mp4_video_mime.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare= /files/03_all_ushare_mp4_video_mime.patch?rev=3D1.1&content-type=3Dtext/p= lain Index: 03_all_ushare_mp4_video_mime.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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[] =3D { { "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[] =3D { { "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_warning= s.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare= /files/02_all_ushare_build_warnings.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare= /files/02_all_ushare_build_warnings.patch?rev=3D1.1&content-type=3Dtext/p= lain Index: 02_all_ushare_build_warnings.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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); =20 if (!started) @@ -211,7 +212,7 @@ ctrl_telnet_stop (void) } =20 /* yes is int, which is bigger then char, so this should be safe */ - write (ttd.killer[1], &yes, sizeof (char)); + tmp =3D write (ttd.killer[1], &yes, sizeof (char)); =20 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; =20 - 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=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare= /files/01_all_ushare_build_system.patch?rev=3D1.1&content-type=3Dtext/pla= in Index: 01_all_ushare_build_system.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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=3DDIR check for libdlna installed in D= IR" 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 a= t installation" @@ -164,6 +167,11 @@ echo "#define $1 \"$2\"" >> $CONFIG_H } =20 +check_cmd_exists(){ + log check_cmd_exists "$@" + which "$@" >>$logfile 2>&1 +} + check_cmd(){ log "$@" "$@" >>$logfile 2>&1 @@ -300,13 +308,15 @@ strip=3D"strip" cpu=3D`uname -m` optimize=3D"yes" +sysconf=3D"yes" +developer=3D"no" debug=3D"no" dostrip=3D"yes" extralibs=3D"" installstrip=3D"-s" cross_compile=3D"no" INSTALL=3D"/usr/bin/install -c" -VERSION=3D"1.1a" +VERSION=3D"1.2.0" system_name=3D`uname -s 2>&1` =20 ################################################# @@ -420,6 +430,12 @@ ;; --disable-dlna) dlna=3D"no" ;; + --disable-sysconf) sysconf=3D"no" + ;; + --enable-developer) developer=3D"yes" + ;; + --disable-developer) developer=3D"no" + ;; --enable-debug) debug=3D"yes" ;; --disable-debug) debug=3D"no" @@ -584,6 +600,25 @@ linux && add_cflags -D_GNU_SOURCE =20 ################################################# +# check for developer options +################################################# +if enabled developer; then + add_cflags -Werror + add_cflags -DHAVE_DEVELOPER + =20 + have_ctags=3D'no' + if check_cmd_exists 'ctags'; then + have_ctags=3D'yes' + fi + + have_etags=3D'no' + if check_cmd_exists 'etags'; then + have_etags=3D'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=3D$LDFLAGS" append_config "INSTALL=3D$INSTALL" =20 +append_config "INSTALL_SYSCONF=3D$sysconf" +append_config "DEVELOPER=3D$developer" +append_config "HAVE_CTAGS=3D$have_ctags" +append_config "HAVE_ETAGS=3D$have_etags" append_config "DEBUG=3D$debug" =20 =20 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 =20 +INSTALL_RULES =3D=20 +ifeq ($(INSTALL_SYSCONF),yes) + INSTALL_RULES +=3D install-sysconf +endif + CONF_FILE =3D "ushare.conf" INITD_FILE =3D "ushare" =20 @@ -14,7 +19,9 @@ =20 distclean: =20 -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 =20 +ifeq ($(DEVELOPER),yes) + ifeq ($(HAVE_ETAGS),yes) + BUILD_RULES +=3D TAGS + endif + ifeq ($(HAVE_CTAGS),yes) + BUILD_RULES +=3D tags + endif +endif + PROG =3D ushare =20 EXTRADIST =3D ushare.1 \ @@ -50,7 +59,7 @@ =20 .SUFFIXES: .c .o =20 -all: depend $(PROG) +all: depend $(BUILD_RULES) $(PROG) =20 .c.o: $(CC) -c $(CFLAGS) $(OPTFLAGS) -o $@ $< @@ -58,6 +67,14 @@ $(PROG): $(OBJS) $(CC) $(OBJS) $(LDFLAGS) $(EXTRALIBS) -o $@ =20 +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