View previous topic :: View next topic |
Author |
Message |
baigsabeeh Guru
Joined: 28 Sep 2005 Posts: 520 Location: North Brunswick, NJ
|
Posted: Fri Oct 19, 2007 1:28 am Post subject: Can't Apply Patch to Ati-Drivers Ebuild |
|
|
I recently installed an Ati Radeon HD 2600XT to replace my aging Nvidia GeForce 6600GT, and I'm having issues with getting the drivers to install from portage, which don't even exist in the tree anyway.
Basically, I've modified the ebuild and followed the directions on the bugzilla page for the patch, but I can't get the patch to apply. What am I doing wrong here?
https://bugs.gentoo.org/show_bug.cgi?id=191374
That is the patch.
This is the modified ebuild in my overlay. The ebuild is called ati-drivers-8.41.7.ebuild
Code: | # Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.41.7.ebuild,v 1.3 2007/10/09 08:11:29 dberkholz Exp $
IUSE="acpi multilib"
inherit eutils multilib linux-mod toolchain-funcs versionator
DESCRIPTION="Ati precompiled drivers for recent chipsets"
HOMEPAGE="http://www.ati.com"
ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
SRC_URI="${ATI_URL}/ati-driver-installer-${PV}-x86.x86_64.run"
LICENSE="AMD GPL-2 QPL-1.0 as-is"
KEYWORDS="~amd64 ~x86"
# The portage dep is for COLON_SEPARATED support in env-update.
# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
RDEPEND="x11-base/xorg-server
!x11-apps/ati-drivers-extra
>=app-admin/eselect-1.0.9
app-admin/eselect-opengl
=virtual/libstdc++-3.3*
amd64? ( multilib? ( app-emulation/emul-linux-x86-compat ) )
acpi? (
x11-apps/xauth
sys-power/acpid
)
>=sys-apps/portage-2.1.1-r1"
DEPEND="${RDEPEND}
x11-proto/xf86miscproto
x11-proto/xf86vidmodeproto"
EMULTILIB_PKG="true"
QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
usr/lib/opengl/ati/lib/libGL.so.1.2
opt/bin/amdcccle"
QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
usr/lib32/dri/fglrx_dri.so
usr/lib64/opengl/ati/lib/libGL.so.1.2
usr/lib32/opengl/ati/lib/libGL.so.1.2
opt/bin/amdcccle"
QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
usr/lib/xorg/modules/drivers/fglrx_drv.so
usr/lib/opengl/ati/lib/libGL.so.1.2"
QA_TEXTRELS_amd64="
usr/lib64/opengl/ati/lib/libGL.so.1.2
usr/lib32/opengl/ati/lib/libGL.so.1.2
usr/lib64/dri/fglrx_dri.so
usr/lib32/dri/fglrx_dri.so"
S="${WORKDIR}"
pkg_setup() {
#check kernel and sets up KV_OBJ
MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
BUILD_TARGETS="kmod_build"
linux-mod_pkg_setup
BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
if ! kernel_is 2 6; then
eerror "Need a 2.6 kernel to compile against!"
die "Need a 2.6 kernel to compile against!"
fi
if ! linux_chkconfig_present MTRR; then
ewarn "You don't have MTRR support enabled, the direct rendering will not work."
fi
if linux_chkconfig_builtin DRM; then
ewarn "You have DRM support enabled builtin, the direct rendering will not work."
fi
if ! linux_chkconfig_present AGP && \
! linux_chkconfig_present PCIEPORTBUS; then
ewarn "You need AGP and/or PCI Express support for direct rendering to work."
fi
if linux_chkconfig_present PARAVIRT; then
eerror "The current ati-drivers don't compile when having"
eerror "paravirtualization active due to GPL symbol export"
eerror "restrictions."
eerror "Please disable it:"
eerror " CONFIG_PARAVIRT=n"
eerror "in /usr/src/linux/.config or"
eerror " Processor type and features -->"
eerror " [ ] Paravirtualization support (EXPERIMENTAL)"
eerror "in 'menuconfig'"
die "CONFIG_PARAVIRT enabled"
fi
# xorg-server 1.1 and its prereleases correspond to xorg 7.1.
if has_version ">=x11-base/xorg-server-1.0.99"; then
BASE_DIR="${S}/x710"
else
BASE_DIR="${S}/x690"
fi
if use amd64 ; then
BASE_DIR="${BASE_DIR}_64a"
# This is used like $(get_libdir) for paths in ati's package.
PKG_LIBDIR=lib64
ARCH_DIR="${S}/arch/x86_64"
else
PKG_LIBDIR=lib
ARCH_DIR="${S}/arch/x86"
fi
}
src_unpack() {
epatch ${FILESDIR}/ati-drivers-8.41.7.ebuild.diff
local src="${DISTDIR}/${A}"
# This is apparently a nonstandard makeself archive, so extract
# the offset by hand.
local offset=$(grep -am1 SKIP "${src}" | sed -e 's/SKIP="\([0-9]\+\)"/\1/')
#Switching to a standard way to extract the files since otherwise no signature file
#would be created
sh "${src}" --extract "${S}" 2&>1 /dev/null
gunzip common/usr/share/man/man8/atieventsd.8 || die "manpage unzip failed"
# These are the userspace utilities that we also have source for.
# We rebuild these later.
rm \
"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
|| die "bin rm failed"
if use acpi; then
sed -i \
-e "s:/var/lib/xdm/authdir/:/etc/X11/xdm/authdir/:" \
-e "s:/var/lib/gdm/:/var/gdm/:" \
-e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \
"${S}/common/etc/ati/authatieventsd.sh" \
|| die "sed failed."
# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/
epatch "${FILESDIR}"/ati-powermode-opt-path.patch
fi
pushd common/lib/modules/fglrx/build_mod >/dev/null
ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
|| die "symlinking precompiled core failed"
convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
# When built with ati's make.sh it defines a bunch of macros if
# certain .config values are set, falling back to less reliable
# detection methods if linux/autoconf.h is not available. We
# simply use the linux/autoconf.h settings directly, bypassing the
# detection script.
sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
|| die "MODVERSIONS sed failed"
popd >/dev/null
mkdir extra || die "mkdir failed"
cd extra
unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
# Add a category.
mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
cd ..
# Misc. patches.
epatch "${FILESDIR}"/${PV}/${P}-warnings.patch
if kernel_is ge 2 6 23; then
epatch "${FILESDIR}"/${PV}/${PN}-2.6.23.patch
fi
}
src_compile() {
linux-mod_src_compile
einfo "Building fgl_glxgears"
cd "${S}"/extra/fgl_glxgears
# These extra libs/utils either have an Imakefile that does not
# work very well without tweaking or a Makefile ignoring CFLAGS
# and the like. We bypass those.
# The -DUSE_GLU is needed to compile using nvidia headers
# according to a comment in ati-drivers-extra-8.33.6.ebuild.
"$(tc-getCC)" -o fgl_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-I"${S}"/common/usr/include fgl_glxgears.c \
-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
einfo "Building fglrx_gamma lib"
cd "${S}"/extra/lib/fglrx_gamma
"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-lXext || die "fglrx_gamma lib build failed"
ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
einfo "Building fglrx_gamma util"
cd "${S}"/extra/programs/fglrx_gamma
"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
|| die "fglrx_gamma util build failed"
}
src_install() {
linux-mod_src_install
# We can do two things here, and neither of them is very nice.
# For direct rendering libGL has to be able to load one or more
# dri modules (files ending in _dri.so, like fglrx_dri.so).
# Gentoo's mesa looks for these files in the location specified by
# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
# location /usr/$(get_libdir)/dri. Ati's libGL does the same
# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
# 64bit. So we can either put the .so files in that (unusual,
# compared to "normal" mesa libGL) location or set
# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
# 101539.
# The problem with this approach is that LIBGL_DRIVERS_PATH
# *overrides* the default hardcoded location, it does not extend
# it. So if ati-drivers is merged but a non-ati libGL is selected
# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
# (because it changed in a newer mesa or because it was compiled
# for a different set of multilib abis than we are) stuff breaks.
# We create one file per ABI to work with "native" multilib, see
# below.
echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
doenvd "${T}/03ati-colon-sep"
# All libraries that we have a 32 bit and 64 bit version of on
# amd64 are installed in src_install-libs. Everything else
# (including libraries only available in native 64bit on amd64)
# goes in here.
# There used to be some code here that tried to detect running
# under a "native multilib" portage ((precursor of)
# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
# should just work (only doing some duplicate work). --marienz
if has_multilib_profile; then
local OABI=${ABI}
for ABI in $(get_install_abis); do
src_install-libs
done
ABI=${OABI}
unset OABI
else
src_install-libs
fi
# This is sorted by the order the files occur in the source tree.
# X modules.
exeinto /usr/$(get_libdir)/xorg/modules/drivers
doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
exeinto /usr/$(get_libdir)/xorg/modules/linux
doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
exeinto /usr/$(get_libdir)/xorg/modules
doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so}
# Arch-specific files.
# (s)bin.
into /opt
if use acpi; then
dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
fi
# We cleaned out the compilable stuff in src_unpack
dobin "${ARCH_DIR}"/usr/X11R6/bin/*
# lib.
exeinto /usr/$(get_libdir)
# Everything except for the libGL.so installed in src_install-libs.
doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
insinto /usr/$(get_libdir)
doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-maxdepth 1 -type f -not -name '*.so*')
# Common files.
# etc.
insinto /etc/ati
# Everything except for the authatieventsd.sh script.
doins common/etc/ati/{fglrxprofiles.csv,fglrxrc,logo*,control,atiogl.xml,signature}
if use acpi; then
doins common/etc/ati/authatieventsd.sh
fi
# include.
insinto /usr
doins -r common/usr/include
insinto /usr/include/X11/extensions
doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
# Just the atigetsysteminfo.sh script.
into /usr
dosbin common/usr/sbin/*
# data files for the control panel.
insinto /usr/share
doins -r common/usr/share/ati
insinto /usr/share/pixmaps
doins common/usr/share/icons/ccc_{large,small}.xpm
make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
ccc_large.xpm System
# doc.
dohtml -r common/usr/share/doc/fglrx
if use acpi; then
doman common/usr/share/man/man8/atieventsd.8
pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
exeinto /etc/acpi
doexe ati-powermode.sh
insinto /etc/acpi/events
doins events/*
popd >/dev/null
fi
# Done with the "source" tree. Install tools we rebuilt:
dobin extra/fgl_glxgears/fgl_fglxgears
newdoc extra/fgl_glxgears/README README.fgl_glxgears
dolib extra/lib/fglrx_gamma/*so*
newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
dobin extra/programs/fglrx_gamma/fglrx_xgamma
doman extra/programs/fglrx_gamma/fglrx_xgamma.1
newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
# Gentoo-specific stuff:
if use acpi; then
newinitd "${FILESDIR}"/atieventsd.init atieventsd \
|| die "Failed to install atieventsd.init.d"
echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
newconfd "${T}"/atieventsd.conf atieventsd
fi
}
src_install-libs() {
if [[ "${ABI}" == "amd64" ]]; then
local pkglibdir=lib64
else
local pkglibdir=lib
fi
einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
# To make sure we do not miss a spot when these change.
local libmajor=1 libminor=2
local libver=${libmajor}.${libminor}
# The GLX libraries
# (yes, this really is "lib" even on amd64/multilib --marienz)
exeinto ${ATI_ROOT}/lib
doexe "${ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
# Same as the xorg implementation (eselect opengl does not fall
# back to xorg-x11 if we omit this symlink, meaning no glx).
dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
# DRI modules, installed into the path used by recent versions of mesa.
exeinto /usr/$(get_libdir)/dri
doexe "${ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
# Make up a libGL.la. Ati does not provide one, but mesa does. If
# a (libtool-based) libfoo is built with libGL.la present a
# reference to it is put into libfoo.la, and compiling
# (libtool-based) things that link too libfoo.la will complain if
# libGL.la disappears. So if we do not make up a libGL.la
# switching between mesa and ati becomes painful.
#
# According to the libtool manual the "revision" should be updated
# whenever the code changes. We construct this from the version
# (8.37.6 becomes 83706).
local revision=$(printf '%d%02d%02d' $(get_version_components))
sed -e "s:\${libmajor}:${libmajor}:g" \
-e "s:\${libminor}:${libminor}:g" \
-e "s:\${libdir}:$(get_libdir):g" \
-e "s:\${revision}:${revision}:g" \
"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
|| die "sed failed to make libGL.la"
local envname="${T}"/04ati-dri-path
if [[ -n ${ABI} ]]; then
envname="${envname}-${ABI}"
fi
echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
doenvd "${envname}"
}
pkg_postinst() {
/usr/bin/eselect opengl set --use-old ati
elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
elog "To change your xorg.conf you can use the bundled \"aticonfig\""
elog
elog "If you experience unexplained segmentation faults and kernel crashes"
elog "with this driver and multi-threaded applications such as wine,"
elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
elog
# (to get the LIBGL_DRIVERS_PATH)
elog "You will have to source /etc/profile (or logout and back in) for dri"
elog "to work, unless you previously had ati-drivers installed."
# DRM module
linux-mod_pkg_postinst
}
pkg_postrm() {
linux-mod_pkg_postrm
/usr/bin/eselect opengl set --use-old xorg-x11
} |
This is the error log.
Code: | ***** ati-drivers-8.41.7.ebuild.diff *****
==========================================
PATCH COMMAND: patch -p0 -g0 -E --no-backup-if-mismatch < /usr/local/portage/x11-drivers/ati-drivers/files/ati-drivers-8.41.7.ebuild.diff
==========================================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- ati-drivers-8.41.7.ebuild.old 2007-09-12 17:23:58.000000000 +0200
|+++ ati-drivers-8.41.7.ebuild 2007-09-12 18:13:10.000000000 +0200
--------------------------
No file to patch. Skipping patch.
2 out of 2 hunks ignored
==========================================
PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch < /usr/local/portage/x11-drivers/ati-drivers/files/ati-drivers-8.41.7.ebuild.diff
==========================================
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- ati-drivers-8.41.7.ebuild.old 2007-09-12 17:23:58.000000000 +0200
|+++ ati-drivers-8.41.7.ebuild 2007-09-12 18:13:10.000000000 +0200
--------------------------
No file to patch. Skipping patch.
2 out of 2 hunks ignored
==========================================
PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch < /usr/local/portage/x11-drivers/ati-drivers/files/ati-drivers-8.41.7.ebuild.diff
==========================================
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- ati-drivers-8.41.7.ebuild.old 2007-09-12 17:23:58.000000000 +0200
|+++ ati-drivers-8.41.7.ebuild 2007-09-12 18:13:10.000000000 +0200
--------------------------
No file to patch. Skipping patch.
2 out of 2 hunks ignored
==========================================
PATCH COMMAND: patch -p3 -g0 -E --no-backup-if-mismatch < /usr/local/portage/x11-drivers/ati-drivers/files/ati-drivers-8.41.7.ebuild.diff
==========================================
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- ati-drivers-8.41.7.ebuild.old 2007-09-12 17:23:58.000000000 +0200
|+++ ati-drivers-8.41.7.ebuild 2007-09-12 18:13:10.000000000 +0200
--------------------------
No file to patch. Skipping patch.
2 out of 2 hunks ignored
==========================================
PATCH COMMAND: patch -p4 -g0 -E --no-backup-if-mismatch < /usr/local/portage/x11-drivers/ati-drivers/files/ati-drivers-8.41.7.ebuild.diff
==========================================
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- ati-drivers-8.41.7.ebuild.old 2007-09-12 17:23:58.000000000 +0200
|+++ ati-drivers-8.41.7.ebuild 2007-09-12 18:13:10.000000000 +0200
--------------------------
No file to patch. Skipping patch.
2 out of 2 hunks ignored
|
_________________ BSD > SysV > Linux
BSD FTW! |
|
Back to top |
|
|
bunder Bodhisattva
Joined: 10 Apr 2004 Posts: 5934
|
Posted: Fri Oct 19, 2007 1:33 am Post subject: |
|
|
Moved from Off the Wall to Unsupported Software. _________________
Neddyseagoon wrote: | The problem with leaving is that you can only do it once and it reduces your influence. |
banned from #gentoo since sept 2017 |
|
Back to top |
|
|
pjj Apprentice
Joined: 30 Apr 2004 Posts: 165 Location: The Netherlands
|
Posted: Sun Oct 21, 2007 1:49 pm Post subject: |
|
|
Someone got a working ebuild for the new drivers yet? |
|
Back to top |
|
|
tekknokrat Apprentice
Joined: 17 Apr 2005 Posts: 278 Location: Magdeburg
|
Posted: Sun Oct 21, 2007 9:15 pm Post subject: |
|
|
the complete support thread for new drivers is here
I got the new driver built with modified ebuild this is patched by hand _________________ Optimism is solely an absence of information. / Optimismus ist nur ein Mangel an Information.
(Arthur Schopenhauer) |
|
Back to top |
|
|
desultory Bodhisattva
Joined: 04 Nov 2005 Posts: 9410
|
|
Back to top |
|
|
|
|
You cannot post new topics in this forum You cannot reply to topics in this forum You cannot edit your posts in this forum You cannot delete your posts in this forum You cannot vote in polls in this forum
|
|