From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QeUnA-0006h4-8V for garchives@archives.gentoo.org; Wed, 06 Jul 2011 16:17:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA24821C034; Wed, 6 Jul 2011 16:17:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id ACD8E21C034 for ; Wed, 6 Jul 2011 16:17:28 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0ACCB1B4019 for ; Wed, 6 Jul 2011 16:17:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 660838003D for ; Wed, 6 Jul 2011 16:17:27 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <427dd31249a7368f349924109aab99c5fc09b299.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/clutter/, media-libs/clutter/files/ X-VCS-Repository: proj/gnome X-VCS-Files: media-libs/clutter/clutter-1.7.2-r1.ebuild media-libs/clutter/clutter-1.7.4.ebuild media-libs/clutter/clutter-9999.ebuild media-libs/clutter/files/clutter-1.7.2-cogl-1.7.2-xlib.patch X-VCS-Directories: media-libs/clutter/ media-libs/clutter/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 427dd31249a7368f349924109aab99c5fc09b299 Date: Wed, 6 Jul 2011 16:17:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 4c0d894ce0991ac40753ae731d82183e commit: 427dd31249a7368f349924109aab99c5fc09b299 Author: Alexandre Rostovtsev gmail com> AuthorDate: Wed Jul 6 16:15:26 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Wed Jul 6 16:15:26 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D427dd312 media-libs/clutter: 1.7.2-r1 =E2=86=92 1.7.4 Version bump with numerous changes. Cogl-1.7.2 patch no longer needed. Fix tests/Makefile.in sed to handle two-line SUBDIRS. --- ...lutter-1.7.2-r1.ebuild =3D> clutter-1.7.4.ebuild} | 7 +-- media-libs/clutter/clutter-9999.ebuild | 2 +- .../files/clutter-1.7.2-cogl-1.7.2-xlib.patch | 46 --------------= ------ 3 files changed, 3 insertions(+), 52 deletions(-) diff --git a/media-libs/clutter/clutter-1.7.2-r1.ebuild b/media-libs/clut= ter/clutter-1.7.4.ebuild similarity index 93% rename from media-libs/clutter/clutter-1.7.2-r1.ebuild rename to media-libs/clutter/clutter-1.7.4.ebuild index 41eda9e..190f2ad 100644 --- a/media-libs/clutter/clutter-1.7.2-r1.ebuild +++ b/media-libs/clutter/clutter-1.7.4.ebuild @@ -8,7 +8,7 @@ WANT_AUTOMAKE=3D"1.11" =20 # Inherit gnome2 after clutter to download sources from gnome.org # since clutter-project.org doesn't provide .xz tarballs -inherit clutter eutils gnome2 +inherit clutter gnome2 if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -74,9 +74,6 @@ pkg_setup() { } =20 src_prepare() { - # cogl-1.7.2 compatibility, will be in next release - epatch "${FILESDIR}/${P}-cogl-1.7.2-xlib.patch" - # Some gettext stuff, we can't run gettextize because that does too muc= h [[ ${PV} =3D 9999 ]] && cp "${ROOT}/usr/share/gettext/po/Makefile.in.in= " "${S}/po" =20 @@ -85,7 +82,7 @@ src_prepare() { # We only need conformance tests, the rest are useless for us sed -e 's/^\(SUBDIRS =3D\).*/\1/g' \ -i tests/Makefile.am || die "am tests sed failed" - sed -e 's/^\(SUBDIRS =3D\).*/\1/g' \ + sed -e 's/^\(SUBDIRS =3D\)[^\]*/\1/g' \ -i tests/Makefile.in || die "in tests sed failed" } =20 diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/= clutter-9999.ebuild index 609f0ae..190f2ad 100644 --- a/media-libs/clutter/clutter-9999.ebuild +++ b/media-libs/clutter/clutter-9999.ebuild @@ -82,7 +82,7 @@ src_prepare() { # We only need conformance tests, the rest are useless for us sed -e 's/^\(SUBDIRS =3D\).*/\1/g' \ -i tests/Makefile.am || die "am tests sed failed" - sed -e 's/^\(SUBDIRS =3D\).*/\1/g' \ + sed -e 's/^\(SUBDIRS =3D\)[^\]*/\1/g' \ -i tests/Makefile.in || die "in tests sed failed" } =20 diff --git a/media-libs/clutter/files/clutter-1.7.2-cogl-1.7.2-xlib.patch= b/media-libs/clutter/files/clutter-1.7.2-cogl-1.7.2-xlib.patch deleted file mode 100644 index 55ddaeb..0000000 --- a/media-libs/clutter/files/clutter-1.7.2-cogl-1.7.2-xlib.patch +++ /dev/null @@ -1,46 +0,0 @@ -From bc34b4ace42cac34b966cc5fa357452d23c86d5b Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Fri, 1 Jul 2011 16:04:37 -0400 -Subject: [PATCH] backend-cogl: update in line with Cogl API change - -cogl_renderer_xlib_set_foreign_display was renamed to -cogl_xlib_renderer_set_foriegn_display so this is the corresponding -change to clutter. - -Signed-off-by: Emmanuele Bassi - -[Alexandre Rostovtsev : backported to clutter-1.7.2= ] ---- - clutter/egl/clutter-backend-egl.c | 2 +- - clutter/glx/clutter-backend-glx.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/clutter/egl/clutter-backend-egl.c b/clutter/egl/clutter-bac= kend-egl.c -index 601b4bf..ff1cd2c 100644 ---- a/clutter/egl/clutter-backend-egl.c -+++ b/clutter/egl/clutter-backend-egl.c -@@ -300,7 +300,7 @@ clutter_backend_egl_create_context (ClutterBackend = *backend, -=20 - backend->cogl_renderer =3D cogl_renderer_new (); - #ifdef COGL_HAS_XLIB_SUPPORT -- cogl_renderer_xlib_set_foreign_display (backend->cogl_renderer, -+ cogl_xlib_renderer_set_foreign_display (backend->cogl_renderer, - backend_x11->xdpy); - #endif - if (!cogl_renderer_connect (backend->cogl_renderer, error)) -diff --git a/clutter/glx/clutter-backend-glx.c b/clutter/glx/clutter-bac= kend-glx.c -index 76f48ee..03cfb1c 100644 ---- a/clutter/glx/clutter-backend-glx.c -+++ b/clutter/glx/clutter-backend-glx.c -@@ -243,7 +243,7 @@ clutter_backend_glx_create_context (ClutterBackend = *backend, - return TRUE; -=20 - backend->cogl_renderer =3D cogl_renderer_new (); -- cogl_renderer_xlib_set_foreign_display (backend->cogl_renderer, -+ cogl_xlib_renderer_set_foreign_display (backend->cogl_renderer, - backend_x11->xdpy); - if (!cogl_renderer_connect (backend->cogl_renderer, error)) - goto error; ---=20 -1.7.6 -