Many fixes, mostly to get x86_64 to work properly

4 files changed, 91 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e55c9877863..2fc45a0b30d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nwn-diamond
 	pkgdesc = Neverwinter Nights is an RPG from Bioware. This requires the Diamond Collection DVD Release.
 	pkgver = 1.69
-	pkgrel = 4
+	pkgrel = 6
 	url = http://nwn.bioware.com/
 	install = nwn.install
 	arch = i686
@@ -20,25 +20,22 @@ pkgbase = nwn-diamond
 	depends = sdl_mixer
 	provides = nwn
 	conflicts = nwn
+	noextract = nwclientgold.tar.gz
+	noextract = nwclienthotu.tar.gz
+	noextract = English_linuxclient169_xp2.tar.gz
 	source = http://nwdownloads.bioware.com/neverwinternights/linux/gold/nwclientgold.tar.gz
 	source = http://nwdownloads.bioware.com/neverwinternights/linux/161/nwclienthotu.tar.gz
 	source = http://files.bioware.com/neverwinternights/updates/linux/169/English_linuxclient169_xp2.tar.gz
-	source = http://home.roadrunner.com/~nwmovies/nwuser/nwuser-latest.tar.gz
-	source = http://home.roadrunner.com/~nwmovies/nwmovies/nwmovies-latest.tar.gz
-	source = http://home.roadrunner.com/~nwmovies/nwmouse/nwmouse-latest.tar.gz
-	source = http://home.roadrunner.com/~nwmovies/nwlogger/nwlogger-latest.tar.gz
+	source = http://home.roadrunner.com/~nwmovies/nwlinux-beta.tar.bz2
 	source = http://home.roadrunner.com/~nwmovies/cursors.tar.gz
 	source = nwn.launcher
 	source = nwn.desktop
 	md5sums = 0a059d55225fc32f905e86191d88a11f
 	md5sums = 376cdece07106ea058d42b531f3146bb
 	md5sums = b021f0da3b3e00848521926716fdf487
-	md5sums = 0ff1296e4afb43844b6eb2544e40cab9
-	md5sums = 1698a83bce2050174670e30c42b9d673
-	md5sums = 02bf7f5610c928a5910d1cab4bf3f87a
-	md5sums = 981d5cd5ec13aa888e4c0a2ba7f9a231
+	md5sums = 3961f7464d3d5b7ac9f097aa9aa2f4d3
 	md5sums = 7be935418f0ececb5660f53b7a902b38
-	md5sums = d28e09031cc8f56406f6878e36683e36
+	md5sums = 7fd0497f55856edf50480b5acd3136d3
 	md5sums = bd7f80f5faa5ee1203371b4e8ec40638
 
 pkgname = nwn-diamond
diff --git a/PKGBUILD b/PKGBUILD
index 04e5fd6877e4..ff60aad82455 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=nwn-diamond
 pkgver=1.69
-pkgrel=4
+pkgrel=6
 pkgdesc="Neverwinter Nights is an RPG from Bioware. This requires the Diamond Collection DVD Release."
 url="http://nwn.bioware.com/"
 license=('custom')
@@ -20,22 +20,18 @@ install=nwn.install
 source=("http://nwdownloads.bioware.com/neverwinternights/linux/gold/nwclientgold.tar.gz" \
 "http://nwdownloads.bioware.com/neverwinternights/linux/161/nwclienthotu.tar.gz" \
 "http://files.bioware.com/neverwinternights/updates/linux/169/English_linuxclient169_xp2.tar.gz" \
-"http://home.roadrunner.com/~nwmovies/nwuser/nwuser-latest.tar.gz" \
-"http://home.roadrunner.com/~nwmovies/nwmovies/nwmovies-latest.tar.gz" \
-"http://home.roadrunner.com/~nwmovies/nwmouse/nwmouse-latest.tar.gz" \
-"http://home.roadrunner.com/~nwmovies/nwlogger/nwlogger-latest.tar.gz" \
+"http://home.roadrunner.com/~nwmovies/nwlinux-beta.tar.bz2" \
 "http://home.roadrunner.com/~nwmovies/cursors.tar.gz" \
 "nwn.launcher" "nwn.desktop")
