fix build with glibc 2.20, patch from upstream, bug #529162

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog
index 61bb83b8903a966230d6dc15459d20ed2df61047..2c90813e8554541b6c2464cf85f5552b9d22ca52 100644 (file)
--- a/media-video/dvdauthor/ChangeLog
+++ b/media-video/dvdauthor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/dvdauthor
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.51 2013/04/10 14:16:02 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.52 2015/02/06 10:09:20 aballier Exp $
+
+  06 Feb 2015; Alexis Ballier <aballier@gentoo.org> dvdauthor-0.7.1.ebuild,
+  +files/dvdauthor-0.7.1-glibc220.patch:
+  fix build with glibc 2.20, patch from upstream, bug #529162
 
   10 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> dvdauthor-0.7.1.ebuild:
   Fix building with USE="graphicsmagick" wrt #459976 by Erik Zeek, Andrew John

diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index 5d0f1c4faba0467802583e35d334cd6db54e9b6e..8a417bc28885f5b1f619fddf5303d6455fe5f2c2 100644 (file)
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -3,22 +3,19 @@ Hash: SHA256
 
 AUX dvdauthor-0.6.18-libpng15.patch 348 SHA256 61c28dc61470afa828df44ab46fcf5ec2cc8527313b9f02691f4b7f64faf3e31 SHA512 00c0e3434146698ed51926a1553b7fedcb7f7fb8391f47f56ca8559efb3f8b404fb4cc5cf1cf9853363c9af6b8a7c31c46c55107be6294ad74387335c3a7d5d1 WHIRLPOOL 5d61984f30f2d5b6669e46b85ffa9a64804b45b2a0c8de332bf41f62b46e203cd63c8cd47e9ee6080293d395ead7ed095122563f897362d221c56d08dcc0128c
 AUX dvdauthor-0.7.0-libpng15.patch 438 SHA256 8e5e38580d2f1a672e8bad0617e2a8edbfae6e48d14be72336c1fabb7181b518 SHA512 757f3f0c404476123616c8ac4a9ccae64f9ea63d751f7b070141aff8e8dc25288cab81311ce44a46c03e25e1b6ab188ab9f8e96d896be3d65c3c3314b75f27e6 WHIRLPOOL ad29aeb261b43674dae52d0ff800d4a4e48d92204ac04720cbb0923520c90cc2a10ab98870a8f6c76fd00d456fd8deb11104f8c72d64f75967300b76a91a6b83
