summaryrefslogtreecommitdiff
path: root/media-libs/cogl
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/cogl')
-rw-r--r--media-libs/cogl/Manifest7
-rw-r--r--media-libs/cogl/cogl-1.22.2.ebuild6
-rw-r--r--media-libs/cogl/files/cogl-1.22.0-fglrx.patch10
3 files changed, 3 insertions, 20 deletions
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index fcf0b05157f8..a5f7308c7b34 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,6 +1,3 @@
-AUX cogl-1.22.0-fglrx.patch 468 SHA256 88c3723c4bd295ba1847c7d4696ddf31e33d19a13918d78644561af5effb4457 SHA512 8587cd9cd7dfe4399333bbe46cda77e6d336fc382493594be809437401f63a61067695e0f7e6d74378cd1b7e3b7310a82530f6e2f693cbe65b32c127003ddab3 WHIRLPOOL e389ab67def02a3703e5eb4a49c6c822361f277ec1182e14843c0d521e7fea0ce6322ba76ec29bd04876434d457226b7290bcc5915b0fd2111a238b951466cf8
DIST cogl-1.22.2.tar.xz 1682360 SHA256 39a718cdb64ea45225a7e94f88dddec1869ab37a21b339ad058a9d898782c00d SHA512 2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3 WHIRLPOOL 548deef9a92fba1ee183f84eb581add8f366ecb0829467025a48c0eb26e85f86ee85dbffded1174fc426f2e85ed5ede3aea75131dfe6a0df547d1440c2b0e53e
-EBUILD cogl-1.22.2.ebuild 4034 SHA256 d3ca411dfbfdf8dd29abb36a5fc4143e4a080e1a72b1703180ea6b1cf02a2c17 SHA512 7cacd1ada49ecff55757c9d6950d82c7f6794de3ea565228770575bb45d9de15a3c2812d89be024be1d2f7fbc509464b7a3b1c49dc2d5056db3603724f04308b WHIRLPOOL e6cd3eef068f471da2a2aabf52a78606e2ed03ec637e749498524be6e65a4891173e8c4e041edf81808af3aa3ff1b1d1a185da18a2e1e7e660d0d89cd5a45113
-MISC ChangeLog 4685 SHA256 cd2cc0b0abf87126e144abf206c24c9358bbfbbf35fc327c5244ddd86bace945 SHA512 3705b7d49fb0b7ce4c1423525785394914d49aae541e568cd3cfa7cab982fbe50f4ef56c7b054ee666893d5c8438aa4f592ef35b80a3a23191fc589cce9027e2 WHIRLPOOL 0494d02633879237cd074864e7054592a4b4bd1bc94023465598e0070902928376addab88baf67d8ecd5cbbf3f598007fcf9b2bdaea04a9bc2473c147583e3d9
-MISC ChangeLog-2015 9035 SHA256 8b8656c7cf28061acd68c639343fd12b07665728397c8da3a47a86222230e7b9 SHA512 626bba18add6e61964a055886ab1fbe365bc75ffe3288accd21f1662e9a831e0dd2bdf095355dbaa6a64aad4d13357d068a2069c3537fd5782c36e864656fe0e WHIRLPOOL e2e0f272c3be585c057889e31065d56a5f21562b165ccef36e1bb40161b7cd26ba32db9b53daed8efbef68a810ffc890db35da5f5334ef828986678a61aa5d6d
-MISC metadata.xml 457 SHA256 6f41a22c2787290ee170105e277929cdc854030fd7f28df64a1eec2897cc1930 SHA512 e0e4be51119ec98c906ca2f5df69c9024d77855fafa53ec00bc30b481f33dfd98708c2c9021737f84a46121788079fdc1d9ecffc2693a3257819f05879318a44 WHIRLPOOL 6c922b316629d60731491120abdf218b61ea78e6df4d7a425a9819761ba4f767246ab8e43ae939ccda3a73ef0015637d90898e517b4de306526468feb0169f94
+EBUILD cogl-1.22.2.ebuild 3842 BLAKE2B 89b491693e418256646e1275e9ddc04f382503a19a1e4202e97f1db3a694bca232adb7813dc7a667e5c461046c1aded013bbac9e99416f46f41b0d01e73896f2 SHA512 dadca4e241bb29a0fccbc9f48f50480092eccc3f8b3d1edb8bba54b9e774827d0008235392080716f173f3614c97ad726e48ae00ac7e9252b940bcc023c287d6
+MISC metadata.xml 457 BLAKE2B 79c55fb3e5a1e5772c7b26cea5b54b15d683772204ec2ff2229481085130f4945b877a4608f01308a297571c01fa0da50220cd44b6a333eb34d2aae71c3a9157 SHA512 e0e4be51119ec98c906ca2f5df69c9024d77855fafa53ec00bc30b481f33dfd98708c2c9021737f84a46121788079fdc1d9ecffc2693a3257819f05879318a44
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild b/media-libs/cogl/cogl-1.22.2.ebuild
index 0419b0b73888..97738b3c5969 100644
--- a/media-libs/cogl/cogl-1.22.2.ebuild
+++ b/media-libs/cogl/cogl-1.22.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="MIT BSD"
SLOT="1.0/20" # subslot = .so version
# doc and profile disable for now due to bugs #484750 and #483332
-IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango test video_cards_fglrx wayland" # doc profile
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
REQUIRED_USE="
wayland? ( gles2 )
|| ( gles2 opengl )
@@ -61,10 +61,6 @@ DEPEND="${COMMON_DEPEND}
RESTRICT="test"
src_prepare() {
- # Let cogl work with fglrx driver, bug #567168
- # https://bugzilla.gnome.org/show_bug.cgi?id=756306
- use video_cards_fglrx && eapply "${FILESDIR}"/${PN}-1.22.0-fglrx.patch
-
# Do not build examples
sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
-i Makefile.am Makefile.in || die
diff --git a/media-libs/cogl/files/cogl-1.22.0-fglrx.patch b/media-libs/cogl/files/cogl-1.22.0-fglrx.patch
deleted file mode 100644
index dac1419a58bc..000000000000
--- a/media-libs/cogl/files/cogl-1.22.0-fglrx.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cogl/driver/gl/gl/cogl-driver-gl.c 2015-09-02 18:39:02.000000000 +0200
-+++ b/cogl/driver/gl/gl/cogl-driver-gl.c 2015-10-18 10:37:14.052350142 +0200
-@@ -419,7 +419,7 @@
- if (COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 1, 2))
- /* We want to use version 120 if it is available so that the
- * gl_PointCoord can be used. */
-- ctx->glsl_version_to_use = 120;
-+ ctx->glsl_version_to_use = 150;
- else
- ctx->glsl_version_to_use = 110;