diff options
Diffstat (limited to 'media-libs/svgalib')
6 files changed, 0 insertions, 417 deletions
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.24 b/media-libs/svgalib/files/digest-svgalib-1.9.24 deleted file mode 100644 index 88169866373e..000000000000 --- a/media-libs/svgalib/files/digest-svgalib-1.9.24 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3be376c08462caf88cfc150239481110 svgalib-1.9.24.tar.gz 986612 -RMD160 5ecab1a6945b8b3747850a0fa283fb2bf558e24d svgalib-1.9.24.tar.gz 986612 -SHA256 12f74fd44c13991ece0fb4bb0d4d95366ba1de2758c7eec10b59290bc6237ca1 svgalib-1.9.24.tar.gz 986612 diff --git a/media-libs/svgalib/files/svgalib-1.9.19-dont-touch-ld.conf.patch b/media-libs/svgalib/files/svgalib-1.9.19-dont-touch-ld.conf.patch deleted file mode 100644 index 2ca42e492a18..000000000000 --- a/media-libs/svgalib/files/svgalib-1.9.19-dont-touch-ld.conf.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- svgalib-1.9.19/Makefile -+++ svgalib-1.9.19/Makefile -@@ -98,8 +98,6 @@ - (cd $(sharedlibdir); \ - ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \ - done -- @./fixldsoconf -- @ldconfig - - installstaticlib: static - @echo Installing static libraries in $(libdir). ---- svgalib-1.9.19/src/Makefile -+++ svgalib-1.9.19/src/Makefile -@@ -454,5 +454,4 @@ - $(sharedlibdir)/libvga.so.$(VERSION): libvga.so.$(VERSION) - $(INSTALL_SHLIB) $< $(sharedlibdir)/$< -- ldconfig - - install: $(sharedlibdir)/libvga.so.$(VERSION) ---- svgalib-1.9.19/threeDKit/Makefile -+++ svgalib-1.9.19/threeDKit/Makefile -@@ -59,5 +59,4 @@ - $(INSTALL_SHLIB) $< $(sharedlibdir)/$< - (cd $(sharedlibdir); ln -sf lib3dkit.so.$(VERSION) `echo lib3dkit.so.$(VERSION) | sed 's/\.so\..*/.so/'` ) -- ldconfig - - install: $(sharedlibdir)/lib3dkit.so.$(VERSION) installheaders diff --git a/media-libs/svgalib/files/svgalib-1.9.23-gentoo.patch b/media-libs/svgalib/files/svgalib-1.9.23-gentoo.patch deleted file mode 100644 index 3cd9b2675a5d..000000000000 --- a/media-libs/svgalib/files/svgalib-1.9.23-gentoo.patch +++ /dev/null @@ -1,86 +0,0 @@ -Make install targets more friendly ---- svgalib-1.9.21/Makefile -+++ svgalib-1.9.21/Makefile -@@ -78,10 +78,6 @@ default: - - installheaders: - @echo Installing header files in $(includedir). -- @if [ -f /usr/include/vga.h ]; then \ -- rm -f /usr/include/vga.h /usr/include/vgagl.h; \ -- echo Old header files in /usr/include removed.; \ -- fi - @mkdir -p $(includedir) - @cp $(SRCDIR)/src/vga.h $(includedir)/vga.h - @chmod a+r $(includedir)/vga.h -@@ -95,16 +91,6 @@ installheaders: - @chmod a+r $(includedir)/vgakeyboard.h - - installsharedlib: $(SHAREDLIBS) $(SVGALIBSHAREDSTUBS) -- @if [ -f /usr/lib/libvga.sa ]; then \ -- rm -f /usr/lib/libvga.sa /usr/lib/libvgagl.sa; \ -- echo Old stubs in /usr/lib removed.; \ -- fi --ifndef KEEPSHAREDLIBS -- @echo "Removing shared library images (old & current)..." -- @for i in $(OBSOLETELDIRS); do \ -- rm -f `echo $(OBSOLETESHAREDIMAGES) | sed s?/lib/?$$i?g`; \ -- done --endif - @echo Installing shared library image as \ - $(addprefix $(sharedlibdir)/,$(notdir $(SHAREDLIBS))). - @for foo in $(notdir $(SHAREDLIBS)); do \ -@@ -118,10 +104,8 @@ endif - installstaticlib: static - @echo Installing static libraries in $(libdir). - @mkdir -p $(libdir) -- @rm -f /usr/lib/libvga.a - @$(INSTALL_DATA) staticlib/libvga.a $(libdir)/libvga.a - @chmod a+r $(libdir)/libvga.a -- @rm -f /usr/lib/libvgagl.a - @$(INSTALL_DATA) staticlib/libvgagl.a $(libdir)/libvgagl.a - @chmod a+r $(libdir)/libvgagl.a - -@@ -130,14 +114,6 @@ installutils: textutils $(LRMI) - echo No $(bindir) directory, creating it.; \ - mkdir -p $(bindir); \ - fi -- @if [ -f /usr/bin/restorefont ]; then \ -- echo Removing old utilities in /usr/bin.; \ -- for x in $(UTILS); do rm -f /usr/bin/$$x; done; \ -- fi -- @if [ -f /usr/bin/convfont ]; then \ -- echo Removing inappropriate utilities in /usr/bin.; \ -- rm -f /usr/bin/convfont /usr/bin/setmclk; \ -- fi - @echo Installing textmode utilities in $(bindir): - @echo "restorefont: Save/restore textmode font." - @$(INSTALL_PROGRAM) utils/restorefont $(bindir) ---- svgalib-1.9.21/Makefile.cfg -+++ svgalib-1.9.21/Makefile.cfg -@@ -44,7 +44,7 @@ CONFDIR = $(SRCDIR)/src/config - # Common prefix for installation directories. - # NOTE: This directory must exist when you start the install. - TOPDIR= --prefix = $(TOPDIR)/usr/local -+prefix = $(TOPDIR)/usr - exec_prefix = $(prefix) - - # Directory where the shared stubs and static library will be installed. -@@ -63,7 +63,7 @@ - includedir = $(prefix)/include - - # Directory where the man files will be installed. --mandir = $(prefix)/man -+mandir = $(prefix)/share/man - - # Target binary format. - TARGET_FORMAT = elf -@@ -126,7 +126,7 @@ INSTALLMAN = installman - # MAKEWHATIS = makewhatis # Beware, this will really need a few minutes! - - # Comment this out if you use devfs only and don't want to make svga nodes --INSTALLDEV = installdev -+#INSTALLDEV = installdev - - # Select which makefile to use to install the module, or comment both out if - # you are going to install the kernel module manually diff --git a/media-libs/svgalib/files/svgalib-1.9.24-all_devices.patch b/media-libs/svgalib/files/svgalib-1.9.24-all_devices.patch deleted file mode 100644 index 53d4cf2a1a5b..000000000000 --- a/media-libs/svgalib/files/svgalib-1.9.24-all_devices.patch +++ /dev/null @@ -1,17 +0,0 @@ -all_devices is an exported symbol so we cant declare it static - -Fix by Pablo De Nápoli - -http://bugs.gentoo.org/133936 - ---- svgalib-1.9.24/kernel/svgalib_helper/main.c -+++ svgalib-1.9.24/kernel/svgalib_helper/main.c -@@ -55,7 +55,7 @@ - #include "displaystart.h" - - int debug=0; --static int all_devices=0; -+int all_devices=0; - int num_devices=0; - - static char *sdev_id="svgalib_helper"; diff --git a/media-libs/svgalib/files/svgalib-1.9.24-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.24-linux2.6.patch deleted file mode 100644 index 4dfd6b3864c3..000000000000 --- a/media-libs/svgalib/files/svgalib-1.9.24-linux2.6.patch +++ /dev/null @@ -1,142 +0,0 @@ - - get rid of warning when linux/device.h doesnt exist - - touch up the Makefile to let the ebuild handle the module details - - fix support with io remap stuff in newer kernels - - dont include headers that dont exist in 2.4.x kernels - - use module_param() for 2.6.x and MODULE_PARM() for all others - ---- svgalib/kernel/svgalib_helper/Makefile -+++ svgalib/kernel/svgalib_helper/Makefile -@@ -28,7 +28,7 @@ - - endif - --CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h) -+CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h 2>/dev/null) - - ifneq ($(CLASS_SIMPLE),) - CLASS_CFLAGS = -DCLASS_SIMPLE=1 ---- svgalib/kernel/svgalib_helper/Makefile.alt -+++ svgalib/kernel/svgalib_helper/Makefile.alt -@@ -37,7 +37,7 @@ - CFLAGS += -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR) - - ifeq (1,$(findstring 1,$(MODVER))) -- CFLAGS += -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h -+ CFLAGS += -DMODVERSIONS -DCONFIG_MODVERSIONS=1 - endif - - TARGET = svgalib_helper -@@ -50,7 +50,8 @@ - endif - endif - --all: .depend $(OBJS) -+modules: $(OBJS) -+all: .depend modules - - $(TARGET).o: $(SRC:.c=.o) - $(LD) -r $^ -o $@ -@@ -61,8 +62,8 @@ - install: device modules_install - - modules_install: $(OBJS) -- mkdir -p /lib/modules/$(VER)/kernel/misc -- install -m 0644 -c $(OBJS) /lib/modules/$(VER)/kernel/misc -+ mkdir -p $(TOPDIR)/lib/modules/$(VER)/kernel/misc -+ install -m 0644 -c $(OBJS) $(TOPDIR)/lib/modules/$(VER)/kernel/misc - - device: - rm -f /dev/svgalib_helper* /dev/svga_helper* /dev/svga /dev/svga? ---- svgalib/kernel/svgalib_helper/kernel26compat.h -+++ svgalib/kernel/svgalib_helper/kernel26compat.h -@@ -10,7 +10,7 @@ - # define PCI_GET_CLASS pci_find_class - # define PCI_GET_DEVICE pci_find_device - --# if defined (PG_chainlock) -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,3) - # define my_io_remap_page_range(vma, start, ofs, len, prot) \ - io_remap_page_range(vma,start,ofs,len,prot) - # else -@@ -84,6 +84,21 @@ - # define SLH_SYSFS_REGISTER \ - svgalib_helper_class = class_create(THIS_MODULE, "svgalib_helper"); - -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) -+ -+# define SLH_SYSFS_ADD_CONTROL \ -+ class_device_create(svgalib_helper_class, NULL, \ -+ MKDEV(SVGALIB_HELPER_MAJOR, 0), \ -+ NULL, "svga"); -+ -+# define SLH_SYSFS_ADD_DEVICE(_name, _minor) \ -+ class_device_create(svgalib_helper_class, NULL, \ -+ MKDEV(SVGALIB_HELPER_MAJOR, _minor), \ -+ &sh_pci_devs[_minor]->dev->dev, _name); -+#else -+ -+ - # define SLH_SYSFS_ADD_CONTROL \ - class_device_create(svgalib_helper_class, \ - MKDEV(SVGALIB_HELPER_MAJOR, 0), \ -@@ -93,6 +108,8 @@ - class_device_create(svgalib_helper_class, \ - MKDEV(SVGALIB_HELPER_MAJOR, _minor), \ - &sh_pci_devs[_minor]->dev->dev, _name); -+#endif -+ - - # define SLH_SYSFS_REMOVE_DEVICE(i) \ - class_destroy(svgalib_helper_class); -@@ -148,6 +148,11 @@ - # define SLH_SYSFS_UNREGISTER - #endif - -+/* gregkh was so kind as to remove a ton of PCI defines in linux-2.6.15 */ -+#if !defined(PCI_VENDOR_ID_RENDITION) -+# define PCI_VENDOR_ID_RENDITION 0x1163 -+#endif -+ - #if (defined MINOR) - # define my_minor(x) MINOR(x) - #else ---- svgalib/kernel/svgalib_helper/main.c -+++ svgalib/kernel/svgalib_helper/main.c -@@ -19,13 +19,18 @@ - #include <linux/pci.h> - #include <linux/devfs_fs_kernel.h> - #include <linux/mm.h> -+#include <linux/version.h> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) - #include <linux/thread_info.h> -+#endif - #include <linux/smp.h> - #include <linux/smp_lock.h> - - #include <linux/sched.h> - #include <linux/wait.h> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) - #include <linux/syscalls.h> -+#endif - - #define __KERNEL_SYSCALLS__ - #include <linux/unistd.h> -@@ -770,10 +770,15 @@ - - } - -+#ifdef KERNEL_2_6 -+module_param(debug, int, 0); -+module_param(all_devices, int, 0); -+#else - MODULE_PARM(debug, "i"); --MODULE_PARM_DESC(debug, "Debug output level."); -- - MODULE_PARM(all_devices, "i"); -+#endif -+ -+MODULE_PARM_DESC(debug, "Debug output level."); - MODULE_PARM_DESC(all_devices, "Give access to all PCI devices, regardless of class."); - - diff --git a/media-libs/svgalib/svgalib-1.9.24.ebuild b/media-libs/svgalib/svgalib-1.9.24.ebuild deleted file mode 100644 index 9a054f880e59..000000000000 --- a/media-libs/svgalib/svgalib-1.9.24.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.24.ebuild,v 1.5 2007/02/12 05:09:35 vapier Exp $ - -inherit eutils flag-o-matic toolchain-funcs linux-mod - -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 no-helper" - -DEPEND="" - -MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)" -BUILD_TARGETS="default" -MODULESD_SVGALIB_HELPER_ADDITIONS="probeall /dev/svga svgalib_helper" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KDIR=${KV_OUT_DIR}" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Misc makefile clean ups - epatch "${FILESDIR}"/${PN}-1.9.23-gentoo.patch - - # Get it to work with kernel 2.6 - epatch "${FILESDIR}"/${PN}-1.9.24-linux2.6.patch - epatch "${FILESDIR}"/${PN}-1.9.24-all_devices.patch #133936 - - # -fPIC does work for lrmi, see bug #51698 - epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch - - # Don't let the ebuild screw around with ld.so.conf #64829 - epatch "${FILESDIR}"/${PN}-1.9.19-dont-touch-ld.conf.patch - - use no-helper && sed -i '/^# NO_HELPER/s:# ::' Makefile.cfg - - # Don't strip stuff, let portage do it - sed -i '/^INSTALL_PROGRAM/s: -s : :' Makefile.cfg -} - -src_compile() { - export CC=$(tc-getCC) - - # 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 -pPR 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!" - - ! use build && ! use no-helper && linux-mod_src_compile -} - -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!" - ! use build && ! use no-helper && linux-mod_src_install - - insinto /usr/include - doins gl/vgagl.h - dolib.a staticlib/libvga.a || die "dolib.a libvga" - dolib.a gl/libvgagl.a || die "dolib.a libvgagl" - dolib.a threeDKit/lib3dkit.a - dolib.so gl/libvgagl.so.${PV} || die "dolib.so libvgagl.so" - local abiver=$(sed -n '/^MAJOR_VER.*=/{s:.*=[ ]*::;p}' Makefile.cfg) - for x in lib3dkit libvga libvgagl ; do - dosym ${x}.so.${PV} /usr/lib/${x}.so - dosym ${x}.so.${PV} /usr/lib/${x}.so.${abiver} - done - - insinto /usr/include - doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h - doins src/keyboard/vgakeyboard.h - - if best_version '>=sys-fs/udev-045' ; then - insinto /etc/udev/rules.d - newins "${FILESDIR}"/svgalib.udev.rules.d 30-svgalib.rules - elif best_version sys-fs/udev ; then - insinto /etc/udev/permissions.d - newins "${FILESDIR}"/svgalib.udev.perms.d 30-svgalib.permissions - elif best_version sys-fs/devfsd ; then - insinto /etc/devfs.d - newins "${FILESDIR}"/svgalib.devfs svgalib - fi - - 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 -} - -pkg_postinst() { - ! use build && ! use no-helper && linux-mod_pkg_postinst -} |