Fix bug #51698, -fPIC not used to compile lrmi thus prelink complains

5 files changed, 193 insertions, 20 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index e25c2019e9c7..6f1b70b418e6 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.46 2004/08/08 13:30:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.47 2004/09/09 16:17:30 cretin Exp $
+
+*svgalib-1.9.19-r1 (09 Sep 2004)
+
+  09 Sep 2004; Stefan Jones <cretin@gentoo.org> +svgalib-1.9.19-r1.ebuild,
+  +files/digest-svgalib-1.9.19-r1, +files/svgalib-1.9.19-pic.patch:
+  Fix bug #51698, -fPIC not used to compile lrmi thus prelink complains
 
   08 Aug 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
   -files/svgalib-1.4.3-gcc3.patch, -files/svgalib-1.4.3-gentoo.diff,
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index c5ba5dfe98e8..32e0ceebb94a 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,24 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 f302d3a6bf16534ba8d8f863a96ea036 ChangeLog 8238
-MD5 fd33dac71cd54e0c49636a35423bd9d4 svgalib-1.9.18-r1.ebuild 4606
 MD5 d7bbbe8abcc227138d856108390731fe svgalib-1.9.19.ebuild 4415
-MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19 66
-MD5 0d7d045fc55ccf3f4a26bc54286a3b8a files/digest-svgalib-1.9.18-r1 66
+MD5 23200adc01b8c9aef62a7284d232f360 svgalib-1.9.19-r1.ebuild 4493
+MD5 fd33dac71cd54e0c49636a35423bd9d4 svgalib-1.9.18-r1.ebuild 4606
+MD5 bae56a490ab8dff15f12ca1d6c55d506 ChangeLog 8483
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 08beaed909b549304425870873b67c19 files/svgalib-1.9.18-gcc33.patch 426
-MD5 0209cd9462a2c845466526a2a4017104 files/svgalib-1.9.18-gentoo.patch 3622
-MD5 c6ccf439f748f710447c61fe41801a3c files/svgalib-1.9.18-linux2.6-v2.patch 7842
-MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107
+MD5 0d7d045fc55ccf3f4a26bc54286a3b8a files/digest-svgalib-1.9.18-r1 66
+MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19-r1 66
 MD5 e6a7509b89c4014c625cf1eaefd994ff files/svgalib-1.9.18-gcc34.patch 322
+MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107
+MD5 0209cd9462a2c845466526a2a4017104 files/svgalib-1.9.18-gentoo.patch 3622
 MD5 0877788ea40d3673a0c50d82d4560e0a files/svgalib-1.9.18-lrmi-gentoo-cflags.patch 269
