| 1 |
commit: 54bdbb5491d762cd844b652569912230a7b8baaf |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 24 05:57:21 2017 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 24 06:06:12 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54bdbb54 |
| 7 |
|
| 8 |
media-libs/cogl: Drop dead video_cards_fglrx |
| 9 |
|
| 10 |
media-libs/cogl/cogl-1.22.2.ebuild | 6 +----- |
| 11 |
media-libs/cogl/files/cogl-1.22.0-fglrx.patch | 10 ---------- |
| 12 |
2 files changed, 1 insertion(+), 15 deletions(-) |
| 13 |
|
| 14 |
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild b/media-libs/cogl/cogl-1.22.2.ebuild |
| 15 |
index 0419b0b7388..97738b3c596 100644 |
| 16 |
--- a/media-libs/cogl/cogl-1.22.2.ebuild |
| 17 |
+++ b/media-libs/cogl/cogl-1.22.2.ebuild |
| 18 |
@@ -12,7 +12,7 @@ LICENSE="MIT BSD" |
| 19 |
SLOT="1.0/20" # subslot = .so version |
| 20 |
|
| 21 |
# doc and profile disable for now due to bugs #484750 and #483332 |
| 22 |
-IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango test video_cards_fglrx wayland" # doc profile |
| 23 |
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile |
| 24 |
REQUIRED_USE=" |
| 25 |
wayland? ( gles2 ) |
| 26 |
|| ( gles2 opengl ) |
| 27 |
@@ -61,10 +61,6 @@ DEPEND="${COMMON_DEPEND} |
| 28 |
RESTRICT="test" |
| 29 |
|
| 30 |
src_prepare() { |
| 31 |
- # Let cogl work with fglrx driver, bug #567168 |
| 32 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756306 |
| 33 |
- use video_cards_fglrx && eapply "${FILESDIR}"/${PN}-1.22.0-fglrx.patch |
| 34 |
- |
| 35 |
# Do not build examples |
| 36 |
sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \ |
| 37 |
-i Makefile.am Makefile.in || die |
| 38 |
|
| 39 |
diff --git a/media-libs/cogl/files/cogl-1.22.0-fglrx.patch b/media-libs/cogl/files/cogl-1.22.0-fglrx.patch |
| 40 |
deleted file mode 100644 |
| 41 |
index dac1419a58b..00000000000 |
| 42 |
--- a/media-libs/cogl/files/cogl-1.22.0-fglrx.patch |
| 43 |
+++ /dev/null |
| 44 |
@@ -1,10 +0,0 @@ |
| 45 |
---- a/cogl/driver/gl/gl/cogl-driver-gl.c 2015-09-02 18:39:02.000000000 +0200 |
| 46 |
-+++ b/cogl/driver/gl/gl/cogl-driver-gl.c 2015-10-18 10:37:14.052350142 +0200 |
| 47 |
-@@ -419,7 +419,7 @@ |
| 48 |
- if (COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 1, 2)) |
| 49 |
- /* We want to use version 120 if it is available so that the |
| 50 |
- * gl_PointCoord can be used. */ |
| 51 |
-- ctx->glsl_version_to_use = 120; |
| 52 |
-+ ctx->glsl_version_to_use = 150; |
| 53 |
- else |
| 54 |
- ctx->glsl_version_to_use = 110; |
Archives