slackbuilds_ponce/system/vice/patches/vice-2.3.21-64bit.patch
Matteo Bernardini 111c0170c7 system/vice: Updated for version 2.3.22.
Rewritten x86_64 patch, added another to fix docs building,
explicitly disabled ffmpeg (not yet compatible).

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
2012-09-08 17:27:22 -05:00

129 lines
4.6 KiB
Diff

diff -Naur vice-2.3.21.orig/doc/vice.guide vice-2.3.21/doc/vice.guide
--- vice-2.3.21.orig/doc/vice.guide 2012-08-06 00:41:54.000000000 +0200
+++ vice-2.3.21/doc/vice.guide 2012-08-06 09:44:36.288562655 +0200
@@ -1292,7 +1292,7 @@
`Directory' resource, which is a colon (`:')-separated search path
list, like the UNIX `PATH' environment variable. The default value is
- PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
+ PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU'
is the name of the emulated machine (`C64', `C64DTV', `C128', `PET',
@@ -1306,12 +1306,12 @@
then the value will be
- /usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
+ /usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
And system files will be searched for under the following directories,
in the specified order:
- 1. `/usr/local/lib/VICE/C64'
+ 1. `/usr/local/lib64/VICE/C64'
2. `$HOME/.vice/C64'
@@ -4010,7 +4010,7 @@
where:
* `LIBDIR' is the VICE installation directory (usually
- `/usr/local/lib/vice', `/usr/lib/vice' or `/opt/vice/lib');
+ `/usr/local/lib64/vice', `/usr/lib64/vice' or `/opt/vice/lib');
* `EMUID' is the emulation identification string (`C64',
`C128', `VIC20' or `PET');
diff -Naur vice-2.3.21.orig/doc/vice.texi vice-2.3.21/doc/vice.texi
--- vice-2.3.21.orig/doc/vice.texi 2012-07-24 04:08:09.000000000 +0200
+++ vice-2.3.21/doc/vice.texi 2012-08-06 09:44:36.291562619 +0200
@@ -1364,7 +1364,7 @@
default value is
@example
-PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
+PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
@end example
Where @code{PREFIX} is the installation prefix (usually
@@ -1383,7 +1383,7 @@
then the value will be
@example
-/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
+/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
@end example
And system files will be searched for under the following directories,
@@ -1391,7 +1391,7 @@
@enumerate 1
@item
-@code{/usr/local/lib/VICE/C64}
+@code{/usr/local/lib64/VICE/C64}
@item
@code{$HOME/.vice/C64}
@item
diff -Naur vice-2.3.21.orig/doc/vice.txt vice-2.3.21/doc/vice.txt
--- vice-2.3.21.orig/doc/vice.txt 2012-08-06 02:23:21.000000000 +0200
+++ vice-2.3.21/doc/vice.txt 2012-08-06 09:44:36.296562563 +0200
@@ -1056,7 +1056,7 @@
`Directory' resource, which is a colon (`:')-separated search path
list, like the UNIX `PATH' environment variable. The default value is
-PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
+PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU'
is the name of the emulated machine (`C64', `C64DTV', `C128', `PET',
@@ -1070,12 +1070,12 @@
then the value will be
-/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
+/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
And system files will be searched for under the following directories,
in the specified order:
-1. `/usr/local/lib/VICE/C64'
+1. `/usr/local/lib64/VICE/C64'
2. `$HOME/.vice/C64'
diff -Naur vice-2.3.21.orig/INSTALL vice-2.3.21/INSTALL
--- vice-2.3.21.orig/INSTALL 2011-01-29 14:17:50.000000000 +0100
+++ vice-2.3.21/INSTALL 2012-08-06 09:44:36.299562529 +0200
@@ -301,7 +301,7 @@
make install
- The binaries and support files will all go under PREFIX/lib/vice.
+ The binaries and support files will all go under PREFIX/lib64/vice.
You must of course have write permissions for the directories where
VICE is to be installed. Normally only the system administrator
has write access to /usr/local, the default PREFIX. Either ask
diff -Naur vice-2.3.21.orig/src/arch/sdl/archdep_unix.h vice-2.3.21/src/arch/sdl/archdep_unix.h
--- vice-2.3.21.orig/src/arch/sdl/archdep_unix.h 2011-07-21 05:10:28.000000000 +0200
+++ vice-2.3.21/src/arch/sdl/archdep_unix.h 2012-08-06 09:42:11.970323196 +0200
@@ -88,7 +88,7 @@
#ifdef __NetBSD__
#define LIBDIR PREFIX "/share/vice"
#else
-#define LIBDIR PREFIX "/lib/vice"
+#define LIBDIR PREFIX "/lib64/vice"
#endif
#if defined(__FreeBSD__) || defined(__NetBSD__)
diff -Naur vice-2.3.21.orig/src/arch/unix/archdep.h vice-2.3.21/src/arch/unix/archdep.h
--- vice-2.3.21.orig/src/arch/unix/archdep.h 2010-10-06 18:17:43.000000000 +0200
+++ vice-2.3.21/src/arch/unix/archdep.h 2012-08-06 09:42:46.474902531 +0200
@@ -127,7 +127,7 @@
#ifdef __NetBSD__
#define LIBDIR PREFIX "/share/vice"
#else
-#define LIBDIR PREFIX "/lib/vice"
+#define LIBDIR PREFIX "/lib64/vice"
#endif
#if defined(__FreeBSD__) || defined(__NetBSD__)