-MD5 627fcf9d82cd93cddcdef96a00248260 files/svgalib-1.9.18-utils-include.patch 413
+MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19 66
+MD5 91fa4baff3dfb211bcb57a068ed7495f files/svgalib-1.9.19-pic.patch 422
 MD5 431e1212290d169ae8f928e63c793009 files/svgalib-1.9.19-linux2.6.patch 7834
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBFimEmdTrptrqvGERAvRKAJ0WGjQNRlTdOKSSKRiiOPic9K+JRACeKbPS
-OAqEcC7v7xU9MWYFy6qxyhc=
-=NSBB
------END PGP SIGNATURE-----
+MD5 627fcf9d82cd93cddcdef96a00248260 files/svgalib-1.9.18-utils-include.patch 413
+MD5 c6ccf439f748f710447c61fe41801a3c files/svgalib-1.9.18-linux2.6-v2.patch 7842
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.19-r1 b/media-libs/svgalib/files/digest-svgalib-1.9.19-r1
new file mode 100644
index 000000000000..a0902968e62f
--- /dev/null
+++ b/media-libs/svgalib/files/digest-svgalib-1.9.19-r1
@@ -0,0 +1 @@
+MD5 44e5063c9a22e9554088e125b0df7593 svgalib-1.9.19.tar.gz 935305
diff --git a/media-libs/svgalib/files/svgalib-1.9.19-pic.patch b/media-libs/svgalib/files/svgalib-1.9.19-pic.patch
new file mode 100644
index 000000000000..cc53366498c4
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.19-pic.patch
@@ -0,0 +1,13 @@
+--- svgalib-1.9.19/src/Makefile.jj	2004-09-09 09:08:24.369399280 -0700
++++ svgalib-1.9.19/src/Makefile	2004-09-09 09:08:32.340187536 -0700
+@@ -462,8 +462,8 @@
+ 	$(CC) $(CFLAGS) $(VGA_DEFINES) -c -o $@ $<
+ 
+ #lrmi must NOT be compiled as -fPIC
+-lrmi.o: lrmi.c
+-	$(CC) $(CFLAGS:-fPIC=) -c -o $@ $<
++#lrmi.o: lrmi.c
++#	$(CC) $(CFLAGS:-fPIC=) -c -o $@ $<
+ 
+ $(RAMDAC): %.o: %.c
+ 	$(CC) $(CFLAGS) $(RAMDAC_DEFINES) -c -o $@ $<
diff --git a/media-libs/svgalib/svgalib-1.9.19-r1.ebuild b/media-libs/svgalib/svgalib-1.9.19-r1.ebuild
new file mode 100644
index 000000000000..8a5aaed6a6b0
--- /dev/null
+++ b/media-libs/svgalib/svgalib-1.9.19-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.19-r1.ebuild,v 1.1 2004/09/09 16:17:30 cretin Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A library for running svga graphics on the console"
+HOMEPAGE="http://www.svgalib.org/"
+SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="build"
+
+DEPEND="virtual/libc"
+
+kernel_supports_modules() {
+	grep '^CONFIG_MODULES=y$' ${ROOT}/usr/src/linux/.config >& /dev/null
+}
+
+pkg_setup() {
+	! use build && kernel_supports_modules && check_KV
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	# Get it to work with kernel 2.6
+	epatch ${FILESDIR}/${P}-linux2.6.patch
+	sed -i '/^KDIR/s:=.*:=${ROOT}/usr/src/linux:' ${S}/kernel/svgalib_helper/Makefile
+
+	# Fix include bug #54198
+	epatch ${FILESDIR}/${PN}-1.9.18-utils-include.patch
+
+	# Have lrmi compile with our $CFLAGS
+	epatch ${FILESDIR}/${PN}-1.9.18-lrmi-gentoo-cflags.patch
+
+	# -fPIC does work for lrmi, see bug #51698
+	epatch ${FILESDIR}/${P}-pic.patch
+}
+
+src_compile() {
+	filter-flags -fPIC
+
+	# First build static
+	make OPTIMIZE="${CFLAGS}" static || die "Failed to build static libraries!"
+	# Have to remove for shared to build ...
+	rm -f src/svgalib_helper.h
+	# Then build shared ...
+	make OPTIMIZE="${CFLAGS}" shared || die "Failed to build shared libraries!"
+	# Missing in some cases ...
+	ln -s libvga.so.${PV} sharedlib/libvga.so
+	# Build lrmi and tools ...
+	make OPTIMIZE="${CFLAGS}" LDFLAGS="-L../sharedlib" \
+		textutils lrmi utils \
+		|| die "Failed to build libraries and utils!"
+	# Build the gl stuff tpp
+	make OPTIMIZE="${CFLAGS}" -C gl || die "Failed to build gl!"
+	make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} \
+		|| die "Failed to build libvgagl.so.${PV}!"
+	# Missing in some cases ...
+	ln -s libvgagl.so.${PV} sharedlib/libvgagl.so
+	rm -f src/svgalib_helper.h
+	make OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} \
+		|| die "Failed to build libvga.so.${PV}!"
+	cp -a src/libvga.so.${PV} sharedlib/
+	# Build threeDKit ...
+	make OPTIMIZE="${CFLAGS}" LDFLAGS='-L../sharedlib' \
+		-C threeDKit lib3dkit.a || die "Failed to build threeDKit!"
+	# Build demo's ...
+	make OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS='-L../sharedlib' \
+		demoprogs || die "Failed to build demoprogs!"
+
+	if ! use build && kernel_supports_modules
+	then
+		cd ${S}/kernel/svgalib_helper
+		if [[ `KV_to_int ${KV}` -lt `KV_to_int 2.6.6` ]] ; then
+			env -u ARCH \
+				make -f Makefile.alt INCLUDEDIR="${ROOT}/usr/src/linux/include" \
+					clean modules || die "Failed to build kernel module!"
+		else
+			env -u ARCH make || die "Failed to build kernel module!"
+		fi
+		cd ${S}
+	fi
+
+	cp Makefile Makefile.orig
+	sed -e 's/\(install: $(INSTALLAOUTLIB) \)installheaders \(.*\)/\1\2/g' \
+	 	Makefile.orig > Makefile
+}
+
+src_install() {
+	local x=
+
+	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
+
+	make \
+		TOPDIR=${D} OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
+		install || die "Failed to install svgalib!"
+	if ! use build && kernel_supports_modules
+	then
+		cd ${S}/kernel/svgalib_helper
+		if [[ `KV_to_int ${KV}` -lt `KV_to_int 2.6.6` ]] ; then
+			env -u ARCH \
+				make -f Makefile.alt TOPDIR=${D} \
+					INCLUDEDIR="${ROOT}/usr/src/linux/include" \
+					modules_install || die "Failed to install svgalib module!"
+		else
+			insinto /lib/modules/${KV}/kernel/misc
+			doins svgalib_helper.ko
+		fi
+		cd ${S}
+	fi
+
+	insinto /usr/include
+	doins gl/vgagl.h
+	dolib.a staticlib/libvga.a
+	dolib.a gl/libvgagl.a
+	dolib.a threeDKit/lib3dkit.a
+	dolib.so gl/libvgagl.so.${PV}
+	dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
+	preplib
+
+	insinto /usr/include
+	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
+	doins src/keyboard/vgakeyboard.h
+
+	dodir /etc/modules.d
+	echo "probeall  /dev/svga  svgalib_helper" > ${D}/etc/modules.d/svgalib
+
+	exeinto /usr/lib/svgalib/demos
+	for x in ${S}/demos/*
+	do
+		[ -x "${x}" ] && doexe ${x}
+	done
+
+	cd ${S}/threeDKit
+	exeinto /usr/lib/svgalib/threeDKit
+	local THREED_PROGS="plane wrapdemo"
+	doexe ${THREED_PROGS}
+
+	cd ${S}
+	dodoc 0-README
+	cd ${S}/doc
+	dodoc CHANGES DESIGN TODO
+	docinto txt
+	dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
+
+	mv ${D}/usr/man/* ${D}/usr/share/man
+	rmdir ${D}/usr/man
+}
+
+pkg_postinst() {
+	[ "${ROOT}" = "/" ] && /sbin/modules-update &> /dev/null
+	einfo "When upgrading your kernel you'll need to rebuild the kernel module."
+}