+AUX dvdauthor-0.7.1-glibc220.patch 3462 SHA256 e74c5ab228fe0bdaaf66b7662507b980f2790cd8df3722a3666e2bb560633e00 SHA512 1f1dd830ab7e101e412429453185a7221f1c417e441aa0f7937576695fc079a3935ddd5925c983e48b716b08059942541942a392c5bce7c360942f67c47e22ea WHIRLPOOL 139bb33a441a56fc2fe8447ca619b8aca483ff2954d2beeb47d46240420bb7e64248727f2cd4f6d9943187a12a022263bc1fbd85f461f740a6a4defdf0bdbc1c
 DIST dvdauthor-0.6.18.tar.gz 392809 SHA256 0e21c2d9c09f7e347c4c9bd7b691455f524ec2e91bcafc18b84d7b7fb3a9cb26
 DIST dvdauthor-0.7.0.tar.gz 414191 SHA256 aea6af7b99eba38ffa9dc5ad1521c2cc652e043cea0e7482e239d2a3fc2f34d0 SHA512 2f450ef02dac774a8611f3398f71a8d9d4f7ebb3c9de56ec1c4ec2d54350f371bf32387f95bc90dcd399618819f46cd589cacfef6f7aae68ee3addda5e9ce892 WHIRLPOOL af960e9ad82c8e0da7c67dfde6c471803ed1d53eda8f373a4f1d3dd54edb2a0a91b654d65855a6171032e12230db0d2bb7e2e016d76c5222591e0ea70dbeb65b
 DIST dvdauthor-0.7.1.tar.gz 421324 SHA256 501fb11b09c6eb9c5a229dcb400bd81e408cc78d34eab6749970685023c51fe9 SHA512 0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9 WHIRLPOOL c07526bbdbd75b4ddc0f2a1057f2bf27dbb5c63b4e4495b3a051d530af58ba4d4d75ec15dff2e3628cd1cb46b476ecb6a3d640ec30e1e6692d832549108b3e63
 EBUILD dvdauthor-0.6.18.ebuild 811 SHA256 1a7baed80ae13c9172d52a60bfe6362df2ce204cfe84abcc4c165b97e39a7a1c SHA512 071a095fbc9684b2e4677d3687c080f46ff12d359f45e28b5197135f67c1616b2f87a47c95e63184a39fe2ddc978de621c94bdffad34791b81c18d832d27941c WHIRLPOOL 7e30fad595de08e7afc1c726eefc771bcf4d3c7a4b4370cc90f92df6df9d8458cc1e648210d716db348d592d83917c06f07ca0622d2bf8b1fcb2c3db678eefd8
 EBUILD dvdauthor-0.7.0.ebuild 1110 SHA256 6316aa47e9dfa533bec33fd25235ef29db13521c1f32006f65f181128c8e1a64 SHA512 03d47b043e60c6afc5d0ad1a40cf4763851c71055047c5f215d8a151ad5976f24d09ac15c8c1aa16bd9b66355d84c47560ac57eb4d9dbe9007348397e2333b75 WHIRLPOOL e4c3336ec1b128d9d36afe136c6a4d51334d67ee7089cae6ebf05f1274c066fa0ce1d72789885530c0a510b0c5e6200e58c027911c7c8017328fb67aacd13bcf
-EBUILD dvdauthor-0.7.1.ebuild 1177 SHA256 167ae5c57c6d1f4ead3c487d8304198c7e459818091d68d2503cdc6fc6fc31b1 SHA512 095ea3b0f2845a192f4c0a62fd19c9da7f0543cab8a5fa4fd40271ef251419ac55c004f3abe8e09f5c969acd5060d01d8e776f96fcf4e7c50381212474182f1c WHIRLPOOL 135464239105a9d7fcd50e650c7be40db7d740071f69a772122a2ab6027a827515a9db6668bac3adb73d080eafd69f81c360d36d261674494c830f44ac5ad7be
-MISC ChangeLog 6992 SHA256 b46698dfeb4eef0c2c3c30af5a433f4cabedf9792f90aeb987e2408e47227062 SHA512 153a826b9ab593b8fbe101e147e9b430cbe4ee39d20a445ca4e7c27830f929fedb09c459e2418b6e7fe0985b84b09e16f6ee824f7fc7d532e4665d3ab304f0e6 WHIRLPOOL 74052b0ef8c3d5408946d942eff9a986dc8e54498fb8227bb7f17c279c20ad7d6fc3ad78e239ff58a500d02e78dfc04b0340a1ff9ca8a9e3d96d1a167fe9bb52
+EBUILD dvdauthor-0.7.1.ebuild 1218 SHA256 6bdb535e44586d91c45e397f6a72a562ad5886d357f55f68540a8c659b330fac SHA512 ac78b2780e17d97eaebe51c477ca87bd53744252cad303d702d50f18194c939ae339a627974a72899a810fbfdb3814be14939736346926924da2592bb246d3e1 WHIRLPOOL d34cc361dc170eff35aed9164547bfe0f939bbc4bf583c5a6d85c5d15c0b0e2f45f8db1780d8a992553c2bbc9a3075ad25dcf871eadbf0d4a2487a8cfd0ef4b6
+MISC ChangeLog 7171 SHA256 afeeabd5865bd4bb89c8ab7f48568dae4cd15456560610b746803380a412559c SHA512 ac7b762a8ef3bb42b2fbc53d8d72f99474323e5a88608a662fa8e56d00385ba78b1e8caba0087c0e865a01abb9ff6b6cbf3c6e8c0746d235e298e8f6cf61e165 WHIRLPOOL f68b85b650ee75c220d70f0ba619ce8445314a29d7257688068bc01f178e5f71eb10fe67c34d58ebd2f2ef74916752cc98811b379f152d9fba39ad785ec3c81b
 MISC metadata.xml 373 SHA256 8a2dd4df029e4eb8c389dbe2856dfba73f0c38e1951bd58c403f37fcecb09c0d SHA512 f4ebaa386dd093ab3e5c19c6444258d84afb6b45665ef405e382c0f12e10b0d51d1ed2883401689a3b152919b2070eb2a0c0638fcfc70b18e3aabe7bf115a9ed WHIRLPOOL c09d88037ac0f2d909faee7def8bbea1b440533b04bbf8bd8efd84d8f731f1dbe5e97d720bb21bde220e46a7ab1c5ec3ae1ca933d2ada1466afa4a3af858ba2b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEbBAEBCAAGBQJRZXQdAAoJEEdUh39IaPFNsQsH8wVW3et7Bi5QXCGv5lODYFMF
