packages: http-live-streaming-tools/http-live-streaming-tools.spec, http-li...

glen glen at pld-linux.org
Sun Sep 5 19:45:44 CEST 2010


Author: glen                         Date: Sun Sep  5 17:45:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- allow specifying input filename

---- Files affected:
packages/http-live-streaming-tools:
   http-live-streaming-tools.spec (1.4 -> 1.5) , input_filename.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/http-live-streaming-tools/http-live-streaming-tools.spec
diff -u packages/http-live-streaming-tools/http-live-streaming-tools.spec:1.4 packages/http-live-streaming-tools/http-live-streaming-tools.spec:1.5
--- packages/http-live-streaming-tools/http-live-streaming-tools.spec:1.4	Tue Aug 31 10:56:15 2010
+++ packages/http-live-streaming-tools/http-live-streaming-tools.spec	Sun Sep  5 19:45:39 2010
@@ -2,13 +2,14 @@
 Summary:	HTTP Live Video Stream Segmenter and Distributor
 Name:		http-live-streaming-tools
 Version:	0.1
-Release:	0.2
+Release:	1
 License:	GPL v2
 Group:		Applications/Networking
 Source0:	%{name}.tar.bz2
 # Source0-md5:	90731a7168cd9393cc4c6e3704b75f11
 URL:		http://www.ioncannon.net/projects/http-live-video-stream-segmenter-and-distributor/
 Patch0:		makefile.patch
+Patch1:		input_filename.patch
 BuildRequires:	bzip2-devel
 BuildRequires:	ffmpeg-devel >= 0.5
 BuildRequires:	rpmbuild(macros) >= 1.484
@@ -35,6 +36,7 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
@@ -70,6 +72,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/09/05 17:45:39  glen
+- allow specifying input filename
+
 Revision 1.4  2010/08/31 08:56:15  glen
 - put live_segmenter to own package, to keep out of ruby
 

================================================================
Index: packages/http-live-streaming-tools/input_filename.patch
diff -u /dev/null packages/http-live-streaming-tools/input_filename.patch:1.1
--- /dev/null	Sun Sep  5 19:45:44 2010
+++ packages/http-live-streaming-tools/input_filename.patch	Sun Sep  5 19:45:39 2010
@@ -0,0 +1,23 @@
+--- http-live-streaming-tools/live_segmenter.c~	2010-08-23 16:01:30.000000000 +0300
++++ http-live-streaming-tools/live_segmenter.c	2010-09-03 18:16:09.899783952 +0300
+@@ -111,9 +111,9 @@
+ 
+ int main(int argc, char **argv)
+ {
+-  if(argc != 5)
++  if(argc != 5 && argc != 6)
+   {
+-    fprintf(stderr, "Usage: %s <segment length> <output location> <filename prefix> <encoding profile>\n", argv[0]);
++    fprintf(stderr, "Usage: %s <segment length> <output location> <filename prefix> <encoding profile> [<filename>]\n", argv[0]);
+     return 1;
+   }
+ 
+@@ -125,7 +125,7 @@
+   config.temp_directory = argv[2];
+   config.filename_prefix = argv[3];
+   config.encoding_profile = argv[4];
+-  config.input_filename = "pipe://1";
++  config.input_filename = argc == 6 ? argv[5] : "pipe://1";
+ 
+   char *output_filename = malloc(sizeof(char) * (strlen(config.temp_directory) + 1 + strlen(config.filename_prefix) + 10));
+   if (!output_filename) 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/http-live-streaming-tools/http-live-streaming-tools.spec?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list