media-libs/libass: Include upstream patches

Package-Manager: portage-2.2.20.1

7 files changed, 44 insertions, 18 deletions

diff --git a/media-libs/libass/ChangeLog b/media-libs/libass/ChangeLog
index b05c28af..aebf35be 100644
--- a/media-libs/libass/ChangeLog
+++ b/media-libs/libass/ChangeLog
@@ -1,3 +1,8 @@
+  11 Oct 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
+  +files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch,
+  libass-0.13.0.ebuild:
+  media-libs/libass: Include upstream patches
+
 *libass-0.13.0 (09 Oct 2015)
 
   09 Oct 2015; Bertrand Jacquin <bertrand@jacquin.bzh> +libass-0.13.0.ebuild,
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index c79c955f..ac39b4c2 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,4 +1,5 @@
+AUX 0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch 821 SHA256 0f6537311c976b7f9d9560c6b277cceefaf195ccb0cef1a18d945faba11c23cd WHIRLPOOL e2ebde0b01e957e27af2f482d8a64e6ba9626d651fdea7dcdd29072bcd350f2b7030537b00ef1ca91ae5a835bffcbc6a1a41e8856eea1602fc4262eaf7852cbe
 DIST libass-0.13.0.tar.xz 336128 SHA256 e0071a3b2e95411c8d474014678368e3f0b852f7d663e0564b344e7335eb0671 WHIRLPOOL 7ccf4df975a07e94cdc85b4436b08eae1a6ce60d027d0db21855bbdfd21e4770a5e21cae90ce7646b477094241df3b36c247f043f347f2f1494f3d6a02e91f28
