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

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 33 insertions, 20 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/Manifest b/media-tv/xawtv/Manifest
index 09f97bec5a75..9ab21810d415 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -2,19 +2,23 @@
 Hash: SHA256
 
 AUX webcamrc 597 SHA256 9cf61695be6b8005c663a6c73f90bd4b048f9e16f95ba659b6bc1087bc6e248e SHA512 9a0105ee984d87191ce5e808748a94dde939d932386201a7faa340a0c1de2c109129d3c41277802db7e9645c4a620885c6697d002334a35b569b0e5ce0cf11b2 WHIRLPOOL 36211dfda8da575ea7d749f2c3861f10bd4a7b10014d91eaa53ae4e069703b5503f286d92a636be19b87fd343c81d34948675876830270af5895d27412532507
-AUX xawtv-3.95-jpeg-7.patch 666 SHA256 65e015afbaebaf2f3a832ab4b6a19aeebe93e7cba2aaeee9f127a0d6d39a952e SHA512 8cbb07872c55ccc3fb5ffcc82d96e70546a27651cd94264a68b7aea13f9fe3f1236ccc783e7eccd12e724a01738aeb6f1013365be2b9070bb4be9bd979ba6245 WHIRLPOOL 3d3e4d2dc48b236ee5347351187c49ddca3e640070beb679344fc98aae7099f1766f8f91371de9e209703b2d5f60695cb0443329b42af88911432ccedf2f6e84
+AUX xawtv-3.95-jpeg-7.patch 746 SHA256 3d5bbe76cfa90ddc6084cfc62685538687c57135323e76aa6d29dd1879878e05 SHA512 56cb8f0cbc7b1d136d80a46f5e6f7ee63998df6b3e6e3382e11d90c2ac2f76d9cbd2fd607c6d7c650f0eb2d93cf7d44d11d44f8fca3e234e8f23182fee322542 WHIRLPOOL ca47bc58b4dbbca9af137b7d73c4cbefcbf415fe7f06559aed1fef753b466d3908a8e72bb85146d16f3e5a597e1de71836c5fc77eaf6baa4cd00f40466c98b16
 AUX xawtv-3.95-libquicktime-compat.patch 1040 SHA256 e7c49e00e845d237478ba13b7afdfa4f8e59d49749a1f953464ae848b90454b3 SHA512 dec544d2c6df3543dab67057bd207b2169e19c09054977a2d990461aa53c2849cdfc9f51682ac0e7adcfca9bc9f9f19f6ce15055a7be34241d70d34cf45f2254 WHIRLPOOL 70bd697eb491ec3d343344f5c1a29655defdcf11e2f634e223736aabeee72bfa7a87fbffcac731429df03677e6ba34208f47ec19bc2abc63321b36cf7c48a868
 AUX xawtv-3.95-pagemask-fix.patch 1284 SHA256 9dae64739e359393d8c991b090f045bb8463a7170d4cd7c4c790636890c67570 SHA512 093157577239b02fb4d953cf888c04445b93a450564c379e341e7b1d7c0da15594244f01c76198ccf29bf359d244e444f8fb648ac3c6ce1faa005aa48f67b88c WHIRLPOOL bb123773b2712fbc1438a159215b5165bf3983c30850937997723f5776740008aea5928940fc3a668f3b6d14d5130f131fb9f2b5477cdcec39859dd003293351
 DIST tv-fonts-1.1.tar.bz2 80177 SHA256 0194dd03ac9b384951e7f5ed7d08c6fc5f6d94efcd08516732720a1a4704d9f6 SHA512 669e3c13ede19f62d69d099a57ca39fd3326608b5b794221d29b3abcc29b1098fd30e0dcde1d1420c9aec55f6ae16d0a262b606ab598f5b3ee522f8b5540c3e9 WHIRLPOOL 3503a868d558151657ddfbd2fba5768ef6377a08a9c16eb5e0bb4d6c0862c4af66fc36271a13093a5b5558980d46f3e83baaa034c763febd6b17199deaac5532
 DIST xawtv-3.95.tar.gz 555731 SHA256 1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f SHA512 9c793ee7fa233aafb12decbd9289f09cbad5aa828db1f4dd89a9999e71bebe5faacc4c361cd41cf928931f32310bdb0c24e52c2c7c8d5595c286c163727faa01 WHIRLPOOL a55089b733d34fa144e9e56f6ff856c3401206294d42d348a05b1128421884269cfb890d16718ac3f3cd70159d7d683b4b9375f92fa936ebeeb22b84d9fd1257
 DIST xawtv-patches-4.tar.bz2 3258 SHA256 0d1a6c386c9e3ea58e92ab26268f620a3e36d888dd8cbaa46441e38215a69e9e SHA512 4f7bf2ac7be1d487daaccaaf853e3ed6a388784d15e87413cbefa4fb2e04c324f5cdce498636d4bf83d70a698b343df877e1f3df9acd615932f361b4292f6dd5 WHIRLPOOL 8b8b72e7815c04470f430e2ba3c1e252782813af56cb9875b647b70e5379f2ce13d1fb5667a6274e472e6dbe1402069b20c36933e24312ab96fef4eb1847f09a
