Attachment #179399 for bug #255647

View | Details | Raw Unified | Return to bug 255647
Collapse All | Expand All

Line 0 Link Here

(-)a/x11-apps/drm-progs/Manifest (+2 lines)
	1	DIST drm-progs-99999999-use-system-libdrm.patch.bz2 1932 RMD160 521c875b29902cc58e0e36e539c16df7f938f6dc SHA1 b9327b1d3e657dbdb9e22378f5be92f5afc64498 SHA256 e1bb96ae5df54b39c9494af265a3a5d58f36c44b8036033344b41de8e3966dda
	2	EBUILD drm-progs-99999999.ebuild 991 RMD160 9352e60b491f22c8a80fa58f510f13720115b5d9 SHA1 b8d0c70b0277b8df50a5da22dc60df644840fd9a SHA256 755456929fc86f7ac8ee52ec4991d0fbb22a22cdc67dbc645893f5b60bbddfe0




# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $

EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"

inherit eutils autotools git

DESCRIPTION="X11 DRM utilities and test programs"
HOMEPAGE="http://dri.freedesktop.org/wiki/"
SRC_URI="http://dev.gentoo.org/~battousai/distfiles/${P}-use-system-libdrm.patch.bz2"

LICENSE="X11"
SLOT="0"

# Keywords inherited from x11-drm ebuild, where these used to be.
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"

IUSE=""

DEPEND="x11-libs/libdrm"
RDEPEND="${DEPEND}"

#S="${WORKDIR}/${P}"

src_unpack() {
	git_src_unpack

	cd "${WORKDIR}"
	unpack ${P}-use-system-libdrm.patch.bz2

	cd "${S}"
	epatch "${WORKDIR}"/${P}-use-system-libdrm.patch

	eautoreconf -v --install
}

src_compile() {
	econf || die "econf failed"

	cd "${S}"/tests
	emake || die "emake failed"
}

src_install() {
	cd "${S}"/tests
	dobin dristat drmstat modeprint/modeprint modetest/modetest || die
}

Lines 1-2 Link Here

(-)a/x11-base/x11-drm/Manifest (-2 / +1 lines)
1	DIST x11-drm-99999999-gentoo-0.2.tar.bz2 719 RMD160 e0a192afe05a3fccc48666e217bf35272085f1c8 SHA1 66ad6b116d95fee65603bbb33935639b7f664251 SHA256 3bdd5c05077b360095709c61b2346989afa1c217996f4e0854f1c8838021c8c0	1	EBUILD x11-drm-99999999.ebuild 6852 RMD160 8e3fbc5b82fa5dc2a5e4d532ab3a71f8ac8f847a SHA1 f281b1b8120526899fe098ae9fa3db5570078686 SHA256 4f1f65c210e0d49f9c9abe177f5204c40a03ffd4de09c1ae67ead50e4f5a3975
2	EBUILD x11-drm-99999999.ebuild 7832 RMD160 1f522702f2e5413030529f71779c073e6bbcdcf2 SHA1 17053ea999a60c2c49e27e56631e80523b7e4be9 SHA256 d4dbfe1c2dfdb649575b27543fb1afaf03435d1c2edfa2ad3dfdee4036835090




# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.2 2007/03/14 18:18:53 battousai Exp $

WANT_AUTOCONF="latest"
WANT_AUTOMAKE="1.7"

#EGIT_BRANCH="vblank-rework"
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"

inherit eutils x11 linux-mod git

IUSE_VIDEO_CARDS="
	video_cards_mach64

RESTRICT="strip"

S="${WORKDIR}/drm"
#PATCHVER="0.1"
PATCHDIR="${WORKDIR}/patch"
EXCLUDED="${WORKDIR}/excluded"

DESCRIPTION="DRM Kernel Modules for X11"
HOMEPAGE="http://dri.sf.net"
if [ -n "${PATCHVER}" ] ; then
	SRC_URI="http://dev.gentoo.org/~dberkholz/distfiles/${P}-gentoo-${PATCHVER}.tar.bz2"
else
	SRC_URI=""
fi

SLOT="0"
LICENSE="X11"

	git_src_unpack
	cd "${WORKDIR}"

	# Apply patches if there's a patchball version number provided.
	if [ -n "${PATCHVER}"  ]
	then
		unpack ${P}-gentoo-${PATCHVER}.tar.bz2
		cd "${S}"

	# Apply patches
	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}

		patch_prepare
	cd "${SRC_BUILD}"
	sed -i -e "s:/kernel/drivers/char/drm:/${PN}:g" Makefile

		# Apply patches
		EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
	fi

	src_unpack_os

	cd "${S}"
	eautoreconf -v --install
}