+noextract=('nwclientgold.tar.gz' 'nwclienthotu.tar.gz' 'English_linuxclient169_xp2.tar.gz')
 md5sums=('0a059d55225fc32f905e86191d88a11f'
          '376cdece07106ea058d42b531f3146bb'
          'b021f0da3b3e00848521926716fdf487'
-         '0ff1296e4afb43844b6eb2544e40cab9'
-         '1698a83bce2050174670e30c42b9d673'
-         '02bf7f5610c928a5910d1cab4bf3f87a'
-         '981d5cd5ec13aa888e4c0a2ba7f9a231'
+         '3961f7464d3d5b7ac9f097aa9aa2f4d3'
          '7be935418f0ececb5660f53b7a902b38'
-         'd28e09031cc8f56406f6878e36683e36'
+         '7fd0497f55856edf50480b5acd3136d3'
          'bd7f80f5faa5ee1203371b4e8ec40638')
+PKGEXT='.pkg.tar'
 
 # Directory where the NWN Diamond DVD is Mounted
 _dvdpath=/media/dvd
@@ -94,37 +90,103 @@ EOF
 
     cd $srcdir/
 
-    # Movies in Linux Client Support for NWN
-    ./nwmovies_install.pl /usr/lib/libSDL.so
+    ###########################################################################
+    #
+    # nwmovies:
+    #
+    #     Movies in Linux Client Support for NWN
+    #
+    ###########################################################################
+
+    # Compile nwmovies using the appropriate SDL library
+    if [ "$CARCH" = "x86_64" ]; then
+        ./nwmovies_install.pl /usr/lib32/libSDL-1.2.so.0
+    else
+        ./nwmovies_install.pl /usr/lib/libSDL-1.2.so.0
+    fi
+
+    # Install nwmovies binaries
     install -D -m 755 -t $pkgdir/opt/nwn/ \
         $srcdir/nwmovies/{nwmovies.so,nwmovies.pl}
+
+    # Install binkplayer binaries
     install -D -m 755 $srcdir/nwmovies/binklib.so \
         $pkgdir/opt/nwn/nwmovies/binklib.so
+
+    # Install libdis binaries
     install -D -m 755 $srcdir/nwmovies/libdis/libdisasm.so \
         $pkgdir/opt/nwn/nwmovies/libdis/libdisasm.so
 
     # SymLink BinkPlayer to the NWN Directory so the Movie Launcher (nwmovies.pl) can find it
     ln -s /usr/bin/binkplayer $pkgdir/opt/nwn/BinkPlayer
 
-    # Per-User Settings Support for NWN
+    ###########################################################################
+    #
+    # nwuser:
+    #
+    #     Per-User Settings Support for NWN
+    #
+    ###########################################################################
+
+    # Compile nwuser
     ./nwuser_install.pl
+
+    # Install nwuser binaries
     install -D -m 755 $srcdir/nwuser/nwuser.so \
         $pkgdir/opt/nwn/nwuser.so
 
-    # Hardware Mouse Cursors Support for NWN
+    # Install 64bit binaries if Arch64
+    if [ "$CARCH" = "x86_64" ]; then
+        install -D -m 755 $srcdir/nwuser/nwuser64.so \
+            $pkgdir/opt/nwn/nwuser64.so
+    fi
+
+    ###########################################################################
+    #
+    # nwmouse:
+    #
+    #     Hardware Mouse Cursors Support for NWN
+    #
+    ###########################################################################
+
+    # Patch file so it can find user.h
+    /bin/sed -i 's|linux/user.h|sys/user.h|1' $srcdir/nwmouse/nwmouse_cookie.c
+
+    # Compile nwmouse
     ./nwmouse_install.pl
+
+    # Install nwmouse binaries
     install -D -m 755 $srcdir/nwmouse/nwmouse.so \
         $pkgdir/opt/nwn/nwmouse.so
