| 1 |
commit: f5fc0aa4c9cd0708692451bfb3b2e92ef2cbd4aa |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 11 22:39:10 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 11 22:39:10 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5fc0aa4 |
| 7 |
|
| 8 |
media-video/vdr: Fix building with media-libs/jpeg |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/667934 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch | 34 +++++++++++++++++++++++++++ |
| 15 |
media-video/vdr/vdr-2.2.0-r3.ebuild | 3 ++- |
| 16 |
2 files changed, 36 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..b67c94d7c57 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch |
| 23 |
@@ -0,0 +1,34 @@ |
| 24 |
+https://bugs.gentoo.org/667934 |
| 25 |
+ |
| 26 |
+--- a/tools.c |
| 27 |
++++ b/tools.c |
| 28 |
+@@ -1221,15 +1221,15 @@ |
| 29 |
+ } |
| 30 |
+ else { |
| 31 |
+ esyslog("ERROR: out of memory"); |
| 32 |
+- return false; |
| 33 |
++ return FALSE; |
| 34 |
+ } |
| 35 |
+ if (jcd->mem) { |
| 36 |
+ cinfo->dest->next_output_byte = jcd->mem + Used; |
| 37 |
+ cinfo->dest->free_in_buffer = jcd->size - Used; |
| 38 |
+- return true; |
| 39 |
++ return TRUE; |
| 40 |
+ } |
| 41 |
+ } |
| 42 |
+- return false; |
| 43 |
++ return FALSE; |
| 44 |
+ } |
| 45 |
+ |
| 46 |
+ static void JpegCompressTermDestination(j_compress_ptr cinfo) |
| 47 |
+@@ -1274,8 +1274,8 @@ |
| 48 |
+ cinfo.in_color_space = JCS_RGB; |
| 49 |
+ |
| 50 |
+ jpeg_set_defaults(&cinfo); |
| 51 |
+- jpeg_set_quality(&cinfo, Quality, true); |
| 52 |
+- jpeg_start_compress(&cinfo, true); |
| 53 |
++ jpeg_set_quality(&cinfo, Quality, TRUE); |
| 54 |
++ jpeg_start_compress(&cinfo, TRUE); |
| 55 |
+ |
| 56 |
+ int rs = Width * 3; |
| 57 |
+ JSAMPROW rp[Height]; |
| 58 |
|
| 59 |
diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild b/media-video/vdr/vdr-2.2.0-r3.ebuild |
| 60 |
index ff3911ffe09..0b6e8222559 100644 |
| 61 |
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild |
| 62 |
+++ b/media-video/vdr/vdr-2.2.0-r3.ebuild |
| 63 |
@@ -1,4 +1,4 @@ |
| 64 |
-# Copyright 1999-2018 Gentoo Foundation |
| 65 |
+# Copyright 1999-2019 Gentoo Authors |
| 66 |
# Distributed under the terms of the GNU General Public License v2 |
| 67 |
|
| 68 |
EAPI=7 |
| 69 |
@@ -220,6 +220,7 @@ src_prepare() { |
| 70 |
eapply "${FILESDIR}/${P}_gentoo.patch" |
| 71 |
eapply "${FILESDIR}/${P}_unsignedtosigned.patch" |
| 72 |
eapply "${FILESDIR}/${P}_glibc-2.24.patch" |
| 73 |
+ eapply "${FILESDIR}/${P}-jpeg-9c.patch" |
| 74 |
|
| 75 |
# fix some makefile issues |
| 76 |
sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \ |
Archives