Install Xawtv app-defaults to correct directory at /usr/share/X11. Fix building with libjpeg.so.62 API wrt #479848 by Martin von Gagern

(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 22 insertions, 13 deletions

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 90b1d281a5d8..2799d7f21308 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xawtv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.69 2013/05/31 15:30:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.70 2013/08/06 08:09:36 ssuominen Exp $
+
+  06 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> xawtv-3.95-r2.ebuild,
+  files/xawtv-3.95-jpeg-7.patch:
+  Install Xawtv app-defaults to correct directory at /usr/share/X11. Fix
+  building with libjpeg.so.62 API wrt #479848 by Martin von Gagern
 
   31 May 2013; Jeroen Roovers <jer@gentoo.org>
   files/xawtv-3.95-pagemask-fix.patch:
diff --git a/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch b/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch
index 69f2d9836d55..20219853d526 100644
--- a/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch
+++ b/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch
@@ -1,20 +1,25 @@
-http://bugs.gentoo.org/show_bug.cgi?id=288158
+http://bugs.gentoo.org/288158
+http://bugs.gentoo.org/479848
 
---- xawtv-3.95/libng/plugins/conv-mjpeg.c
-+++ xawtv-3.95/libng/plugins/conv-mjpeg.c
-@@ -229,6 +229,7 @@
+--- libng/plugins/conv-mjpeg.c
++++ libng/plugins/conv-mjpeg.c
+@@ -229,6 +229,9 @@
      jpeg_set_quality(&h->mjpg_cinfo, ng_jpeg_quality, TRUE);
  
      h->mjpg_cinfo.raw_data_in = TRUE;
++    #if JPEG_LIB_VERSION >= 70
 +    h->mjpg_cinfo.do_fancy_downsampling = FALSE;
++    #endif
      jpeg_set_colorspace(&h->mjpg_cinfo,JCS_YCbCr);
  
      h->mjpg_ptrs[0] = malloc(h->fmt.height*sizeof(char*));
-@@ -453,6 +454,7 @@
+@@ -453,6 +456,9 @@
      h->buf = in;
      jpeg_read_header(&h->mjpg_cinfo,1);
      h->mjpg_cinfo.raw_data_out = 1;
++    #if JPEG_LIB_VERSION >= 70
 +    h->mjpg_cinfo.do_fancy_upsampling = FALSE;
++    #endif
  
      if (ng_debug > 1)
  	fprintf(stderr,"yuv: %dx%d  -  %d %d / %d %d / %d %d\n",
diff --git a/media-tv/xawtv/xawtv-3.95-r2.ebuild b/media-tv/xawtv/xawtv-3.95-r2.ebuild
index b829faaa6471..f8ac3dd9e90d 100644
--- a/media-tv/xawtv/xawtv-3.95-r2.ebuild
+++ b/media-tv/xawtv/xawtv-3.95-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95-r2.ebuild,v 1.9 2012/10/24 19:18:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95-r2.ebuild,v 1.10 2013/08/06 08:09:36 ssuominen Exp $
 
 EAPI=1
 
@@ -96,19 +96,18 @@ src_compile() {
 		$(use_enable lirc) \
 		$(use_enable opengl gl) \
 		$(use_enable zvbi) \
-		$(use_enable aalib aa) \
-		|| die " xawtv configure failed"
+		$(use_enable aalib aa)
 
-	emake verbose=yes || die "Make failed"
+	emake verbose=yes || die
 
 	if use X; then
 		cd "${WORKDIR}/${MY_FONT}"
-		emake -j1 DISPLAY= || die "tvfonts failed"
+		emake -j1 DISPLAY= || die
 	fi
 }
 
 src_install() {
-	make install DESTDIR="${D}" resdir="${D}"/etc/X11 || die "make install failed"
+	make install DESTDIR="${D}" resdir="${D}"/usr/share/X11 || die
 
 	# v4lctl is only installed automatically if the X USE flag is enabled
 	use X || \