dev-libs/DirectFB: sync with upstream

remove r99 suffix

4 files changed, 103 insertions, 11 deletions

diff --git a/dev-libs/DirectFB/DirectFB-1.7.6-r99.ebuild b/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
index 555645b4..460d8885 100644
--- a/dev-libs/DirectFB/DirectFB-1.7.6-r99.ebuild
+++ b/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 inherit autotools eutils toolchain-funcs
@@ -25,13 +24,13 @@ IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse mutouch
 IUD=${IUSE_INPUT_DEVICES// / input_devices_}
 
 DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://directfb.org/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
-	http://directfb.org/downloads/Old/${P}.tar.gz"
+HOMEPAGE="http://www.directfb.net/"
+SRC_URI="http://directfb.net/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
+	http://directfb.net/downloads/Old/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm -mips ~ppc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 -mips ppc ppc64 sh -sparc x86"
 IUSE="alsa bmp cddb debug divine drmkms +dynload doc egl fbcon fusiondale fusionsound gif gles2 gstreamer imlib2 input_hub jpeg jpeg2k mad cpu_flags_x86_mmx mng mpeg2 mpeg3 multicore opengl oss png pnm sawman sdl cpu_flags_x86_sse static-libs swfdec tiff timidity tremor truetype v4l vdpau vorbis webp X xine zlib ${IUV} ${IUD}"
 REQUIRED_USE="gles2? ( opengl )"
 
@@ -45,15 +44,14 @@ RDEPEND="
 	gif? ( media-libs/giflib )
 	gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
 	imlib2? ( media-libs/imlib2 )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper[jpeg] )
+	jpeg? ( virtual/jpeg:0= )
+	jpeg2k? ( media-libs/jasper:=[jpeg] )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
 	mpeg3? ( media-libs/libmpeg3 )
 	opengl? ( media-libs/mesa[gbm,egl?,gles2?] x11-libs/libdrm )
-	png? ( media-libs/libpng:0 )
+	png? ( media-libs/libpng:0= )
 	sdl? ( media-libs/libsdl )
