[patch] Patch to ebuild for use with X.org >= 6.8.99

ati-xorg-6.8.99.diff (text/plain), 6.00 KB, created by Robert Führicht on 2005-10-16 05:04:48 UTC

--- /usr/portage/media-video/ati-drivers/ati-drivers-8.18.6.ebuild	2005-10-15 18:18:38.000000000 +0200
+++ /usr/local/portage/media-video/ati-drivers/ati-drivers-8.18.6.ebuild	2005-10-16 13:57:15.000000000 +0200
@@ -8,8 +8,8 @@
 
 DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
 HOMEPAGE="http://www.ati.com"
-SRC_URI="x86? ( mirror://gentoo/fglrx_6_8_0-${PV}-1.i386.rpm )
-	 amd64? ( mirror://gentoo/fglrx64_6_8_0-${PV}-1.x86_64.rpm )"
+SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
+	 amd64? ( mirror://gentoo/ati-driver-installer-${PV}-x86_64.run )"
 
 LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
@@ -26,7 +26,26 @@
 ATIBIN="${D}/opt/ati/bin"
 RESTRICT="nostrip multilib-pkg-force"
 
-MODULE_NAMES="fglrx(video:${WORKDIR}/lib/modules/fglrx/build_mod)"
+MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
+
+
+choose_driver_folder() {
+	BASE_NAME="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
+
+	# Determine if we are facing X.org 6.8.99 aka 6.9
+	if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
+	   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
+	   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ] 
+	then
+		BASE_NAME="${BASE_NAME}90"
+	else
+		BASE_NAME="${BASE_NAME}$(get_version_component_range 2)0"
+	fi
+	
+	if use amd64 ; then
+		BASE_NAME="${BASE_NAME}_64a"
+	fi
+}
 
 pkg_setup(){
 	#check kernel and sets up KV_OBJ
@@ -47,14 +66,14 @@
 
 	if [[ $? -ne 0 ]] ; then
 
-		ebegin "Checking for PCI Express support enabled"
-		linux_chkconfig_present PCIEPORTBUS
-		eend $?
-
-		if [[ $? -ne 0 ]] ; then
-		ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
-		ewarn "will not work."
-	fi
+                ebegin "Checking for PCI Express support enabled"
+                linux_chkconfig_present PCIEPORTBUS
+                eend $?
+
+                if [[ $? -ne 0 ]] ; then
+                ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
+                ewarn "will not work."
+	        fi
 
 	fi
 	ebegin "Checking for DRM support disabled"
@@ -69,34 +88,30 @@
 	X11_IMPLEM_P="$(best_version virtual/x11)"
 	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
 	X11_IMPLEM="${X11_IMPLEM##*\/}"
+	X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-}"
+	X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
 	einfo "X11 implementation is ${X11_IMPLEM}."
+	choose_driver_folder
 }
 
 src_unpack() {
 	local OLDBIN="/usr/X11R6/bin"
 
 	cd ${WORKDIR}
-	rpm_src_unpack
+	
+	sh ${DISTDIR}/${A} --extract .
 
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-
-#	if kernel_is 2 6
-#	then
-#		epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch
-#		epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch
-#	fi
-#	epatch ${FILESDIR}/8.8.25-via-amd64.patch
-#	epatch ${FILESDIR}/8.8.25-smp.patch
-#	epatch ${FILESDIR}/8.14.13-amd64.patch
-	rm -rf ${WORKDIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
-	rm -rf ${WORKDIR}/usr/X11R6/bin/{aticonfig,fglrx_pplay}
+	rm -rf ${BASE_NAME}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
+        rm -rf ${BASE_NAME}/usr/X11R6/bin/{aticonfig,fglrx_pplay}
 
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
 }
 
-
 src_compile() {
 	einfo "Building the DRM module..."
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	ln -s ${BASE_NAME}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version)
+
 	if kernel_is 2 6
 	then
 		set_arch_to_kernel
@@ -124,7 +139,7 @@
 }
 
 pkg_preinst() {
-	# Clean the dinamic libGL stuff's home to ensure
+	# Clean the dynamic libGL stuff's home to ensure
 	# we don't have stale libs floating around ...
 	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
 	then
@@ -135,12 +150,10 @@
 src_install() {
 	local ATI_ROOT="/usr/lib/opengl/ati"
 
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	MODULE_NAMES="fglrx(video::${WORKDIR}/common/lib/modules/fglrx/build_mod)"
 	linux-mod_src_install
-	# DRM module
-	# insinto /lib/modules/${KV_FULL}/video
-	# set_kvobj
-	# doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ}
+
 	cd ${WORKDIR}
 
 	local native_dir
@@ -168,11 +181,11 @@
 
 	#apps
 	exeinto /opt/ati/bin
-	doexe usr/X11R6/bin/*
+	doexe ${BASE_NAME}/usr/X11R6/bin/*
 
 	#ati custom stuff
 	insinto /usr
-	doins -r ${WORKDIR}/usr/include
+	doins -r ${WORKDIR}/common/usr/include
 
 	#env.d entry
 	cp ${FILESDIR}/09ati ${T}/
@@ -205,7 +218,7 @@
 
 	# The GLX libraries
 	exeinto ${ATI_ROOT}/lib
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/libGL.so.1.2
 	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
 	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
 
@@ -232,20 +245,29 @@
 	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
 
 	exeinto ${X11_LIB_DIR}/modules/drivers
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+	# In X.org 6.8.99 / 6.9 this is a .so
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
 
 	exeinto ${X11_LIB_DIR}/modules/dri
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
 
 	exeinto ${X11_LIB_DIR}/modules/linux
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
-	cp -pPR ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+	# In X.org 6.8.99 / 6.9 this is a .so
+	if has_version ">=x11-base/xorg-x11-6.8.99"
+	then
+		doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	else
+		doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	fi
+	cp -pPR ${BASE_NAME}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
 			${D}/${X11_LIB_DIR}
 	#Not the best place
 	insinto ${X11_DIR}/include/X11/extensions
-	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+	doins ${BASE_NAME}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
 
+	dodir /etc
+	cp -pPR ${BASE_NAME}/etc/* ${D}/etc/
 }