Menu
▾
▴
[UFRaw-CVS] ufraw Makefile.am,1.13,1.14 README,1.18,1.19 configure.ac,1.28,1.29 ufraw_routines.c,1.52,1.53 blackbody.h,1.1.1.1,NONE
|
From: Udi F. <udi...@us...> - 2006-03-04 20:32:35
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4743 Modified Files: Makefile.am README configure.ac ufraw_routines.c Removed Files: blackbody.h Log Message: Bump up version to 0.8 Some code clean up. Remove blackbody.h that is no longer used and will not be used. Add configuration option --with-prefix instead of the environment variable PREFIX. Index: README =================================================================== RCS file: /cvsroot/ufraw/ufraw/README,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** README 3 Mar 2006 21:11:39 -0000 1.18 --- README 4 Mar 2006 20:32:10 -0000 1.19 *************** *** 76,79 **** --- 76,84 ---- --with-libexif: use libexif to read raw EXIF data. + --with-prefix=PREFIX: use also {REFOX as am input prefix for the build + + --with-dosprefix=PREFIX: PREFIX is the prefix in dos format + (needed only in windows) + To build UFRaw: make *************** *** 87,92 **** You also need to make sure that rawphoto is not installed. ! If one of the packages (lcms, libjpeg, libtiff, zlib) is not installed on your ! system, you can build it locally and export PREFIX to its location. To build any of the above packages download the package and type: ./configure --prefix=$PREFIX --- 92,98 ---- You also need to make sure that rawphoto is not installed. ! If one of the packages (lcms, libjpeg, libtiff, zlib) is not installed ! on your system, you can build it locally and use UFRaw's configuration ! option --with-prefix to point to its location. To build any of the above packages download the package and type: ./configure --prefix=$PREFIX *************** *** 98,101 **** --- 104,110 ---- ./configure --prefix=$PREFIX --with-zlib-include-dir=$PREFIX/include --with-zlib-lib-dir=$PREFIX/lib + Finally, you should configure UFRaw with the command: + ./configure --prefix=$PREFIX --with-prefix=$PREFIX + MS-Windows installation ======================= *************** *** 109,116 **** 'make install-windows' will run this installer. pkg-config behaves differently under MinGW32. Therefore, if you are cross compiling from Linux or CygWin, you will have to modify all the ! *.pc files that come with the different packages. The following script should ! do the trick (after updating TARGET to your needs): TARGET=/opt/i586-mingw32msvc --- 118,131 ---- 'make install-windows' will run this installer. + For creating the installer UFRaw needs to know the path to all the DLLs. + For this you should use the configuration option --with-dosprefix. + For example, from CygWin: + ./configure --with-prefix=/cygdrive/c/mingw32 --with-dosprefix=c:\\mingw32 \ + --target=i686-mingw32msvc --host=i686-mingw32msvc --build=i686-mingw32msvc + pkg-config behaves differently under MinGW32. Therefore, if you are cross compiling from Linux or CygWin, you will have to modify all the ! *.pc files that come with the different packages. The following script ! should does the trick in debian (update TARGET to your needs): TARGET=/opt/i586-mingw32msvc Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** ufraw_routines.c 23 Feb 2006 21:27:01 -0000 1.52 --- ufraw_routines.c 4 Mar 2006 20:32:10 -0000 1.53 *************** *** 207,222 **** } - /* Following code might be useful if we want to convert temperature from - * pre 0.7 calculation to the current temperature calculation */ - /* - #include "blackbody.h" - void BB_Temperature_to_RGB(double T, double RGB[3]) - { - int i = T/10-200; - int c; - for (c=0; c<3; c++) RGB[c] = bbWB[c]; - } - */ - void curve_parse_start(GMarkupParseContext *context, const gchar *element, const gchar **names, const gchar **values, gpointer user, GError **error) --- 207,210 ---- Index: Makefile.am =================================================================== RCS file: /cvsroot/ufraw/ufraw/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.am 21 Feb 2006 00:05:30 -0000 1.13 --- Makefile.am 4 Mar 2006 20:32:10 -0000 1.14 *************** *** 27,31 **** UFRAW_COMMON = ufraw_ufraw.c ufraw_routines.c ufraw_exif.c ufraw_developer.c \ ! ufraw_conf.c ufraw_writer.c ufraw.h ufraw_icon.h wb_presets.c blackbody.h \ dcraw_api.c dcraw_api.h dcraw_indi.c nikon_curve.c nikon_curve.h \ iccjpeg.c iccjpeg.h --- 27,31 ---- UFRAW_COMMON = ufraw_ufraw.c ufraw_routines.c ufraw_exif.c ufraw_developer.c \ ! ufraw_conf.c ufraw_writer.c ufraw.h ufraw_icon.h wb_presets.c \ dcraw_api.c dcraw_api.h dcraw_indi.c nikon_curve.c nikon_curve.h \ iccjpeg.c iccjpeg.h --- blackbody.h DELETED --- Index: configure.ac =================================================================== RCS file: /cvsroot/ufraw/ufraw/configure.ac,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** configure.ac 27 Feb 2006 16:00:42 -0000 1.28 --- configure.ac 4 Mar 2006 20:32:10 -0000 1.29 *************** *** 1,4 **** dnl $Id$ ! AC_INIT(UFRaw, 0.7) AC_PREREQ(2.57) --- 1,4 ---- dnl $Id$ ! AC_INIT(UFRaw, 0.8) AC_PREREQ(2.57) *************** *** 14,19 **** # nikon_curve makes some sizeof assumptions, requiring the following tests ! # XXX Fix nikon_curve to use C99 standard types so it will work on 64-bit ! # machines. AC_CHECK_SIZEOF(short) if test $ac_cv_sizeof_short -ne 2; then --- 14,18 ---- # nikon_curve makes some sizeof assumptions, requiring the following tests ! # (could be avoided by using C99 standart types) AC_CHECK_SIZEOF(short) if test $ac_cv_sizeof_short -ne 2; then *************** *** 38,51 **** #LDFLAGS="$LDFLAGS -s" - # Set default PREFIX, if not already defined according to os. # windows will require some special attention case $host_os in *mingw* ) ufraw_win32=yes - test -z $PREFIX && PREFIX=/c/mingw32 - ;; - *darwin* ) - ufraw_win32=no - test -z $PREFIX && PREFIX=/sw ;; * ) --- 37,44 ---- *************** *** 55,64 **** AM_CONDITIONAL(UFRAW_WIN32, test $ufraw_win32 = yes) - # In windows --prefix=$PREFIX is set as default if test $ufraw_win32 = yes; then CFLAGS="$CFLAGS -mno-cygwin -mwindows -mms-bitfields" CONSOLE="-mconsole" - #AC_PREFIX_DEFAULT($PREFIX) # this ac macro ignores the test condition - prefix=$PREFIX else CONSOLE= --- 48,54 ---- *************** *** 66,81 **** AC_SUBST(CONSOLE) ! # If prefix is non-empty, add prefix's pkgconfig dir to the pkgconfig search ! # path, so we'll find programs/libraries also installed to this prefix. ! # XXX Really, where we are building to and where we obtain things from are ! # logically separate, and this should be solved by --with-gimp=/foo/bar ! # arguments. ! if test "!(-z $PREFIX)"; then ! echo "Adding pkgconfig/cppflags/ldflags for $PREFIX." ! export PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH" ! CPPFLAGS="$CPPFLAGS -I$PREFIX/include" ! LDFLAGS="$LDFLAGS -L$PREFIX/lib" fi PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4) AC_SUBST(GTK_LIBS) --- 56,77 ---- AC_SUBST(CONSOLE) ! # point to programs/libraries installed in a non-default place ! AC_ARG_WITH(prefix, ! [ --with-prefix=PREFIX use also PREFIX as an input prefix for the build], ! [ with_prefix=$withval], ! [ with_prefix=NONE ] ) ! if test "$with_prefix = NONE"; then ! echo "Adding pkgconfig/cppflags/ldflags for $with_prefix." ! export PKG_CONFIG_PATH="$with_prefix/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH" ! CPPFLAGS="$CPPFLAGS -I$with_prefix/include" ! LDFLAGS="$LDFLAGS -L$with_prefix/lib" fi + AC_ARG_WITH(dosprefix, + [ --with-dosprefix=PREFIX PREFIX is the prefix in dos format + (needed only in windows) ], + [ with_dosprefix=$withval], + [ with_dosprefix=NONE ] ) + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4) AC_SUBST(GTK_LIBS) *************** *** 102,106 **** # unless using an old gimp-dev package. if $PKG_CONFIG --atleast-version=2.2 gimpui-2.0; then ! if $PKG_CONFIG --max-version=2.8.9 gtk+-2.0; then AC_DEFINE(G_DISABLE_DEPRECATED, [], disable deprecated glib features) AC_DEFINE(GDK_DISABLE_DEPRECATED, [], disable deprecated gdk features) --- 98,102 ---- # unless using an old gimp-dev package. if $PKG_CONFIG --atleast-version=2.2 gimpui-2.0; then ! if $PKG_CONFIG --max-version=2.8.12 gtk+-2.0; then AC_DEFINE(G_DISABLE_DEPRECATED, [], disable deprecated glib features) AC_DEFINE(GDK_DISABLE_DEPRECATED, [], disable deprecated gdk features) *************** *** 135,140 **** AC_MSG_ERROR(can not build UFRaw without getopt_long)) ! # XXX A comment is required to explain this. ! #AC_SEARCH_LIBS(ntohs, ws2_32) if test $ufraw_win32 = yes; then LIBS="$LIBS -lws2_32" --- 131,135 ---- AC_MSG_ERROR(can not build UFRaw without getopt_long)) ! # The ws2_32 library is required for the ntohs sybmol on WIN32. if test $ufraw_win32 = yes; then LIBS="$LIBS -lws2_32" *************** *** 191,197 **** AC_SUBST(WINDRES) # For the windows-intstaller make needs the location of the DLLs AC_SUBST(PREFIX) # and ISCC (ufraw-setup.iss.in) needs them in dos format... ! test -z $DOSPREFIX && DOSPREFIX="C:\\mingw32" AC_SUBST(DOSPREFIX) ISCC="\"\$(PROGRAMFILES)\"/Inno\ Setup\ 5/ISCC.exe" --- 186,193 ---- AC_SUBST(WINDRES) # For the windows-intstaller make needs the location of the DLLs + PREFIX=$with_prefix AC_SUBST(PREFIX) # and ISCC (ufraw-setup.iss.in) needs them in dos format... ! DOSPREFIX=$with_dosprefix AC_SUBST(DOSPREFIX) ISCC="\"\$(PROGRAMFILES)\"/Inno\ Setup\ 5/ISCC.exe" *************** *** 235,239 **** AC_MSG_CHECKING(whether to build extras) AC_ARG_ENABLE(extras, ! [ --enable-extras build extra (dcraw, nikon-curve, ufraw-exif) executables], , enable_extras=no) AC_MSG_RESULT($enable_extras) --- 231,235 ---- AC_MSG_CHECKING(whether to build extras) AC_ARG_ENABLE(extras, ! [ --enable-extras build extra (dcraw, nikon-curve, ufraw-exif) executables], , enable_extras=no) AC_MSG_RESULT($enable_extras) |