zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libtheora: patch for png_sizeof issue (#20240)

Browse Source 
See

https://gitlab.freedesktop.org/gstreamer/cerbero/blob/master/recipes/libtheora/0004-examples-Don-t-use-png_sizeof.patch

Signed-off-by: Howard Pritchard <howardp@lanl.gov>
This commit is contained in:
Howard Pritchard 2020-12-04 02:12:44 -07:00 committed by GitHub
parent 9afaaa3c25
commit 61f0f840d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
var/spack/repos/builtin/packages/libtheora/dont_use_png_sizeof.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/examples/png2theora.c b/examples/png2theora.c
index 71a0d0f..ed24c2a 100644
--- a/examples/png2theora.c
+++ b/examples/png2theora.c
@@ -462,9 +462,9 @@ png_read(const char *pathname, unsigned int *w, unsigned int *h, unsigned char *
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);
}
--
2.7.4

1
var/spack/repos/builtin/packages/libtheora/package.py
View File

@ -23,6 +23,7 @@ class Libtheora(AutotoolsPackage):
depends_on('libogg')
patch('exit-prior-to-running-configure.patch', when='@1.1.1')
patch('dont_use_png_sizeof.patch', when='@1.1.1')
def autoreconf(self, spec, prefix):
sh = which('sh')