ver bump #54465

4 files changed, 113 insertions, 71 deletions

diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.18 b/media-libs/svgalib/files/digest-svgalib-1.9.18
deleted file mode 100644
index 0c2fdc8d9e53..000000000000
--- a/media-libs/svgalib/files/digest-svgalib-1.9.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a1dc3dbf3182fb560959678dfba6181 svgalib-1.9.18.tar.gz 933786
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.19 b/media-libs/svgalib/files/digest-svgalib-1.9.19
new file mode 100644
index 000000000000..a0902968e62f
--- /dev/null
+++ b/media-libs/svgalib/files/digest-svgalib-1.9.19
@@ -0,0 +1 @@
+MD5 44e5063c9a22e9554088e125b0df7593 svgalib-1.9.19.tar.gz 935305
diff --git a/media-libs/svgalib/files/svgalib-1.9.19-gentoo.patch b/media-libs/svgalib/files/svgalib-1.9.19-gentoo.patch
new file mode 100644
index 000000000000..4e4c6a2c9a53
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.19-gentoo.patch
@@ -0,0 +1,103 @@
+diff -ur svgalib-1.9.19.orig/Makefile svgalib-1.9.19/Makefile
+--- svgalib-1.9.19.orig/Makefile	2004-06-22 22:10:10.696376120 -0400
++++ svgalib-1.9.19/Makefile	2004-06-22 22:11:08.182636880 -0400
+@@ -78,10 +78,6 @@
+ 
+ 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 @@
+ 	@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 @@
+ 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 @@
+ 		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."
+ 	@cp utils/restorefont $(bindir)
+@@ -213,7 +189,7 @@
+ lib3dkit-install:
+ 	(cd threeDKit/; $(MAKE) install)
+ 	 
+-install: uninstall installheaders $(INSTALLSHAREDLIB) installconfig \
++install: installheaders $(INSTALLSHAREDLIB) installconfig \
+ 	$(INSTALLSTATICLIB) $(INSTALLUTILS) $(INSTALLMAN) $(INSTALLMODULE) $(INSTALLDEV) \
+ 	lib3dkit-install
+ 	@echo
+diff -ur svgalib-1.9.19.orig/Makefile.cfg svgalib-1.9.19/Makefile.cfg
+--- svgalib-1.9.19.orig/Makefile.cfg	2004-06-22 22:10:10.707374448 -0400
++++ svgalib-1.9.19/Makefile.cfg	2004-06-22 22:12:25.266918288 -0400
+@@ -44,7 +44,7 @@
+ # 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.
+@@ -126,7 +126,7 @@
+ # 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 -ur svgalib-1.9.19.orig/kernel/svgalib_helper/Makefile svgalib-1.9.19/kernel/svgalib_helper/Makefile
+--- svgalib-1.9.19.orig/kernel/svgalib_helper/Makefile	2004-06-22 22:10:10.705374752 -0400
++++ svgalib-1.9.19/kernel/svgalib_helper/Makefile	2004-06-22 22:11:59.252873024 -0400
+@@ -45,9 +45,9 @@
+ 	mknod -m 666 /dev/svga3 c $(SVGALIB_HELPER_MAJOR) 3
+ 	mknod -m 666 /dev/svga4 c $(SVGALIB_HELPER_MAJOR) 4
+ 
+-install: device modules_install
++install: modules_install
+ 
+ modules_install: $(MODNAME)
+-	mkdir -p /lib/modules/$(VER)/kernel/misc
+-	install -m 0644 -c $(TARGET).o /lib/modules/$(VER)/kernel/misc ||	install -m 0644 -c $(TARGET).ko /lib/modules/$(VER)/kernel/misc
++	mkdir -p $(TOPDIR)/lib/modules/$(VER)/kernel/misc
++	install -m 0644 -c $(TARGET).o $(TOPDIR)/lib/modules/$(VER)/kernel/misc ||	install -m 0644 -c $(TARGET).ko $(TOPDIR)/lib/modules/$(VER)/kernel/misc
+ 
diff --git a/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.19-linux2.6.patch
index 335d6409630d..9c1008616c14 100644
--- a/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.19-linux2.6.patch
@@ -1,64 +1,7 @@
-diff -urpN svgalib-1.9.18/kernel/svgalib_helper/Makefile svgalib-1.9.18.new/kernel/svgalib_helper/Makefile
---- svgalib-1.9.18/kernel/svgalib_helper/Makefile	2004-02-23 00:47:43.616320424 +0200
-+++ svgalib-1.9.18.new/kernel/svgalib_helper/Makefile	2004-02-23 00:47:58.475061552 +0200
-@@ -13,15 +13,32 @@ EXTRA_CFLAGS := -DSVGALIB_HELPER_MAJOR=$
- 
- ifeq ($(PATCHLEVEL),4)
-   include $(TOPDIR)/Rules.make
-+  OBJEXT := o
-+else
-+  OBJEXT := ko
- endif
- 
- else
- 
--VER    = $(shell uname -r)
-+# Extract version number from headers.
-+VER = $(shell awk -F\" '/REL/ {print $$2}' $(INCLUDEDIR)/linux/version.h 2>/dev/null)
-+
-+# Use version of current running kernel
-+ifeq ($(VER),)
-+  VER = $(shell uname -r)
-+endif
-+
-+PATCHLEVEL := $(shell echo $(VER) | cut -d. -f2)
- KDIR	:= /lib/modules/$(VER)/build
- PWD	:= $(shell pwd)
- TARGET  := svgalib_helper
- 
-+ifeq ($(PATCHLEVEL),4)
-+  OBJEXT := o
-+else
-+  OBJEXT := ko
-+endif
-+
- default:
- 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
- 
-@@ -49,4 +66,4 @@ install: modules_install
- 
- modules_install: $(TARGET).o
- 	mkdir -p $(TOPDIR)/lib/modules/$(VER)/kernel/misc
--	install -m 0644 -c $(TARGET).o $(TOPDIR)/lib/modules/$(VER)/kernel/misc
-+	install -m 0644 -c $(TARGET).$(OBJEXT) $(TOPDIR)/lib/modules/$(VER)/kernel/misc
 diff -urpN svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.18.new/kernel/svgalib_helper/kernel26compat.h
 --- svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h	2003-10-04 15:42:01.000000000 +0200
 +++ svgalib-1.9.18.new/kernel/svgalib_helper/kernel26compat.h	2004-02-23 00:41:03.176196576 +0200
-@@ -9,9 +12,11 @@
- 
- # define my_io_remap_page_range(vma, start, ofs, len, prot) io_remap_page_range(start,ofs,len,prot)
- 
-+# ifndef IRQ_NONE
- typedef void irqreturn_t;
--# define IRQ_NONE
--# define IRQ_HANDLED
-+#  define IRQ_NONE
-+#  define IRQ_HANDLED
-+# endif
- 
- #else /* Kernel 2.6 */
- 
-@@ -43,9 +43,36 @@ static inline int devfs_unregister_chrde
+@@ -52,6 +52,33 @@ static inline int devfs_unregister_chrde
  }
  #endif
  
