summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-06-24 19:48:32 +0000
committerPacho Ramos <pacho@gentoo.org>2015-06-24 19:48:32 +0000
commit870e587c328183c820781f51c802918ff74223c6 (patch)
tree894a8ac657e7bc3498574087c31944cfa52a56ea /x11-libs
parentVersion bump. Fix bug 552566. (diff)
downloadhistorical-870e587c328183c820781f51c802918ff74223c6.tar.gz
historical-870e587c328183c820781f51c802918ff74223c6.tar.bz2
historical-870e587c328183c820781f51c802918ff74223c6.zip
Fix automagic wayland depend (#529388)
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/libva-intel-driver/ChangeLog7
-rw-r--r--x11-libs/libva-intel-driver/Manifest11
-rw-r--r--x11-libs/libva-intel-driver/files/libva-intel-driver-1.5.1-wayland-automagic.patch20
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild8
4 files changed, 39 insertions, 7 deletions
diff --git a/x11-libs/libva-intel-driver/ChangeLog b/x11-libs/libva-intel-driver/ChangeLog
index 1489f1f1b636..913695bf0dc5 100644
--- a/x11-libs/libva-intel-driver/ChangeLog
+++ b/x11-libs/libva-intel-driver/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/libva-intel-driver
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.40 2015/03/20 13:23:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.41 2015/06/24 19:48:30 pacho Exp $
+
+ 24 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+ +files/libva-intel-driver-1.5.1-wayland-automagic.patch,
+ libva-intel-driver-1.5.1.ebuild:
+ Fix automagic wayland depend (#529388)
*libva-intel-driver-1.5.1 (20 Mar 2015)
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 124e78a682de..f558c0fdab5c 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,6 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX libva-intel-driver-1.5.1-wayland-automagic.patch 812 SHA256 0adee95b3153deea44f0209091d6e3149c0e873b8b7cc1fe5e88c2e45a59ea6c SHA512 7646eb21b6b3afbc47a4d81da8661e4bc6ffa005e9326e679b7c4c02f66328eaa176409e1e2c18213778448592222ace0496e41cf979cc5d62d60f01ea5a7005 WHIRLPOOL be25380c0d988e3e6b24cc7139761739da655827c3aa6f8d1cb338a5111256c7191741164017e7e4ac0f131aa37d5c1623e2a0cb6f813d3743bf32b2f86939ae
AUX nox.patch 972 SHA256 4f3c920e51913aef332430eae9795ffe489d7240b920b1728187b3e31bbdc548 SHA512 99d0c6ed169fdf4edd7ee2885a269fc4eb2a06e2ecf8c25605f31ebd0a0d63b60fc0e86d890e20f497483a5f1a2c2ec3b14ffe8bb64403cdd5fac3c5ebea3784 WHIRLPOOL 615578cbb9b0a381d278555269ff45890782398ee804c12ba9d9a052bcc8f3ed27f7e56bd6a9fc6f8753083104138ea5aa800fc65848ecab3be066011b26db33
DIST libva-intel-driver-1.3.0.tar.bz2 965030 SHA256 734c15e78495f53fecb9862a22579d05ca5994fac4d04e3cc804ca9cbaa7fb6c SHA512 09566199409f76b8a533857c6bef26c35cd21b1555d29b395e72649fa0337b86b4a65eb5adf4144649ae26d5d8c93f1462d19011c95de9256728cadf56975e5d WHIRLPOOL 727b1bd14a55baa60092a5f2f9bc0bfb2ca39328103f812ccb3be8391246c0b0c4e99b596527e7189e2700d91d15aceed1e5284808644d46e26b2d470d67194f
DIST libva-intel-driver-1.4.1.tar.bz2 980214 SHA256 fe6784c7ba6092204e3e7d4142e6023386b43f08127dae1243385078c5c21fec SHA512 1b0d868c50ae18dde025618618b984ffc71d3e7827edda125479a42cd4c197c8059f764c7ffe601d83c2838038a6dd18e6a80caf13176897ac271bec75644550 WHIRLPOOL 7b36831efc3619a315c5711210af06a8637411b59fd9941256248e783305b482df402c2bdc84d15175c01adc18abf8995b123e8952e6b525e69104833676f34e
@@ -9,14 +10,14 @@ DIST libva-intel-driver-1.5.1.tar.bz2 1046744 SHA256 0bdb6c303d03ccb536ab7269364
EBUILD libva-intel-driver-1.3.0.ebuild 1446 SHA256 60925b501e471faa36a19cfd2709cba06dd2c1835877999255c5226713397bbc SHA512 daa90d5b9200ac4657a292698b9506fe65dbecd29cca68ccc1fe271daa1accbee096a57757c8abae5b442084237ed6f08c9b2d49d73290ac808ea94c0184967b WHIRLPOOL f4835148675710c87b634d2c797b3ef31e6d82430504ea1ef43318c3a0a5d0c1c2f8408539af0e0d9054f89c84595a713cd12794ca06ffb73d38ccf4374c155c
EBUILD libva-intel-driver-1.4.1.ebuild 1562 SHA256 7320000fdd0bb4f0c7f4cb31805ee9c0f56ccc9c0fb750bdbd8b1d7849566bb0 SHA512 78f10e7acf99d5d66d35075c09d03a24b188d993f65b99edddf008420954636bee3a52033e7d77a0745a84a7932b4a67481c1c1c7e0d916c54e57655e8c6a670 WHIRLPOOL 578e78e5ecd7778186f5347361b16799970579892ea2715fcc807b24d4b9555d7e6b85e30a6a298007dc4515b1a13d2102c6a9463ff1c0e222f5c80723dc9bea
EBUILD libva-intel-driver-1.5.0.ebuild 1598 SHA256 47eb12df8e410f63646ab8359f4a2f0a16bd4780b11a54405a910f23dcf66eef SHA512 5f18d7753557247a7882756550e4fbc867095482a564b53e47106f897d1ac8f4e0734e31dd7b6c018b88d763679bd8c3230a6cbca1d72193a0a1452574ec9f39 WHIRLPOOL 9950ac265b7b91ca915623891d57a57320d126b0417a5dc6865e23981820ec0a176ed6ba2e09d6dee635ae9b452f1a876023daa1886ac236a4e4470b362ab7c5
-EBUILD libva-intel-driver-1.5.1.ebuild 1562 SHA256 37c84ac149dc226a448fc905ac9468f364e3f0f9b37a58e9d7ca0bf8d83ff773 SHA512 a089fd6d677166b161c3d07b7917ced2277ddd08074102089e927bea5dd12ecfc2da5b424e7bd8a6c8296eaca732c7263d149264937572aae939bd8981a6c501 WHIRLPOOL bf0eb3839e5231e8311879841d5492202ab20cfefdf5ee6e315fbcfc1809eee79b5b19670c87ff0aa4d2226ed40e14d1ad20c0f095f1150bd085b686575d891b
+EBUILD libva-intel-driver-1.5.1.ebuild 1714 SHA256 fb5657361ba6d17a8e90dd0db98473a75d190b977e8e6a17a059a2b7dbbe5df8 SHA512 69ce1b2cb1e59845ac10426ca93bd9e5f34ccfc5da8714e513e4946e129d7fe62ab0699e9a3ea6acba5cfa49c9ffa93ed20cac8c2a8cabf44dda90a2eb4b1962 WHIRLPOOL b1db5f6af9a8312c4caecd63d4267ff3da7a978c5785d104d0c41418769ea25000e45052280cf315351f92e54201f1c692f20ded2a4215655a390296ea3a4170
EBUILD libva-intel-driver-9999.ebuild 1562 SHA256 32294c2564401cc661991d95b9f4e0b64bf0318f22e032b508a6ed0bebc362ee SHA512 da61050bd90e13bc60d481ddde2f1ed239153574ae631c89fd718dc899fdc690d633a48b037cf38b4bdfb7a08c4ce16c441d3015bd4a2727e8b904eefbf8c336 WHIRLPOOL 27546189bebd8a95086d02d2317c2d42020c0b379974ee2432ce24f5fb99374e0588d76702873e7b2c966a23308dfa0acf3a22dcd7139e0533d704960a0a0202
-MISC ChangeLog 7041 SHA256 b44746bc07ee206cea73330edb5a0537b3be36c17e84728c335549797d538ec2 SHA512 bd64df7b6b4adbb2a37ea6ce8b8426938f3d0322464191819292ed0e3e686dc4075344d04982288ffd6896d5a5e54ead6246e6c111cc3b2739eb5581e7e2d3d2 WHIRLPOOL f0ea9abfbd71c13c72899c3f7a979de97921f9714a6b6eb126962e3ae5f60cfa9379e7f05b4036d0d45e3a97254f7ed24a6d9507f77b3f770bfb6608390539fb
+MISC ChangeLog 7220 SHA256 fa2559a2553937813a2ec5ca25a7a37078b863040af972bafa526ef8e895dc1b SHA512 59bbc6e3f89e222a3c8b98812a50eae9b2db61819430c49baa5690acff0c4ae106538bad34bcf6c640101bcffbc30b8ecda3b36bd824c166df8d932540f5daf9 WHIRLPOOL 78492ab07767ca735649c713f431856a46e024c1e3c6fa9070f03f97185b8bb722481c06d079829769ebf30ad3c9a0d27ddb16ba9631918501f108f47195ef32
MISC metadata.xml 440 SHA256 ababbea513452ff834ddeb767611edd4ccee13c993042948c0e831e1c69c6181 SHA512 b1305b545b6fef13c319fcfd6c8f34f65e372e941975b54048499482d5f034ad780d9e744dff5e27ce4a3565d25c2ce924c0a1dd02e552dc27de97c22cf765ab WHIRLPOOL e7079730071ecd6491e45bd5d7d23e0763e3cd4a971819b8045af592459882a3b0c7c4cc16c37cd1774ae6102e0a153e38d2219a70d95eba716b0ef2071b2ef8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlUMH1MACgkQvFcC4BYPU0oVCACeN2O4S7O/gcDzPpi8MEP+Ga99
-wa0AoMgrgw8/mQyUHxO4MggprxK4jg8s
-=Jx9o
+iEYEAREIAAYFAlWLCY8ACgkQCaWpQKGI+9QahwCfRaHMJclzX6AIRXO5B/2PY8ol
+UycAn10pOZznlu188vo7hIufuzyUNquS
+=q8E3
-----END PGP SIGNATURE-----
diff --git a/x11-libs/libva-intel-driver/files/libva-intel-driver-1.5.1-wayland-automagic.patch b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.5.1-wayland-automagic.patch
new file mode 100644
index 000000000000..9f0c0d4e8fef
--- /dev/null
+++ b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.5.1-wayland-automagic.patch
@@ -0,0 +1,20 @@
+--- configure.ac~ 2015-03-20 04:48:37.000000000 +0100
++++ configure.ac 2015-06-24 21:45:47.954846367 +0200
+@@ -164,12 +164,13 @@
+ PKG_CHECK_MODULES([LIBVA_WAYLAND_DEPS], [libva-wayland],
+ [AC_DEFINE([HAVE_VA_WAYLAND], [1], [Defined to 1 if VA/Wayland API is enabled])],
+ [USE_WAYLAND="no"])
++ m4_ifdef([WAYLAND_SCANNER_RULES],
++ [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
++ [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
++
+ fi
+-AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+
+-m4_ifdef([WAYLAND_SCANNER_RULES],
+- [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
+- [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
++AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+
+ AC_OUTPUT([
+ Makefile
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild
index a45ffc9b53f3..7b68c4fb4ccf 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild,v 1.1 2015/03/20 13:23:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild,v 1.2 2015/06/24 19:48:30 pacho Exp $
EAPI=5
@@ -40,6 +40,12 @@ RDEPEND=">=x11-libs/libva-1.4[X?,wayland?,drm?,${MULTILIB_USEDEP}]
DEPEND="${RDEPEND}
virtual/pkgconfig"
+PATCHES=(
+ # Fix automagic depend, bug #529388
+ # https://bugs.freedesktop.org/show_bug.cgi?id=79478
+ "${FILESDIR}"/${PN}-1.5.1-wayland-automagic.patch
+)
+
DOCS=( AUTHORS NEWS README )
src_prepare() {