commit: f5fc0aa4c9cd0708692451bfb3b2e92ef2cbd4aa Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Apr 11 22:39:10 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Apr 11 22:39:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5fc0aa4
media-video/vdr: Fix building with media-libs/jpeg Closes: https://bugs.gentoo.org/667934 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: David Seifert <soap <AT> gentoo.org> media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch | 34 +++++++++++++++++++++++++++ media-video/vdr/vdr-2.2.0-r3.ebuild | 3 ++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch b/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch new file mode 100644 index 00000000000..b67c94d7c57 --- /dev/null +++ b/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/667934 + +--- a/tools.c ++++ b/tools.c +@@ -1221,15 +1221,15 @@ + } + else { + esyslog("ERROR: out of memory"); +- return false; ++ return FALSE; + } + if (jcd->mem) { + cinfo->dest->next_output_byte = jcd->mem + Used; + cinfo->dest->free_in_buffer = jcd->size - Used; +- return true; ++ return TRUE; + } + } +- return false; ++ return FALSE; + } + + static void JpegCompressTermDestination(j_compress_ptr cinfo) +@@ -1274,8 +1274,8 @@ + cinfo.in_color_space = JCS_RGB; + + jpeg_set_defaults(&cinfo); +- jpeg_set_quality(&cinfo, Quality, true); +- jpeg_start_compress(&cinfo, true); ++ jpeg_set_quality(&cinfo, Quality, TRUE); ++ jpeg_start_compress(&cinfo, TRUE); + + int rs = Width * 3; + JSAMPROW rp[Height]; diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild b/media-video/vdr/vdr-2.2.0-r3.ebuild index ff3911ffe09..0b6e8222559 100644 --- a/media-video/vdr/vdr-2.2.0-r3.ebuild +++ b/media-video/vdr/vdr-2.2.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -220,6 +220,7 @@ src_prepare() { eapply "${FILESDIR}/${P}_gentoo.patch" eapply "${FILESDIR}/${P}_unsignedtosigned.patch" eapply "${FILESDIR}/${P}_glibc-2.24.patch" + eapply "${FILESDIR}/${P}-jpeg-9c.patch" # fix some makefile issues sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \
