walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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'.
This commit is contained in:
Antonin Descampe 2010-10-10 21:17:18 +00:00
parent 72b6fdb04b
commit 106da2f51e
6 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CHANGES
View File

@ -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.

1
configure.ac
View File

@ -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

5
jp3d/Makefile.nix
View File

@ -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:

5
jp3d/libjp3dvm/Makefile.am
View File

@ -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})

4
mj2/Makefile.nix
View File

@ -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

2
opj_config.h.in.user
View File

@ -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.