-q4P7T4iUQCrwtl7ajtjKfTSxnCSdZ06e6a5H16KeT98Xj1MtH2zhmwZ6ZpgqzJxT
-emzF68UYl15dMirHrsgT+b/g+V5gO2uVjV30KC0K4EL1vfevlxPF43FkHVrPsszu
-KwfF3qALAb7i7tJ6oDq+icpa5UKGw2XYcXj1AhsOLsxSPbsYdLsiPRcpWFDjsanX
-pnzL6tj/YuM6ZjSc91w/Zi6r5OH/aBqRzlZ0RleU/Q3t0DkFW8+ZuQiNh5kqjo0I
-GmXo/ngHPLh46/NOapn5wVExn6ULQQu9ugszYVuIFwjtm8Ifn5MlLl8n898vgQ==
-=3M6D
+iEYEAREIAAYFAlTUktEACgkQvFcC4BYPU0oDHgCglrAnF0vkpm0cjrn53xnoapPF
+wgEAn3p2Bj0gTC/G2L0bh6WNhyGPEKWe
+=UO1G
 -----END PGP SIGNATURE-----

diff --git a/media-video/dvdauthor/dvdauthor-0.7.1.ebuild b/media-video/dvdauthor/dvdauthor-0.7.1.ebuild
index 2331dd08ebc782d0816ecc88c7639308e39f5fac..213acff4c973f8ce679c6d8fe041ceb3150431f2 100644 (file)
--- a/media-video/dvdauthor/dvdauthor-0.7.1.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.7.1.ebuild,v 1.2 2013/04/10 14:16:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.7.1.ebuild,v 1.3 2015/02/06 10:09:20 aballier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs
@@ -29,6 +29,7 @@ S=${WORKDIR}/${PN}
 DOCS=( AUTHORS ChangeLog README TODO )
 
 src_prepare() {
+       epatch "${FILESDIR}/${P}-glibc220.patch"
        use graphicsmagick && \
                sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure
 }

diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.1-glibc220.patch b/media-video/dvdauthor/files/dvdauthor-0.7.1-glibc220.patch
new file mode 100644 (file)
index 0000000..880c63a
--- /dev/null
+++ b/media-video/dvdauthor/files/dvdauthor-0.7.1-glibc220.patch
@@ -0,0 +1,162 @@
+From 5b890b47aaf6f692c876faf435e6bf8990e7a45d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Sat, 19 Jul 2014 21:06:58 +0300
+Subject: [PATCH] compat.h needs stuff from config.h so include it there
+
+This was brought up by dvdvml.* not including it and thus causing a
+build failure on Fedora (22) devel. While at it, uninclude config.h
+from files where it was included just for compat.h reasons.
+---
+ src/compat.h        | 2 ++
+ src/conffile.c      | 1 -
+ src/dvdauthor.c     | 2 --
+ src/dvdcompile.c    | 2 --
+ src/dvdpgc.c        | 1 -
+ src/dvdunauthor.c   | 2 --
+ src/dvduncompile.c  | 1 -
+ src/dvdvob.c        | 2 --
+ src/readxml.c       | 2 --
+ src/spuunmux.c      | 1 -
+ src/subgen-encode.c | 2 --
+ 11 files changed, 2 insertions(+), 16 deletions(-)
+
+diff --git a/src/compat.h b/src/compat.h
+index 126dcd7..93de081 100644
+--- a/src/compat.h
++++ b/src/compat.h
+@@ -1,6 +1,8 @@
+ // basic headers
+ #define _GNU_SOURCE /* really just for strndup */
+ 
++#include "config.h"
++
+ #ifdef HAVE_STDBOOL_H
+ # include <stdbool.h>
+ #else
+diff --git a/src/conffile.c b/src/conffile.c
+index cab661a..36ded07 100644
+--- a/src/conffile.c
++++ b/src/conffile.c
+@@ -21,7 +21,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+ #include "compat.h"
+ #include <errno.h>
+ #include "conffile.h"
+diff --git a/src/dvdauthor.c b/src/dvdauthor.c
+index d591d68..4860258 100644
+--- a/src/dvdauthor.c
++++ b/src/dvdauthor.c
+@@ -20,8 +20,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+-
+ #include "compat.h"
+ 
+ #include <sys/types.h>
+diff --git a/src/dvdcompile.c b/src/dvdcompile.c
+index fd232b6..47f13e5 100644
+--- a/src/dvdcompile.c
++++ b/src/dvdcompile.c
+@@ -20,8 +20,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+-
+ #include "compat.h"
+ #include <assert.h>
+ 
+diff --git a/src/dvdpgc.c b/src/dvdpgc.c
+index e0adc61..cf6eb04 100644
+--- a/src/dvdpgc.c
++++ b/src/dvdpgc.c
+@@ -20,7 +20,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+ #include "compat.h"
+ #include <errno.h>
+ #include <assert.h>
+diff --git a/src/dvdunauthor.c b/src/dvdunauthor.c
+index ccd422f..f988cdf 100644
+--- a/src/dvdunauthor.c
++++ b/src/dvdunauthor.c
+@@ -23,8 +23,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+-
+ #include "compat.h"
+ 
+ #include <ctype.h>
+diff --git a/src/dvduncompile.c b/src/dvduncompile.c
+index 0c5eaf1..a064011 100644
+--- a/src/dvduncompile.c
++++ b/src/dvduncompile.c
+@@ -22,7 +22,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+ #include "compat.h"
+ 
+ #include <stdio.h>
+diff --git a/src/dvdvob.c b/src/dvdvob.c
+index 2d7e2b8..2146689 100644
+--- a/src/dvdvob.c
++++ b/src/dvdvob.c
+@@ -20,8 +20,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+-
+ #include "compat.h"
+ 
+ #include <assert.h>
+diff --git a/src/readxml.c b/src/readxml.c
+index 61ff0a1..3b83f07 100644
+--- a/src/readxml.c
++++ b/src/readxml.c
+@@ -20,8 +20,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+-
+ #include "compat.h"
+ 
+ #include <assert.h>
+diff --git a/src/spuunmux.c b/src/spuunmux.c
+index 1981e41..94fcb10 100644
+--- a/src/spuunmux.c
++++ b/src/spuunmux.c
+@@ -31,7 +31,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+ #include "compat.h"
+ 
+ #include <fcntl.h>
+diff --git a/src/subgen-encode.c b/src/subgen-encode.c
+index 53ed4b2..962e902 100644
+--- a/src/subgen-encode.c
++++ b/src/subgen-encode.c
+@@ -21,8 +21,6 @@
+  * MA 02110-1301 USA.
+  */
+ 
+-#include "config.h"
+-
+ #include "compat.h"
+ 
+ #include <assert.h>
+ 
\ No newline at end of file