ver bump #54465

7 files changed, 179 insertions, 103 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 3968bf542b16..ce9aafeb8941 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.39 2004/06/19 07:12:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.40 2004/06/23 02:56:28 vapier Exp $
+
+*svgalib-1.9.19 (22 Jun 2004)
+
+  22 Jun 2004; Mike Frysinger <vapier@gentoo.org>
+  -files/svgalib-1.9.18-linux2.6.patch, +files/svgalib-1.9.19-gentoo.patch,
+  +files/svgalib-1.9.19-linux2.6.patch, svgalib-1.9.18-r1.ebuild,
+  -svgalib-1.9.18.ebuild, +svgalib-1.9.19.ebuild:
+  Version bumpage and cleanup #54465 by yuntaku@sunny-net.ne.jp.
 
   19 Jun 2004; Mike Frysinger <vapier@gentoo.org>
   +files/svgalib-1.9.18-lrmi-gentoo-cflags.patch,
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++;
          }
diff --git a/media-libs/svgalib/svgalib-1.9.18-r1.ebuild b/media-libs/svgalib/svgalib-1.9.18-r1.ebuild
index 815364e3e8a9..a2ec0b8b75aa 100644
--- a/media-libs/svgalib/svgalib-1.9.18-r1.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.18-r1.ebuild,v 1.7 2004/06/19 07:12:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.18-r1.ebuild,v 1.8 2004/06/23 02:56:28 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE="build"
 
 DEPEND="virtual/glibc"
diff --git a/media-libs/svgalib/svgalib-1.9.18.ebuild b/media-libs/svgalib/svgalib-1.9.19.ebuild
index b3b8ebc20df4..a651a32a2116 100644
--- a/media-libs/svgalib/svgalib-1.9.18.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.18.ebuild,v 1.5 2004/05/12 12:30:06 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.19.ebuild,v 1.1 2004/06/23 02:56:28 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,8 +15,12 @@ IUSE="build"
 
 DEPEND="virtual/glibc"
 
+kernel_supports_modules() {
+	grep '^CONFIG_MODULES=y$' /usr/src/linux/.config >& /dev/null
+}
+
 pkg_setup() {
-	use build || check_KV
+	! use build && kernel_supports_modules && check_KV
 }
 
 src_unpack() {
@@ -25,52 +29,61 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.patch
 
-	# Fix a small gcc33 issue
-	epatch ${FILESDIR}/${P}-gcc33.patch
-
 	# Get it to work with kernel 2.6
 	epatch ${FILESDIR}/${P}-linux2.6.patch
 
-	# Disable kernel module support while building stages #38403
-	#use build && 
-	sed -i 's:installmodule ::' Makefile
-	# for now we dont build the module at all #42522
+	# 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
 }
 
 src_compile() {
+	filter-flags -fPIC
 
-	filter-flags "-fPIC"
-
-	make OPTIMIZE="${CFLAGS}" static \
-		|| die "Failed to build static libraries!"
+	# 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
-	make OPTIMIZE="${CFLAGS}" shared textutils lrmi utils \
+	# 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/
-	make OPTIMIZE="${CFLAFS}" LDFLAGS='-L ../sharedlib' \
+	# Build threeDKit ...
+	make OPTIMIZE="${CFLAFS}" LDFLAGS='-L../sharedlib' \
 		-C threeDKit lib3dkit.a || die "Failed to build threeDKit!"
-
-	if ! use build ; then
-		# for now we dont build the module at all #42522
-		if [ 0 -eq 1 ] ; then
-			cd ${S}/kernel/svgalib_helper
+	# 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 -C /usr/src/linux SUBDIRS=`pwd` clean modules \
-				|| die "Failed to build kernel module!"
-			cd ${S}
+				make -f Makefile.alt INCLUDEDIR="/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
 
-	make OPTIMIZE="${CFLAGS}" LDFLAGS='-L ../sharedlib' demoprogs \
-		|| die "Failed to build demoprogs!"
-
 	cp Makefile Makefile.orig
 	sed -e 's/\(install: $(INSTALLAOUTLIB) \)installheaders \(.*\)/\1\2/g' \
 	 	Makefile.orig > Makefile
@@ -82,8 +95,21 @@ src_install() {
 	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
 
 	make TOPDIR=${D} OPTIMIZE="${CFLAGS}" \
-		INCLUDEDIR="/usr/src/linux/include" install installmodule \
-		|| die "Failed to install svgalib!"
+		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="/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
@@ -113,7 +139,7 @@ src_install() {
 	doexe ${THREED_PROGS}
 
 	cd ${S}
-	dodoc 0-README LICENSE
+	dodoc 0-README
 	cd ${S}/doc
 	dodoc CHANGES DESIGN TODO
 	docinto txt