+
+    # Install libdis binaries
     install -D -m 755 $srcdir/nwmouse/libdis/libdisasm.so \
         $pkgdir/opt/nwn/nwmouse/libdis/libdisasm.so
 
-    # Client-Side Chat Window Logging Support for NWN
+    ###########################################################################
+    #
+    # nwlogger:
+    #
+    #     Client-Side Chat Window Logging Support for NWN
+    #
+    ###########################################################################
+
+    # Patch file so it can find user.h
+    /bin/sed -i 's|linux/user.h|sys/user.h|1' $srcdir/nwlogger/nwlogger_cookie.c
+
+    # Compile nwlogger
     ./nwlogger_install.pl
+
+    # Install nwlogger binaries
     install -D -m 755 $srcdir/nwlogger/nwlogger.so \
         $pkgdir/opt/nwn/nwlogger.so
+
+    # Install libdis binaries
     install -D -m 755 $srcdir/nwlogger/libdis/libdisasm.so \
         $pkgdir/opt/nwn/nwlogger/libdis/libdisasm.so
 
+    ###########################################################################
+
     # Install Cursors
     install -d $pkgdir/opt/nwn/nwmouse/cursors/
     tar -zxvf $srcdir/cursors.tar.gz -C $pkgdir/opt/nwn/nwmouse/cursors/
@@ -134,7 +196,7 @@ EOF
         $pkgdir/usr/share/licenses/$pkgname/EULA.txt
 
     # Install Launcher (Client)
-    install -D -m 755 $startdir/nwn.launcher \
+    install -D -m 755 $srcdir/nwn.launcher \
         $pkgdir/usr/bin/nwn
 
     # Install Desktop File
diff --git a/nwn.install b/nwn.install
index e8bfa88fe72b..9a4304d13759 100644
--- a/nwn.install
+++ b/nwn.install
@@ -7,17 +7,6 @@ post_install() {
     echo ">>>   they start. You may have to restart nwn a few times for it"
     echo ">>>   load successfully. This is normal. Run 'nwn' from a terminal the"
     echo ">>>   first few times until the game starts running correctly."
-    echo ">>>"
-    echo ">>> If something throws an error saying it cannot create the .ini file, "
-    echo ">>>   try modifying the export LD_PRELOAD line in /usr/bin/nwn to"
-    echo ">>>   include just one additional library at a time. For example:"
-    echo ">>>"
-    echo ">>>      export LD_PRELOAD=./nwuser.so  (start nwn)"
-    echo ">>>      export LD_PRELOAD=./nwuser.so:./nwmouse.so (start nwn)"
-    echo ">>>      export LD_PRELOAD=./nwuser.so:./nwmouse.so:./nwmovies.so (start nwn)"
-    echo ">>>      ... etc"
-    echo ">>>"
-    echo ">>>   Now when you start NWN again, all the extra modules should load successfully."
 }
 
 post_upgrade() {
diff --git a/nwn.launcher b/nwn.launcher
index 6a38ff7b6058..b0b3c0a89b62 100644
--- a/nwn.launcher
+++ b/nwn.launcher
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+# Create user directory if it doesn't exist
+if [ ! -d "$HOME/.nwn/" ]; then
+    mkdir $HOME/.nwn/
+fi
+
 cd "/opt/nwn"
 
 # Uncomment to make SDL Sound work on Software Mixers
@@ -20,7 +25,7 @@ export __GL_FSAA_MODE=4
 export LD_LIBRARY_PATH=./miles:$LD_LIBRARY_PATH
 
 # Per-User Settings Support, Hardware Mouse Cursor Support, Linux Movies Support, Client Side Chat Logging Support
-export LD_PRELOAD=./nwuser.so:./nwmouse.so:./nwmovies.so:./nwlogger.so
+export LD_PRELOAD=./nwuser.so:./nwuser64.so:./nwmouse.so:./nwmovies.so:./nwlogger.so
 
 # Run Neverwinter Nights
 ./nwmain $*