Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/svgalib: ChangeLog svgalib-1.9.25-r2.ebuild
Date: Sat, 03 Mar 2012 12:36:25
Message-Id: 20120303123612.5667E2004C@flycatcher.gentoo.org
1 pacho 12/03/03 12:36:12
2
3 Modified: ChangeLog
4 Added: svgalib-1.9.25-r2.ebuild
5 Log:
6 Respect LDFLAGS (bug #339873 by Andrew Savchenko), install svgalib_helper.h (bug #341393 by Andrew Savchenko), fix build with recent kernels (bug #344663 by Rene Hertell), fix segfault (bug #402831 by O.Sezer).
7
8 (Portage version: 2.1.10.49/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.92 media-libs/svgalib/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/svgalib/ChangeLog?rev=1.92&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/svgalib/ChangeLog?rev=1.92&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/svgalib/ChangeLog?r1=1.91&r2=1.92
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v
20 retrieving revision 1.91
21 retrieving revision 1.92
22 diff -u -r1.91 -r1.92
23 --- ChangeLog 3 Oct 2011 17:01:40 -0000 1.91
24 +++ ChangeLog 3 Mar 2012 12:36:11 -0000 1.92
25 @@ -1,6 +1,16 @@
26 # ChangeLog for media-libs/svgalib
27 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.91 2011/10/03 17:01:40 mr_bones_ Exp $
29 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.92 2012/03/03 12:36:11 pacho Exp $
31 +
32 +*svgalib-1.9.25-r2 (03 Mar 2012)
33 +
34 + 03 Mar 2012; Pacho Ramos <pacho@g.o>
35 + +files/svgalib-1.9.25-build2.patch, +files/svgalib-1.9.25-build2.patch~,
36 + +files/svgalib-1.9.25-fPIC.patch, +files/svgalib-1.9.25-linux2.6.36-r1.patch,
37 + +files/svgalib-1.9.25-segfault.patch, +svgalib-1.9.25-r2.ebuild:
38 + Respect LDFLAGS (bug #339873 by Andrew Savchenko), install svgalib_helper.h
39 + (bug #341393 by Andrew Savchenko), fix build with recent kernels (bug #344663
40 + by Rene Hertell), fix segfault (bug #402831 by O.Sezer).
41
42 03 Oct 2011; Michael Sterrett <mr_bones_@g.o>
43 svgalib-1.9.25-r1.ebuild:
44
45
46
47 1.1 media-libs/svgalib/svgalib-1.9.25-r2.ebuild
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/svgalib/svgalib-1.9.25-r2.ebuild?rev=1.1&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/svgalib/svgalib-1.9.25-r2.ebuild?rev=1.1&content-type=text/plain
51
52 Index: svgalib-1.9.25-r2.ebuild
53 ===================================================================
54 # Copyright 1999-2012 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 # $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.25-r2.ebuild,v 1.1 2012/03/03 12:36:12 pacho Exp $
57
58 EAPI="4"
59
60 inherit eutils flag-o-matic toolchain-funcs linux-mod
61
62 DESCRIPTION="A library for running svga graphics on the console"
63 HOMEPAGE="http://www.svgalib.org/"
64 SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
65
66 LICENSE="BSD"
67 SLOT="0"
68 KEYWORDS="-* ~x86"
69 IUSE="build +kernel-helper"
70
71 DEPEND=""
72 RDEPEND=""
73
74 MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
75 BUILD_TARGETS="default"
76
77 pkg_setup() {
78 linux-mod_pkg_setup
79 BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
80 }
81
82 src_prepare() {
83 epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.patch
84 epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch #51698
85 epatch "${FILESDIR}"/${PN}-1.9.25-build.patch
86 epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.28.patch
87 epatch "${FILESDIR}"/${PN}-1.9.25-glibc210.patch #274305
88 epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.36-r1.patch
89 epatch "${FILESDIR}"/${PN}-1.9.25-segfault.patch
90 epatch "${FILESDIR}"/${PN}-1.9.25-build2.patch
91 sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
92 }
93
94 src_compile() {
95 use kernel-helper || export NO_HELPER=y
96
97 export CC=$(tc-getCC)
98
99 # First build static
100 emake OPTIMIZE="${CFLAGS}" static || die "Failed to build static libraries!"
101 # Then build shared ...
102 emake OPTIMIZE="${CFLAGS}" shared || die "Failed to build shared libraries!"
103 # Missing in some cases ...
104 ln -s libvga.so.${PV} sharedlib/libvga.so
105 # Build lrmi and tools ...
106 emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
107 textutils lrmi utils \
108 || die "Failed to build libraries and utils!"
109 # Build the gl stuff tpp
110 emake OPTIMIZE="${CFLAGS}" -C gl || die "Failed to build gl!"
111 emake OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} \
112 || die "Failed to build libvgagl.so.${PV}!"
113 # Missing in some cases ...
114 ln -s libvgagl.so.${PV} sharedlib/libvgagl.so
115 emake OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} \
116 || die "Failed to build libvga.so.${PV}!"
117 cp -pPR src/libvga.so.${PV} sharedlib/
118 # Build threeDKit ...
119 emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
120 -C threeDKit lib3dkit.a || die "Failed to build threeDKit!"
121 # Build demo's ...
122 emake OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS+=" -L../sharedlib" \
123 demoprogs || die "Failed to build demoprogs!"
124
125 ! use build && use kernel-helper && linux-mod_src_compile
126 }
127
128 src_install() {
129 local x=
130
131 dodir /etc/svgalib /usr/{include,lib,bin,share/man}
132
133 emake \
134 TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
135 install || die "Failed to install svgalib!"
136 ! use build && use kernel-helper && linux-mod_src_install
137
138 insinto /usr/include
139 doins gl/vgagl.h
140 dolib.a staticlib/libvga.a || die "dolib.a libvga"
141 dolib.a gl/libvgagl.a || die "dolib.a libvgagl"
142 dolib.a threeDKit/lib3dkit.a
143 dolib.so gl/libvgagl.so.${PV} || die "dolib.so libvgagl.so"
144 local abiver=$(sed -n '/^MAJOR_VER.*=/{s:.*=[ ]*::;p}' Makefile.cfg)
145 for x in lib3dkit libvga libvgagl ; do
146 dosym ${x}.so.${PV} /usr/lib/${x}.so
147 dosym ${x}.so.${PV} /usr/lib/${x}.so.${abiver}
148 done
149
150 insinto /usr/include
151 doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
152 doins src/keyboard/vgakeyboard.h src/svgalib_helper.h
153
154 insinto /etc/udev/rules.d
155 newins "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules
156
157 exeinto /usr/lib/svgalib/demos
158 for x in "${S}"/demos/* ; do
159 [[ -x ${x} ]] && doexe ${x}
160 done
161
162 cd "${S}"/threeDKit
163 exeinto /usr/lib/svgalib/threeDKit
164 local THREED_PROGS="plane wrapdemo"
165 doexe ${THREED_PROGS}
166
167 cd "${S}"
168 dodoc 0-README
169 cd "${S}"/doc
170 dodoc CHANGES DESIGN TODO
171 docinto txt
172 dodoc Driver-programming-HOWTO README.* add_driver svgalib.lsm
173 }
174
175 pkg_postinst() {
176 ! use build && use kernel-helper && linux-mod_pkg_postinst
177 }