Skip to content

Commit

Permalink
Fix for locking problem with multipart .m3u8 files
Browse files Browse the repository at this point in the history
  • Loading branch information
ColumPaget committed Mar 14, 2017
1 parent e440157 commit ff5f222
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 46 deletions.
47 changes: 30 additions & 17 deletions config.log
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ generated by GNU Autoconf 2.69. Invocation command line was
## Platform. ##
## --------- ##

hostname = latitude
hostname = lifebook
uname -m = i686
uname -r = 4.8.6-486
uname -r = 4.7.3-p4-smp-hugemem
uname -s = Linux
uname -v = #5 Tue Nov 15 13:59:32 UTC 2016
uname -v = #1 SMP Mon Sep 12 21:20:39 BST 2016

/usr/bin/uname -p = unknown
/bin/uname -X = unknown
Expand All @@ -33,9 +33,26 @@ PATH: /usr/bin
PATH: /usr/X11R7/bin
PATH: /bin
PATH: /usr/games/bin
PATH: /opt/wine-1.7.49/bin
PATH: /opt/git-2.11.0/bin
PATH: /opt/perl-5.20.1/bin
PATH: /opt/wine-1.9.10/bin
PATH: /opt/git-2.8.3/bin
PATH: /opt/qemu-2.5.0/bin
PATH: /opt/Qt4/bin
PATH: /opt/SDL/bin
PATH: /opt/avr/bin
PATH: /opt/chkrootkit-0.50/bin
PATH: /opt/gdbm-1.11/bin
PATH: /opt/ghostscript-9.19/bin
PATH: /opt/gifprogs-5.1.2/bin
PATH: /opt/git-2.8.3/bin
PATH: /opt/jpegprogs-8c/bin
PATH: /opt/lxc-2.0.0/bin
PATH: /opt/mujs-b005928/bin
PATH: /opt/perl-5.22.2/bin
PATH: /opt/pngprogs-1.6.17/bin
PATH: /opt/poppler-0.43.0/bin
PATH: /opt/qemu-2.5.0/bin
PATH: /opt/tiffprogs-4.0.6/bin
PATH: /opt/wine-1.9.10/bin


## ----------- ##
Expand All @@ -47,20 +64,20 @@ configure:1974: found /usr/bin/gcc
configure:1985: result: gcc
configure:2214: checking for C compiler version
configure:2223: gcc --version >&5
gcc (GCC) 4.9.2
Copyright (C) 2014 Free Software Foundation, Inc.
gcc (GCC) 5.3.0
Copyright (C) 2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

configure:2234: $? = 0
configure:2223: gcc -v >&5
Using built-in specs.
COLLECT_GCC=gcc
COLLECT_LTO_WRAPPER=/usr/libexec/gcc/i486-pc-linux-gnu/4.9.2/lto-wrapper
COLLECT_LTO_WRAPPER=/usr/libexec/gcc/i486-pc-linux-gnu/5.3.0/lto-wrapper
Target: i486-pc-linux-gnu
Configured with: ../gcc-4.9.2-src/configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/include --localstatedir=/var --mandir=/usr/share/man --infodir=/usr/share/info --enable-languages=c,c++ --host=i486-pc-linux-gnu --build=i486-pc-linux-gnu --target=i486-pc-linux-gnu --enable-bootstrap
Configured with: ../gcc-5.3.0-src/configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/include --localstatedir=/var --mandir=/usr/share/man --infodir=/usr/share/info --enable-languages=c,c++,go --host=i486-pc-linux-gnu --build=i486-pc-linux-gnu --target=i486-pc-linux-gnu --enable-bootstrap
Thread model: posix
gcc version 4.9.2 (GCC)
gcc version 5.3.0 (GCC)
configure:2234: $? = 0
configure:2223: gcc -V >&5
gcc: error: unrecognized command line option '-V'
Expand Down Expand Up @@ -113,8 +130,6 @@ configure:2866: gcc -E conftest.c
configure:2866: $? = 0
configure:2880: gcc -E conftest.c
conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
#include <ac_nonexistent.h>
^
compilation terminated.
configure:2880: $? = 1
configure: failed program was:
Expand All @@ -132,8 +147,6 @@ configure:2925: gcc -E conftest.c
configure:2925: $? = 0
configure:2939: gcc -E conftest.c
conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
#include <ac_nonexistent.h>
^
compilation terminated.
configure:2939: $? = 1
configure: failed program was:
Expand Down Expand Up @@ -185,10 +198,10 @@ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status

on latitude
on lifebook

