[gentoo-commits] repo/gentoo:master commit in: dev-libs/DirectFB/files/
commit: f3b072c33d4644cfd8390b2b02a0f5aae4931a9a
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Sun Aug 13 08:25:07 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Aug 13 11:27:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b072c3
dev-libs/DirectFB: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/5399
.../DirectFB/files/DirectFB-1.1.1-pkgconfig.patch | 22 --
.../DirectFB/files/DirectFB-1.2.0-headers.patch| 16 --
.../DirectFB/files/DirectFB-1.2.7-CFLAGS.patch | 19 --
.../DirectFB/files/DirectFB-1.4.9-libpng-1.5.patch | 244 -
4 files changed, 301 deletions(-)
diff --git a/dev-libs/DirectFB/files/DirectFB-1.1.1-pkgconfig.patch
b/dev-libs/DirectFB/files/DirectFB-1.1.1-pkgconfig.patch
deleted file mode 100644
index 01a119ec7ae..000
--- a/dev-libs/DirectFB/files/DirectFB-1.1.1-pkgconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/200661
-
DirectFB/directfb-config.in
-+++ DirectFB/directfb-config.in
-@@ -306,7 +306,7 @@
-libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@"
-
-if test -n "$echo_static"; then
-- libs="$libs @DYNLIB@ @ZLIB_LIBS@"
-+ libs="$libs @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@"
-fi
- fi
-
DirectFB/directfb.pc.in
-+++ DirectFB/directfb.pc.in
-@@ -8,5 +8,5 @@
- Version: @VERSION@
- Requires: fusion direct
- Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
--Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@
-+Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@
- Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
diff --git a/dev-libs/DirectFB/files/DirectFB-1.2.0-headers.patch
b/dev-libs/DirectFB/files/DirectFB-1.2.0-headers.patch
deleted file mode 100644
index dc2e6d33be2..000
--- a/dev-libs/DirectFB/files/DirectFB-1.2.0-headers.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Don't rely on the kernel to tell us what the cpu target is ... we'll just
-use the default values all the time instead.
-
-http://bugs.gentoo.org/152614
-
lib/direct/ppcasm_memcpy_cachable.S
-+++ lib/direct/ppcasm_memcpy_cachable.S
-@@ -34,8 +34,6 @@
-
- #define __ASSEMBLY__
-
--#include
--
- #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
- #define L1_CACHE_LINE_SIZE 16
- #define LG_L1_CACHE_LINE_SIZE 4
diff --git a/dev-libs/DirectFB/files/DirectFB-1.2.7-CFLAGS.patch
b/dev-libs/DirectFB/files/DirectFB-1.2.7-CFLAGS.patch
deleted file mode 100644
index 92e3ed8bdda..000
--- a/dev-libs/DirectFB/files/DirectFB-1.2.7-CFLAGS.patch
+++ /dev/null
@@ -1,19 +0,0 @@
DirectFB-1.2.7/configure
-+++ DirectFB-1.2.7/configure
-@@ -22953,8 +22953,6 @@
- CFLAGS=
- fi
-
--CFLAGS="-O3 -ffast-math -pipe $CFLAGS"
--
- DFB_INTERNAL_CFLAGS="-D_GNU_SOURCE $DFB_INTERNAL_CFLAGS"
-
- # Check whether --enable-extra-warnings was given.
-@@ -23622,7 +23620,6 @@
- fi
-
- if test "$enable_debug" = "yes"; then
--CFLAGS="$CFLAGS -g3 -fno-inline -Wno-inline"
- DIRECT_BUILD_DEBUG=1
- else
- DIRECT_BUILD_DEBUG=0
diff --git a/dev-libs/DirectFB/files/DirectFB-1.4.9-libpng-1.5.patch
b/dev-libs/DirectFB/files/DirectFB-1.4.9-libpng-1.5.patch
deleted file mode 100644
index e428afbaf7c..000
--- a/dev-libs/DirectFB/files/DirectFB-1.4.9-libpng-1.5.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 83180b25e90721e717bf37c5332c22713508786e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger
-Date: Sun, 20 Feb 2011 19:18:19 -0500
-Subject: [PATCH] png: add support for libpng 1.5.x
-
-Signed-off-by: Mike Frysinger
- .../idirectfbimageprovider_png.c | 56 ---
- 1 files changed, 35 insertions(+), 21 deletions(-)
-
-diff --git a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-index 6d65ea3..7d82c5c 100644
a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-@@ -207,7 +207,7 @@ Construct( IDirectFBImageProvider *thiz,
- if (!data->png_ptr)
- goto error;
-
-- if (setjmp( data->png_ptr->jmpbuf )) {
-+ if (setjmp( png_jmpbuf( data->png_ptr ))) {
- D_ERROR( "ImageProvider/PNG: Error reading header!\n" );
- goto error;
- }
-@@ -292,7 +292,7 @@ IDirectFBImageProvider_PNG_RenderTo(
IDirectFBImageProvider *thiz,
- rect = dst_data->area.wanted;
- }
-
-- if (setjmp( data->png_ptr->jmpbuf )) {
-+ if (setjmp( png_jmpbuf( data->png_ptr ))) {
- D_ERROR( "ImageProvider/PNG: Error during decoding!\n" );
-
- if (data->stage < STAGE_IMAGE)
-@@ -327,6 +327,7 @@ IDirectFBImageProvider_PNG_RenderTo(
IDirectFBImageProvider *thiz,
- }
- else {
- CoreSurfaceBufferLock lock;
-+ png_byte bit_depth = png_get_bit_depth( data->png_ptr,
data->info_ptr );
-
- ret
[gentoo-commits] repo/gentoo:master commit in: dev-libs/DirectFB/files/, dev-libs/DirectFB/
commit: fa0999c97caa29cbcbf0bb95cea7d769afeb0ec0
Author: Markus Meier gentoo org>
AuthorDate: Tue Jan 17 17:19:25 2017 +
Commit: Markus Meier gentoo org>
CommitDate: Tue Jan 17 17:19:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0999c9
dev-libs/DirectFB: stabilize latest version on sh and remove old, bug #510472
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-libs/DirectFB/DirectFB-1.4.9-r1.ebuild | 123 ---
dev-libs/DirectFB/DirectFB-1.7.6.ebuild| 2 +-
dev-libs/DirectFB/Manifest | 1 -
.../DirectFB/files/DirectFB-1.1.1-pkgconfig.patch | 22 --
.../DirectFB/files/DirectFB-1.2.0-headers.patch| 16 --
.../DirectFB/files/DirectFB-1.2.7-CFLAGS.patch | 19 --
.../DirectFB/files/DirectFB-1.4.9-libpng-1.5.patch | 244 -
7 files changed, 1 insertion(+), 426 deletions(-)
diff --git a/dev-libs/DirectFB/DirectFB-1.4.9-r1.ebuild
b/dev-libs/DirectFB/DirectFB-1.4.9-r1.ebuild
deleted file mode 100644
index efdedc8..
--- a/dev-libs/DirectFB/DirectFB-1.4.9-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-# Map Gentoo IUSE expand vars to DirectFB drivers
-# echo `sed -n '/Possible gfxdrivers are:/,/^$/{/Possible/d;s:\[
*::;s:\].*::;s:,::g;p}' configure.in`
-I_TO_D_intel="i810,i830"
-I_TO_D_mga="matrox"
-I_TO_D_r128="ati128"
-I_TO_D_s3="unichrome"
-I_TO_D_sis="sis315"
-I_TO_D_via="cle266"
-# cyber5k davinci ep9x gl omap pxa3xx sh772x
-IUSE_VIDEO_CARDS=" intel mach64 mga neomagic nsc nvidia r128 radeon s3 savage
sis tdfx via vmware"
-IUV=${IUSE_VIDEO_CARDS// / video_cards_}
-# echo `sed -n '/Possible inputdrivers are:/,/^$/{/\(Possible\|^input\)/d;s:\[
*::;s:\].*::;s:,::g;p}' configure.in`
-I_TO_D_elo2300="elo-input"
-I_TO_D_evdev="linuxinput"
-I_TO_D_mouse="ps2mouse serialmouse"
-# dbox2remote dreamboxremote gunze h3600_ts penmount sonypijogdial ucb1x00
wm97xx zytronic
-IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse
mutouch tslib"
-IUD=${IUSE_INPUT_DEVICES// / input_devices_}
-
-DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-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="alpha amd64 arm hppa ia64 -mips ppc ppc64 sh -sparc x86"
-IUSE="debug doc fbcon gif jpeg cpu_flags_x86_mmx png sdl cpu_flags_x86_sse
static-libs truetype v4l X zlib ${IUV} ${IUD}"
-
-RDEPEND="sdl? ( media-libs/libsdl )
- gif? ( media-libs/giflib )
- png? ( media-libs/libpng )
- jpeg? ( virtual/jpeg )
- zlib? ( sys-libs/zlib )
- truetype? ( >=media-libs/freetype-2.0.1 )
- X? ( x11-libs/libXext x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- X? ( x11-proto/xextproto x11-proto/xproto )"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.2.7-CFLAGS.patch \
- "${FILESDIR}"/${PN}-1.2.0-headers.patch \
- "${FILESDIR}"/${PN}-1.1.1-pkgconfig.patch \
- "${FILESDIR}"/${PN}-1.4.9-libpng-1.5.patch
-
- # the media subdir uses sqrt(), so make sure it links in -lm
- sed -i \
- -e '/libdirectfb_media_la_LIBADD/s:$: -lm:' \
- src/media/Makefile.in || die
-
- # Avoid invoking `ld` directly #300779
- find . -name Makefile.in -exec sed -i \
- '/[$](LD)/s:$(LD) -o $@ -r:$(CC) $(LDFLAGS) $(CFLAGS) -Wl,-r
-nostdlib -o $@:' {} +
-}
-
-driver_list() {
- local pfx=$1
- local dev devs map
- shift
- for dev in "$@" ; do
- use ${pfx}_${dev} || continue
- map="I_TO_D_${dev}"
- devs=${devs:+${devs},}${!map:-${dev}}
- done
- echo ${devs:-none}
-}
-
-src_configure() {
- local sdlconf="--disable-sdl"
- if use sdl ; then
- # since SDL can link against DirectFB and trigger a
- # dependency loop, only link against SDL if it isn't
- # broken #61592
- echo 'int main(){}' > sdl-test.c
- $(tc-getCC) sdl-test.c -lSDL 2>/dev/null \
- && sdlconf="--enable-sdl" \
- || ewarn "Disabling SDL since libSDL.so is broken"
- fi
-
- econf \
- --disable-dependency-tracking \
- $(use_enable static-libs static) \
- $(use_enable X x11) \
- $(use_enable fbcon fbdev) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable jpeg) \
- $(use_enable png) \
- $(use_enable gif) \
- $(use_enable truetype freetype) \
- $(use_enable debug) \
-
[gentoo-commits] repo/gentoo:master commit in: dev-libs/DirectFB/files/, dev-libs/DirectFB/
commit: abe95f7952f00bf0340c8708e458d65002e1bb5a
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Dec 8 21:51:42 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Dec 8 21:52:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe95f79
dev-libs/DirectFB: fix tslib detection #567294
dev-libs/DirectFB/DirectFB-1.7.6.ebuild| 3 +-
dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch | 33 ++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
b/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
index 7e56b85..fdb99b1 100644
--- a/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
+++ b/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
@@ -77,7 +77,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-idivine.patch \
+ "${FILESDIR}"/${PN}-1.7.6-tslib.patch
sed -i \
-e '/#define RASPBERRY_PI/d' \
systems/egl/egl_system.c || die #497124
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 ..3315968
--- /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
+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
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/DirectFB/files/
commit: eef80f0e2d519bd77555bd4cd4036ab9ec81eb9e
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Sat Sep 3 15:46:35 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Sep 10 18:35:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef80f0e
dev-libs/DircetFB: remove unused patches
dev-libs/DirectFB/files/DirectFB-1.6.3-build.patch | 33
dev-libs/DirectFB/files/DirectFB-1.6.3-flags.patch | 11
dev-libs/DirectFB/files/DirectFB-1.7.1-flags.patch | 63 --
3 files changed, 107 deletions(-)
diff --git a/dev-libs/DirectFB/files/DirectFB-1.6.3-build.patch
b/dev-libs/DirectFB/files/DirectFB-1.6.3-build.patch
deleted file mode 100644
index 2418751..
--- a/dev-libs/DirectFB/files/DirectFB-1.6.3-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
DirectFB-1.6.3/interfaces/IDirectFBImageProvider/Makefile.am
-+++ DirectFB-1.6.3/interfaces/IDirectFBImageProvider/Makefile.am
-@@ -59,15 +59,15 @@
- MPEG2_PROVIDER =
- endif
-
--INCLUDES = \
-+AM_CPPFLAGS =
-+AM_CPPFLAGS = \
- -I$(top_builddir)/include \
- -I$(top_builddir)/lib \
- -I$(top_builddir)/src \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/lib \
-- -I$(top_srcdir)/src
--
--AM_CPPFLAGS = -DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\" $(LIBJPEG_CFLAGS)
$(LIBPNG_CFLAGS)
-+ -I$(top_srcdir)/src \
-+ -DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\" $(LIBJPEG_CFLAGS)
$(LIBPNG_CFLAGS) $(SVG_CFLAGS)
-
- idirectfbimageprovider_LTLIBRARIES = \
- libidirectfbimageprovider_dfiff.la \
DirectFB-1.6.3/configure.in
-+++ DirectFB-1.6.3/configure.in
-@@ -980,7 +980,7 @@
- dnl Test for libmng
- MNG=no
-
--AC_ARG_ENABLE(mngg,
-+AC_ARG_ENABLE(mng,
- AC_HELP_STRING([--enable-mng],
- [build MNG image provider @<:@default=yes@:>@]),
- [], [enable_mng=yes])
diff --git a/dev-libs/DirectFB/files/DirectFB-1.6.3-flags.patch
b/dev-libs/DirectFB/files/DirectFB-1.6.3-flags.patch
deleted file mode 100644
index d20b05b..
--- a/dev-libs/DirectFB/files/DirectFB-1.6.3-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
DirectFB-1.6.3/configure.in
-+++ DirectFB-1.6.3/configure.in
-@@ -457,7 +457,7 @@
- [enable debugging @<:@default=no@:>@]),
- [], [enable_debug=no])
- if test "$enable_debug" = "yes"; then
--CFLAGS="-g3 -O0 -fno-inline -Wno-inline $CFLAGS"
-+CFLAGS="-fno-inline -Wno-inline $CFLAGS"
- DIRECT_BUILD_DEBUG=1
- else
- DIRECT_BUILD_DEBUG=0
diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.1-flags.patch
b/dev-libs/DirectFB/files/DirectFB-1.7.1-flags.patch
deleted file mode 100644
index 6522175..
--- a/dev-libs/DirectFB/files/DirectFB-1.7.1-flags.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Author: hasufell
-Date: Sat Dec 28 23:48:53 2013 +0100
-
-* respect system flags
-* remove Werror, it breaks the build
-
a/configure.in
-+++ b/configure.in
-@@ -194,12 +194,7 @@ AM_CONDITIONAL(X11VDPAU_CORE, test "$enable_x11vdpau" =
"yes")
- AC_CHECK_HEADERS(linux/compiler.h linux/unistd.h asm/page.h signal.h)
-
-
--dnl Clear default CFLAGS
--if test x"$CFLAGS" = x"-g -O2"; then
-- CFLAGS=
--fi
--
--CFLAGS="-ffast-math -pipe $CFLAGS"
-+CFLAGS="-ffast-math $CFLAGS"
-
- DFB_INTERNAL_CFLAGS="-D_GNU_SOURCE $DFB_INTERNAL_CFLAGS"
-
-@@ -467,7 +462,7 @@ AC_ARG_ENABLE(debug,
- [enable debugging @<:@default=no@:>@]),
- [], [enable_debug=no])
- if test "$enable_debug" = "yes"; then
--CFLAGS="-g3 -O0 -fno-inline -Wno-inline $CFLAGS"
-+CFLAGS="-fno-inline -Wno-inline $CFLAGS"
- DIRECT_BUILD_DEBUG=1
- else
- DIRECT_BUILD_DEBUG=0
-@@ -483,13 +478,8 @@ AC_ARG_ENABLE(debug-support,
- [], [enable_debug_support=yes])
- if test "$enable_debug_support" = "yes" || test "$enable_debug" = "yes"; then
- enable_debug_support=yes
--if test "$enable_debug" = "no"; then
--CFLAGS="-g2 $CFLAGS"
--fi
--CFLAGS="-O3 $CFLAGS"
- DIRECT_BUILD_DEBUGS=1
- else
--CFLAGS="-O3 -g0 $CFLAGS"
- DIRECT_BUILD_DEBUGS=0
- fi
- AM_CONDITIONAL(ENABLE_DEBUGS, test "$enable_debug_support" = "yes")
-@@ -2750,8 +2750,6 @@
-
- AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-
--CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
--
- AC_ARG_ENABLE(extra-warnings,
- AC_HELP_STRING([--enable-extra-warnings],
- [enable extra warnings @<:@default=no@:>@]),
-@@ -2761,7 +2759,7 @@
- fi
-
- if test "$GCC" = "yes"; then
-- CFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-strict-aliasing
-Werror-implicit-function-declaration $CFLAGS"
-+ CFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-strict-aliasing
$CFLAGS"
- CXXFLAGS="-Wall -Wno-strict-aliasing $CXXFLAGS"
- fi
-
