Djv (neko mips4):Patches

From Nekoware

Jump to: navigation, search

Contents

[edit] Patches

The content of this article was generated by a script. This script will update the article from time to time or when ever a new tardist of this software package is released. There is no reason for do manual changes here, so dont wast time for editing this page.


[edit] Info

The following patch(es) are needed in order to compile neko_djv-0.5.0 (version 1) on an IRIX system.


[edit] djv-0.5.0_irix.patch

diff -urN ../djv-0.5.0/config.mk ./config.mk
--- ../djv-0.5.0/config.mk      2006-09-28 18:05:18.000000000 +0200
+++ ./config.mk 2006-10-02 15:30:30.621787924 +0200
@@ -10,7 +10,8 @@
 #PLATFORM = irix-gcc
 #PLATFORM = solaris
 #PLATFORM = solaris-x86
-PLATFORM = linux
+#PLATFORM = linux
+PLATFORM = irix-cc
 
 # Version.
 #
@@ -20,12 +21,12 @@
 
 # Install.
 #
-INSTALL_PATH = /usr/local/djv
+INSTALL_PATH = /usr/nekoware
 INSTALL_PATH_LIB = $(INSTALL_PATH)/lib
-INSTALL_PATH_PLUGIN = $(INSTALL_PATH)/plugin
+INSTALL_PATH_PLUGIN = $(INSTALL_PATH)/share/djv/plugin
 INSTALL_PATH_BIN = $(INSTALL_PATH)/bin
 INSTALL_PATH_INC = $(INSTALL_PATH)/include
-INSTALL_PATH_DOC = $(INSTALL_PATH)/doc
+INSTALL_PATH_DOC = $(INSTALL_PATH)/share/djv/doc
 INSTALL_PATH_SHORTCUT = /usr/bin
 
 # Build options.
@@ -68,6 +69,7 @@
 JPEG_LIBS = -ljpeg
 PNG_INCS =
 PNG_LIBS = -lpng
+EXR_PATH = /usr/nekoware
 EXR_INCS = -I$(EXR_PATH)/include/OpenEXR
 EXR_LIBS = \
   -L$(EXR_PATH)/lib -lIlmImf -lIlmThread -lIex -lImath -lHalf $(THREAD_LIBS)
diff -urN ../djv-0.5.0/mk/base.mk ./mk/base.mk
--- ../djv-0.5.0/mk/base.mk     2006-09-27 18:03:24.000000000 +0200
+++ ./mk/base.mk        2006-10-02 14:43:34.221781006 +0200
@@ -9,19 +9,20 @@
 DEFINES = \
   -DDJ_VERSION='"$(VERSION)"' \
   -DDJ_SEARCH_PATH='"$(INSTALL_PATH_PLUGIN):$(BUILD_DIR)/plugin"'
-CC = g++
+CC = CC
 CC_FLAGS = -Wall
 CC_FLAGS_LIB = -fPIC
 CC_FLAGS_OBJ = -c
 CC_FLAGS_OPTIMIZE = -O2
 #CC_FLAGS_OPTIMIZE = -O3 -ffast-math -funsafe-math-optimizations
+CC_FLAGS_OPTIMIZE = $(CXXFLAGS)
 CC_FLAGS_MMAP = -DDJ_MMAP
 CC_FLAGS_DBG = -DDJ_ASSERT -g
 CC_FLAGS_PROFILE = -pg
 
 # Linker.
 #
-LD = g++
+LD = $(CC)
 LD_FLAGS = -Wl,-rpath,$(BUILD_DIR)/lib -Wl,-rpath,$(INSTALL_PATH_LIB)
 LD_FLAGS_LIB = -shared
 LD_FLAGS_BIN =
diff -urN ../djv-0.5.0/mk/irix-cc.mk ./mk/irix-cc.mk
--- ../djv-0.5.0/mk/irix-cc.mk  1970-01-01 01:00:00.000000000 +0100
+++ ./mk/irix-cc.mk     2006-10-02 14:39:35.780456085 +0200
@@ -0,0 +1,7 @@
+DEFINES += -DDJ_IRIX
+
+INCS += -I/usr/nekoware/include
+LIBS += -L/usr/nekoware/lib
+
+DEFINES += -DDJ_VLUT_XSGI
+VLUT_LIBS += -lXsgivc
diff -urN ../djv-0.5.0/src/lib/dj/appBase.cxx ./src/lib/dj/appBase.cxx
--- ../djv-0.5.0/src/lib/dj/appBase.cxx 2006-09-27 01:46:08.000000000 +0200
+++ ./src/lib/dj/appBase.cxx    2006-10-02 14:44:44.047098761 +0200
@@ -135,7 +135,7 @@
   
   // Distribution path.
   //
-  Str dist(appName);
+  /* Str dist(appName);
   if (find(dist, '/') != -1) ;
   else {
     env = Str(getenv("PATH"));
@@ -146,7 +146,7 @@
         Dir dir(it());
         const List<FileInfo> itemList =
           filter(dir.itemList(), FILE_FILTER_FILES);
-        ConstListIt<FileInfo> it = itemList;
+        ConstListIt<FileInfo> it = itemList; 
         for (; it.isValid(); ++it)
           if (dist == it().get(-1, false)) break;
         if (it.isValid()) {
@@ -168,8 +168,8 @@
     (tmp.size() ? Str("/") : Str());
   DJ_DBG_PRN("dist = " << dist);
   _searchPathList += dist + Str("lib");
-  _searchPathList += dist + Str("plugin");
-  
+  _searchPathList += dist + Str("plugin");*/
+
   DJ_DBG_PRN("search paths = " << _searchPathList);
 }
 


[edit] Note

Most of these patches are in "unified" format. You may apply a patch by using the "patch" program which is located in "/usr/sbin". The "patch" program is installed by default from the eoe.sw system package.

Personal tools