src_compile() {
	unset LDFLAGS

	cd "${S}"
	# Building the programs. These are useful for developers and getting info from DRI and DRM.
	#
	# libdrm objects are needed for drmstat.
	econf \
		--enable-static \
		--disable-shared \
		|| die "libdrm configure failed."
	emake || die "libdrm build failed."

	einfo "Building DRM in ${SRC_BUILD}..."
	src_compile_os
	einfo "DRM build finished".

	src_install_os

	dodoc "${S}/linux-core/README.drm"

	dobin dristat
	dobin drmstat
}

pkg_postinst() {

	MODULE_NAMES=""
	for i in drm.${KV_OBJ} ${VIDCARDS}; do
		MODULE_NAMES="${MODULE_NAMES} ${i/.${KV_OBJ}}(${PN}:${SRC_BUILD})"
		i=$(echo ${i/.${KV_OBJ}} | tr '[:lower:]' '[:upper:]')
		eval MODULESD_${i}_ENABLED="yes"
	done


	then
		ewarn "Please disable in-kernel DRM support to use this package."
	fi

	# LINUXDIR is needed to allow Makefiles to find kernel release.
	cd "${SRC_BUILD}"
	emake LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
	emake LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
}

src_compile_freebsd() {

		KMODDIR="/boot/modules" \
		|| die "pmake failed."
	export CFLAGS=${svcflags}; export LDFLAGS=${svldflags}

	cd "${S}/tests"
	# -D_POSIX_SOURCE skips the definition of several stuff we need
	# for these two to compile
	sed -i -e "s/-D_POSIX_SOURCE//" Makefile
	emake dristat || die "Building dristat failed."
	emake drmstat || die "Building drmstat failed."
	# Move these where the linux stuff expects them
	mv dristat drmstat ${SRC_BUILD}
}

