Version bump #140448 by Michael Cramer.

Package-Manager: portage-2.1.1_pre2-r8

5 files changed, 157 insertions, 0 deletions

diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.21-r1 b/media-libs/svgalib/files/digest-svgalib-1.9.21-r1
index b01ecc6bf94e..53a90c62b444 100644
--- a/media-libs/svgalib/files/digest-svgalib-1.9.21-r1
+++ b/media-libs/svgalib/files/digest-svgalib-1.9.21-r1
@@ -1 +1,3 @@
 MD5 1bd8892ee38481051e4b4d85008c86be svgalib-1.9.21.tar.gz 950274
+RMD160 b1aa727edfb796c523bcf6123734f8a0dc9e36fa svgalib-1.9.21.tar.gz 950274
+SHA256 5e053650e147ed0d0c16dc3956ec04318d1224628aad1c2d6194fcc1d8d1a2e5 svgalib-1.9.21.tar.gz 950274
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.23 b/media-libs/svgalib/files/digest-svgalib-1.9.23
index bced2d75c1e3..01f6dac06d4e 100644
--- a/media-libs/svgalib/files/digest-svgalib-1.9.23
+++ b/media-libs/svgalib/files/digest-svgalib-1.9.23
@@ -1 +1,3 @@
 MD5 b51f7c791f0a64a856beec283bcdc0ba svgalib-1.9.23.tar.gz 982053
+RMD160 49915a5d4b0c2d81d46a721a48bc489747ccb43b svgalib-1.9.23.tar.gz 982053
+SHA256 e3b85c40ac3cf532b4f3496fe477bfd0d077fd1c702b83356548c4375b4fae5a svgalib-1.9.23.tar.gz 982053
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.25 b/media-libs/svgalib/files/digest-svgalib-1.9.25
new file mode 100644
index 000000000000..c3a769adf1e2
--- /dev/null
+++ b/media-libs/svgalib/files/digest-svgalib-1.9.25
@@ -0,0 +1,3 @@
+MD5 4dda7e779e550b7404cfe118f1d74222 svgalib-1.9.25.tar.gz 987084
+RMD160 e987f65ddb5610c575183e4a2058423eab3ce1e4 svgalib-1.9.25.tar.gz 987084
+SHA256 2ad5da713a6bd69622c483de4e4f448ed2b82f7b954db43dc477d5b6b12d8602 svgalib-1.9.25.tar.gz 987084
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch b/media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch
new file mode 100644
index 000000000000..5ee2a985b17b
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch
@@ -0,0 +1,42 @@
+--- svgalib-1.9.25/Makefile.cfg
++++ svgalib-1.9.25/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.
+--- svgalib-1.9.25/Makefile
++++ svgalib-1.9.25/Makefile
+@@ -99,8 +99,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.25/threeDKit/Makefile
++++ svgalib-1.9.25/threeDKit/Makefile
+@@ -58,7 +58,6 @@
+ $(sharedlibdir)/lib3dkit.so.$(VERSION): lib3dkit.so.$(VERSION)
+ 	$(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
+ 
+--- svgalib-1.9.25/src/Makefile
++++ svgalib-1.9.25/src/Makefile
+@@ -453,7 +453,6 @@
+ 
+ $(sharedlibdir)/libvga.so.$(VERSION): libvga.so.$(VERSION)
+ 	$(INSTALL_SHLIB) $< $(sharedlibdir)/$<
+-	-ldconfig
+ 
+ install: $(sharedlibdir)/libvga.so.$(VERSION)
+ 
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch
new file mode 100644
index 000000000000..d01479c286bc
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch
@@ -0,0 +1,108 @@
+	- 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
+	- dont declare all_devices as static since it is exported
+
+--- svgalib/kernel/svgalib_helper/Makefile
++++ svgalib/kernel/svgalib_helper/Makefile
+@@ -25,7 +25,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
+--- 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>
+@@ -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";
+@@ -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.");
+