From c29b460f61bc5f2b914cd4d73c2069269a0647ea Mon Sep 17 00:00:00 2001 From: "Kacper Kowalik (Xarthisius)" Date: Thu, 14 Jul 2011 10:27:50 +0200 Subject: Use tree branch --- x11-wm/i3/Manifest | 3 +- x11-wm/i3/files/i3-9999-build.patch | 113 ++++++++++++++++++++++++++++++++++++ x11-wm/i3/i3-9999.ebuild | 60 ++++++++++--------- 3 files changed, 148 insertions(+), 28 deletions(-) create mode 100644 x11-wm/i3/files/i3-9999-build.patch diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest index 7b9c832..4c06165 100644 --- a/x11-wm/i3/Manifest +++ b/x11-wm/i3/Manifest @@ -1,5 +1,6 @@ +AUX i3-9999-build.patch 3212 RMD160 11687098d9be7fe3e87765a25970ee8bf2147c34 SHA1 7001c2e00120ded08ffee7ca5ecf9d081b0975f7 SHA256 334a55f9c949d3b3d489d265948d57aaea34f7fff3844a590cd8f80d23a5a6dc AUX i3-gentoo.diff 5219 RMD160 d592d6e12f1983be50a78d43a65c1380f5366413 SHA1 8899a886209d30c21ab5f81f82f9e6a5fe487371 SHA256 a21e3f877eab4c2068f0fa7447765aa642cdf8a7756e495ef947da5118787897 DIST i3-3.e-bf3.tar.bz2 360704 RMD160 858d92020e251b3afd34bcb0008d7ccc25d04669 SHA1 7c35f49fa14a21b606bb102b41c5f0cead4e93a3 SHA256 e0a7b030ebbad0ebf2ac39f235dd5e0ad34ef0ff5b83e31501a361f92e85c68f EBUILD i3-3e_p3.ebuild 1047 RMD160 66f5d82c72f8652fcf5dadb3446f1a9a27320f12 SHA1 e422b3ceae77a9dffe78d7c2ab7ab0948fb1a4fe SHA256 69bdfdbd358c00ec7acf5063eb95ac9a312dbe7f3f58aa372ad1c9b44ce6131f -EBUILD i3-9999.ebuild 1286 RMD160 34a9e79d7fb7db82437e2b4e75c0f4b279b45f9a SHA1 2ec6440b308c80af1329855dc5f978b885205afd SHA256 ab4bd9e0ab8d5b3dc5c745fa743176a355d10b055d5a141c71a0d68c56e01fe7 +EBUILD i3-9999.ebuild 1171 RMD160 1de18ad68c0cbf6d7b1416bc5fab40d7dc999ebb SHA1 8649aa04e76924e477af9a43ab77047c8627e3da SHA256 0e1121dcc643ea6212f70a43b2eb37f566e1350af75fc0c2be53d1a6cf7e98bd MISC metadata.xml 262 RMD160 5fa004a3927201d509adf4583c80fcea57d845cb SHA1 7d07024bbe476df939b23a4552ec9a403ec8fff7 SHA256 9efce27cc1c3955b252cc5b7272629cd5b66260849fd9e5a5fae9e420a1829d9 diff --git a/x11-wm/i3/files/i3-9999-build.patch b/x11-wm/i3/files/i3-9999-build.patch new file mode 100644 index 0000000..6c13460 --- /dev/null +++ b/x11-wm/i3/files/i3-9999-build.patch @@ -0,0 +1,113 @@ +diff --git a/Makefile b/Makefile +index 10af73b..b96e64e 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,14 +18,22 @@ else + UNUSED:=$(shell $(MAKE) loglevels.h) + endif + ++SUBDIRS=i3-msg i3-input i3-nagbar i3-config-wizard ++ + # Depend on the specific file (.c for each .o) and on all headers + src/%.o: src/%.c ${HEADERS} + echo "CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="((uint64_t)1 << $(shell awk '/$(shell basename $< .c)/ { print NR; exit 0; }' loglevels.tmp))" -c -o $@ $< + +-all: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES} +- echo "LINK i3" +- $(CC) $(LDFLAGS) -o i3 $^ $(LIBS) ++all: i3 subdirs ++ ++i3: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES} ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) ++ ++subdirs: ++ for dir in $(SUBDIRS); do \ ++ $(MAKE) -C $$dir; \ ++ done + + loglevels.h: + echo "LOGLEVELS" +@@ -74,10 +82,9 @@ install: all + $(INSTALL) -m 0644 i3.welcome $(DESTDIR)$(SYSCONFDIR)/i3/welcome + $(INSTALL) -m 0644 i3.desktop $(DESTDIR)$(PREFIX)/share/xsessions/ + $(INSTALL) -m 0644 include/i3/ipc.h $(DESTDIR)$(PREFIX)/include/i3/ +- $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg install +- $(MAKE) TOPDIR=$(TOPDIR) -C i3-input install +- $(MAKE) TOPDIR=$(TOPDIR) -C i3-nagbar install +- $(MAKE) TOPDIR=$(TOPDIR) -C i3-config-wizard install ++ for dir in $(SUBDIRS); do \ ++ $(MAKE) -C $$dir install; \ ++ done + + dist: distclean + [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION} +diff --git a/i3-config-wizard/Makefile b/i3-config-wizard/Makefile +index 688df11..690fc0f 100644 +--- a/i3-config-wizard/Makefile ++++ b/i3-config-wizard/Makefile +@@ -13,9 +13,11 @@ HEADERS:=$(wildcard *.h) + echo "CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +-all: cfgparse.y.o cfgparse.yy.o ${FILES} ++all: i3-config-wizard ++ ++i3-config-wizard: cfgparse.y.o cfgparse.yy.o ${FILES} + echo "LINK i3-config-wizard" +- $(CC) $(LDFLAGS) -o i3-config-wizard $^ $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + + cfgparse.yy.o: cfgparse.l cfgparse.y.o ${HEADERS} + echo "LEX $<" +diff --git a/i3-input/Makefile b/i3-input/Makefile +index 498cfb5..45653da 100644 +--- a/i3-input/Makefile ++++ b/i3-input/Makefile +@@ -12,9 +12,11 @@ HEADERS=$(wildcard *.h) + echo "CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +-all: ${FILES} ++all: i3-input ++ ++i3-input: ${FILES} + echo "LINK i3-input" +- $(CC) $(LDFLAGS) -o i3-input ${FILES} $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ ${FILES} $(LIBS) + + install: all + echo "INSTALL" +diff --git a/i3-msg/Makefile b/i3-msg/Makefile +index 7ea19e6..1b7c1c0 100644 +--- a/i3-msg/Makefile ++++ b/i3-msg/Makefile +@@ -14,7 +14,9 @@ HEADERS=$(wildcard *.h) + echo "CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +-all: ${FILES} ++all: i3-msg ++ ++i3-msg: ${FILES} + echo "LINK i3-msg" + $(CC) $(LDFLAGS) -o i3-msg ${FILES} $(LIBS) + +diff --git a/i3-nagbar/Makefile b/i3-nagbar/Makefile +index c9eec44..933ae76 100644 +--- a/i3-nagbar/Makefile ++++ b/i3-nagbar/Makefile +@@ -12,9 +12,11 @@ HEADERS=$(wildcard *.h) + echo "CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +-all: ${FILES} ++all: i3-nagbar ++ ++i3-nagbar: ${FILES} + echo "LINK i3-nagbar" +- $(CC) $(LDFLAGS) -o i3-nagbar ${FILES} $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ ${FILES} $(LIBS) + + install: all + echo "INSTALL" diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild index 9294c03..8abb5b1 100644 --- a/x11-wm/i3/i3-9999.ebuild +++ b/x11-wm/i3/i3-9999.ebuild @@ -2,55 +2,61 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI=4 EGIT_REPO_URI="git://code.stapelberg.de/i3" -EGIT_BRANCH="next" +EGIT_BRANCH="tree" -inherit git multilib +inherit eutils git-2 toolchain-funcs DESCRIPTION="An improved dynamic tiling window manager" -HOMEPAGE="http://i3.zekjur.net/" +HOMEPAGE="http://i3wm.org/" SRC_URI="" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="debug doc" +IUSE="doc" -RDEPEND=">=x11-libs/libxcb-1.1.93 - >=x11-libs/xcb-util-0.3.3 +CDEPEND="dev-libs/libev + dev-libs/yajl + x11-libs/libxcb x11-libs/libX11 - dev-libs/libev - dev-libs/yajl" -DEPEND="${RDEPEND} - >=x11-proto/xcb-proto-1.3 - >=app-text/asciidoc-8.3 + x11-libs/xcb-util" +DEPEND="${CDEPEND} + sys-devel/flex + sys-devel/bison + app-text/asciidoc app-text/xmlto app-text/docbook-xml-dtd - sys-devel/bison - sys-devel/flex" + x11-proto/xcb-proto" +RDEPEND="${CDEPEND} + x11-apps/xmessage" + +pkg_setup() { + tc-export CC +} src_prepare() { - use debug || { sed -i -e "s:DEBUG=1:DEBUG=0:" common.mk || die "sed die - debug" ; } - sed -i \ - -e "s:/usr/local/include:/usr/include:" \ - -e "s:/usr/local/lib:/usr/$(get_libdir):" \ - common.mk || die "sed die" + epatch "${FILESDIR}"/${P}-build.patch + sed -e "/SILENT/d" -e "/DEBUG=/d" \ + -e '/ifeq ($(DEBUG),1)/,/endif/d' \ + -i common.mk || die + sed -e '/echo "\([[:upper:]]\)/d' \ + -i Makefile i3-{msg,nagbar,config-wizard}/Makefile || die } src_compile() { - emake || die "emake compile die" - emake -C man || die "emake man die" - use doc && { emake -C docs || die "emake docs die" ; } + emake || die + emake -C man || die + use doc && { emake -C docs || die ; } } src_install() { - emake DESTDIR="${D}" install || die "emake install die" - dodoc GOALS TODO CMDMODE || die "dodoc die" - doman man/*.1 || die "doman die" + emake DESTDIR="${D}" install || die + dodoc GOALS TODO CMDMODE RELEASE-* + doman man/*.1 if use doc; then - dohtml -r docs/*.html || die "dohtml die" - elog "Documentation in html is in /etc/share/doc/${P}" + dohtml -r docs/*.html fi } -- cgit v1.2.3-65-gdbad From 0d9e915fc6bf2d11b8327e91c71e05e9894936c4 Mon Sep 17 00:00:00 2001 From: "Kacper Kowalik (Xarthisius)" Date: Tue, 20 Dec 2011 12:10:03 +0100 Subject: [dev-util/opencl-headers] Initial import based on ebuild from nbigaouette overlay --- dev-util/opencl-headers/ChangeLog | 10 ++++++ dev-util/opencl-headers/Manifest | 11 +++++++ dev-util/opencl-headers/metadata.xml | 8 +++++ dev-util/opencl-headers/opencl-headers-1.1.ebuild | 37 +++++++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 dev-util/opencl-headers/ChangeLog create mode 100644 dev-util/opencl-headers/Manifest create mode 100644 dev-util/opencl-headers/metadata.xml create mode 100644 dev-util/opencl-headers/opencl-headers-1.1.ebuild diff --git a/dev-util/opencl-headers/ChangeLog b/dev-util/opencl-headers/ChangeLog new file mode 100644 index 0000000..4d8a92f --- /dev/null +++ b/dev-util/opencl-headers/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for dev-util/opencl-headers +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*opencl-headers-1.1 (20 Dec 2011) + + 20 Dec 2011; Kacper Kowalik + +opencl-headers-1.1.ebuild, +metadata.xml: + Initial import based on ebuild from nbigaouette overlay + diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest new file mode 100644 index 0000000..3bb3ffd --- /dev/null +++ b/dev-util/opencl-headers/Manifest @@ -0,0 +1,11 @@ +DIST cl.h 50091 RMD160 b72fccf5534424df7d68c2e69244d4d4c901a832 SHA1 a33a55a0187f3f7543e41f944ba38198c45b6886 SHA256 1fc7512902cc8377f99cdc9e8c05220aa042a8ab85ed9f771143068b06632f44 +DIST cl.hpp 112900 RMD160 d00e8a8c214873cb7887fa9c3d0a5d5252fcfb75 SHA1 175a4f93aaff3b547310c90d26b134adb1502ebd SHA256 f9487e8bd31747fa8b21479f2a3039bc0c1bf597e26734ab0384be6956528b96 +DIST cl_d3d10.h 4859 RMD160 f0b2bef48ca15520e49d1dbebbf762efc18da410 SHA1 8a91d148dce1d4f6511188bcc6b968475c8f9cad SHA256 828c5288f898ad11fa5e82260fc810190fac25ef77c2916f045d02edf0e5a52e +DIST cl_ext.h 9951 RMD160 ee623880cae3e7f798fe0a063af381030d892e49 SHA1 b1dd69faa731290b6770d15676b22d1c43ce187b SHA256 bda268419b454540c56ee615f6718a917d4289973545d7357509b4128933a18e +DIST cl_gl.h 6715 RMD160 b995246a14278bf43aa356242636bce2b5f3b962 SHA1 87d43a39a196e43896e50532772c1c513a3a48e4 SHA256 7e1e59c6424b1defefc51bf4b446682b927eb71f5f9791cba8c42f779d05930b +DIST cl_gl_ext.h 2632 RMD160 6d29edceb52f4997f9600f43c69078cb9c24825b SHA1 1cab14eebd71aa90823dbc0d1346fc736cc696df SHA256 aaa317644ec14cc68fd877ac630a93e21c37497a047396792b679ae78ba344bc +DIST cl_platform.h 38036 RMD160 13819fc2f65f1ca028aa1ebcb96ce6a5d9948b34 SHA1 c97a6e08aca4837daf3073d7a3938457a990b251 SHA256 aedd544164012026ab69e973acc2a248d298d1e1e1fb12f4710e9d5ab0bfd4e3 +DIST opencl.h 1754 RMD160 37acc641bb24e319192384f0b2eeef225a82d0d0 SHA1 d3cc5d61d2ad077085d1c60b4bdf8c03b093f159 SHA256 a69842d53ea5b505323a6bee242cca8ddba47294f69972fe61c0371636935819 +EBUILD opencl-headers-1.1.ebuild 1021 RMD160 b943a721c1aa85dded64e148807265f3afd82cbe SHA1 5f91458ce469ef746c4923edfea986a87694e143 SHA256 728a730609247310a686c1bb792e849c1126cba4156aec2a7d15051abf5c0c4f +MISC ChangeLog 317 RMD160 440162dc566d66027991475fc019c5e0a88d8f11 SHA1 4cb47a675f0607b47259357a3e7038f975b3b7d5 SHA256 04fafc90e08915c55dd574940a8e9bbd2db1d5820daa70d5c718aa82365ad569 +MISC metadata.xml 237 RMD160 c1eff8035f69f2011d83fdee601d3131a88ea9bf SHA1 bbbe43f48a08f38c431e4f1aecd0210b8049798b SHA256 da0461f424a48f918d7233b1c957149d1bedcd5b81e63652176728af4e524c6f diff --git a/dev-util/opencl-headers/metadata.xml b/dev-util/opencl-headers/metadata.xml new file mode 100644 index 0000000..6629da3 --- /dev/null +++ b/dev-util/opencl-headers/metadata.xml @@ -0,0 +1,8 @@ + + + + + xarthisius@gentoo.org + Kacper Kowalik + + diff --git a/dev-util/opencl-headers/opencl-headers-1.1.ebuild b/dev-util/opencl-headers/opencl-headers-1.1.ebuild new file mode 100644 index 0000000..140f4a8 --- /dev/null +++ b/dev-util/opencl-headers/opencl-headers-1.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +EAPI=4 + +DESCRIPTION="OpenCL headers from Khronos.org" +HOMEPAGE="http://www.khronos.org/" + +SRC_URI="http://www.khronos.org/registry/cl/api/${PV}/opencl.h + http://www.khronos.org/registry/cl/api/${PV}/cl_platform.h + http://www.khronos.org/registry/cl/api/${PV}/cl.h + http://www.khronos.org/registry/cl/api/${PV}/cl_ext.h + http://www.khronos.org/registry/cl/api/${PV}/cl_d3d10.h + http://www.khronos.org/registry/cl/api/${PV}/cl_gl.h + http://www.khronos.org/registry/cl/api/${PV}/cl_gl_ext.h + http://www.khronos.org/registry/cl/api/${PV}/cl.hpp" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RESTRICT="mirror" + +HEADERS=( opencl.h cl_platform.h cl.h cl_ext.h cl_d3d10.h cl_gl.h cl_gl_ext.h cl.hpp ) + +src_unpack() { + mkdir ${S} || die + for f in ${HEADERS[@]}; do + cp "${DISTDIR}"/${f} "${S}" + done +} + +src_install() { + insinto /usr/include/CL + doins * +} -- cgit v1.2.3-65-gdbad From 555e00d0f6eeb2be06703039e4c18438789e64f5 Mon Sep 17 00:00:00 2001 From: "Kacper Kowalik (Xarthisius)" Date: Tue, 20 Dec 2011 12:12:06 +0100 Subject: [dev-util/opencl-headers] cleanup --- dev-util/opencl-headers/Manifest | 2 +- dev-util/opencl-headers/opencl-headers-1.1.ebuild | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest index 3bb3ffd..01d81e8 100644 --- a/dev-util/opencl-headers/Manifest +++ b/dev-util/opencl-headers/Manifest @@ -6,6 +6,6 @@ DIST cl_gl.h 6715 RMD160 b995246a14278bf43aa356242636bce2b5f3b962 SHA1 87d43a39a DIST cl_gl_ext.h 2632 RMD160 6d29edceb52f4997f9600f43c69078cb9c24825b SHA1 1cab14eebd71aa90823dbc0d1346fc736cc696df SHA256 aaa317644ec14cc68fd877ac630a93e21c37497a047396792b679ae78ba344bc DIST cl_platform.h 38036 RMD160 13819fc2f65f1ca028aa1ebcb96ce6a5d9948b34 SHA1 c97a6e08aca4837daf3073d7a3938457a990b251 SHA256 aedd544164012026ab69e973acc2a248d298d1e1e1fb12f4710e9d5ab0bfd4e3 DIST opencl.h 1754 RMD160 37acc641bb24e319192384f0b2eeef225a82d0d0 SHA1 d3cc5d61d2ad077085d1c60b4bdf8c03b093f159 SHA256 a69842d53ea5b505323a6bee242cca8ddba47294f69972fe61c0371636935819 -EBUILD opencl-headers-1.1.ebuild 1021 RMD160 b943a721c1aa85dded64e148807265f3afd82cbe SHA1 5f91458ce469ef746c4923edfea986a87694e143 SHA256 728a730609247310a686c1bb792e849c1126cba4156aec2a7d15051abf5c0c4f +EBUILD opencl-headers-1.1.ebuild 986 RMD160 46f9020dcee781fb390ee33624812fc2d80a474b SHA1 e97460b79d2b83e0d486ae25b46cb10ef0028032 SHA256 96a5608d746b67c064b365e9f9aaf1e32462e696045034e9d2fd7a1be85b1dc7 MISC ChangeLog 317 RMD160 440162dc566d66027991475fc019c5e0a88d8f11 SHA1 4cb47a675f0607b47259357a3e7038f975b3b7d5 SHA256 04fafc90e08915c55dd574940a8e9bbd2db1d5820daa70d5c718aa82365ad569 MISC metadata.xml 237 RMD160 c1eff8035f69f2011d83fdee601d3131a88ea9bf SHA1 bbbe43f48a08f38c431e4f1aecd0210b8049798b SHA256 da0461f424a48f918d7233b1c957149d1bedcd5b81e63652176728af4e524c6f diff --git a/dev-util/opencl-headers/opencl-headers-1.1.ebuild b/dev-util/opencl-headers/opencl-headers-1.1.ebuild index 140f4a8..591ffea 100644 --- a/dev-util/opencl-headers/opencl-headers-1.1.ebuild +++ b/dev-util/opencl-headers/opencl-headers-1.1.ebuild @@ -6,26 +6,25 @@ EAPI=4 DESCRIPTION="OpenCL headers from Khronos.org" HOMEPAGE="http://www.khronos.org/" - SRC_URI="http://www.khronos.org/registry/cl/api/${PV}/opencl.h - http://www.khronos.org/registry/cl/api/${PV}/cl_platform.h - http://www.khronos.org/registry/cl/api/${PV}/cl.h - http://www.khronos.org/registry/cl/api/${PV}/cl_ext.h - http://www.khronos.org/registry/cl/api/${PV}/cl_d3d10.h - http://www.khronos.org/registry/cl/api/${PV}/cl_gl.h - http://www.khronos.org/registry/cl/api/${PV}/cl_gl_ext.h - http://www.khronos.org/registry/cl/api/${PV}/cl.hpp" + http://www.khronos.org/registry/cl/api/${PV}/cl_platform.h + http://www.khronos.org/registry/cl/api/${PV}/cl.h + http://www.khronos.org/registry/cl/api/${PV}/cl_ext.h + http://www.khronos.org/registry/cl/api/${PV}/cl_d3d10.h + http://www.khronos.org/registry/cl/api/${PV}/cl_gl.h + http://www.khronos.org/registry/cl/api/${PV}/cl_gl_ext.h + http://www.khronos.org/registry/cl/api/${PV}/cl.hpp" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" +IUSE="" RESTRICT="mirror" - HEADERS=( opencl.h cl_platform.h cl.h cl_ext.h cl_d3d10.h cl_gl.h cl_gl_ext.h cl.hpp ) src_unpack() { - mkdir ${S} || die + mkdir "${S}" || die for f in ${HEADERS[@]}; do cp "${DISTDIR}"/${f} "${S}" done -- cgit v1.2.3-65-gdbad From f36c5dbcc3311c251445d5dfb5387143082d025b Mon Sep 17 00:00:00 2001 From: "Kacper Kowalik (Xarthisius)" Date: Tue, 20 Dec 2011 12:13:04 +0100 Subject: [dev-util/opencl-headers] cleanup --- dev-util/opencl-headers/Manifest | 2 +- dev-util/opencl-headers/opencl-headers-1.1.ebuild | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest index 01d81e8..1825668 100644 --- a/dev-util/opencl-headers/Manifest +++ b/dev-util/opencl-headers/Manifest @@ -6,6 +6,6 @@ DIST cl_gl.h 6715 RMD160 b995246a14278bf43aa356242636bce2b5f3b962 SHA1 87d43a39a DIST cl_gl_ext.h 2632 RMD160 6d29edceb52f4997f9600f43c69078cb9c24825b SHA1 1cab14eebd71aa90823dbc0d1346fc736cc696df SHA256 aaa317644ec14cc68fd877ac630a93e21c37497a047396792b679ae78ba344bc DIST cl_platform.h 38036 RMD160 13819fc2f65f1ca028aa1ebcb96ce6a5d9948b34 SHA1 c97a6e08aca4837daf3073d7a3938457a990b251 SHA256 aedd544164012026ab69e973acc2a248d298d1e1e1fb12f4710e9d5ab0bfd4e3 DIST opencl.h 1754 RMD160 37acc641bb24e319192384f0b2eeef225a82d0d0 SHA1 d3cc5d61d2ad077085d1c60b4bdf8c03b093f159 SHA256 a69842d53ea5b505323a6bee242cca8ddba47294f69972fe61c0371636935819 -EBUILD opencl-headers-1.1.ebuild 986 RMD160 46f9020dcee781fb390ee33624812fc2d80a474b SHA1 e97460b79d2b83e0d486ae25b46cb10ef0028032 SHA256 96a5608d746b67c064b365e9f9aaf1e32462e696045034e9d2fd7a1be85b1dc7 +EBUILD opencl-headers-1.1.ebuild 978 RMD160 f04211b38070fb664e53cf84c2ad757a61790568 SHA1 fa4039f664fc6aa7b5dc3c036321f50d770af8b8 SHA256 bd0f73ca236d8e5a64c4e548fcf2cd1d8fed01628e879f6554e07dafcee1d01c MISC ChangeLog 317 RMD160 440162dc566d66027991475fc019c5e0a88d8f11 SHA1 4cb47a675f0607b47259357a3e7038f975b3b7d5 SHA256 04fafc90e08915c55dd574940a8e9bbd2db1d5820daa70d5c718aa82365ad569 MISC metadata.xml 237 RMD160 c1eff8035f69f2011d83fdee601d3131a88ea9bf SHA1 bbbe43f48a08f38c431e4f1aecd0210b8049798b SHA256 da0461f424a48f918d7233b1c957149d1bedcd5b81e63652176728af4e524c6f diff --git a/dev-util/opencl-headers/opencl-headers-1.1.ebuild b/dev-util/opencl-headers/opencl-headers-1.1.ebuild index 591ffea..7f8f539 100644 --- a/dev-util/opencl-headers/opencl-headers-1.1.ebuild +++ b/dev-util/opencl-headers/opencl-headers-1.1.ebuild @@ -7,13 +7,13 @@ EAPI=4 DESCRIPTION="OpenCL headers from Khronos.org" HOMEPAGE="http://www.khronos.org/" SRC_URI="http://www.khronos.org/registry/cl/api/${PV}/opencl.h - http://www.khronos.org/registry/cl/api/${PV}/cl_platform.h - http://www.khronos.org/registry/cl/api/${PV}/cl.h - http://www.khronos.org/registry/cl/api/${PV}/cl_ext.h - http://www.khronos.org/registry/cl/api/${PV}/cl_d3d10.h - http://www.khronos.org/registry/cl/api/${PV}/cl_gl.h - http://www.khronos.org/registry/cl/api/${PV}/cl_gl_ext.h - http://www.khronos.org/registry/cl/api/${PV}/cl.hpp" + http://www.khronos.org/registry/cl/api/${PV}/cl_platform.h + http://www.khronos.org/registry/cl/api/${PV}/cl.h + http://www.khronos.org/registry/cl/api/${PV}/cl_ext.h + http://www.khronos.org/registry/cl/api/${PV}/cl_d3d10.h + http://www.khronos.org/registry/cl/api/${PV}/cl_gl.h + http://www.khronos.org/registry/cl/api/${PV}/cl_gl_ext.h + http://www.khronos.org/registry/cl/api/${PV}/cl.hpp" LICENSE="GPL-2" SLOT="0" @@ -26,7 +26,7 @@ HEADERS=( opencl.h cl_platform.h cl.h cl_ext.h cl_d3d10.h cl_gl.h cl_gl_ext.h cl src_unpack() { mkdir "${S}" || die for f in ${HEADERS[@]}; do - cp "${DISTDIR}"/${f} "${S}" + cp "${DISTDIR}"/${f} "${S}" done } -- cgit v1.2.3-65-gdbad From 8005c209b13491616158b2984e74d1cbe51bf1c8 Mon Sep 17 00:00:00 2001 From: "Kacper Kowalik (Xarthisius)" Date: Tue, 20 Dec 2011 14:53:42 +0100 Subject: [dev-util/amdstream] initial import --- dev-util/amdstream/Manifest | 4 + dev-util/amdstream/amdstream-2.6.ebuild | 108 +++++++++++++++++++++++ dev-util/amdstream/files/amdstream-2.6-x11.patch | 33 +++++++ dev-util/amdstream/metadata.xml | 8 ++ 4 files changed, 153 insertions(+) create mode 100644 dev-util/amdstream/Manifest create mode 100644 dev-util/amdstream/amdstream-2.6.ebuild create mode 100644 dev-util/amdstream/files/amdstream-2.6-x11.patch create mode 100644 dev-util/amdstream/metadata.xml diff --git a/dev-util/amdstream/Manifest b/dev-util/amdstream/Manifest new file mode 100644 index 0000000..1374eb5 --- /dev/null +++ b/dev-util/amdstream/Manifest @@ -0,0 +1,4 @@ +AUX amdstream-2.6-x11.patch 903 RMD160 7bc7ecf59b5bc9a20de05b9a37e52712a7bcebaf SHA1 a708e3ab7f4ecb21ba371d874f63d40e49e6bdf1 SHA256 7b7c2dd9a7433d1c66575b2d80eab5b236f8d8c359755839f4cefacf967f9c48 +DIST AMD-APP-SDK-v2.6-lnx32.tgz 17953026 RMD160 3a117bc7a54e779ae80cd5f9559aa11c415b5190 SHA1 b927bc1839af8aa890c3f72199256d9ec2e81170 SHA256 b7f48da66d77228d1962d9698c65511c3091f511892597fa3bd52d031956e83d +DIST AMD-APP-SDK-v2.6-lnx64.tgz 97519970 RMD160 4b6643ffae445fb4bb5cc817cb4fae886b86beb3 SHA1 b2ce0497306b65f4fe912d74142902ecdbbfbd07 SHA256 3042dafb0fbe3e61585b53f23f9d2d568888df01f39cbb12ee74118dca2845ba +EBUILD amdstream-2.6.ebuild 2332 RMD160 c06835492f5d035e69a5fe944ec033c0b054ce59 SHA1 9c78755f04959ad1220fc4686ff746f8af65cd92 SHA256 30b72876399e737f44096c3c44995f7f8fb2ad0540f763215c9b61c17370e548 diff --git a/dev-util/amdstream/amdstream-2.6.ebuild b/dev-util/amdstream/amdstream-2.6.ebuild new file mode 100644 index 0000000..1a0feda --- /dev/null +++ b/dev-util/amdstream/amdstream-2.6.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit eutils toolchain-funcs + +MY_PN=AMD-APP-SDK +MY_PV=v${PV} +MY_P=${MY_PN}-${MY_PV} + +DESCRIPTION="AMD Accelerated Parallel Processing (APP) SDK (formerly ATI Stream)" +HOMEPAGE="http://developer.amd.com/sdks/amdappsdk/pages/default.aspx" + +SRC_URI="amd64? ( http://developer.amd.com/Downloads/${MY_P}-lnx64.tgz ) + x86? ( http://developer.amd.com/Downloads/${MY_P}-lnx32.tgz )" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="examples" + +DEPEND="examples? ( app-admin/eselect-opengl + sys-devel/llvm + media-libs/mesa + || ( dev-util/opencl-headers dev-util/nvidia-cuda-toolkit ) + media-libs/glew + media-libs/freeglut )" +RDEPEND="${DEPEND}" + +S=${WORKDIR} + +RESTRICT="mirror" +QA_PREBUILT="opt/AMDAPP/lib/* + opt/AMDAPP/bin/clinfo" + +pkg_setup() { + if [[ $(tc-arch) == 'x86' ]] ; then + bitness=32 + _arch=x86 + else + bitness=64 + _arch=x86_64 + fi + export bitness + export _arch + export MY_S=${MY_P}-RC3-lnx${bitness} +} + +src_unpack() { + default_src_unpack + unpack ./${MY_S}.tgz ./icd-registration.tgz +} + +src_prepare() { + local _ddir=/opt/AMDAPP + cat <<-EOF > 99${PN} + PATH=${_ddir}/bin + LDPATH=${_ddir}/lib + EOF + + if use examples ; then + pushd ${MY_S} &> /dev/null + epatch "${FILESDIR}"/${P}-x11.patch + sed -i make/openclsdkdefs.mk \ + -e "s/g++/$(tc-getCXX)/" \ + -e "/C_DEBUG_FLAG/d" || die + popd &> /dev/null + fi +} + +src_compile() { + use examples || return + emake -C ${MY_S} +} + +src_install() { + doenvd 99${PN} + doins -r etc + + #Install SDK + pushd ${MY_S} &> /dev/null + insinto /opt/AMDAPP + doins -r {glut_notice.txt,docs,include} + + insinto /opt/AMDAPP/bin + doins bin/${_arch}/clinfo + + insinto /opt/AMDAPP/lib + doins lib/*.so lib/${_arch}/* + + # fix perms + fperms 755 /opt/AMDAPP/bin/clinfo + + #TODO: install examples + + #Env vars + #mkdir -p ${D}/etc/profile.d + #cd ${D}/etc/profile.d + #echo "#!/bin/sh" > amdstream.sh + #echo "export AMDAPPSDKROOT=${_installdir}" >> amdstream.sh + #echo "export AMDAPPSDKSAMPLESROOT=${_installdir}" >> amdstream.sh + + ##More docs and export + #echo "AMDSTREAMSDKROOT=${_installdir}/" >> ${D}/etc/env.d/99amdstream + #echo "AMDSTREAMSDKSAMPLEROOT=${_installdir}/" >> ${D}/etc/env.d/99amdstream + #echo "LIBRARY_PATH=${_installdir}/lib/x86_64" >> ${D}/etc/env.d/99amdstream +} diff --git a/dev-util/amdstream/files/amdstream-2.6-x11.patch b/dev-util/amdstream/files/amdstream-2.6-x11.patch new file mode 100644 index 0000000..05ff3ea --- /dev/null +++ b/dev-util/amdstream/files/amdstream-2.6-x11.patch @@ -0,0 +1,33 @@ +--- a/samples/opencl/cl/app/BoxFilterGL/Makefile ++++ b/samples/opencl/cl/app/BoxFilterGL/Makefile +@@ -29,7 +29,7 @@ + ifdef MINGW + LLIBS += glew$(BITS).dll glut$(BITS) opengl32 glu32 gdi32 + else +- LLIBS += glut GLEW GL GLU ++ LLIBS += glut GLEW GL GLU X11 + endif + else + LLIBS += glut$(BITS) GLEW$(BITS) +--- a/samples/opencl/cl/app/URNGNoiseGL/Makefile ++++ b/samples/opencl/cl/app/URNGNoiseGL/Makefile +@@ -29,7 +29,7 @@ + ifdef MINGW + LLIBS += glew$(BITS).dll glut$(BITS) opengl32 glu32 gdi32 + else +- LLIBS += glut GLEW GL GLU ++ LLIBS += glut GLEW GL GLU X11 + endif + else + LLIBS += glut$(BITS) GLEW$(BITS) +--- a/samples/opencl/cl/app/SimpleGL/Makefile ++++ b/samples/opencl/cl/app/SimpleGL/Makefile +@@ -29,7 +29,7 @@ + ifdef MINGW + LLIBS += glew$(BITS).dll glut$(BITS) opengl32 glu32 gdi32 + else +- LLIBS += glut GLEW GL GLU ++ LLIBS += glut GLEW GL GLU X11 + endif + else + LLIBS += glut$(BITS) GLEW$(BITS) diff --git a/dev-util/amdstream/metadata.xml b/dev-util/amdstream/metadata.xml new file mode 100644 index 0000000..6629da3 --- /dev/null +++ b/dev-util/amdstream/metadata.xml @@ -0,0 +1,8 @@ + + + + + xarthisius@gentoo.org + Kacper Kowalik + + -- cgit v1.2.3-65-gdbad