@@ -89,17 +32,13 @@ diff -urpN svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.18.
 +#  define SLH_SYSFS_UNREGISTER
 +#endif
 +
- 
- /* Our main.c really do not like MINOR from 2.6 kernels ... */
--#if (defined MINOR) && (!defined KERNEL_2_6)
-+#if (defined MINOR)
+ #if (defined MINOR)
  # define my_minor(x) MINOR(x)
  #else
- # define my_minor(x) minor(x)
 diff -urpN svgalib-1.9.18/kernel/svgalib_helper/main.c svgalib-1.9.18.new/kernel/svgalib_helper/main.c
 --- svgalib-1.9.18/kernel/svgalib_helper/main.c	2003-10-04 12:34:20.000000000 +0200
 +++ svgalib-1.9.18.new/kernel/svgalib_helper/main.c	2004-02-23 00:42:25.490682872 +0200
-@@ -53,6 +53,10 @@ static int irqs[MAX_NR_DEVICES];
+@@ -51,6 +51,10 @@ static int irqs[MAX_NR_DEVICES];
  static devfs_handle_t devfs_handle;
  #endif
  
@@ -110,7 +49,7 @@ diff -urpN svgalib-1.9.18/kernel/svgalib_helper/main.c svgalib-1.9.18.new/kernel
  static int check_io_range(int port, int device) {
      return 1;
  }
-@@ -502,6 +506,7 @@ int init_module(void)
+@@ -467,6 +471,7 @@ int init_module(void)
  {
      int result, i, j;
      struct pci_dev *dev=NULL;
@@ -171,12 +110,12 @@ diff -urpN svgalib-1.9.18/kernel/svgalib_helper/main.c svgalib-1.9.18.new/kernel
              if((sh_pci_devs[num_devices]=kmalloc(sizeof(struct sh_pci_device),GFP_KERNEL))==NULL) {
                  goto nomem_error;
 @@ -581,6 +589,10 @@ int init_module(void)
-                 }
-             }
-             vga_init_vsync(sh_pci_devs[num_devices]);
+ 			sh_pci_devs[num_devices]->startad=-1;
+ #endif
+ 			sh_pci_devs[num_devices]->opencount=0;
 +
-+            sprintf(name, "svga%d", num_devices);
-+            SLH_SYSFS_ADD_DEVICE(name, num_devices);
++			sprintf(name, "svga%d", num_devices);
++			SLH_SYSFS_ADD_DEVICE(name, num_devices);
 +
              num_devices++;
          }