[gentoo-commits] gentoo-x86 commit in media-libs/waffle: waffle-9999.ebuild waffle-1.3.0-r1.ebuild ChangeLog

[Matt Turner (mattst88)]

mattst88    14/01/23 23:24:59

  Modified:             waffle-1.3.0-r1.ebuild ChangeLog
  Added:                waffle-9999.ebuild
  Log:
  Add waffle git ebuild thanks to Dylan Baker <baker.dylan.c@×××××.com>
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)

Revision  Changes    Path
1.2                  media-libs/waffle/waffle-1.3.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/waffle/waffle-1.3.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/waffle/waffle-1.3.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/waffle/waffle-1.3.0-r1.ebuild?r1=1.1&r2=1.2

Index: waffle-1.3.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/waffle/waffle-1.3.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- waffle-1.3.0-r1.ebuild	31 Dec 2013 23:08:30 -0000	1.1
+++ waffle-1.3.0-r1.ebuild	23 Jan 2014 23:24:58 -0000	1.2
@@ -1,18 +1,29 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/waffle/waffle-1.3.0-r1.ebuild,v 1.1 2013/12/31 23:08:30 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/waffle/waffle-1.3.0-r1.ebuild,v 1.2 2014/01/23 23:24:58 mattst88 Exp $
 
 EAPI=5
 
-inherit cmake-utils cmake-multilib
+EGIT_REPO_URI="git://people.freedesktop.org/~chadversary/waffle"
+
+if [[ ${PV} = 9999* ]]; then
+    GIT_ECLASS="git-2"
+fi
+
+inherit cmake-utils cmake-multilib ${GIT_ECLASS}
 
 DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
 HOMEPAGE="http://people.freedesktop.org/~chadversary/waffle/"
-SRC_URI="http://people.freedesktop.org/~chadversary/waffle/files/release/${P}/${P}.tar.xz"
+
+if [[ $PV = 9999* ]]; then
+	KEYWORDS=""
+else
+	SRC_URI="http://people.freedesktop.org/~chadversary/waffle/files/release/${P}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc egl gbm test wayland"
 
 RDEPEND="
@@ -29,6 +40,11 @@
 		app-text/docbook-xml-dtd:4.2
 	)"
 
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-2_src_unpack
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-Dwaffle_has_glx=ON



1.4                  media-libs/waffle/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/waffle/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/waffle/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/waffle/ChangeLog?r1=1.3&r2=1.4

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/waffle/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog	31 Dec 2013 23:08:30 -0000	1.3
+++ ChangeLog	23 Jan 2014 23:24:59 -0000	1.4
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/waffle
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/waffle/ChangeLog,v 1.3 2013/12/31 23:08:30 mattst88 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/waffle/ChangeLog,v 1.4 2014/01/23 23:24:59 mattst88 Exp $
+
+*waffle-9999 (23 Jan 2014)
+
+  23 Jan 2014; Matt Turner <mattst88@g.o> +waffle-9999.ebuild,
+  waffle-1.3.0-r1.ebuild:
+  Add waffle git ebuild thanks to Dylan Baker <baker.dylan.c@×××××.com>
 
 *waffle-1.3.0-r1 (31 Dec 2013)
 



1.1                  media-libs/waffle/waffle-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/waffle/waffle-9999.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/waffle/waffle-9999.ebuild?rev=1.1&content-type=text/plain

Index: waffle-9999.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/waffle/waffle-9999.ebuild,v 1.1 2014/01/23 23:24:58 mattst88 Exp $

EAPI=5

EGIT_REPO_URI="git://people.freedesktop.org/~chadversary/waffle"

if [[ ${PV} = 9999* ]]; then
    GIT_ECLASS="git-2"
fi

inherit cmake-utils cmake-multilib ${GIT_ECLASS}

DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
HOMEPAGE="http://people.freedesktop.org/~chadversary/waffle/"

if [[ $PV = 9999* ]]; then
	KEYWORDS=""
else
	SRC_URI="http://people.freedesktop.org/~chadversary/waffle/files/release/${P}/${P}.tar.xz"
	KEYWORDS="~amd64 ~arm ~x86"
fi

LICENSE="BSD-2"
SLOT="0"
IUSE="doc egl gbm test wayland"

RDEPEND="
	media-libs/mesa[egl?,gbm?,${MULTILIB_USEDEP}]
	virtual/opengl[${MULTILIB_USEDEP}]
	wayland? ( >=dev-libs/wayland-1.0[${MULTILIB_USEDEP}] )
	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
	x11-libs/libX11[${MULTILIB_USEDEP}]
	x11-libs/libxcb[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
	x11-proto/xcb-proto[${MULTILIB_USEDEP}]
	doc? (
		dev-libs/libxslt
		app-text/docbook-xml-dtd:4.2
	)"

src_unpack() {
	default
	[[ $PV = 9999* ]] && git-2_src_unpack
}

src_configure() {
	local mycmakeargs=(
		-Dwaffle_has_glx=ON
		-Dwaffle_build_examples=OFF
		$(cmake-utils_use doc waffle_build_manpages)
		$(cmake-utils_use egl waffle_has_x11_egl)
		$(cmake-utils_use gbm waffle_has_gbm)
		$(cmake-utils_use test waffle_build_tests)
		$(cmake-utils_use wayland waffle_has_wayland)
	)

	cmake-multilib_src_configure
}

src_test() {
	emake -C "${CMAKE_BUILD_DIR}" check
}