-	swfdec? ( media-libs/swfdec )
 	tiff? ( media-libs/tiff:0 )
 	timidity? (
 		media-libs/libtimidity
@@ -78,6 +76,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.6.3-setregion.patch \
 		"${FILESDIR}"/${PN}-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch \
 		"${FILESDIR}"/${PN}-1.7.6-cle266.patch \
+		"${FILESDIR}"/${PN}-1.7.6-idivine.patch \
+		"${FILESDIR}"/${PN}-1.7.6-tslib.patch \
 		"${FILESDIR}"/${PN}-1.7.6-uint32_t.patch \
 		"${FILESDIR}"/${PN}-1.7.6-union-sigval.patch \
 		"${FILESDIR}"/${PN}-1.7.6-use-PTHREAD_MUTEX_RECURSIVE.patch
diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
index 570843ae..ca48734d 100644
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -4,9 +4,11 @@ AUX DirectFB-1.6.3-setregion.patch 3812 SHA256 35c1e46e49d8b9880e177272b83a2fb47
 AUX DirectFB-1.7.1-build.patch 839 SHA256 3705a87656ac9d3383a5a9296f9290fc6fe54d99f22747ad2a63116a89bca71a SHA512 51a3a88274de35798f93b76accdb345e015da0781218393d5271835ae7c64ff1e38b5b9fe96281511c0057f12e9a952bb6dbba2c54d3f940ace6e1f57d9d1114 WHIRLPOOL 432df15397af292527d9386c7805de4f926dafb06e8bf2df0282eea00a39b82657bde96c417006eabe2330fb1cf6936708b004610e05056d68d86b3cdd7e0865
 AUX DirectFB-1.7.5-flags.patch 2003 SHA256 48f167ab0f392d219a45057c6ab44538312b0bbce702dd4390d37939d3b3dca3 SHA512 b8f947f338b872436bb1e029d9971852018400aa869121fada260e3ea325f2d5d28d765a4b960b3970644fc91a7ba39d86a0eb3a160473cc467523048833c264 WHIRLPOOL 53adb74ea41fffb33f419b394ccb2041fc8a83064fa1312206e558ceec207b826882367e909db03c2c1eafff4ba39cb9d1d015d16740af71cd024c268f386eb6
 AUX DirectFB-1.7.6-cle266.patch 410 SHA256 89667185062f13a692d6e518c8803fc91f2872d83db1fc4ffe0a189eb3c2b9e6 SHA512 409f5de16912e78d0053e8438f77ca79995d1d609f0c36064b0dcfe3d46b25d29ca53a44ecec7d000aba5e7f9339d57128651024d34879f51c208fb86c2a9afd WHIRLPOOL 2d40b262eb3bfd9fa2132583ba2819beab7d26f3f8f639c957ae712db40339eb46144df828cb83913f1588dbe854f489d8392d8b8f676dc45c0600ba69eee9ad
+AUX DirectFB-1.7.6-idivine.patch 1805 SHA256 743332a864f95832ca70d1e3e5e324bf27c143a63b210a739e37abd54e63cf7b SHA512 29f7b7c7bcf0eeb33b295c681723c2f1203ddca43879d430d15619d6d92d67df813acd4e6d237c297e407fe0d919952badb3901f54b32a7c025ec38b8ac55593 WHIRLPOOL cf1228d28d4c54bafd98347896029450f6c35330dd9227165864edfdec80dcc79d6ce8a00bd4b1da90307b55aed5adddda850773b804dbe29400c80f10bd1f92
+AUX DirectFB-1.7.6-tslib.patch 1220 SHA256 4f174f476657a59d910682607219666f589e66fa30ce07fa010ae39d39a953ab SHA512 60f0dc5fcefde34bb65bbd034e9e29f2776eec0260c93ce1cda2d5ea714d940b270d83ebaf343d888bab5ed748ab24affdfe5393b4dd87b702034d319cba493b WHIRLPOOL fa11c2473225380df550dd82d37e59ba00b1e1ba4a7df3ceb847f90bc300e015f515544098aa6a0064dcae389d6ad72b016408aa745650edc8d169cd37027357
 AUX DirectFB-1.7.6-uint32_t.patch 1490 SHA256 42015a714b623a6f7350033a42afb31a96cc4fba97ebc2623c7e4863e34f370f SHA512 184db571f44ce8abfaa523d08b1a0025f20a2fb20a69e7e38dd3ff6592504caa2b3893b50e976771cc62406c561b702f338e6750959818c6c709d413b4a3da29 WHIRLPOOL 3b8f559b45c6d6411c4084ecf8a0e9902ed382a09863903ddd8bb5a824d35cfdf432d20246a91036fac1656fbe7bc70e383d00f6143b8db978959821f1f80961
 AUX DirectFB-1.7.6-union-sigval.patch 633 SHA256 eb3c49a77564c4090ddc0e4c6f77124a62afa995b37f98c9828368785c5b5205 SHA512 a269c786e2ae3a9b4bcb026a5c1554dce1d569d3bc16760bdd0a9880984f8021b4897c515013e42d491306599d3f10a3b4acd1218f67318921a91ed204384837 WHIRLPOOL 504bd8118c809c931c4ac8e6d43824088a0bf5604337ea3a26bebb319426e3c61883a62fe3e9a3cba02dfe9f405c62bdc7ce4ecfaa56c4c4daea6f2c3621aece
 AUX DirectFB-1.7.6-use-PTHREAD_MUTEX_RECURSIVE.patch 705 SHA256 abe846e122d0fb03474ff6cc252a46210356da57142f8315f0740360fde5fcd5 SHA512 9836d39692d809fb5a4a30fbab0663d8e64cd7406b9df685d632190d134cff9969f4b7e418c8469f27e5bfaa4d25402004e306138c1685398990f73f66c3c09c WHIRLPOOL bc5a457f4e3b827f72943308bffb6fe24b7f5c4a90e77c355f57c71df68aa5d3adf9c3218267d45a1bf8330bdc990c2833785bf068253e636339037dcba624a0
 DIST DirectFB-1.7.6.tar.gz 5975444 SHA256 44f32bacfb842ea234599532f8481fe41b5bd2310d2bd101508eb3a5df26c9e1 SHA512 18cf1aad6c277a6de147a9b0aff1cd7408ddd7c7159ef21dab9a548db7399c681603624e7820b186a29e03edaa7737350a61e2abaec572887e9cc56658bf85a2 WHIRLPOOL 2868906bbd2b4e681c6702f164f7ba4f01a0f538aea0c744c6e77ce32b274a967232ef0046ec21b74c9c53c4824182e632159cca5ea0c7c27292cb258257d6a8
-EBUILD DirectFB-1.7.6-r99.ebuild 6921 SHA256 97c60be82507696b3c0a6700332a4e55a184a94897baac67146caa1de5125087 SHA512 a08244a3e0aa7f258a768c4623e1b1d27267083854794dd6e8264ee4739147b066ecc32a560912d09ccbca59cd783e1d732634dfdcb4812a14d40d2a6e4a38e9 WHIRLPOOL 4f1a36b0cfabcf37ac6cbc2bf6fd18b264794d0cdeae777d6101673f4535c72dcee462662f11f574007c2669e3de3f10e2f4b12ddd375b2f9df9f48cdf194018
+EBUILD DirectFB-1.7.6.ebuild 7004 SHA256 563f89b3eb53ace56cb0ac4cc721365825c95caa283369b6f2f5685654ab495a SHA512 d992702d6377a39cf6cbac953d8b26cc81d272de41434e465ab86cf83f9e0a2f93fea475b088c95c00067a9c3e35ac32def1f690684dc47df241a13bdb67b6c6 WHIRLPOOL 670cce3fd11013e2ba103ae24a3ac2d395831490a4139f5d2bb53dc3b8b0c7d8443270980bd4f07e4ffc2b02073b0a7d3a3184536866e623cba7e2f32e9125f9
 MISC metadata.xml 1948 SHA256 8c46dc85065e07ddc1ea910bd0e200b2a2ac27aafd469004499b08aa09eb3f41 SHA512 6d1dc07a903d8554fda072001ffaaaf685ee1363fc820626c3c271965f7589409c3a95567bc8b4b820bd643c752e570b8a4be9cb938da1ca53b6ac6643800dd1 WHIRLPOOL 4d6d55477d23f66578502858d614601384d03bb7cec90e5dfdf90ebb67ed3e9c3869a917800614aa9dd655316282e1b2afe9245c11ce36688d034e134564c50f
diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.6-idivine.patch b/dev-libs/DirectFB/files/DirectFB-1.7.6-idivine.patch
new file mode 100644
index 00000000..561db23a
--- /dev/null
+++ b/dev-libs/DirectFB/files/DirectFB-1.7.6-idivine.patch
@@ -0,0 +1,57 @@
+--- lib/divine/idivine.h.orig
++++ lib/divine/idivine.h
+@@ -0,0 +1,54 @@
++/*
++   (c) Copyright 2012-2013  DirectFB integrated media GmbH
++   (c) Copyright 2001-2013  The world wide DirectFB Open Source Community (directfb.org)
++   (c) Copyright 2000-2004  Convergence (integrated media) GmbH
++
++   All rights reserved.
++
++   Written by Denis Oliver Kropp <dok@directfb.org>,
++              Andreas Shimokawa <andi@directfb.org>,
++              Marek Pikarski <mass@directfb.org>,
++              Sven Neumann <neo@directfb.org>,
++              Ville Syrjälä <syrjala@sci.fi> and
++              Claudio Ciccani <klan@users.sf.net>.
++
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2 of the License, or (at your option) any later version.
++
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with this library; if not, write to the
++   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++*/
++
++
++
++#ifndef __IDIVINE_H__
++#define __IDIVINE_H__
++
++#include <divine.h>
++
++/*
++ * private data struct of IDiVine
++ */
++typedef struct {
++     int                         ref;      /* reference counter */
++
++     DiVine                     *divine;
++} IDiVine_data;
++
++/*
++ * IDiVine constructor/destructor
++ */
++DFBResult IDiVine_Construct( IDiVine *thiz );
++
++void      IDiVine_Destruct ( IDiVine *thiz );
++
++#endif
diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch b/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch
new file mode 100644
index 00000000..3315968b
--- /dev/null
+++ b/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch
@@ -0,0 +1,33 @@
+https://github.com/deniskropp/DirectFB/pull/6
+https://bugs.gentoo.org/567294
+
+From 5c7c4b197b9d04587b05624db4cfca6503adb3ff Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 8 Dec 2016 16:47:34 -0500
+Subject: [PATCH] configure: fix tslib version check
+
+The tslib version is 1.0, not 1.0.0.  Trying to check for the latter
+fails when using pkg-config:
+$ pkg-config --exists --print-errors "tslib-1.0 >= 1.0"
+$ pkg-config --exists --print-errors "tslib-1.0 >= 1.0.0"
+Requested 'tslib-1.0 >= 1.0.0' but version of tslib is 1.0
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 6143cd393699..12a65fdc4f52 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2561,7 +2561,7 @@ fi
+ 
+ enable_tslib=no
+ if test "$checkfor_tslib" = "yes"; then
+-  PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
++  PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0], [enable_tslib=yes], [enable_tslib=no])
+   if test "$enable_tslib" = "no"; then
+      PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no
+        AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
+-- 
+2.11.0.rc2
+