Fix libtheora non-safe PATH use and libpng incompatibility.
This commit is contained in:
Jonas 'Sortie' Termansen
parent
36d9de7f54
commit
86f6cdb718
|
|
@ -10,6 +10,31 @@ diff -Paur --no-dereference -- libtheora.upstream/config.sub libtheora/config.su
|
|||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||
| -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
|
||||
diff -Paur --no-dereference -- libtheora.upstream/configure libtheora/configure
|
||||
--- libtheora.upstream/configure
|
||||
+++ libtheora/configure
|
||||
@@ -13031,9 +13031,9 @@
|
||||
fi
|
||||
|
||||
|
||||
- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
|
||||
+ # PATCH: Don't put /bin in the front of the PATH.
|
||||
# Extract the first word of "sdl-config", so it can be a program name with args.
|
||||
-set dummy sdl-config; ac_word=$2
|
||||
+set dummy false; ac_word=$2
|
||||
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
|
||||
@@ -14930,7 +14930,8 @@
|
||||
if test -n "$CONFIG_FILES"; then
|
||||
|
||||
|
||||
-ac_cr='
'
|
||||
+ac_cr='
|
||||
+'
|
||||
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
|
||||
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
|
||||
ac_cs_awk_cr='\\r'
|
||||
diff -Paur --no-dereference -- libtheora.upstream/examples/dump_psnr.c libtheora/examples/dump_psnr.c
|
||||
--- libtheora.upstream/examples/dump_psnr.c
|
||||
+++ libtheora/examples/dump_psnr.c
|
||||
|
|
@ -89,3 +114,18 @@ diff -Paur --no-dereference -- libtheora.upstream/examples/dump_video.c libtheor
|
|||
|
||||
fprintf(stderr,"\rframe:%d rate:%.2fx ",
|
||||
frames,
|
||||
diff -Paur --no-dereference -- libtheora.upstream/examples/png2theora.c libtheora/examples/png2theora.c
|
||||
--- libtheora.upstream/examples/png2theora.c
|
||||
+++ libtheora/examples/png2theora.c
|
||||
@@ -462,9 +462,9 @@
|
||||
png_set_strip_alpha(png_ptr);
|
||||
|
||||
row_data = (png_bytep)png_malloc(png_ptr,
|
||||
- 3*height*width*png_sizeof(*row_data));
|
||||
+ 3*height*width*sizeof(*row_data));
|
||||
row_pointers = (png_bytep *)png_malloc(png_ptr,
|
||||
- height*png_sizeof(*row_pointers));
|
||||
+ height*sizeof(*row_pointers));
|
||||
for(y = 0; y < height; y++) {
|
||||
row_pointers[y] = row_data + y*(3*width);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,73 +1,2 @@
|
|||
rm -rf -- 'doc/libtheora/'
|
||||
rm -rf -- 'doc/libtheora/html/'
|
||||
rm -rf -- 'doc/libtheora/html/annotated.html'
|
||||
rm -rf -- 'doc/libtheora/html/classes.html'
|
||||
rm -rf -- 'doc/libtheora/html/codec_8h.html'
|
||||
rm -rf -- 'doc/libtheora/html/codec_8h_source.html'
|
||||
rm -rf -- 'doc/libtheora/html/doxygen.css'
|
||||
rm -rf -- 'doc/libtheora/html/doxygen.png'
|
||||
rm -rf -- 'doc/libtheora/html/files.html'
|
||||
rm -rf -- 'doc/libtheora/html/functions.html'
|
||||
rm -rf -- 'doc/libtheora/html/functions_vars.html'
|
||||
rm -rf -- 'doc/libtheora/html/globals.html'
|
||||
rm -rf -- 'doc/libtheora/html/globals_defs.html'
|
||||
rm -rf -- 'doc/libtheora/html/globals_enum.html'
|
||||
rm -rf -- 'doc/libtheora/html/globals_eval.html'
|
||||
rm -rf -- 'doc/libtheora/html/globals_func.html'
|
||||
rm -rf -- 'doc/libtheora/html/globals_type.html'
|
||||
rm -rf -- 'doc/libtheora/html/globals_vars.html'
|
||||
rm -rf -- 'doc/libtheora/html/group__basefuncs.html'
|
||||
rm -rf -- 'doc/libtheora/html/group__decfuncs.html'
|
||||
rm -rf -- 'doc/libtheora/html/group__encfuncs.html'
|
||||
rm -rf -- 'doc/libtheora/html/group__oldfuncs.html'
|
||||
rm -rf -- 'doc/libtheora/html/index.html'
|
||||
rm -rf -- 'doc/libtheora/html/modules.html'
|
||||
rm -rf -- 'doc/libtheora/html/structth__comment.html'
|
||||
rm -rf -- 'doc/libtheora/html/structth__huff__code.html'
|
||||
rm -rf -- 'doc/libtheora/html/structth__img__plane.html'
|
||||
rm -rf -- 'doc/libtheora/html/structth__info.html'
|
||||
rm -rf -- 'doc/libtheora/html/structth__quant__info.html'
|
||||
rm -rf -- 'doc/libtheora/html/structth__quant__ranges.html'
|
||||
rm -rf -- 'doc/libtheora/html/structth__stripe__callback.html'
|
||||
rm -rf -- 'doc/libtheora/html/structtheora__comment.html'
|
||||
rm -rf -- 'doc/libtheora/html/structtheora__info.html'
|
||||
rm -rf -- 'doc/libtheora/html/structtheora__state.html'
|
||||
rm -rf -- 'doc/libtheora/html/structyuv__buffer.html'
|
||||
rm -rf -- 'doc/libtheora/html/tab_b.gif'
|
||||
rm -rf -- 'doc/libtheora/html/tab_l.gif'
|
||||
rm -rf -- 'doc/libtheora/html/tab_r.gif'
|
||||
rm -rf -- 'doc/libtheora/html/tabs.css'
|
||||
rm -rf -- 'doc/libtheora/html/theora_8h.html'
|
||||
rm -rf -- 'doc/libtheora/html/theora_8h_source.html'
|
||||
rm -rf -- 'doc/libtheora/html/theoradec_8h.html'
|
||||
rm -rf -- 'doc/libtheora/html/theoradec_8h_source.html'
|
||||
rm -rf -- 'doc/libtheora/html/theoraenc_8h.html'
|
||||
rm -rf -- 'doc/libtheora/html/theoraenc_8h_source.html'
|
||||
rm -rf -- 'doc/libtheora/latex/'
|
||||
rm -rf -- 'doc/libtheora/latex/Makefile'
|
||||
rm -rf -- 'doc/libtheora/latex/annotated.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/codec_8h.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/doxygen.sty'
|
||||
rm -rf -- 'doc/libtheora/latex/files.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/group__basefuncs.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/group__decfuncs.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/group__encfuncs.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/group__oldfuncs.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/index.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/modules.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/refman.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/structth__comment.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/structth__huff__code.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/structth__img__plane.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/structth__info.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/structth__quant__info.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/structth__quant__ranges.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/structth__stripe__callback.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/structtheora__comment.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/structtheora__info.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/structtheora__state.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/structyuv__buffer.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/theora_8h.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/theoradec_8h.tex'
|
||||
rm -rf -- 'doc/libtheora/latex/theoraenc_8h.tex'
|
||||
rm -rf -- 'doc/libtheora'
|
||||
rm -rf -- 'libtheora.spec'
|
||||
|
|
|
|||
Loading…
Reference in New Issue