-EBUILD xawtv-3.95-r2.ebuild 3692 SHA256 41b71ad7740846016d0770982dfd94de913c67f311ff03d8d6e9ee99d508348d SHA512 b03f5343f1e5d63baec3b542b559c1504941fde29d1ba9597465a4c6659b64248bf1882fc0efcc51c129f07c3def994008cf70938f5930ca936f1d450f0c7a22 WHIRLPOOL d6afdf1ffbded9c70852eb656968e4bf25060b1733a9353f0389362ac7f25756271d2d9a984ed0de1faf9ceb622841c78d21d9f29f0e243ea8e9b8fd6fc25579
-MISC ChangeLog 15846 SHA256 cd98ae0269c87d1f8a39bb2de9bbb3124d63092ca0652e674ef258a5974fe330 SHA512 688eb63698cedde7a488abb313f7750a55c21033e562c48fd61b5e0aec632b3a4280cc88ca0b25f1f885acd3422f2caf622bd8bb9a7d69b2a47244f15b736fa6 WHIRLPOOL 12bbff526b02f9e8b87a957306277d170900ec42490867cfc6733abc4001d3f21881da9d20a2273fada44c4fddd30e4e4d063d802aa9a0042970ac7ac7207355
+EBUILD xawtv-3.95-r2.ebuild 3615 SHA256 a0334d104fd8cfb8849057e0e228bcf4313aac4db71eb14076f1ca6caa479406 SHA512 6ea4a4d9eabc92b6411749162d08d69bc05564948fd8dd7fd9591bfd4144f41c0184ce826fc7d56f12ec9ac951d98b10f14c1e40267e075a108f5d959b228bb5 WHIRLPOOL 5185f04b15db4ab66bec06964ae01a9d73eb21a76263538ff64c5cdf13afd17795c17989c7ec1962a4714c2cab410dbfe75d01a3bf1ea0923fe0c94748207e14
+MISC ChangeLog 16102 SHA256 d0800176ede67c16a6781805189c95c4217a8da95fcb40fe5a5a5b51c0bdbecc SHA512 2c64d7aa761f799e6b605605ef2344a7a6905502d89237ed97fea248e19e82784fc4cd1d642e28f68ab08422280b57b8df816cf645f4c0949896814ace28dbc2 WHIRLPOOL a478da7865642184ff44c90f174c21d9cec9d6c54aa17be1d7a3f1f0bb586e77f357b79247c20209ca9d31870e38875c1ab6735fa14a21761823de9c76cc49a7
 MISC metadata.xml 328 SHA256 96f627b19b6b8c71bf35895cbd63e4e355caa23579e5879ecaeace8c37f1a7c5 SHA512 8737036a68ee39c0127d936f3159db10f6ab18dbd60c99f64373a4f6906aa7cbbb8bfaa69329b0127673485bacae7ffeb5513eaa9cf019a365bf55d30fd1c001 WHIRLPOOL 15548da907b989cf27e9b575604719f26b51db63324e4e58185c0afa78c9d1c9a93cdf8115ebbcc52a0aae7ff7243dad5da4b0a4107c69b5237aa735c8400884
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGowh0ACgkQVWmRsqeSphNSzACcD3iSp7tJ0o9HDgOZNRz8mBJk
-33oAn2dgWWKcDV+TM8vza+nBrAtJe2ww
-=ggyw
+iQEcBAEBCAAGBQJSAK7WAAoJEEdUh39IaPFNz6AH/Ai/WLzcrccUGtbIJLKbUmRF
+xhPcm/p71sZgJlG2ja2Wg3Lt9dnH5ndKWNB5Czr3Ohj1AKZCCGlkAP3m0nNDFDz0
+n8ZxH+e2iXASk8SfZrhw/kXNN1kGJxFhdMblLWiSL8d1yp9l6hgh7RvI49z4Nk2/
+WY8v51OXAK7yUaHrGxzuBvsjj/vFyVFTX8hYewLJPropbocbc4p+b3tFL9PyVdZs
+eP95Gs1XFp2D34tvH+FN31KnveYHtvA4IYgkREpVf8IdPjKtNoE9l95B0bn9MUcA
+bTGYdvki9/xe935Q/rNs9KaVuJBM/Di8itGT5XlVYKKTDlKtdPxV0OaA7rdZNVk=
+=gqP1
 -----END PGP SIGNATURE-----
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 || \