diff -Nurd -x'*~' OpenJPEG_v1_3.orig/Makefile OpenJPEG_v1_3/Makefile --- OpenJPEG_v1_3.orig/Makefile 2007-12-21 05:39:41.000000000 -0500 +++ OpenJPEG_v1_3/Makefile 2008-12-23 01:53:37.000000000 -0500 @@ -18,16 +18,16 @@ # Converts cr/lf to just lf DOS2UNIX = dos2unix -COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC -LIBRARIES = -lstdc++ +COMPILERFLAGS = -Wall -Os -ffast-math -std=c99 -fPIC +#LIBRARIES = -lstdc++ MODULES = $(SRCS:.c=.o) CFLAGS = $(COMPILERFLAGS) $(INCLUDE) TARGET = openjpeg STATICLIB = lib$(TARGET).a -SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so -LIBNAME = lib$(TARGET).so.$(VER_MAJOR) +SHAREDLIB = lib$(TARGET).$(VER_MAJOR).dylib +LIBNAME = lib$(TARGET).dylib @@ -54,16 +54,15 @@ $(AR) r $@ $(MODULES) $(SHAREDLIB): $(MODULES) - $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES) + $(CC) -dynamiclib -single_module -compatibility_version $(VER_MINOR) -install_name $(INSTALL_LIBDIR)/$@ -o $@ $(MODULES) $(LIBRARIES) install: OpenJPEG install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)' - install -m 644 -o root -g root $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' + install -m 644 $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)' - install -m 755 -o root -g root $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' + install -m 644 $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)' - install -m 644 -o root -g root libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)' - -ldconfig + install -m 644 libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)' clean: rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) diff -Nurd -x'*~' OpenJPEG_v1_3.orig/libopenjpeg/openjpeg.h OpenJPEG_v1_3/libopenjpeg/openjpeg.h --- OpenJPEG_v1_3.orig/libopenjpeg/openjpeg.h 2007-12-21 05:39:41.000000000 -0500 +++ OpenJPEG_v1_3/libopenjpeg/openjpeg.h 2010-11-16 16:29:14.000000000 -0500 @@ -61,7 +61,10 @@ #endif /* !OPJ_STATIC || !WIN32 */ #ifndef __cplusplus -#if defined(HAVE_STDBOOL_H) +#if 1 /* darwin always has stdbool.h and compat #define are not viable + on altivec, but cannot expect others to know to set token to + trigger #include */ + /* The C language implementation does correctly provide the standard header file "stdbool.h". diff -Nurd -x'*~' OpenJPEG_v1_3.orig/libopenjpeg/opj_malloc.h OpenJPEG_v1_3/libopenjpeg/opj_malloc.h --- OpenJPEG_v1_3.orig/libopenjpeg/opj_malloc.h 2007-12-21 05:19:01.000000000 -0500 +++ OpenJPEG_v1_3/libopenjpeg/opj_malloc.h 2008-12-23 01:43:54.000000000 -0500 @@ -75,7 +75,7 @@ #else /* Not WIN32 */ #if defined(__sun) #define HAVE_MEMALIGN - #elif defined(__GNUC__) + #elif defined(__GNUC__) && !defined(__APPLE__) #define HAVE_MEMALIGN #include /* Linux x86_64 and OSX always align allocations to 16 bytes */