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@gentoo.org>

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 (file)
index 0000000..b67c94d
--- /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 ff3911ffe09747d0ec8d1a2c7bd2f0a79a4085fd..0b6e82225591e85c081f0edb0b9fc4eb571168fb 100644 (file)
--- 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):" \