| 1 |
dirtyepic 09/05/31 01:15:45 |
| 2 |
|
| 3 |
Added: subtitleripper-0.3.4-libpng.patch |
| 4 |
subtitleripper-0.3.4-glibc210.patch |
| 5 |
Log: |
| 6 |
Fix building against newer libpng versions (bug #269803, patch by Victor |
| 7 |
Ostorga) and glibc-2.10. |
| 8 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: subtitleripper-0.3.4-libpng.patch |
| 17 |
=================================================================== |
| 18 |
diff -NrU5 subtitleripper.orig/spudec.c subtitleripper/spudec.c |
| 19 |
--- subtitleripper.orig/spudec.c 2009-05-20 03:06:23.000000000 -0600 |
| 20 |
+++ subtitleripper/spudec.c 2009-05-20 03:07:47.000000000 -0600 |
| 21 |
@@ -34,17 +34,18 @@ |
| 22 |
|
| 23 |
#ifdef _HAVE_ZLIB_ |
| 24 |
#include <zlib.h> |
| 25 |
#endif |
| 26 |
|
| 27 |
+#ifdef _HAVE_PNG_ |
| 28 |
+#include <png.h> |
| 29 |
+#endif |
| 30 |
+ |
| 31 |
#ifdef _HAVE_LIB_PPM_ |
| 32 |
#include <netpbm/ppm.h> |
| 33 |
#endif |
| 34 |
|
| 35 |
-#ifdef _HAVE_PNG_ |
| 36 |
-#include "png.h" |
| 37 |
-#endif |
| 38 |
|
| 39 |
static void spudec_handle_rest(spudec_handle_t *this); |
| 40 |
|
| 41 |
// read a big endian 16 bit value |
| 42 |
static inline unsigned int get_be16(const unsigned char *p) |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: subtitleripper-0.3.4-glibc210.patch |
| 52 |
=================================================================== |
| 53 |
diff -Naurp subtitleripper-orig/vobsub.c subtitleripper/vobsub.c |
| 54 |
--- subtitleripper-orig/vobsub.c 2003-12-08 03:28:02.000000000 -0600 |
| 55 |
+++ subtitleripper/vobsub.c 2009-05-30 19:09:13.266973499 -0600 |
| 56 |
@@ -56,7 +56,7 @@ extern ssize_t getline(char **, size_t * |
| 57 |
/* FIXME This should go into a general purpose library or even a |
| 58 |
separate file. */ |
| 59 |
static ssize_t |
| 60 |
-getline (char **lineptr, size_t *n, FILE *stream) |
| 61 |
+get_line (char **lineptr, size_t *n, FILE *stream) |
| 62 |
{ |
| 63 |
size_t res = 0; |
| 64 |
int c; |
| 65 |
@@ -753,7 +753,7 @@ vobsub_parse_one_line(vobsub_t *vob, FIL |
| 66 |
do { |
| 67 |
size_t line_reserve = 0; |
| 68 |
char *line = NULL; |
| 69 |
- line_size = getline(&line, &line_reserve, fd); |
| 70 |
+ line_size = get_line(&line, &line_reserve, fd); |
| 71 |
if (line_size < 0) { |
| 72 |
if (line) |
| 73 |
free(line); |
Archives