diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2009-05-31 01:15:45 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2009-05-31 01:15:45 +0000 |
| commit | 347f107163f5058d42b7cef1d56c9f400b736b65 (patch) | |
| tree | 903bdcfee37475a543c93f0ea2737787558405ae /media-video/subtitleripper | |
| parent | Add patch from en.ABCD fixing build with glibc 2.10. (bug #271843) (diff) | |
| download | gentoo-2-347f107163f5058d42b7cef1d56c9f400b736b65.tar.gz gentoo-2-347f107163f5058d42b7cef1d56c9f400b736b65.tar.bz2 gentoo-2-347f107163f5058d42b7cef1d56c9f400b736b65.zip | |
Fix building against newer libpng versions (bug #269803, patch by Victor
Ostorga) and glibc-2.10.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-video/subtitleripper')
4 files changed, 57 insertions, 2 deletions
diff --git a/media-video/subtitleripper/ChangeLog b/media-video/subtitleripper/ChangeLog index f4ede1d976aa..d5d5f11bf12f 100644 --- a/media-video/subtitleripper/ChangeLog +++ b/media-video/subtitleripper/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/subtitleripper # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/ChangeLog,v 1.21 2009/01/07 15:59:14 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/ChangeLog,v 1.22 2009/05/31 01:15:44 dirtyepic Exp $ + + 31 May 2009; Ryan Hill <dirtyepic@gentoo.org> + subtitleripper-0.3.4-r3.ebuild, + +files/subtitleripper-0.3.4-glibc210.patch, + +files/subtitleripper-0.3.4-libpng.patch: + Fix building against newer libpng versions (bug #269803, patch by Victor + Ostorga) and glibc-2.10. 07 Jan 2009; Brent Baude <ranger@gentoo.org> subtitleripper-0.3.4-r3.ebuild: diff --git a/media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch b/media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch new file mode 100644 index 000000000000..8dc2b24f9f6a --- /dev/null +++ b/media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch @@ -0,0 +1,21 @@ +diff -Naurp subtitleripper-orig/vobsub.c subtitleripper/vobsub.c +--- subtitleripper-orig/vobsub.c 2003-12-08 03:28:02.000000000 -0600 ++++ subtitleripper/vobsub.c 2009-05-30 19:09:13.266973499 -0600 +@@ -56,7 +56,7 @@ extern ssize_t getline(char **, size_t * + /* FIXME This should go into a general purpose library or even a + separate file. */ + static ssize_t +-getline (char **lineptr, size_t *n, FILE *stream) ++get_line (char **lineptr, size_t *n, FILE *stream) + { + size_t res = 0; + int c; +@@ -753,7 +753,7 @@ vobsub_parse_one_line(vobsub_t *vob, FIL + do { + size_t line_reserve = 0; + char *line = NULL; +- line_size = getline(&line, &line_reserve, fd); ++ line_size = get_line(&line, &line_reserve, fd); + if (line_size < 0) { + if (line) + free(line); diff --git a/media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch b/media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch new file mode 100644 index 000000000000..e9869b3bd5dd --- /dev/null +++ b/media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch @@ -0,0 +1,25 @@ +diff -NrU5 subtitleripper.orig/spudec.c subtitleripper/spudec.c +--- subtitleripper.orig/spudec.c 2009-05-20 03:06:23.000000000 -0600 ++++ subtitleripper/spudec.c 2009-05-20 03:07:47.000000000 -0600 +@@ -34,17 +34,18 @@ + + #ifdef _HAVE_ZLIB_ + #include <zlib.h> + #endif + ++#ifdef _HAVE_PNG_ ++#include <png.h> ++#endif ++ + #ifdef _HAVE_LIB_PPM_ + #include <netpbm/ppm.h> + #endif + +-#ifdef _HAVE_PNG_ +-#include "png.h" +-#endif + + static void spudec_handle_rest(spudec_handle_t *this); + + // read a big endian 16 bit value + static inline unsigned int get_be16(const unsigned char *p) diff --git a/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild b/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild index 2563b3cc3b97..84647f35c19b 100644 --- a/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild +++ b/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild,v 1.8 2009/01/07 15:59:14 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild,v 1.9 2009/05/31 01:15:44 dirtyepic Exp $ inherit versionator eutils @@ -32,6 +32,8 @@ src_unpack() { sed -i -e 's:~/sourceforge/subtitleripper/src/:/usr/share/subtitleripper:' pgm2txt epatch "${FILESDIR}/${P}-linkingorder.patch" + epatch "${FILESDIR}"/${P}-libpng.patch + epatch "${FILESDIR}"/${P}-glibc210.patch } src_install () { |