config.status:729: creating Makefile
configure:4604: === configuring in libUseful-2.6 (/home/colum/Movgrab/libUseful-2.6)
configure:4604: === configuring in libUseful-2.6 (/home/meta/Movgrab/libUseful-2.6)
configure:4667: running /bin/sh ./configure --disable-option-checking '--prefix=/usr/local' '--enable-ssl' --cache-file=/dev/null --srcdir=.

## ---------------- ##
Expand Down
2 changes: 1 addition & 1 deletion config.status
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."

ac_pwd='/home/colum/Movgrab'
ac_pwd='/home/meta/Movgrab'
srcdir='.'
INSTALL='/bin/install -c'
test -n "$AWK" || AWK=awk
Expand Down
2 changes: 1 addition & 1 deletion download.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ if (Flags & FLAG_TEST)

if (Flags & FLAG_DEBUG) fprintf(stderr,"Next URL: %s\n",URL);

if (! (Flags & FLAG_TEST_SITES)) OpenOutputFiles(Title,URL,&BytesRead);



Expand All @@ -225,6 +224,7 @@ if (Con)
if (strncmp(Format,"m3u8-stream:",12)==0) RetVal=M3UStreamDownload(Con, URL, Title);
else
{
if (! (Flags & FLAG_TEST_SITES)) OpenOutputFiles(Title,URL,&BytesRead);
Token=CopyStr(Token,STREAMGetValue(Con,"HTTP:Content-Range"));
if (StrLen(Token))
{
Expand Down
81 changes: 55 additions & 26 deletions libUseful-2.6/config.log
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ generated by GNU Autoconf 2.69. Invocation command line was
## Platform. ##
## --------- ##

hostname = latitude
hostname = lifebook
uname -m = i686
uname -r = 4.8.6-486
uname -r = 4.7.3-p4-smp-hugemem
uname -s = Linux
uname -v = #5 Tue Nov 15 13:59:32 UTC 2016
uname -v = #1 SMP Mon Sep 12 21:20:39 BST 2016

/usr/bin/uname -p = unknown
/bin/uname -X = unknown
Expand All @@ -33,9 +33,26 @@ PATH: /usr/bin
PATH: /usr/X11R7/bin
PATH: /bin
PATH: /usr/games/bin
PATH: /opt/wine-1.7.49/bin
PATH: /opt/git-2.11.0/bin
PATH: /opt/perl-5.20.1/bin
PATH: /opt/wine-1.9.10/bin
PATH: /opt/git-2.8.3/bin
PATH: /opt/qemu-2.5.0/bin
PATH: /opt/Qt4/bin
PATH: /opt/SDL/bin
PATH: /opt/avr/bin
PATH: /opt/chkrootkit-0.50/bin
PATH: /opt/gdbm-1.11/bin
PATH: /opt/ghostscript-9.19/bin
PATH: /opt/gifprogs-5.1.2/bin
PATH: /opt/git-2.8.3/bin
PATH: /opt/jpegprogs-8c/bin
PATH: /opt/lxc-2.0.0/bin
PATH: /opt/mujs-b005928/bin
PATH: /opt/perl-5.22.2/bin
PATH: /opt/pngprogs-1.6.17/bin
PATH: /opt/poppler-0.43.0/bin
PATH: /opt/qemu-2.5.0/bin
PATH: /opt/tiffprogs-4.0.6/bin
PATH: /opt/wine-1.9.10/bin


## ----------- ##
Expand All @@ -47,20 +64,20 @@ configure:2164: found /usr/bin/gcc
configure:2175: result: gcc
configure:2404: checking for C compiler version
configure:2413: gcc --version >&5
gcc (GCC) 4.9.2
Copyright (C) 2014 Free Software Foundation, Inc.
gcc (GCC) 5.3.0
Copyright (C) 2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

configure:2424: $? = 0
configure:2413: gcc -v >&5
Using built-in specs.
COLLECT_GCC=gcc
COLLECT_LTO_WRAPPER=/usr/libexec/gcc/i486-pc-linux-gnu/4.9.2/lto-wrapper
COLLECT_LTO_WRAPPER=/usr/libexec/gcc/i486-pc-linux-gnu/5.3.0/lto-wrapper
Target: i486-pc-linux-gnu
Configured with: ../gcc-4.9.2-src/configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/include --localstatedir=/var --mandir=/usr/share/man --infodir=/usr/share/info --enable-languages=c,c++ --host=i486-pc-linux-gnu --build=i486-pc-linux-gnu --target=i486-pc-linux-gnu --enable-bootstrap
Configured with: ../gcc-5.3.0-src/configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/include --localstatedir=/var --mandir=/usr/share/man --infodir=/usr/share/info --enable-languages=c,c++,go --host=i486-pc-linux-gnu --build=i486-pc-linux-gnu --target=i486-pc-linux-gnu --enable-bootstrap
Thread model: posix
gcc version 4.9.2 (GCC)
gcc version 5.3.0 (GCC)
configure:2424: $? = 0
configure:2413: gcc -V >&5
gcc: error: unrecognized command line option '-V'
Expand Down Expand Up @@ -111,8 +128,6 @@ configure:2963: gcc -E conftest.c
configure:2963: $? = 0
configure:2977: gcc -E conftest.c
conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
#include <ac_nonexistent.h>
^
compilation terminated.
configure:2977: $? = 1
configure: failed program was:
Expand All @@ -130,8 +145,6 @@ configure:3022: gcc -E conftest.c
configure:3022: $? = 0
configure:3036: gcc -E conftest.c
conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
#include <ac_nonexistent.h>
^
compilation terminated.
configure:3036: $? = 1
configure: failed program was:
Expand Down Expand Up @@ -160,14 +173,30 @@ configure:3314: checking for special C compiler options needed for large files
configure:3359: result: no
configure:3365: checking for _FILE_OFFSET_BITS value needed for large files
configure:3390: gcc -c -g -O2 conftest.c >&5
conftest.c:16:3: warning: left shift count >= width of type
conftest.c:15:33: warning: left shift count >= width of type [-Wshift-count-overflow]
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
^
conftest.c:16:23: note: in expansion of macro 'LARGE_OFF_T'
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
^
conftest.c:16:3: warning: left shift count >= width of type
conftest.c:17:10: warning: left shift count >= width of type
^
conftest.c:15:57: warning: left shift count >= width of type [-Wshift-count-overflow]
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
^
conftest.c:16:23: note: in expansion of macro 'LARGE_OFF_T'
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
^
conftest.c:15:33: warning: left shift count >= width of type [-Wshift-count-overflow]
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
^
conftest.c:17:13: note: in expansion of macro 'LARGE_OFF_T'
&& LARGE_OFF_T % 2147483647 == 1)
^
conftest.c:15:57: warning: left shift count >= width of type [-Wshift-count-overflow]
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
^
conftest.c:17:13: note: in expansion of macro 'LARGE_OFF_T'
&& LARGE_OFF_T % 2147483647 == 1)
^
conftest.c:17:10: warning: left shift count >= width of type
^
conftest.c:16:7: error: variably modified 'off_t_is_large' at file scope
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
^
Expand Down Expand Up @@ -261,8 +290,8 @@ configure:3706: $? = 0
configure:3715: result: yes
configure:3731: checking for OpenSSL_add_all_algorithms
configure:3731: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lc >&5
/tmp/cc4YRzqx.o: In function `main':
/home/colum/Movgrab/libUseful-2.6/conftest.c:59: undefined reference to `OpenSSL_add_all_algorithms'
/tmp/cciSJXvw.o: In function `main':
/home/meta/Movgrab/libUseful-2.6/conftest.c:59: undefined reference to `OpenSSL_add_all_algorithms'
collect2: error: ld returned 1 exit status
configure:3731: $? = 1
configure: failed program was:
Expand Down Expand Up @@ -343,8 +372,8 @@ configure:3731: $? = 0
configure:3731: result: yes
configure:3731: checking for EVP_rc5_32_12_16_cbc
configure:3731: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lc >&5
/tmp/cc8vEfTw.o: In function `main':
/home/colum/Movgrab/libUseful-2.6/conftest.c:62: undefined reference to `EVP_rc5_32_12_16_cbc'
/tmp/cccCPqnr.o: In function `main':
/home/meta/Movgrab/libUseful-2.6/conftest.c:62: undefined reference to `EVP_rc5_32_12_16_cbc'
collect2: error: ld returned 1 exit status
configure:3731: $? = 1
configure: failed program was:
Expand Down Expand Up @@ -465,7 +494,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status

on latitude
on lifebook

config.status:727: creating Makefile

Expand Down
2 changes: 1 addition & 1 deletion libUseful-2.6/config.status
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."

ac_pwd='/home/colum/Movgrab/libUseful-2.6'
ac_pwd='/home/meta/Movgrab/libUseful-2.6'
srcdir='.'
test -n "$AWK" || AWK=awk
# The default lists apply if the user does not specify any file.
Expand Down

0 comments on commit ff5f222

Please sign in to comment.