1. The jp3d/libjp3dvm/Makefile.am has been changed:

Installing: /usr/local/TEST_CONFIG/include/openjpeg3d-1.3/
Installing: /usr/local/TEST_CONFIG/include/openjpeg3d-1.3/openjpeg3d.h

PREFIX/include:

   23  openjpeg.h -> openjpeg-1.4/openjpeg.h
   27  openjpeg3d.h -> openjpeg3d-1.3/openjpeg3d.h

28773  openjpeg-1.4/openjpeg.h
22158  openjpeg3d-1.3/openjpeg3d.h

2. The jp3d/Makefile.nix has been changed respectivly.

3. The mj2/Makefile.nix contained a wrong path to 'compat/'

4. opj_config.h.in.user contained a comment within a comment.

5. 'autoreconf' reported that AC_PROG_RANLIB is no longer necessary in 'configure.ac'.

diff --git a/CHANGES b/CHANGES
index 2e8fd599f9773170a5d719440f7aad0c25b56713..767f6f71f46a9cc1a8fbbf822f6a4d9d7663b27a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,31 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+October 10, 2010
+* [antonin] Patch from winfried
+
+                               1. The jp3d/libjp3dvm/Makefile.am has been changed:
+
+                               Installing: /usr/local/TEST_CONFIG/include/openjpeg3d-1.3/
+                               Installing: /usr/local/TEST_CONFIG/include/openjpeg3d-1.3/openjpeg3d.h
+
+                               PREFIX/include:
+
+                                        23  openjpeg.h -> openjpeg-1.4/openjpeg.h
+                                        27  openjpeg3d.h -> openjpeg3d-1.3/openjpeg3d.h
+
+                               28773  openjpeg-1.4/openjpeg.h
+                               22158  openjpeg3d-1.3/openjpeg3d.h
+                                       
+                               2. The jp3d/Makefile.nix has been changed respectivly.
+                                       
+                               3. The mj2/Makefile.nix contained a wrong path to 'compat/'
+                                       
+                               4. opj_config.h.in.user contained a comment within a comment.
+                                       
+                               5. 'autoreconf' reported that AC_PROG_RANLIB is no longer
+                                       necessary in 'configure.ac'.
+
 October 08, 2010
 * [antonin] fixed a bug in mj2.c that prevented extract_j2k_from_mj2 to build properly. Patch from winfried.
 

diff --git a/configure.ac b/configure.ac
index 55ab6498f010d91e5dfe35397677bd7bbd440ee9..67c30983ff84611564ccfd04774462e0ffe9dab4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,6 @@ AC_SUBST(JP3D_BUILD_NR)
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_SED

diff --git a/jp3d/Makefile.nix b/jp3d/Makefile.nix
index 69caaddf45455ca1a79338bc6609f9bf86151c76..b65ed2edd4a7a8b5d80b248985b95b0ea14f0cce 100644 (file)
--- a/jp3d/Makefile.nix
+++ b/jp3d/Makefile.nix
@@ -85,10 +85,11 @@ ifeq ($(ENABLE_SHARED),yes)
 endif
        ldconfig
        install -d $(DESTDIR)$(INSTALL_INCLUDE)
+       rm -f $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg.h
        install -m 644 -o root -g root libjp3dvm/openjpeg.h \
-       $(DESTDIR)$(INSTALL_INCLUDE)
+       $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg3d.h
        (cd $(DESTDIR)$(prefix)/include && \
-       ln -sf $(headerdir)/openjpeg.h openjpeg3d.h)
+       ln -sf $(headerdir)/openjpeg3d.h openjpeg3d.h)
        make -C codec -f Makefile.nix install
 
 uninstall:

diff --git a/jp3d/libjp3dvm/Makefile.am b/jp3d/libjp3dvm/Makefile.am
index 9f8fce363879429708b01d425cdfc32696f47254..c048599f819d8d34a44800c9076ba4378be7e83c 100644 (file)
--- a/jp3d/libjp3dvm/Makefile.am
+++ b/jp3d/libjp3dvm/Makefile.am
@@ -46,7 +46,7 @@ all-local:
        @rm -f .report_lib/libopenjp3dvm.lai
        @echo "" > ../.report.txt
        @echo "Installing: ${prefix}/include/${headerdir}/" >> ../.report.txt
-       @echo "Installing: ${prefix}/include/${headerdir}/openjpeg.h" >> ../.report.txt
+       @echo "Installing: ${prefix}/include/${headerdir}/openjpeg3d.h" >> ../.report.txt
        @(cd .report_lib; \
        l=`ls --file-type`; \
        for f in $$l ; do \
@@ -56,8 +56,9 @@ all-local:
 
 install-data-hook:
        (cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)
+       (cd ${prefix}/include/${headerdir} && mv openjpeg.h openjpeg3d.h) 
        (cd $(DESTDIR)${prefix}/include && \
-       $(LN_S) ${headerdir}/openjpeg.h openjpeg3d.h)
+       $(LN_S) ${headerdir}/openjpeg3d.h openjpeg3d.h)
 
 uninstall-hook:
        (cd $(DESTDIR)${prefix}/include && rm -rf openjpeg3d.h ${headerdir})

diff --git a/mj2/Makefile.nix b/mj2/Makefile.nix
index 7c962fdd8a2fcfc122a9e59aff3bf020658ad322..574d5e245e4fdf1fb9e8b341822b4d413064435b 100644 (file)
--- a/mj2/Makefile.nix
+++ b/mj2/Makefile.nix
@@ -30,11 +30,11 @@ all: frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2
        wrap_j2k_in_mj2 ../bin
 
 frames_to_mj2: frames_to_mj2.c ../libopenjpeg.a
-       $(CC) $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c frames_to_mj2.c \
+       $(CC) $(CFLAGS) ../codec/compat/getopt.c mj2_convert.c mj2.c frames_to_mj2.c \
        -o frames_to_mj2 ../libopenjpeg.a $(USERLIBS)
 
 mj2_to_frames: mj2_to_frames.c ../libopenjpeg.a
-       $(CC) $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c mj2_to_frames.c \
+       $(CC) $(CFLAGS) ../codec/compat/getopt.c mj2_convert.c mj2.c mj2_to_frames.c \
        -o mj2_to_frames ../libopenjpeg.a $(USERLIBS)
 
 extract_j2k_from_mj2: extract_j2k_from_mj2.c ../libopenjpeg.a

diff --git a/opj_config.h.in.user b/opj_config.h.in.user
index ddb7738d4a8a3516be445cc124d76944cdc2408e..7f8b0b791e840fb09a36babe4c9e67bff58b5dd1 100644 (file)
--- a/opj_config.h.in.user
+++ b/opj_config.h.in.user
@@ -9,8 +9,8 @@
  * if you want to define something because you know you have 
  * BOTH installed the library AND the header file(s).
  * Then e.g. write
-/* #undef HAVE_LIBPNG */
 #define HAVE_LIBPNG 1
+ *  
  *
  * The file 'opj_config.h' will be included in some source files.
  * You can not compile without it.