[svn] r6396 - in trunk/rpms: . mplayerplug-in svgalib vobcopy
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Fri Jul 4 04:31:15 CEST 2008
Author: dag
Date: 2008-07-04 03:31:15 +0100 (Fri, 04 Jul 2008)
New Revision: 6396
Added:
trunk/rpms/svgalib/
trunk/rpms/svgalib/svgalib-1.4.3-fhs.patch
trunk/rpms/svgalib/svgalib-1.9.21-cfg.patch
trunk/rpms/svgalib/svgalib-1.9.21-demos.patch
trunk/rpms/svgalib/svgalib-1.9.21-makefiles.patch
trunk/rpms/svgalib/svgalib-1.9.25-kernel-2.6.26.patch
trunk/rpms/svgalib/svgalib-todo
trunk/rpms/svgalib/svgalib.spec
Modified:
trunk/rpms/mplayerplug-in/mplayerplug-in.spec
trunk/rpms/vobcopy/vobcopy.spec
Log:
Updates
Modified: trunk/rpms/mplayerplug-in/mplayerplug-in.spec
===================================================================
--- trunk/rpms/mplayerplug-in/mplayerplug-in.spec 2008-07-04 02:30:42 UTC (rev 6395)
+++ trunk/rpms/mplayerplug-in/mplayerplug-in.spec 2008-07-04 02:31:15 UTC (rev 6396)
@@ -7,27 +7,31 @@
%{?dtag: %{expand: %%define %dtag 1}}
-%define mozilla seamonkey
-%{!?dtag:%define mozilla firefox}
-%{?el5:%define mozilla firefox}
-%{?fc7:%define mozilla firefox}
-%{?fc6:%define mozilla firefox}
+%define mozilla seamonkey-devel
+%{!?dtag:%define mozilla xulrunner-devel nspr-devel}
+%{?el5:%define mozilla nspr-devel xulrunner-devel}
+%{?fc7:%define mozilla firefox-devel}
+%{?fc6:%define mozilla firefox-devel}
+
%{?fc4:%define _without_modxorg 1}
%{?el4:%define _without_modxorg 1}
+%{?el4:%define mozilla seamonkey-devel}
%{?fc3:%define _without_modxorg 1}
%{?fc2:%define _without_modxorg 1}
%{?fc1:%define _without_modxorg 1}
%{?el3:%define _without_modxorg 1}
+%{?el3:%define mozilla seamonkey-devel}
%{?rh9:%define _without_modxorg 1}
-%{?rh9:%define mozilla mozilla}
+%{?rh9:%define mozilla mozilla-devel}
%{?rh7:%define _without_modxorg 1}
-%{?rh7:%define mozilla mozilla}
+%{?rh7:%define mozilla mozilla-devel}
%{?el2:%define _without_modxorg 1}
+%{?el2:%define mozilla seamonkey-devel}
Summary: Browser plugin for MPlayer
Name: mplayerplug-in
-Version: 3.50
+Version: 3.55
Release: 1
License: GPL
Group: Applications/Multimedia
@@ -36,7 +40,7 @@
Source: http://dl.sf.net/mplayerplug-in/mplayerplug-in-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: %{mozilla}-devel, gtk2-devel >= 2.2.1
+BuildRequires: %{mozilla}, gtk2-devel >= 2.2.1
BuildRequires: gcc-c++, gettext
%{!?_without_modxorg:BuildRequires: libXt-devel, libXpm-devel}
%{?_without_modxorg:BuildRequires: XFree86-devel}
@@ -51,7 +55,7 @@
in your browser.
%prep
-%setup -n %{name}
+%setup
%build
%configure
@@ -82,6 +86,9 @@
%{_libdir}/mozilla/plugins/mplayerplug-in-wmp.xpt
%changelog
+* Thu Jul 03 2008 Dag Wieers <dag at wieers.com> - 3.55-1
+- Updated to release 3.55.
+
* Sun Dec 02 2007 Dag Wieers <dag at wieers.com> - 3.50-1
- Updated to release 3.50.
Added: trunk/rpms/svgalib/svgalib-1.4.3-fhs.patch
===================================================================
--- trunk/rpms/svgalib/svgalib-1.4.3-fhs.patch (rev 0)
+++ trunk/rpms/svgalib/svgalib-1.4.3-fhs.patch 2008-07-04 02:31:15 UTC (rev 6396)
@@ -0,0 +1,151 @@
+--- svgalib-1.4.3/doc/man1/savetextmode.1.debian 2004-07-16 17:36:23.000000000 +0200
++++ svgalib-1.4.3/doc/man1/savetextmode.1 2004-07-16 17:33:02.000000000 +0200
+@@ -10,7 +10,11 @@
+ .SH DESCRIPTION
+ These are simple scripts to save the SVGA register state when in textmode to the
+ files
+-.IR /tmp/fontdata " and " /tmp/textregs
++.IR /etc/vga/fontdata " and " /etc/vga/textregs
++.RI ( $HOME/.vga/fontdata " and " $HOME/.vga/textregs
++if directory
++.I /etc/vga
++is not writeable)
+ or to restore it from these files.
+
+ The actual utilities used are
+@@ -40,9 +44,13 @@
+ will understand.
+
+ .SH FILES
+-.I /tmp/fontdata
++.I /etc/vga/fontdata
++or
++.I $HOME/.vga/fontdata
+ .br
+-.I /tmp/textregs
++.I /etc/vga/textregs
++or
++.I $HOME/.vga/textregs
+
+ .SH SEE ALSO
+
+--- svgalib-1.4.3/doc/man1/svgakeymap.1.debian 2004-07-16 17:36:23.000000000 +0200
++++ svgalib-1.4.3/doc/man1/svgakeymap.1 2004-07-16 17:33:02.000000000 +0200
+@@ -9,7 +9,7 @@
+ Generates a keymap conversion file for
+ .BR svgalib (7)
+ from two keytable definitions. Keytables are searched for in
+-.I /usr/lib/kbd/keytables
++.I /lib/kbd/keymaps
+ and are automatically filtered through
+ .BR gzip (1)
+ if necessary.
+@@ -22,7 +22,7 @@
+ or piped in any creative manner you wish.
+
+ .SH FILES
+-.I /usr/lib/kbd/keytables/*.map[.gz]
++.I /lib/kbd/keymaps/*/*/*.map[.gz]
+ .RS
+ The system keytable files used by
+ .BR loadkeys "(1)."
+--- svgalib-1.4.3/doc/README.keymap.debian 2004-07-16 17:36:23.000000000 +0200
++++ svgalib-1.4.3/doc/README.keymap 2004-07-16 17:33:02.000000000 +0200
+@@ -83,7 +83,7 @@
+ equivalents in the layout expected by the program.
+
+ A program called svgakeymap is provided to generate these maps from the
+-keytable files in /usr/lib/kbd/keytables; you must have perl for it to work.
++keytable files in /lib/kbd/keymaps; you must have perl for it to work.
+ Creating a keymap file with svgakeymap is easy; to make a map to convert
+ scancodes from a US Dvorak keyboard to a US QWERTY keyboard as for our example
+ above:
+--- svgalib-1.4.3/utils/runx.debian 2004-07-16 17:36:24.000000000 +0200
++++ svgalib-1.4.3/utils/runx 2004-07-16 17:33:02.000000000 +0200
+@@ -5,8 +5,8 @@
+ # running X, and 'textmode' after. This will restore the textmode registers
+ # and the VGA palette in addition to the VGA font.
+
+-echo Saving font in /tmp/fontdata
+-restorefont -w /tmp/fontdata
++echo Saving font in $HOME/.fontdata
++restorefont -w $HOME/.fontdata
+ startx
+-echo Restoring font from /tmp/fontdata
+-restorefont -r /tmp/fontdata
++echo Restoring font from $HOME/.fontdata
++restorefont -r $HOME/.fontdata
+--- svgalib-1.4.3/utils/savetextmode.debian 2004-07-16 17:36:24.000000000 +0200
++++ svgalib-1.4.3/utils/savetextmode 2004-07-16 17:33:02.000000000 +0200
+@@ -1,4 +1,14 @@
+ #!/bin/sh
+-rm -f /etc/vga/textregs /etc/vga/fontdata
+-restoretextmode -w /etc/vga/textregs
+-restorefont -w /etc/vga/fontdata
++dir=/etc/vga
++if [ ! -w "$dir" ]; then
++ dir="$HOME/.vga"
++ mkdir -p -m 700 "$dir"
++fi
++if [ -f /etc/textregs -o -f /etc/fontdata ]; then
++ echo >&2 "WARNING: the textregs and fontdata files have moved in this"
++ echo >&2 " release from /etc to /etc/vga; please remove or rename"
++ echo >&2 " your old versions."
++fi
++rm -f "$dir/textregs" "$dir/fontdata"
++restoretextmode -w "$dir/textregs"
++restorefont -w "$dir/fontdata"
+--- svgalib-1.4.3/utils/svgakeymap.debian 2004-07-16 17:36:24.000000000 +0200
++++ svgalib-1.4.3/utils/svgakeymap 2004-07-16 17:33:02.000000000 +0200
+@@ -7,16 +7,16 @@
+ # svgakeymap [physical_map [program_map]] > output.keymap
+ #
+ # The conversion map is output to stdout; you may wish to redirect it.
+-# Keymaps are searched for in /usr/lib/kbd/keytables and are automatically
++# Keymaps are searched for in /lib/kbd/keymaps and are automatically
+ # filtered through gzip if necessary.
+ #
+ # Read the file README.keymap from the svgalib distribution for more info.
+
+-$ktd = "/usr/lib/kbd/keytables/";
++$ktd = "/lib/kbd/keymaps/";
+ if(scalar(@ARGV) > 0) {
+ $inmap = $ARGV[0];
+ } else {
+- $inmap = "us";
++ $inmap = "i386/qwerty/us";
+ }
+ if(scalar(@ARGV) > 1) {
+ $outmap = $ARGV[1];
+@@ -34,7 +34,7 @@
+
+ unless(-e $bob) {
+ # Tack a .gz on it
+- $bob .= ".map";
++ $bob .= ".kmap";
+ #print "$bob\n";
+
+ unless(-e $bob) {
+--- svgalib-1.4.3/utils/textmode.debian 2004-07-16 17:36:24.000000000 +0200
++++ svgalib-1.4.3/utils/textmode 2004-07-16 17:33:02.000000000 +0200
+@@ -1,4 +1,18 @@
+ #!/bin/sh
+-restoretextmode -r /etc/vga/textregs
+-restorefont -r /etc/vga/fontdata
++
++dir=/etc/vga
++[ -w "$dir" ] || dir="$HOME/.vga"
++
++if [ -f "$dir/textregs" -o -f "$dir/fontdata" ]; then
++ restoretextmode -r "$dir/textregs"
++ restorefont -r "$dir/fontdata"
++elif [ -f /etc/textregs -o -f /etc/fontdata ]; then
++ echo >&2 "WARNING: the textregs and fontdata files have moved in this"
++ echo >&2 " release from /etc to /etc/vga; please remove or rename"
++ echo >&2 " your old versions."
++ echo "Using old location for data files."
++ restoretextmode -r /etc/textregs
++ restorefont -r /etc/fontdata
++fi
++
+ restorepalette
Added: trunk/rpms/svgalib/svgalib-1.9.21-cfg.patch
===================================================================
--- trunk/rpms/svgalib/svgalib-1.9.21-cfg.patch (rev 0)
+++ trunk/rpms/svgalib/svgalib-1.9.21-cfg.patch 2008-07-04 02:31:15 UTC (rev 6396)
@@ -0,0 +1,115 @@
+--- svgalib-1.9.25/src/vga.c.defaultcfg 2005-10-25 13:13:56.000000000 +0200
++++ svgalib-1.9.25/src/vga.c 2006-07-17 13:11:20.000000000 +0200
+@@ -3710,7 +3710,9 @@
+ __svgalib_vesatext=1;
+ break;
+ #else
++#ifdef __i386__
+ fprintf(stderr,"svgalib: Warning: VESA support not enabled!\n");
++#endif
+ break;
+ #endif
+ case 57: /* Vesa save bitmap */
+--- svgalib-1.9.25/src/config/libvga.config.defaultcfg 2005-08-03 15:07:32.000000000 +0200
++++ svgalib-1.9.25/src/config/libvga.config 2006-07-17 13:19:14.000000000 +0200
+@@ -11,7 +11,7 @@
+
+ Helper /dev/svga
+
+-# NoHelper # Disable use of the helper-kernelmodule (/dev/svga) and
++NoHelper # Disable use of the helper-kernelmodule (/dev/svga) and
+ # fallback to old ioperm/iopl and /dev/mem use.
+
+ # If you have two vga cards with the same pci vendor id, svgalib will try
+@@ -43,14 +43,14 @@
+ # mouse MouseMan # Logitech MouseMan
+ # mouse Spaceball # Spacetec Spaceball
+ # mouse IntelliMouse # Microsoft IntelliMouse or Logitech MouseMan+ on serial port
+-# mouse IMPS2 # Microsoft IntelliMouse or Logitech MouseMan+ on PS/2 port
++mouse IMPS2 # Microsoft IntelliMouse or Logitech MouseMan+ on PS/2 port
+ # mouse pnp # plug'n'pray
+ # mouse WacomGraphire # Wacom Graphire tablet/mouse
+ # mouse DRMOUSE4DS # Digital Research double-wheeled mouse
+ # mouse ExplorerPS2 # Microsoft Intellimouse Explorer PS/2
+ # mouse none # None
+
+-mouse unconfigured
++# mouse unconfigured
+
+ # (DEBIAN NOTE: the mouse used to default to microsoft, but this was changed
+ # to fix bug #13458. If your mouse used to work fine, you can simply change
+@@ -129,6 +129,7 @@
+ # want to specify a different device for svgalib to use
+
+ # mdev /dev/ttyS0 # mouse is at /dev/ttyS0
++mdev /dev/input/mice
+
+ # Some multiprotocol mice will need one of the following:
+
+@@ -346,35 +347,35 @@
+ # chipset VGA # Standard VGA
+ # chipset EGA # EGA
+ # chipset ET3000 # Tseng ET3000
+-# chipset ET4000 # Tseng ET4000
++# chipset ET4000 # Tseng ET4000 (only available on i386)
+ # chipset Cirrus # Cirrus Logic GD542x/543x/544x
+-# chipset TVGA # Trident TVGA8900/9000
++# chipset TVGA # Trident TVGA8900/9000 (only available on i386)
+ # chipset Oak # Oak Technologies 037/067/077
+ # chipset S3 # S3 chipsets
+ # chipset GVGA6400 # Genoa 6400
+ # chipset ARK # ARK Logic
+ # chipset ATI # old ATI VGA
+-# chipset Mach32 # ATI Mach32
++# chipset Mach32 # ATI Mach32 (only available on i386)
+ # chipset ALI # ALI2301
+ # chipset Mach64 # ATI Mach64 - deprecated, use RAGE driver
+ # chipset ET6000 # Tseng ET6000
+ # chipset APM # Alliance Technology AT 24/25/3D
+ # chipset NV3 # nVidia Riva 128
+-# chipset VESA # nicely behaved Vesa Bioses
++# chipset VESA # nicely behaved Vesa Bioses (only available on i386)
+ # chipset MX # MX86251 (some Voodoo Rush boards)
+ # chipset PARADISE # WD90C31
+ # chipset RAGE # RagePro (and might work with some older mach64)
+ # chipset BANSHEE # Banshee/V3.
+ # chipset SIS # SiS 5597/6326/620/530 cards / integrated vga.
+ # chipset I740 # Intel i740 based cards.
+-# chipset NEOMAGIC
++# chipset NEOMAGIC # (only available on i386)
+ # chipset LAGUNA # Cirrus Logic Laguna series (546X)
+ # chipset FBDEV # Use kernel fbdev, instead of direct hardware.
+ # chipset G400 # Matrox Mystique/G100/G200/G400/G450
+ # chipset R128 # Ati Rage128 and Radeon
+ # chipset SAVAGE # S3 chipsets Savage, Virge, and some Trio64
+ # chipset MILLENNIUM # Matrox Millennium and Millennium II
+-# chipset I810 # Intel i810/815 integrated video
++# chipset I810 # Intel i810/815 integrated video (i386 only)
+ # chipset TRIDENT # Trident PCI and AGP chipsets
+ # chipset RENDITION # Rendition V2100/V2200
+ # chipset G450C2
+@@ -421,11 +422,11 @@
+ # Clockchip ICD2061A # The only one supported right now
+
+
+-# VesaText # Helps the VESA driver with text mode restoration
+- # problems.
++VesaText # Helps the VESA driver with text mode restoration
++ # problems (i386 only).
+
+-# VesaSave 14 # changing value might help text mode restoring
+- # problems with VESA driver. Legal values: 0-15
++# VesaSave 14 # changing value might help text mode restoring problems
++ # with VESA driver (i386 only). Legal values: 0-15
+
+ # NoVCControl # Disables svgalib's finding a new VC if run
+ # from X, also disables svgalib restoring textmode when
+@@ -439,7 +440,7 @@
+ # me (matan at svgalib.org)
+
+ # NeoMagicLibretto100 # Enable if you have a NeoMagic card on a Toshiba
+- # Libretto 100, 110, etc
++ # Libretto 100, 110, etc (i386 only).
+
+ # FbdevNoVga # When this is set the FBDEV chipset drivers doesn't
+ # (try to) use standardvga modes through the vga driver.
Added: trunk/rpms/svgalib/svgalib-1.9.21-demos.patch
===================================================================
--- trunk/rpms/svgalib/svgalib-1.9.21-demos.patch (rev 0)
+++ trunk/rpms/svgalib/svgalib-1.9.21-demos.patch 2008-07-04 02:31:15 UTC (rev 6396)
@@ -0,0 +1,431 @@
+--- svgalib-1.9.21/demos/testgl.c.demos 2002-04-03 09:31:14.000000000 +0200
++++ svgalib-1.9.21/demos/testgl.c 2005-07-01 20:51:55.000000000 +0200
+@@ -184,7 +184,7 @@
+
+ if (!vga_hasmode(VGAMODE)) {
+ printf("Mode not available.\n");
+- exit(-1);
++ return -1;
+ }
+ VIRTUAL = 0; /* No virtual screen. */
+ if (vga_getmodeinfo(VGAMODE)->colors == 16 ||
+@@ -224,5 +224,5 @@
+ if (VIRTUAL)
+ gl_freecontext(backscreen);
+ vga_setmode(TEXT);
+- exit(0);
++ return 0;
+ }
+--- svgalib-1.9.21/demos/vgatweak.c.demos 2000-08-06 12:20:02.000000000 +0200
++++ svgalib-1.9.21/demos/vgatweak.c 2005-07-01 20:51:55.000000000 +0200
+@@ -124,7 +124,7 @@
+ testmode(mode);
+ else {
+ printf("Error: Video mode not supported by driver\n");
+- exit(-1);
++ return -1;
+ }
+
+ return 0;
+--- svgalib-1.9.21/demos/linearfork.c.demos 2000-01-06 13:12:36.000000000 +0100
++++ svgalib-1.9.21/demos/linearfork.c 2005-07-01 20:51:55.000000000 +0200
+@@ -82,7 +82,7 @@
+
+ if (!vga_hasmode(vgamode)) {
+ printf("Mode not available.\n");
+- exit(1);
++ return 1;
+ }
+ vga_setmode(vgamode);
+ vga_setlinearaddressing();
+@@ -95,7 +95,7 @@
+ /* purposes. */
+ if (keyboard_init()) {
+ printf("Could not initialize keyboard.\n");
+- exit(1);
++ return 1;
+ }
+ /* Translate to 4 keypad cursor keys, and unify enter key. */
+ keyboard_translatekeys(TRANSLATE_CURSORKEYS | TRANSLATE_KEYPADENTER |
+@@ -161,5 +161,5 @@
+ keyboard_close(); /* Don't forget this! */
+
+ vga_setmode(TEXT);
+- exit(0);
++ return 0;
+ }
+--- svgalib-1.9.21/demos/bg_test.c.demos 2000-01-06 13:12:36.000000000 +0100
++++ svgalib-1.9.21/demos/bg_test.c 2005-07-01 20:51:55.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+ #include <strings.h>
+ #include <vga.h>
+ #include <vgagl.h>
+--- svgalib-1.9.21/demos/accel.c.demos 2002-04-03 09:30:23.000000000 +0200
++++ svgalib-1.9.21/demos/accel.c 2005-07-01 20:51:55.000000000 +0200
+@@ -97,7 +97,7 @@
+
+ if (accelfuncs == 0) {
+ printf("No acceleration supported.\n");
+- exit(0);
++ return 1;
+ }
+ printf("Accelflags: 0x%08X\n", accelfuncs);
+
+@@ -292,7 +292,7 @@
+ );
+ }
+ vga_setmode(TEXT);
+- exit(-1);
++ return 0;
+ }
+
+
+--- svgalib-1.9.21/demos/vgatest.c.demos 2005-01-27 11:34:16.000000000 +0100
++++ svgalib-1.9.21/demos/vgatest.c 2005-07-01 20:51:55.000000000 +0200
+@@ -275,7 +275,7 @@
+
+ if (mode < 1 || mode > GLASTMODE) {
+ printf("Error: Mode number out of range \n");
+- exit(-1);
++ return -1;
+ }
+ }
+ if (vga_hasmode(mode)) {
+@@ -285,7 +285,7 @@
+ }
+ } else {
+ printf("Error: Video mode not supported by driver\n");
+- exit(-1);
++ return -1;
+ }
+
+ vga_setmode(TEXT);
+--- svgalib-1.9.21/demos/printftest.c.demos 2000-01-06 13:12:36.000000000 +0100
++++ svgalib-1.9.21/demos/printftest.c 2005-07-01 20:51:55.000000000 +0200
+@@ -44,7 +44,7 @@
+
+ if (!vga_hasmode(vgamode)) {
+ printf("Mode not available.\n");
+- exit(1);
++ return 1;
+ }
+
+ vga_setmode(vgamode);
+@@ -68,5 +68,5 @@
+
+ vga_setmode(TEXT);
+
+- exit(retval);
++ return retval;
+ }
+--- svgalib-1.9.21/demos/fun.c.demos 2002-07-20 18:33:54.000000000 +0200
++++ svgalib-1.9.21/demos/fun.c 2005-07-01 20:51:55.000000000 +0200
+@@ -13,6 +13,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <time.h>
++#include <string.h>
+ #include <vga.h>
+ #include <vgagl.h>
+
+--- svgalib-1.9.21/demos/bankspeed.c.demos 2002-04-03 09:31:22.000000000 +0200
++++ svgalib-1.9.21/demos/bankspeed.c 2005-07-01 20:51:55.000000000 +0200
+@@ -125,7 +125,7 @@
+
+ if (!vga_hasmode(VGAMODE)) {
+ printf("Mode not available.\n");
+- exit(-1);
++ return -1;
+ }
+ VIRTUAL = 0; /* No virtual screen. */
+ if (vga_getmodeinfo(VGAMODE)->colors == 16 ||
+@@ -165,5 +165,5 @@
+ t2=clock();
+ printf("total:%1.2f sec\n",(1.0*t2-t1)/CLOCKS_PER_SEC);
+ vga_setmode(TEXT);
+- exit(0);
++ return 0;
+ }
+--- svgalib-1.9.21/demos/eventtest.c.demos 2000-01-06 13:12:36.000000000 +0100
++++ svgalib-1.9.21/demos/eventtest.c 2005-07-01 20:51:55.000000000 +0200
+@@ -3,6 +3,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <time.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <vga.h>
+@@ -254,5 +255,5 @@
+ keyboard_close(); /* Don't forget this! */
+ #endif
+ vga_setmode(TEXT);
+- exit(0);
++ return 0;
+ }
+--- svgalib-1.9.21/demos/svidtune.c.demos 2000-01-06 13:12:36.000000000 +0100
++++ svgalib-1.9.21/demos/svidtune.c 2005-07-01 20:51:55.000000000 +0200
+@@ -48,7 +48,7 @@
+
+ if (!vga_hasmode(vgamode)) {
+ printf("Mode not available.\n");
+- exit(1);
++ return 1;
+ }
+
+ vga_setmode(vgamode);
+@@ -176,5 +176,5 @@
+
+ vga_setmode(TEXT);
+
+- exit(retval);
++ return retval;
+ }
+--- svgalib-1.9.21/demos/keytest.c.demos 2000-01-06 13:12:36.000000000 +0100
++++ svgalib-1.9.21/demos/keytest.c 2005-07-01 20:51:55.000000000 +0200
+@@ -38,7 +38,7 @@
+
+ if (!vga_hasmode(vgamode)) {
+ printf("Mode not available.\n");
+- exit(1);
++ return 1;
+ }
+ printf("\nWARNING: This program will set the keyboard to RAW mode.\n"
+ "The keyboard routines in svgalib have not been tested\n"
+@@ -61,7 +61,7 @@
+ /* purposes. */
+ if (keyboard_init()) {
+ printf("Could not initialize keyboard.\n");
+- exit(1);
++ return 1;
+ }
+ /* Translate to 4 keypad cursor keys, and unify enter key. */
+ keyboard_translatekeys(TRANSLATE_CURSORKEYS | TRANSLATE_KEYPADENTER |
+@@ -126,5 +126,5 @@
+
+ keyboard_close(); /* Don't forget this! */
+ vga_setmode(TEXT);
+- exit(0);
++ return 0;
+ }
+--- svgalib-1.9.21/demos/scrolltest.c.demos 2000-01-12 21:03:39.000000000 +0100
++++ svgalib-1.9.21/demos/scrolltest.c 2005-07-01 20:51:55.000000000 +0200
+@@ -304,5 +304,5 @@
+ demo3();
+
+ vga_setmode(TEXT);
+- exit(0);
++ return 0;
+ }
+--- svgalib-1.9.21/demos/forktest.c.demos 2000-01-06 13:12:36.000000000 +0100
++++ svgalib-1.9.21/demos/forktest.c 2005-07-01 20:51:55.000000000 +0200
+@@ -82,7 +82,7 @@
+
+ if (!vga_hasmode(vgamode)) {
+ printf("Mode not available.\n");
+- exit(1);
++ return 1;
+ }
+ vga_setmode(vgamode);
+ gl_setcontextvga(vgamode);
+@@ -94,7 +94,7 @@
+ /* purposes. */
+ if (keyboard_init()) {
+ printf("Could not initialize keyboard.\n");
+- exit(1);
++ return 1;
+ }
+ /* Translate to 4 keypad cursor keys, and unify enter key. */
+ keyboard_translatekeys(TRANSLATE_CURSORKEYS | TRANSLATE_KEYPADENTER |
+@@ -160,5 +160,5 @@
+ keyboard_close(); /* Don't forget this! */
+
+ vga_setmode(TEXT);
+- exit(0);
++ return 0;
+ }
+--- svgalib-1.9.21/demos/mjoytest.c.demos 2000-01-06 13:12:36.000000000 +0100
++++ svgalib-1.9.21/demos/mjoytest.c 2005-07-01 20:51:55.000000000 +0200
+@@ -196,7 +196,7 @@
+
+ if (!vga_hasmode(vgamode)) {
+ printf("Mode not available.\n");
+- exit(-1);
++ return -1;
+ }
+
+ puts("In the demo, press\n"
+@@ -286,6 +286,6 @@
+ printf("Shutting down.\n");
+
+ vga_setmode(TEXT);
+- exit(0);
++ return 0;
+ }
+
+--- svgalib-1.9.21/demos/speedtest.c.demos 2000-01-06 13:12:36.000000000 +0100
++++ svgalib-1.9.21/demos/speedtest.c 2005-07-01 20:51:55.000000000 +0200
+@@ -1,4 +1,3 @@
+-
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -308,5 +307,5 @@
+ speed();
+
+ vga_setmode(TEXT);
+- exit(0);
++ return 0;
+ }
+--- svgalib-1.9.21/demos/linearspeed.c.demos 2003-11-07 10:26:02.000000000 +0100
++++ svgalib-1.9.21/demos/linearspeed.c 2005-07-01 20:51:55.000000000 +0200
+@@ -418,5 +418,5 @@
+ if(!fast)sysmem_speed();
+
+ vga_setmode(TEXT);
+- exit(0);
++ return 0;
+ }
+--- svgalib-1.9.21/demos/testlinear.c.demos 2004-09-16 19:56:12.000000000 +0200
++++ svgalib-1.9.21/demos/testlinear.c 2005-07-01 20:51:55.000000000 +0200
+@@ -11,7 +11,7 @@
+ #include <string.h>
+ #include <vga.h>
+ #include <time.h>
+-#include "../src/libvga.h"
++#include "libvga.h"
+
+
+ #define USE_LINEAR_ADDRESSING
+@@ -66,7 +66,7 @@
+ if (!(argc == 2 && strcmp(argv[1], "--force") == 0))
+ if (!(vga_getmodeinfo(vga_getdefaultmode())->flags & CAPABLE_LINEAR)) {
+ printf("Linear addressing not supported for this chipset.\n");
+- exit(1);
++ return 1;
+ }
+ vga_init();
+ vga_setmode(vga_getdefaultmode());
+@@ -75,7 +75,7 @@
+ if (vga_setlinearaddressing() == -1) {
+ vga_setmode(TEXT);
+ printf("Could not set linear addressing.\n");
+- exit(-1);
++ return -1;
+ }
+ #endif
+
+--- svgalib-1.9.21/demos/Makefile.demos 2004-11-16 08:59:52.000000000 +0100
++++ svgalib-1.9.21/demos/Makefile 2005-07-01 20:59:09.000000000 +0200
+@@ -4,19 +4,15 @@
+ # This file is a part of SVGAlib.
+ #----------------------------------------------------------------------
+
+-include ../Makefile.cfg
+-
+-srcdir = ..
+-VPATH = $(srcdir)/demos
+-
+ #----------------------------------------------------------------------
+-# Compiler Section (overrides Makefile.cfg)
++# Compiler Section
+ #----------------------------------------------------------------------
+
+-CFLAGS = $(WARN) $(OPTIMIZE) -I$(srcdir)/include -I$(srcdir)/gl $(DEBFLAGS)
+-ifeq (a.out, $(TARGET_FORMAT))
+- CFLAGS += -DSVGA_AOUT
+-endif
++CC = gcc
++CFLAGS = -Wall -Wstrict-prototypes
++CFLAGS += -fomit-frame-pointer -O2 -fno-strength-reduce -pipe -g
++LDFLAGS = -s
++LIBS = -lvgagl -lvga -lm
+
+ #----------------------------------------------------------------------
+ # Rules Section
+@@ -25,51 +21,12 @@
+ PROGS = fun testgl speedtest mousetest vgatest scrolltest testlinear \
+ keytest testaccel accel forktest eventtest spin bg_test printftest \
+ joytest mjoytest bankspeed lineart linearspeed addmodetest \
+- svidtune linearfork cursor vgatweak buildcsr
+-
+-# Determine what library (static or shared) we will be linking programs with
+-ifdef INSTALLSHAREDLIB
+- LIBS = -lvgagl -lvga
+-endif
+-ifndef LIBS
+- LIBS = ../staticlib/libvgagl.a ../staticlib/libvga.a -lm
+- LVGADEP = $(LIBS)
+-endif
++ svidtune linearfork cursor vgatweak
+
+ all: $(PROGS)
+
+-.PHONY: all clean cleanbin dep
+-
+-$(PROGS): $(LVGADEP)
+-
+ .c:
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $* $*.c $(LIBS)
+
+-rwpage: rwpage.pp
+- $(PC) -Rintel rwpage.pp
+-
+-testaccel: testaccel.c
+- $(CC) $(CFLAGS) $(LDFLAGS) -o testaccel testaccel.c $(LIBS) -lm
+-
+-accel: accel.c
+- $(CC) $(CFLAGS) $(LDFLAGS) -o accel accel.c $(LIBS) -lm
+-
+-linearspeed: linearspeed.c memset.o
+- $(CC) $(CFLAGS) $(LDFLAGS) -o linearspeed linearspeed.c memset.o $(LIBS)
+-
+-buildcsr: mkcur.o
+- $(CC) -o buildcsr $(LDFLAGS) mkcur.o -lvgagl -lvga
+-
+-clean: cleanbin
+- rm -f .depend *.o *~ *.bak core
+-
+-cleanbin:
+- rm -f $(PROGS) rwpage
+-
+-#
+-# No dependencies required here.
+-#
+-
+-dep:
+-.depend:
+-
++clean:
++ rm -f $(PROGS)
+--- svgalib-1.9.21/demos/mousetest.c.demos 2000-01-06 13:12:36.000000000 +0100
++++ svgalib-1.9.21/demos/mousetest.c 2005-07-01 20:51:55.000000000 +0200
+@@ -34,7 +34,7 @@
+
+ if (!vga_hasmode(vgamode)) {
+ printf("Mode not available.\n");
+- exit(-1);
++ return -1;
+ }
+ #ifndef MANUALLY_SETUP_MOUSE
+ /* Enable automatic mouse setup at mode set. */
+@@ -72,7 +72,7 @@
+ /* To be able to test fake mouse events... */
+ if (keyboard_init()) {
+ printf("Could not initialize keyboard.\n");
+- exit(1);
++ return 1;
+ }
+
+ /* Set the range for the wheel */
+@@ -136,5 +136,5 @@
+ #endif
+
+ vga_setmode(TEXT);
+- exit(0);
++ return 0;
+ }
Added: trunk/rpms/svgalib/svgalib-1.9.21-makefiles.patch
===================================================================
--- trunk/rpms/svgalib/svgalib-1.9.21-makefiles.patch (rev 0)
+++ trunk/rpms/svgalib/svgalib-1.9.21-makefiles.patch 2008-07-04 02:31:15 UTC (rev 6396)
@@ -0,0 +1,30 @@
+--- svgalib-1.9.21/Makefile.makefiles 2005-03-18 14:49:10.000000000 +0100
++++ svgalib-1.9.21/Makefile 2005-07-08 21:16:12.000000000 +0200
+@@ -152,8 +126,10 @@
+ @echo "savetextmode: Script that saves textmode information used by 'textmode'."
+ @$(INSTALL_SCRIPT) utils/savetextmode $(bindir)
+ ifeq ($(LRMI),lrmi)
+- @echo "mode3: Restore textmode by setting VESA mode 3."
++ @echo "mode3: Restore textmode by setting VESA mode 3."
+ @$(INSTALL_PROGRAM) lrmi-0.6m/mode3 $(bindir)
++ @echo "vga_reset: Restore textmode by resetting graphic board."
++ @cp lrmi-0.6m/vga_reset $(bindir)
+ endif
+ @echo "Installing keymap utilities in $(bindir):"
+ @echo "svgakeymap: Perl script that generates scancode conversion maps."
+--- svgalib-1.9.21/src/Makefile.makefiles 2005-02-03 12:31:43.000000000 +0100
++++ svgalib-1.9.21/src/Makefile 2005-07-08 21:16:12.000000000 +0200
+@@ -471,9 +471,11 @@
+ vga.o: vga.c
+ $(CC) $(CFLAGS) $(VGA_DEFINES) -c -o $@ $<
+
+-#lrmi must NOT be compiled as -fPIC
++# XXX: Upstream used this so it may break, disabled to close an RC
++# lrmi must NOT be compiled as -fPIC
+ lrmi.o: lrmi.c
+- $(CC) $(CFLAGS:-fPIC=) -c -o $@ $<
++ $(CC) $(CFLAGS) -c -o $@ $<
++# $(CC) $(CFLAGS:-fPIC=) -c -o $@ $<
+
+ $(RAMDAC): %.o: %.c
+ $(CC) $(CFLAGS) $(RAMDAC_DEFINES) -c -o $@ $<
Added: trunk/rpms/svgalib/svgalib-1.9.25-kernel-2.6.26.patch
===================================================================
--- trunk/rpms/svgalib/svgalib-1.9.25-kernel-2.6.26.patch (rev 0)
+++ trunk/rpms/svgalib/svgalib-1.9.25-kernel-2.6.26.patch 2008-07-04 02:31:15 UTC (rev 6396)
@@ -0,0 +1,69 @@
+diff -up svgalib-1.9.25/src/lrmi.6.c~ svgalib-1.9.25/src/lrmi.6.c
+--- svgalib-1.9.25/src/lrmi.6.c~ 2008-05-31 15:58:26.000000000 +0200
++++ svgalib-1.9.25/src/lrmi.6.c 2008-05-31 15:58:26.000000000 +0200
+@@ -169,6 +169,13 @@ LRMI_free_real(void *m)
+ }
+ }
+
++#ifndef TF_MASK
++#define TF_MASK X86_EFLAGS_TF
++#define IF_MASK X86_EFLAGS_IF
++#define IOPL_MASK X86_EFLAGS_IOPL
++#define VIF_MASK X86_EFLAGS_VIF
++#define VIP_MASK X86_EFLAGS_VIP
++#endif
+
+ #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK)
+ #define DEFAULT_STACK_SIZE 0x1000
+diff -up svgalib-1.9.25/src/lrmi.9.c~ svgalib-1.9.25/src/lrmi.9.c
+--- svgalib-1.9.25/src/lrmi.9.c~ 2008-05-31 15:58:25.000000000 +0200
++++ svgalib-1.9.25/src/lrmi.9.c 2008-05-31 15:58:25.000000000 +0200
+@@ -206,6 +206,13 @@ LRMI_free_real(void *m)
+
+
+ #if defined(__linux__)
++#ifndef TF_MASK
++#define TF_MASK X86_EFLAGS_TF
++#define IF_MASK X86_EFLAGS_IF
++#define IOPL_MASK X86_EFLAGS_IOPL
++#define VIF_MASK X86_EFLAGS_VIF
++#define VIP_MASK X86_EFLAGS_VIP
++#endif
+ #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK)
+ #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+ #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL)
+diff -up svgalib-1.9.25/lrmi-0.6m/lrmi.c~ svgalib-1.9.25/lrmi-0.6m/lrmi.c
+--- svgalib-1.9.25/lrmi-0.6m/lrmi.c~ 2008-05-31 16:10:14.000000000 +0200
++++ svgalib-1.9.25/lrmi-0.6m/lrmi.c 2008-05-31 16:10:14.000000000 +0200
+@@ -170,6 +170,14 @@ LRMI_free_real(void *m)
+ }
+
+
++#ifndef TF_MASK
++#define TF_MASK X86_EFLAGS_TF
++#define IF_MASK X86_EFLAGS_IF
++#define IOPL_MASK X86_EFLAGS_IOPL
++#define VIF_MASK X86_EFLAGS_VIF
++#define VIP_MASK X86_EFLAGS_VIP
++#endif
++
+ #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK)
+ #define DEFAULT_STACK_SIZE 0x1000
+ #define RETURN_TO_32_INT 255
+diff -up svgalib-1.9.25/lrmi-0.9/lrmi.c~ svgalib-1.9.25/lrmi-0.9/lrmi.c
+--- svgalib-1.9.25/lrmi-0.9/lrmi.c~ 2008-05-31 16:10:28.000000000 +0200
++++ svgalib-1.9.25/lrmi-0.9/lrmi.c 2008-05-31 16:10:28.000000000 +0200
+@@ -203,6 +203,13 @@ LRMI_free_real(void *m)
+
+
+ #if defined(__linux__)
++#ifndef TF_MASK
++#define TF_MASK X86_EFLAGS_TF
++#define IF_MASK X86_EFLAGS_IF
++#define IOPL_MASK X86_EFLAGS_IOPL
++#define VIF_MASK X86_EFLAGS_VIF
++#define VIP_MASK X86_EFLAGS_VIP
++#endif
+ #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK)
+ #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+ #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL)
Added: trunk/rpms/svgalib/svgalib-todo
===================================================================
--- trunk/rpms/svgalib/svgalib-todo (rev 0)
+++ trunk/rpms/svgalib/svgalib-todo 2008-07-04 02:31:15 UTC (rev 6396)
@@ -0,0 +1,103 @@
+wip:
+-don't allow any vga modes (not even 320x200x256, mode 5) with fbdev and
+ fbdev_novga, it barfs in vgaclear.c because of outb instructions. If the
+ framebuffer can handle it, it will still be available as mode 146.
+-use /sys/bus/pci for linear fd.
+-when mem_fd == -1 (nohelper, secure) and linear_fd != -1 and trying to set
+ runinbackground and CM can handle emulatepage set emulatepage instead of
+ refusing to runinbackground.
+
+wip2:
+-fix a cut and paste error in fbdev.c which caused fbdev_set_virtual_height
+ to not do anything, leaving yres_virtual at yres .
+-add fbdev_put_vscreeninfo, which tries to put the vscreen info three times
+ before giving up:
+ 1st with yres_virtual as calculated by fbdev_set_virtual_height
+ 2nd with yres_virtual set to 2x yres
+ 3th with yres_virtual set to yres
+ This is needed because even with the max of 8192 in fbdev_set_virtual_height
+ fbdev still doesn't like the yres_virtuals we calculate for all modes,
+ with this 3 attempts approach much more modes are available.
+-update fbdev_getmodeinfo to calculate maxpixels based on the yres_virtual
+ which actually succeeded.
+-check all uses of long, replace most with int because:
+ -most of the times a 32 bit variable is enough (it works on i386 where
+ a long is 32 bit doesn't it), 64 bit is a waste of memory and slower.
+ -sometimes a long ptr is used to walk past MMIO mapped 32 bits registers,
+ which causes it to walk in steps of 64 bits, skipping a reg each time,
+ which is a plain bug. This also goes for other use of long ptrs to point
+ to 32 bits data (memsetlong, memcpylong) .
+-change modeline for 640x480 at 72Hz in timing.c to Xorg's builtin default
+ modeline for 640x480 at 72Hz, the old one makes my monitor go into powersaving
+ mode.
+-restore textmode and return an error code if chipset_setregs fails
+ in vga_setmode.
+-use the same checks done in vga_runinbackground, in
+ vga_runinbackgroundversion to determine if runinbackground is ok.
+-add fbdev_novga docs to libvga.config
+
+wip3:
+-vga_getmodeinfo used to check for EXT_INFO_AVAILABLE in modeinfo.flags,
+ before adding __svgalib_modeinfo_linearset to modeinfo.flags. This seems wrong,
+ since lots of drivers don't set EXT_INFO_AVAILABLE but do support linear
+ just fine, so the check has been simplified to just checking for
+ CAPABLE_LINEAR . Otherwise a program could get/do:
+ -call getmodeinfo, see that mode is linear capable
+ -call setlinearaddressing, which indicates success
+ -call getmodeinfo again, still don't see the IS_LINEAR flag.
+-in setmode don't set IS_LINEAR in __svgalib_modeinfo_linearset when enabling
+ LFB because of emulating page, although the LFB has been explicitly
+ enabled, this was not on the users request, so we mustnot return
+ LINEAR_POINTER, but GM in getgraphmem hence IS_LINEAR shouldnot be set.
+ And it is also not correct to report IS_LINEAR in getmodeinfo when not
+ explicitly requested.
+ (all this happened only for cards which need the LFB explicitly enabled).
+-in restorestate enable linear mode when emulating pages on cards which
+ need it explictly enabled, checking saved_linear is no longer enough,
+ since we no longer set IS_LINEAR in this case unless explicitly requested
+ by the user.
+-320x200x256 is linear because it fits within one page, but it should be
+ accessed through GM not through LINEAR_POINTER. Fix this in: vga.c & vgapix.c.
+-Because of the above we cannot do 320x200x256 when emulating pages,
+ update vga_hasmode for this.
+
+
+todo:
+-VESA on x86_64 ?!
+
+cleanups:
+-clean up makefiles, use TOPDIR everywhere, set include paths so that
+compilation of utils, gl threeDkit will work without install libvga first
+-check init return value in setchip xxx.
+-This has inspired me to get rid of the unneeded GM pointer in svgalib, GM
+(in drivers sometimes still called __svgalib_graph_mem) always points to
+BANKED_POINTER after a setmode, and no code checks for it not being set
+(which is ok, progs should call setmode before drawingfuncs) so tomorrow I'm
+going through the entire source and replace it all with BANKED_POINTER.
+Which imho is a better name, and makes things less confusing, why have 2
+ptrs for the same thing?
+-vga_setchipsetandfeatures should do same sanitychecks as vga_setchipset
+-move come from background call to above forbidvtrelease=0
+-add chipset range check to disable_chipset, setchipset
+-get_perm in vga_fork is bullshit, because done already is 1 so it will do
+ nothing! Same goes for __vga_map;
+-ioperm is not needed when doing iopl, what does iopl(value lower then 3) do?
+-ioperm does nog get inherited by fork, iopl does.
+-vga_set_LRMI_callbacks is done in a zillion places
+-move only do this once readconfig var to readconfig func.
+-move only do this once vars for map_mmio and map_mem to the funcs.
+-__svgalib_flipaway may be made static
+-__svgalib_runinbackground may be made static
+-map_mem may be made static
+-__svgalib_savemem may be removed
+-don't open /dev/mem in drivers instead use mem_fd
+-do we need to make sure fd's 0,1,2, are going somewhere in vga_init,
+ or can this be delayed till open_mem?
+-Remove release_acquire debug stuff
+-properly check mmap, fork execv and other return values.
+-make map_vgaxxxio static
+
+
+strangeness:
+-inconsistent use of __svgalib_secondary in flip_away vs flip_back
+-vga_flip vs console switches
Added: trunk/rpms/svgalib/svgalib.spec
===================================================================
--- trunk/rpms/svgalib/svgalib.spec (rev 0)
+++ trunk/rpms/svgalib/svgalib.spec 2008-07-04 02:31:15 UTC (rev 6396)
@@ -0,0 +1,126 @@
+# $Id$
+# Authority: dag
+
+Summary: Low-level fullscreen SVGA graphics library
+Name: svgalib
+Version: 1.9.25
+Release: 1
+Group: System Environment/Libraries
+License: Public Domain
+URL: http://www.svgalib.org/
+
+Source0: http://www.arava.co.il/matan/svgalib/svgalib-%{version}.tar.gz
+Patch0: svgalib-1.9.21-makefiles.patch
+Patch1: svgalib-1.4.3-fhs.patch
+Patch2: svgalib-1.9.21-demos.patch
+Patch3: svgalib-1.9.21-cfg.patch
+Patch4: svgalib-1.9.25-kernel-2.6.26.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Exclusivearch: %{ix86} x86_64
+
+%description
+The svgalib package provides the SVGAlib low-level graphics library
+for Linux. SVGAlib is a library which allows applications to use full
+screen graphics on a variety of hardware platforms. Some games and
+utilities use SVGAlib for their graphics. For details on
+supported chipsets, see man 7 svgalib (when svgalib is installed).
+
+%package devel
+Summary: Development tools for the SVGAlib graphics library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Provides: libvga-devel = %{version}-%{release}
+
+%description devel
+The svgalib-devel package contains the libraries and header files
+needed to build programs which will use the SVGAlib low-level graphics
+library.
+
+%prep
+%setup
+%patch0 -p1 -b .makefiles
+%patch1 -p1 -b .fhs
+%patch2 -p1
+%patch3 -p1 -b .defaultcfg
+%patch4 -p1
+
+#the testlinear demo needs svgalib's internal libvga header, so copy it to the
+#demo dir
+cp src/libvga.h demos
+
+%build
+#%{?_smp_mflags} doesn't work on x86_64 chances are it will fail on
+#some i386 machines too.
+%{__make} shared OPTIMIZE="%{optflags}" LDFLAGS= \
+ prefix="%{_prefix}" \
+ NO_HELPER="y" \
+ INCLUDE_ET4000_DRIVER="y" \
+ INCLUDE_OAK_DRIVER="y" \
+ INCLUDE_MACH32_DRIVER="y" \
+ INCLUDE_ET3000_DRIVER="y" \
+ INCLUDE_GVGA6400_DRIVER="y" \
+ INCLUDE_ATI_DRIVER="y" \
+ INCLUDE_G450C2_DRIVER="y" \
+ INCLUDE_ET4000_DRIVER_TEST="y" \
+ INCLUDE_FBDEV_DRIVER_TEST="y" \
+ INCLUDE_VESA_DRIVER_TEST="y"
+make -C utils OPTIMIZE="%{optflags}" LDFLAGS="" \
+ prefix="%{_prefix}"
+make -C threeDKit OPTIMIZE="%{optflags} -I../gl" LDFLAGS="" \
+ prefix="%{_prefix}" lib3dkit.so.%{version}
+
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/vga
+%{__install} -d -m0755 %{buildroot}%{_libdir}
+%{__make} install \
+ TOPDIR="%{buildroot}" \
+ prefix="%{buildroot}%{_prefix}" \
+ mandir="%{buildroot}%{_mandir}" \
+ sharedlibdir="%{buildroot}%{_libdir}" \
+ NO_HELPER="y" \
+ MANFORMAT="compressed" \
+ INSTALL_PROGRAM="install -p -m0755" \
+ INSTALL_SCRIPT="install -p -m0755" \
+ INSTALL_SHLIB="install -p -m0755" \
+ INSTALL_DATA="install -p -m0644"
+%{__ln_s} -f libvga.so.%{version} %{buildroot}%{_libdir}/libvga.so.1
+%{__ln_s} -f libvgagl.so.%{version} %{buildroot}%{_libdir}/libvgagl.so.1
+%{__ln_s} -f lib3dkit.so.%{version} %{buildroot}%{_libdir}/lib3dkit.so.1
+#for %ghost
+touch %{buildroot}%{_sysconfdir}/vga/fontdata
+touch %{buildroot}%{_sysconfdir}/vga/textregs
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc doc/CHANGES doc/README.joystick doc/README.keymap lrmi-0.6m/README
+%doc doc/README.multi-monitor doc/README.vesa doc/TODO doc/dual-head-howto
+%doc %{_mandir}/man[^3]/*
+%dir %{_sysconfdir}/vga/
+%config(noreplace) %{_sysconfdir}/vga/dvorak-us.keymap
+%config(noreplace) %{_sysconfdir}/vga/libvga.config
+%config(noreplace) %{_sysconfdir}/vga/libvga.et4000
+%config(noreplace) %{_sysconfdir}/vga/null.keymap
+%ghost %{_sysconfdir}/vga/fontdata
+%ghost %{_sysconfdir}/vga/textregs
+%{_bindir}/*
+%{_libdir}/*.so.*
+
+%files devel
+%defattr(-, root, root, 0755)
+%doc demos doc/DESIGN doc/Driver-programming-HOWTO doc/README.patching
+%doc %{_mandir}/man3/*.3*
+%{_includedir}/*
+%{_libdir}/*.so
+
+%changelog
+* Thu Jul 03 2008 Dag Wieers <dag at wieers.com> - 1.9.25-1
+- Initial package. (based on Fedora)
Property changes on: trunk/rpms/svgalib/svgalib.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/vobcopy/vobcopy.spec
===================================================================
--- trunk/rpms/vobcopy/vobcopy.spec 2008-07-04 02:30:42 UTC (rev 6395)
+++ trunk/rpms/vobcopy/vobcopy.spec 2008-07-04 02:31:15 UTC (rev 6396)
@@ -8,9 +8,11 @@
License: GPL
Group: Applications/Multimedia
URL: http://vobcopy.org/projects/c/c.shtml
+
Source: http://vobcopy.org/download/vobcopy-%{version}.tar.bz2
Patch0: vobcopy-1.0.1-Makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
BuildRequires: libdvdread-devel
%description
More information about the svn-commits
mailing list