Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
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
Date: Mon, 02 Apr 2012 19:14:22
Message-Id: 20120402191404.4F5D02004C@flycatcher.gentoo.org
1 pacho 12/04/02 19:14:04
2
3 Added: 03_all_ushare_mp4_video_mime.patch
4 02_all_ushare_build_warnings.patch
5 01_all_ushare_build_system.patch
6 Log:
7 Revision bump fixing tons of bugs and with a new maintainer by #403979. Thanks a lot to Sal Gonzalez for his work. Remove old.
8
9 (Portage version: 2.1.10.54/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 media-video/ushare/files/03_all_ushare_mp4_video_mime.patch
13
14 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
15 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
16
17 Index: 03_all_ushare_mp4_video_mime.patch
18 ===================================================================
19 diff --git a/src/mime.c b/src/mime.c
20 index bf0121b..f38deca 100644
21 --- a/src/mime.c
22 +++ b/src/mime.c
23 @@ -53,6 +53,7 @@ const struct mime_type_t MIME_Type_List[] = {
24 { "mpeg2", UPNP_VIDEO, "http-get:*:video/mpeg2:"},
25 { "m4v", UPNP_VIDEO, "http-get:*:video/mp4:"},
26 { "m4p", UPNP_VIDEO, "http-get:*:video/mp4:"},
27 + { "mp4", UPNP_VIDEO, "http-get:*:video/mp4:"},
28 { "mp4ps", UPNP_VIDEO, "http-get:*:video/x-nerodigital-ps:"},
29 { "ts", UPNP_VIDEO, "http-get:*:video/mpeg2:"},
30 { "ogm", UPNP_VIDEO, "http-get:*:video/mpeg:"},
31 @@ -79,7 +80,6 @@ const struct mime_type_t MIME_Type_List[] = {
32 { "mp1", UPNP_AUDIO, "http-get:*:audio/mp1:"},
33 { "mp2", UPNP_AUDIO, "http-get:*:audio/mp2:"},
34 { "mp3", UPNP_AUDIO, "http-get:*:audio/mpeg:"},
35 - { "mp4", UPNP_AUDIO, "http-get:*:audio/mp4:"},
36 { "m4a", UPNP_AUDIO, "http-get:*:audio/mp4:"},
37 { "ogg", UPNP_AUDIO, "http-get:*:audio/x-ogg:"},
38 { "wav", UPNP_AUDIO, "http-get:*:audio/wav:"},
39
40
41
42 1.1 media-video/ushare/files/02_all_ushare_build_warnings.patch
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare/files/02_all_ushare_build_warnings.patch?rev=1.1&view=markup
45 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
46
47 Index: 02_all_ushare_build_warnings.patch
48 ===================================================================
49 diff --git a/src/ctrl_telnet.c b/src/ctrl_telnet.c
50 index 0849d80..b3e9e8d 100644
51 --- a/src/ctrl_telnet.c
52 +++ b/src/ctrl_telnet.c
53 @@ -202,6 +202,7 @@ ctrl_telnet_start (int port)
54 void
55 ctrl_telnet_stop (void)
56 {
57 + ssize_t tmp;
58 pthread_mutex_lock (&startstop_lock);
59
60 if (!started)
61 @@ -211,7 +212,7 @@ ctrl_telnet_stop (void)
62 }
63
64 /* yes is int, which is bigger then char, so this should be safe */
65 - write (ttd.killer[1], &yes, sizeof (char));
66 + tmp = write (ttd.killer[1], &yes, sizeof (char));
67
68 pthread_mutex_unlock (&startstop_lock);
69 pthread_join (ttd.thread, NULL);
70 diff --git a/src/mime.c b/src/mime.c
71 index 66c48ab..bf0121b 100644
72 --- a/src/mime.c
73 +++ b/src/mime.c
74 @@ -144,7 +144,8 @@ char *mime_get_protocol (struct mime_type_t *mime)
75 if (!mime)
76 return NULL;
77
78 - sprintf (protocol, mime->mime_protocol);
79 + //sprintf (protocol, mime->mime_protocol);
80 + strcpy (protocol, mime->mime_protocol);
81 strcat (protocol, "*");
82 return strdup (protocol);
83 }
84
85
86
87 1.1 media-video/ushare/files/01_all_ushare_build_system.patch
88
89 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ushare/files/01_all_ushare_build_system.patch?rev=1.1&view=markup
90 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
91
92 Index: 01_all_ushare_build_system.patch
93 ===================================================================
94 diff -uNr ushare-1.1a/configure ushare-1.1b/configure
95 --- ushare-1.1a/configure 2007-12-09 08:03:36.000000000 -0500
96 +++ ushare-1.1b/configure 2012-03-25 17:35:07.000000000 -0400
97 @@ -42,6 +42,9 @@
98 echo " --with-libdlna-dir=DIR check for libdlna installed in DIR"
99 echo ""
100 echo "Advanced options (experts only):"
101 + echo " --disable-sysconf disable installation of init files"
102 + echo " --enable-developer enable developer options"
103 + echo " --disable-developer disable developer options"
104 echo " --enable-debug enable debugging symbols"
105 echo " --disable-debug disable debugging symbols"
106 echo " --disable-strip disable stripping of executables at installation"
107 @@ -164,6 +167,11 @@
108 echo "#define $1 \"$2\"" >> $CONFIG_H
109 }
110
111 +check_cmd_exists(){
112 + log check_cmd_exists "$@"
113 + which "$@" >>$logfile 2>&1
114 +}
115 +
116 check_cmd(){
117 log "$@"
118 "$@" >>$logfile 2>&1
119 @@ -300,13 +308,15 @@
120 strip="strip"
121 cpu=`uname -m`
122 optimize="yes"
123 +sysconf="yes"
124 +developer="no"
125 debug="no"
126 dostrip="yes"
127 extralibs=""
128 installstrip="-s"
129 cross_compile="no"
130 INSTALL="/usr/bin/install -c"
131 -VERSION="1.1a"
132 +VERSION="1.2.0"
133 system_name=`uname -s 2>&1`
134
135 #################################################
136 @@ -420,6 +430,12 @@
137 ;;
138 --disable-dlna) dlna="no"
139 ;;
140 + --disable-sysconf) sysconf="no"
141 + ;;
142 + --enable-developer) developer="yes"
143 + ;;
144 + --disable-developer) developer="no"
145 + ;;
146 --enable-debug) debug="yes"
147 ;;
148 --disable-debug) debug="no"
149 @@ -584,6 +600,25 @@
150 linux && add_cflags -D_GNU_SOURCE
151
152 #################################################
153 +# check for developer options
154 +#################################################
155 +if enabled developer; then
156 + add_cflags -Werror
157 + add_cflags -DHAVE_DEVELOPER
158 +
159 + have_ctags='no'
160 + if check_cmd_exists 'ctags'; then
161 + have_ctags='yes'
162 + fi
163 +
164 + have_etags='no'
165 + if check_cmd_exists 'etags'; then
166 + have_etags='yes'
167 + fi
168 +
169 +fi
170 +
171 +#################################################
172 # check for debug symbols
173 #################################################
174 if enabled debug; then
175 @@ -684,6 +719,8 @@
176 echolog " STRIP $strip"
177 echolog " make $make"
178 echolog " CPU $cpu ($tune)"
179 +echolog " install sysconf $sysconf"
180 +echolog " developer options $developer"
181 echolog " debug symbols $debug"
182 echolog " strip symbols $dostrip"
183 echolog " optimize $optimize"
184 @@ -724,6 +761,10 @@
185 append_config "LDFLAGS=$LDFLAGS"
186 append_config "INSTALL=$INSTALL"
187
188 +append_config "INSTALL_SYSCONF=$sysconf"
189 +append_config "DEVELOPER=$developer"
190 +append_config "HAVE_CTAGS=$have_ctags"
191 +append_config "HAVE_ETAGS=$have_etags"
192 append_config "DEBUG=$debug"
193
194
195 diff -uNr ushare-1.1a/scripts/Makefile ushare-1.1b/scripts/Makefile
196 --- ushare-1.1a/scripts/Makefile 2007-12-09 08:03:36.000000000 -0500
197 +++ ushare-1.1b/scripts/Makefile 2012-03-25 17:35:07.000000000 -0400
198 @@ -3,6 +3,11 @@
199 endif
200 include ../config.mak
201
202 +INSTALL_RULES =
203 +ifeq ($(INSTALL_SYSCONF),yes)
204 + INSTALL_RULES += install-sysconf
205 +endif
206 +
207 CONF_FILE = "ushare.conf"
208 INITD_FILE = "ushare"
209
210 @@ -14,7 +19,9 @@
211
212 distclean:
213
214 -install:
215 +install: $(INSTALL_RULES)
216 +
217 +install-sysconf:
218 $(INSTALL) -d $(sysconfdir)
219 $(INSTALL) -m 644 $(CONF_FILE) $(sysconfdir)
220 $(INSTALL) -d $(sysconfdir)/init.d
221 diff -uNr ushare-1.1a/src/Makefile ushare-1.1b/src/Makefile
222 --- ushare-1.1a/src/Makefile 2007-12-09 08:03:36.000000000 -0500
223 +++ ushare-1.1b/src/Makefile 2012-03-25 17:35:07.000000000 -0400
224 @@ -3,6 +3,15 @@
225 endif
226 include ../config.mak
227
228 +ifeq ($(DEVELOPER),yes)
229 + ifeq ($(HAVE_ETAGS),yes)
230 + BUILD_RULES += TAGS
231 + endif
232 + ifeq ($(HAVE_CTAGS),yes)
233 + BUILD_RULES += tags
234 + endif
235 +endif
236 +
237 PROG = ushare
238
239 EXTRADIST = ushare.1 \
240 @@ -50,7 +59,7 @@
241
242 .SUFFIXES: .c .o
243
244 -all: depend $(PROG)
245 +all: depend $(BUILD_RULES) $(PROG)
246
247 .c.o:
248 $(CC) -c $(CFLAGS) $(OPTFLAGS) -o $@ $<
249 @@ -58,6 +67,14 @@
250 $(PROG): $(OBJS)
251 $(CC) $(OBJS) $(LDFLAGS) $(EXTRALIBS) -o $@
252
253 +TAGS:
254 + @rm -f $@; \
255 + ( find -name '*.[chS]' -print ) | xargs etags -a
256 +
257 +tags:
258 + @rm -f $@; \
259 + ( find -name '*.[chS]' -print ) | xargs ctags -a;
260 +
261 clean:
262 -$(RM) -f *.o $(PROG)
263 -$(RM) -f .depend
Report Message
Find on MARC Find on Google Groups