From: mh <mh>
Date: Sat, 13 Oct 2001 22:58:23 +0000 (+0000)
Subject: upgraded JAI to version 1.1.1 the latest and first version not to depend on
X-Git-Tag: prexmlproducerconfig~340
X-Git-Url: http://erislabs.net/gitweb/?p=mir.git;a=commitdiff_plain;h=5c9a03ce20b28fe1b1b73b9c2b3914ea69eaf63a

upgraded JAI to version 1.1.1 the latest and first version not to depend on
an X server for GIF and JPEG manipulation. HOORAH.

this also adds native acceleration. see INSTALL.Mir for how to enable that.
---

diff --git a/doc/INSTALL.mir b/doc/INSTALL.mir
index 989d14cc..ad1ff797 100755
--- a/doc/INSTALL.mir
+++ b/doc/INSTALL.mir
@@ -47,25 +47,36 @@ you installed the "mir" directory).
 	cd /usr/share/tomcat/webapps
 	ln -s Mir-install-dir Mir
 
+7. Modify your tomcat startup script and add an LD_LIBRARY_PATH variable
+that points to the WEB-INF/lib directory of your Mir install dir. (called
+"Mir"). Add something like the following at the top of tomcat.sh (tomcat.sh
+is found in the "bin/" dir. under $TOMCAT_HOME):
+    LD_LIBRARY_PATH=/path/to/Mir-install-dir/WEB-INF/lib
 
-7. create a new database 
+An alternaive way to avoid this is to copy any dynamic library files 
+ending with ".so" in WEB-INF/lib to your jre/jdk lib directory (where the 
+other ".so" files live). Or, you can skip the whole thing and live without
+"native" acceleration for image manipulation
+
+
+8. create a new database 
 the database name should be the same as in config.properties
 as user postgres: 
 	createdb dbname 
 
 
-8. create base table
+9. create base table
 	psql -Upostgres dbname < dbscripts/create_pg.sql
-	cat dbscript/help*.sql | psql -Upostgres dbname
-	cat dbscript/populate*.sql | psql -Upostgres dbname
+	cat dbscripts/help*.sql | psql -Upostgres dbname
+	cat dbscripts/populate*.sql | psql -Upostgres dbname
 
-9. Add the dupe prevention trigger to the database:
+10. Add the dupe prevention trigger to the database:
 	cd dbscripts/dupetrigger
 	
 	There, read INSTALL and follow the instructions.
 	
 
-10. Set permissions
+11. Set permissions
 	We provide a script that sets all files' and direcories' permissions to
 	a quite reasonable state.
 	
@@ -75,9 +86,9 @@ as user postgres:
 	./perms.sh
 
 
-11. restart tomcat 
+12. restart tomcat 
 
-12. configure mod_jk 
+13. configure mod_jk 
 
 insert the following patch into /etc/apache/httpd.conf. Edit the directories
 to suit your needs.
@@ -93,7 +104,7 @@ If mod_jk.conf-auto doesn't get written or is 0 bytes in size, check your
 system for file ownership/permissions problems.
 
 
-13. Add a password to your PostgreSQL user and link it to Mir (optional)
+14. Add a password to your PostgreSQL user and link it to Mir (optional)
 
 Add a hard to guess password to the PostgreSQL user database:
 
diff --git a/lib/jai_codec.jar b/lib/jai_codec.jar
index da5a14c4..acdc382b 100755
Binary files a/lib/jai_codec.jar and b/lib/jai_codec.jar differ
diff --git a/lib/jai_core.jar b/lib/jai_core.jar
index ef3ef919..bd785cf5 100755
Binary files a/lib/jai_core.jar and b/lib/jai_core.jar differ
diff --git a/lib/libmlib_jai.so b/lib/libmlib_jai.so
new file mode 100755
index 00000000..b91f5da4
Binary files /dev/null and b/lib/libmlib_jai.so differ