Gentoo Archives: gentoo-commits

From: Enrico Tagliavini <enrico.tagliavini@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
Date: Sat, 30 Jul 2011 10:39:29
Message-Id: 6e5b2e2dc48c5360187e21743101046d1d99d97d.Enrico@gentoo
1 commit: 6e5b2e2dc48c5360187e21743101046d1d99d97d
2 Author: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
3 AuthorDate: Sat Jul 30 10:38:59 2011 +0000
4 Commit: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
5 CommitDate: Sat Jul 30 10:38:59 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=6e5b2e2d
7
8 version bump and QA fix
9
10 ---
11 x11-drivers/ati-drivers/ati-drivers-11.6.ebuild | 8 ++++
12 ...vers-11.5-r1.ebuild => ati-drivers-11.7.ebuild} | 37 +++++++++++---------
13 2 files changed, 28 insertions(+), 17 deletions(-)
14
15 diff --git a/x11-drivers/ati-drivers/ati-drivers-11.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.6.ebuild
16 index 41a2fc1..f76e808 100644
17 --- a/x11-drivers/ati-drivers/ati-drivers-11.6.ebuild
18 +++ b/x11-drivers/ati-drivers/ati-drivers-11.6.ebuild
19 @@ -545,6 +545,14 @@ src_install-libs() {
20 fi
21 echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
22 doenvd "${envname}"
23 +
24 + # Silence the QA notice by creating missing soname symlinks
25 + for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
26 + do
27 + local soname=${so##*/}
28 + einfo dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
29 + dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
30 + done
31 }
32
33 pkg_postinst() {
34
35 diff --git a/x11-drivers/ati-drivers/ati-drivers-11.5-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.7.ebuild
36 similarity index 96%
37 rename from x11-drivers/ati-drivers/ati-drivers-11.5-r1.ebuild
38 rename to x11-drivers/ati-drivers/ati-drivers-11.7.ebuild
39 index 7ca6011..dfb3317 100644
40 --- a/x11-drivers/ati-drivers/ati-drivers-11.5-r1.ebuild
41 +++ b/x11-drivers/ati-drivers/ati-drivers-11.7.ebuild
42 @@ -54,6 +54,8 @@ DEPEND="${RDEPEND}
43 x11-proto/xf86vidmodeproto
44 x11-proto/xineramaproto
45 x11-libs/libXtst
46 + sys-apps/findutils
47 + app-misc/pax-utils
48 "
49
50 EMULTILIB_PKG="true"
51 @@ -290,14 +292,6 @@ src_prepare() {
52 fi
53 fi
54
55 - # Fix a known compilation error
56 - epatch "${FILESDIR}"/ati-drivers-fix_compilation-bug-297322.patch
57 -
58 - # Experimental 2.6.39 support
59 - if kernel_is -ge 2 6 39 ; then
60 - epatch "${FILESDIR}"/ati-drivers-2.6.39.patch || die "epatch failed"
61 - fi
62 -
63 # These are the userspace utilities that we also have source for.
64 # We rebuild these later.
65 rm \
66 @@ -428,15 +422,6 @@ src_install() {
67 # We cleaned out the compilable stuff in src_unpack
68 dobin "${ARCH_DIR}"/usr/X11R6/bin/*
69
70 - # lib.
71 - exeinto /usr/$(get_libdir)
72 - # Everything except for the libGL.so installed in src_install-libs.
73 - doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
74 - -maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
75 - insinto /usr/$(get_libdir)
76 - doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
77 - -maxdepth 1 -type f -not -name '*.so*')
78 -
79 # Common files.
80 # etc.
81 insinto /etc/ati
82 @@ -534,6 +519,15 @@ src_install-libs() {
83 ${ATI_ROOT}/extensions/FGL.renamed.libglx.so
84 dosym fglrx-libglx.so ${ATI_ROOT}/extensions/libglx.so
85
86 + # other libs
87 + exeinto /usr/$(get_libdir)
88 + # Everything except for the libGL.so installed some row above
89 + doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
90 + -maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
91 + insinto /usr/$(get_libdir)
92 + doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
93 + -maxdepth 1 -type f -not -name '*.so*')
94 +
95 # DRI modules, installed into the path used by recent versions of mesa.
96 exeinto /usr/$(get_libdir)/dri
97 doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
98 @@ -548,6 +542,15 @@ src_install-libs() {
99 fi
100 echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
101 doenvd "${envname}"
102 +
103 + # Silence the QA notice by creating missing soname symlinks
104 + for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
105 + do
106 + local soname=${so##*/}
107 + ## let's keep also this alternative way ;)
108 + #dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
109 + dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
110 + done
111 }
112
113 pkg_postinst() {