-EBUILD libass-0.13.0.ebuild 1512 SHA256 c637f07590a86e53d9e3abaed0e22b60dc541f1f6a28588a46f860837add238a WHIRLPOOL ac89716dee720151985231e41242b85df6b0347b57deb2a7536303fc5ef540da9c2060be5d6f29699a6a90d4efe98ef83937ddee966c0d19212fe8c6ec34a1d8
-MISC ChangeLog 885 SHA256 90152075f770d3e5620b49d794d848e967f8d0e242683a89d74d796ca4384de8 WHIRLPOOL 6294321bc269622f45f1c238bac3b43fe95be701aae9216437a2f7db83dbef162eb7a6a2a2de4b10e35447f3c93f64f912cd986a4fdb7c29c90abc8c99f8e502
-MISC metadata.xml 409 SHA256 1c11ee8622d14f7e37288db8b5ebaf9e5aaa1d8bcaf850cdcad5883bfa99edf5 WHIRLPOOL 66701d01ca2029e0155b741fba4f82467d078404cb1eaf0a74b5e496f508d06dae123c7befb8f2837601286a6b68caf5acc1f9aeda5381d40f113cc9a02bc2e8
+EBUILD libass-0.13.0.ebuild 1477 SHA256 5a73168616380735330b53a7fb1b6845fa728e9fb36c891692b1d76ff801727b WHIRLPOOL c222f250c8bc34af7bef99086f666f5a7c4ec63e36d7c4098947ab49c07fe022e7b47edfd5b4681ed97ad222776630e6607c180c618b74613845751a629a1ac8
+MISC ChangeLog 1087 SHA256 6813abd21f03ab1956e5296c016650a9dee070b5767e17f8e0bbca17e7613460 WHIRLPOOL e6c97fd1d6d4cecb4815c2da2e87f4e253c50f3d6f1830523b83300cf8268156fdf0b9fa6675b3d541c16e9b0a596a6eac62b0b87b2f42d444b1791dcffa3b77
+MISC metadata.xml 329 SHA256 ff4cd24251d0ea081875fe94d80083af46dc7dcf862b5b5b467bfa3aad806510 WHIRLPOOL 670113333aeca6ea0eeabf04113bc633194468a2042e6fd3d7cad3cdae2a02b2ebfdb6711ec4c03e1d62a20fa07b6d7905c867560066e7d4333b3cbb507284fb
diff --git a/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch b/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch
new file mode 100644
index 00000000..3688aad4
--- /dev/null
+++ b/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch
@@ -0,0 +1,26 @@
+From 4778001b673c73133d7d1dd48a385d0ca424ccfc Mon Sep 17 00:00:00 2001
+From: Luke Dashjr <luke-jr+git@utopios.org>
+Date: Sat, 10 Oct 2015 08:11:38 +0000
+Subject: [PATCH] configure: Set the correct x32 machine option for yasm
+
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 117b23b..d6fbe34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,6 +56,12 @@ AS_IF([test x$enable_asm != xno], [
+             X86=true
+             BITS=32
+             ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -m x86" ],
++        [x86_64-*-gnux32|amd64-*-gnux32], [
++            AS=yasm
++            INTEL=true
++            X64=true
++            BITS=64
++            ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -m x32" ],
+         [x86_64-*|amd64-*], [
+             AS=yasm
+             INTEL=true
diff --git a/media-libs/libass/libass-0.13.0.ebuild b/media-libs/libass/libass-0.13.0.ebuild
index 7d5b2747..3646359d 100644
--- a/media-libs/libass/libass-0.13.0.ebuild
+++ b/media-libs/libass/libass-0.13.0.ebuild
@@ -23,25 +23,21 @@ RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-ASM_MULTILIB_ABIS="abi_x86_32 abi_x86_64"
-for i in ${ASM_MULTILIB_ABIS} ; do
+X86_CPU_OPTS="abi_x86_32 abi_x86_64"
+for i in ${X86_CPU_OPTS} ; do
 	DEPEND="${DEPEND}
 		${i}? ( dev-lang/yasm )"
 done
 
 DOCS="Changelog"
 
-multilib_src_configure() {
-	local myconf
-
-	if has ${MULTILIB_ABI_FLAG} ${ASM_MULTILIB_ABIS} ; then
-		myconf="--enable-asm"
-	else
-		myconf="--disable-asm"
-	fi
+src_prepare() {
+	# bug #509460
+	epatch "${FILESDIR}/${PV}-configure-Set-the-correct-x32-machine-option-for-yas.patch"
+}
 
+multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		${myconf} \
 		$(use_enable fontconfig) \
 		$(use_enable harfbuzz) \
 		$(use_enable static-libs static) \
diff --git a/media-libs/libass/metadata.xml b/media-libs/libass/metadata.xml
index 235d662c..5dbcaa86 100644
--- a/media-libs/libass/metadata.xml
+++ b/media-libs/libass/metadata.xml
@@ -6,7 +6,6 @@
   <email>media-video@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='enca'>Enables support for charset discovery and conversion.</flag>
 	<flag name='harfbuzz'>Enables OpenType shaping via <pkg>media-libs/harfbuzz</pkg>.</flag>
 </use>
 </pkgmetadata>
diff --git a/metadata/md5-cache/media-libs/libass-0.13.0 b/metadata/md5-cache/media-libs/libass-0.13.0
index c544aa68..e62117e1 100644
--- a/metadata/md5-cache/media-libs/libass-0.13.0
+++ b/metadata/md5-cache/media-libs/libass-0.13.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install test
+DEFINED_PHASES=compile configure install prepare test
 DEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm )
 DESCRIPTION=Library for SSA/ASS subtitles rendering
 EAPI=5
@@ -10,4 +10,4 @@ RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(
 SLOT=0/5
 SRC_URI=https://github.com/libass/libass/releases/download/0.13.0/libass-0.13.0.tar.xz
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=fd667eef03d86f81364924ba12a8c351
+_md5_=1104b37a664b8dcf1877b0d8fd7b2db8
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f4d8cf18..485c9d56 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -51,7 +51,6 @@ dev-libs/dietlibc:target_sparc64 - Support SPARC64 target
 dev-libs/dietlibc:target_x86_64 - Support amd64 target
 dev-util/jenkins-bin:standalone - Run as standalone with internal HTTP server
 media-gfx/natural-gentoo:grub - Enable support for sys-boot/grub
-media-libs/libass:enca - Enables support for charset discovery and conversion.
 media-libs/libass:harfbuzz - Enables OpenType shaping via media-libs/harfbuzz.
 media-libs/x265:10bit - Set output bit depth to 10.
 media-video/rtmpdump:gnutls - Use GnuTLS library instead of the default OpenSSL