die_error() {
- 

Return to bug 255647

Line 0 Link Here

(-)a/x11-apps/drm-progs/drm-progs-99999999.ebuild (+48 lines)
	1	# Copyright 1999-2009 Gentoo Foundation
	2	# Distributed under the terms of the GNU General Public License v2
	3	# $Header: $
	4
	5	EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
	6
	7	inherit eutils autotools git
	8
	9	DESCRIPTION="X11 DRM utilities and test programs"
	10	HOMEPAGE="http://dri.freedesktop.org/wiki/"
	11	SRC_URI="http://dev.gentoo.org/~battousai/distfiles/${P}-use-system-libdrm.patch.bz2"
	12
	13	LICENSE="X11"
	14	SLOT="0"
	15
	16	# Keywords inherited from x11-drm ebuild, where these used to be.
	17	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
	18
	19	IUSE=""
	20
	21	DEPEND="x11-libs/libdrm"
	22	RDEPEND="${DEPEND}"
	23
	24	#S="${WORKDIR}/${P}"
	25
	26	src_unpack() {
	27	git_src_unpack
	28
	29	cd "${WORKDIR}"
	30	unpack ${P}-use-system-libdrm.patch.bz2
	31
	32	cd "${S}"
	33	epatch "${WORKDIR}"/${P}-use-system-libdrm.patch
	34
	35	eautoreconf -v --install
	36	}
	37
	38	src_compile() {
	39	econf \|\| die "econf failed"
	40
	41	cd "${S}"/tests
	42	emake \|\| die "emake failed"
	43	}
	44
	45	src_install() {
	46	cd "${S}"/tests
	47	dobin dristat drmstat modeprint/modeprint modetest/modetest \|\| die
	48	}

Lines 1-14 Link Here

(-)a/x11-base/x11-drm/x11-drm-99999999.ebuild (-53 / +18 lines)
1	# Copyright 1999-2007 Gentoo Foundation	1	# Copyright 1999-2009 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.2 2007/03/14 18:18:53 battousai Exp $	3	# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.2 2007/03/14 18:18:53 battousai Exp $
4		4
5	WANT_AUTOCONF="latest"
6	WANT_AUTOMAKE="1.7"
7
8	#EGIT_BRANCH="vblank-rework"	5	#EGIT_BRANCH="vblank-rework"
9	EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"	6	EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
10		7
11	inherit eutils x11 linux-mod autotools git	8	inherit eutils x11 linux-mod git
12		9
13	IUSE_VIDEO_CARDS="	10	IUSE_VIDEO_CARDS="
14	video_cards_mach64	11	video_cards_mach64
Lines 28-40 IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux" Link Here
28	RESTRICT="strip"	25	RESTRICT="strip"
29		26
30	S="${WORKDIR}/drm"	27	S="${WORKDIR}/drm"
31	PATCHVER="0.2"	28	#PATCHVER="0.1"
32	PATCHDIR="${WORKDIR}/patch"	29	PATCHDIR="${WORKDIR}/patch"
33	EXCLUDED="${WORKDIR}/excluded"	30	EXCLUDED="${WORKDIR}/excluded"
34		31
35	DESCRIPTION="DRM Kernel Modules for X11"	32	DESCRIPTION="DRM Kernel Modules for X11"
36	HOMEPAGE="http://dri.sf.net"	33	HOMEPAGE="http://dri.sf.net"
37	SRC_URI="http://dev.gentoo.org/~dberkholz/distfiles/${P}-gentoo-${PATCHVER}.tar.bz2"	34	if [ -n "${PATCHVER}" ] ; then
		35	SRC_URI="http://dev.gentoo.org/~dberkholz/distfiles/${P}-gentoo-${PATCHVER}.tar.bz2"
		36	else
		37	SRC_URI=""
		38	fi
38		39
39	SLOT="0"	40	SLOT="0"
40	LICENSE="X11"	41	LICENSE="X11"
Lines 62-101 src_unpack() { Link Here
62	git_src_unpack	63	git_src_unpack
63	cd "${WORKDIR}"	64	cd "${WORKDIR}"
64		65
65	unpack ${P}-gentoo-${PATCHVER}.tar.bz2	66	# Apply patches if there's a patchball version number provided.
66		67	if [ -n "${PATCHVER}" ]
67	cd "${S}"	68	then
68		69	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
69	patch_prepare	70	cd "${S}"
70
71	# Apply patches
72	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
73		71
74	# Substitute new directory under /lib/modules/${KV_FULL}	72	patch_prepare
75	cd "${SRC_BUILD}"
76	sed -i -e "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
77		73
78	cp "${S}"/tests/*.c ${SRC_BUILD}	74	# Apply patches
		75	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
		76	fi
79		77
80	src_unpack_os	78	src_unpack_os
81
82	cd "${S}"
83	eautoreconf -v --install
84	}	79	}
85		80
86	src_compile() {	81	src_compile() {
87	unset LDFLAGS
88
89	cd "${S}"
90	# Building the programs. These are useful for developers and getting info from DRI and DRM.
91	#
92	# libdrm objects are needed for drmstat.
93	econf \
94	--enable-static \
95	--disable-shared \
96	\|\| die "libdrm configure failed."
97	emake \|\| die "libdrm build failed."
98
99	einfo "Building DRM in ${SRC_BUILD}..."	82	einfo "Building DRM in ${SRC_BUILD}..."
100	src_compile_os	83	src_compile_os
101	einfo "DRM build finished".	84	einfo "DRM build finished".
Lines 108-116 src_install() { Link Here
108	src_install_os	91	src_install_os
109		92
110	dodoc "${S}/linux-core/README.drm"	93	dodoc "${S}/linux-core/README.drm"
111
112	dobin dristat
113	dobin drmstat
114	}	94	}
115		95
116	pkg_postinst() {	96	pkg_postinst() {
Lines 256-262 src_compile_linux() { Link Here
256	MODULE_NAMES=""	236	MODULE_NAMES=""
257	for i in drm.${KV_OBJ} ${VIDCARDS}; do	237	for i in drm.${KV_OBJ} ${VIDCARDS}; do
258	MODULE_NAMES="${MODULE_NAMES} ${i/.${KV_OBJ}}(${PN}:${SRC_BUILD})"	238	MODULE_NAMES="${MODULE_NAMES} ${i/.${KV_OBJ}}(${PN}:${SRC_BUILD})"
259	i=$(echo ${i} \| tr '[:lower:]' '[:upper:]')	239	i=$(echo ${i/.${KV_OBJ}} \| tr '[:lower:]' '[:upper:]')
260	eval MODULESD_${i}_ENABLED="yes"	240	eval MODULESD_${i}_ENABLED="yes"
261	done	241	done
262		242
Lines 271-281 src_compile_linux() { Link Here
271	then	251	then
272	ewarn "Please disable in-kernel DRM support to use this package."	252	ewarn "Please disable in-kernel DRM support to use this package."
273	fi	253	fi
274
275	# LINUXDIR is needed to allow Makefiles to find kernel release.
276	cd "${SRC_BUILD}"
277	emake LINUXDIR="${KERNEL_DIR}" dristat \|\| die "Building dristat failed."
278	emake LINUXDIR="${KERNEL_DIR}" drmstat \|\| die "Building drmstat failed."
279	}	254	}
280		255
281	src_compile_freebsd() {	256	src_compile_freebsd() {
Lines 290-304 src_compile_freebsd() { Link Here
290	KMODDIR="/boot/modules" \	265	KMODDIR="/boot/modules" \
291	\|\| die "pmake failed."	266	\|\| die "pmake failed."
292	export CFLAGS=${svcflags}; export LDFLAGS=${svldflags}	267	export CFLAGS=${svcflags}; export LDFLAGS=${svldflags}
293
294	cd "${S}/tests"
295	# -D_POSIX_SOURCE skips the definition of several stuff we need
296	# for these two to compile
297	sed -i -e "s/-D_POSIX_SOURCE//" Makefile
298	emake dristat \|\| die "Building dristat failed."
299	emake drmstat \|\| die "Building drmstat failed."
300	# Move these where the linux stuff expects them
301	mv dristat drmstat ${SRC_BUILD}
302	}	268	}
303		269
304	die_error() {	270	die_error() {
305	-